IAM21 instance, do not create collab nor modify a team, your changes will be lost


Changes for page Context Search

Last modified by bougault on 2023/02/20 16:29
From version 27.60
edited by bougault
on 2022/11/17 14:29
Change comment: There is no comment for this version
To version 26.71
edited by bougault
on 2022/11/17 10:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,10 +1,9 @@
1 1  {{html clean="false"}}
2 2  <!--
3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 - !!! Many optimisations can be done !!!
3 + !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
5 5  -->
6 6  <script type="module">
7 -import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
6 +import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
8 8  window.addEventListener('DOMContentLoaded', function() {
9 9  
10 10   class UnifiedSearch extends LitElement {
... ... @@ -19,115 +19,43 @@
19 19   privateFilter: { type: Boolean },
20 20   }
21 21   */
22 - static properties = {
23 - results: { type: Array }
24 - }
25 - static styles = css`
26 - :host > div {
27 - padding-bottom: 4em;
28 - }
29 - .result {
30 - margin-top: 1em;
31 - }
32 - .light {
33 - color: var(--color-gray-500, #CCC);
34 - font-size: 14px;
35 - }
36 - a {
37 - color: var(--color-brand-primary, blue);
38 - }
39 - `;
40 40   constructor() {
41 41   super();
42 42   this.searchText = "";
43 - this.prevSearchText = "";
44 44   this.administrator = false;
45 45   this.editor = false;
46 46   this.viewer = false;
47 47   this.rolesFilter = [];
48 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49 - this.results = [];
50 - this.resultsCache = [];
28 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
51 51   }
52 52   toggleRoleFilter(roleName) {
53 - if(this.rolesFilter.indexOf(roleName) === -1) {
31 + if(this.rolesFilter.indexOf(roleName) == -1) {
54 54   this.rolesFilter.push(roleName);
55 55   } else {
56 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
34 + this.rolesFilter.filter(role => role !== roleName);
57 57   }
58 58   this[roleName] = !this[roleName];
59 59   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
60 - this.handleSearch();
61 61   }
62 62   setSearchText(e) {
63 63   this.searchText = e.target.value;
64 64   }
65 - handleSearch(textSearch) {
66 - if(this.searchText !== "" || textSearch) {
67 - if(this.searchText !== this.prevSearchText) {
68 - this.clearResults();
69 - this.prevSearchText = this.searchText;
70 - this.fetchWikiSearch().then(results => {
71 - this.resultsCache = results;
72 - if(this.hasActiveFilters()) {
73 - this.fetchFilterSearch().then(this.filterResults);
74 - } else {
75 - this.results = results;
76 - }
77 - })
78 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
79 - this.fetchFilterSearch().then(this.filterResults)
80 - } else {
81 - this.results = this.resultsCache;
82 - }
83 - } else {
84 - this.clearResults();
85 - console.log("no search text, should return filter search results if any");
86 - this.fetchFilterSearch().then(collabs => {
87 - console.log("Format and display collabs", collabs);
88 - })
89 - }
42 + handleSearch() {
43 + console.log(this.searchText);
90 90   }
91 - hasActiveFilters() {
92 - // we only look at role filters for POC.
93 - return this.rolesFilter.length > 0;
94 - }
95 95   fetchWikiSearch() {
96 96   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
97 - return handleXWikiSearch(this.searchText);
47 + handleXWikiSearch(this.searchText).then(results => console.log(results));
98 98   }
99 - fetchFilterSearch() {
100 - return new Promise((resolve) => {
101 - if(this.hasActiveFilters()) {
102 - fetch(this.filterUrl).then(res => res.json()).then(resolve);
103 - } else {
104 - resolve([]);
105 - }
106 - });
49 + buildFilter() {
50 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
107 107   }
108 - filterResults = (filteredCollabs) => {
109 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
110 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
111 - }
112 - clearResults() {
113 - this.results = [];
114 - this.resultsCache = [];
115 - }
116 - getLink(xwikiDocSpace) {
117 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118 - }
119 - handleKeyPress(e) {
120 - console.log(e.keyCode === 13) {
121 - e.preventDefault()
122 - this.handleSearch(true);
123 - }
124 - }
125 125   render() {
126 126   return html`
127 127  <div>
128 128   <div>
129 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
130 - <button @click="${() => this.handleSearch(true)}">Search</button>
56 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
57 + <button @click="${this.handleSearch}">Search</button>
131 131   </div>
132 132   <div>
133 133   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
... ... @@ -134,15 +134,6 @@
134 134   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
135 135   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
136 136   </div>
137 - <div>
138 - ${this.results.map(result => html`
139 - <div class="result">
140 - <a href="${this.getLink(result.space)}">${result.title_}</a>
141 - <div>${result.doccontent_.substring(0, 150)}
142 - <div class="light">${result.space.replaceAll('.', ' / ')}</div>
143 - </div>
144 - `)}
145 - </div>
146 146  </div>
147 147  `
148 148   }
... ... @@ -152,8 +152,8 @@
152 152   function handleXWikiSearch(searchString) {
153 153   return new Promise((resolve) => {
154 154   require(['jquery'], function($) {
155 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
156 - //contextSearchButton.addEventListener('click', function() {
73 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
74 + contextSearchButton.addEventListener('click', function() {
157 157   $.post(solrServiceURL, {
158 158   outputSyntax: 'plain',
159 159   media: 'json',
... ... @@ -164,7 +164,7 @@
164 164   ].join('\n'),
165 165   input: searchString
166 166   }).then(resolve);
167 - //});
85 + });
168 168   });
169 169   });
170 170   }
... ... @@ -172,5 +172,130 @@
172 172  </script>
173 173  
174 174  <clb-unified-search></clb-unified-search>
93 +<!--
94 +<select id="context-search-type">
95 + <option value="all">All</option>
96 + <option value="collabs">Collabs</option>
97 + <option value="current-collab">Current Collab</option>
98 +</select>
99 +<input type="text" id="context-search-text" />
100 +<button id="context-search-button" class="btn btn-primary">Search</button>
101 +<div class="form-group">
102 + <label>
103 + <input type="checkbox" data-role-filter="administrator"> Administrator
104 + </label>
105 + <label>
106 + <input type="checkbox" data-role-filter="editor"> Editor
107 + </label>
108 +</div>
175 175  
110 +
111 +<pre id="context-search-response"></pre>
112 +<script>
113 + window.addEventListener('DOMContentLoaded', function() {
114 + const filters = {
115 + search: '',
116 + offset: 0,
117 + orderField: 'title',
118 + order: 'asc',
119 + favorite: false,
120 + roles: [] // to be joined as administrator+editor+viewer
121 + };
122 +
123 + function addRole(role) {
124 + if(filters.roles.indexOf(role) == -1) {
125 + filters.roles.push(role);
126 + }
127 + }
128 +
129 + function removeRole(role) {
130 + filters.roles = filters.roles.filter(r => r !== role)
131 + }
132 +
133 + const filterInputs = document.querySelectorAll('input[data-role-filter]');
134 +
135 + filterInputs.forEach(function(filterIpt) {
136 + filterIpt.addEventListener('click', function() {
137 + const role = this.getAttribute('data-role-filter');
138 + if(this.checked) {
139 + addRole(role);
140 + } else {
141 + removeRole(role);
142 + }
143 + runFilteredRequest();
144 + })
145 + });
146 +
147 + function runFilteredRequest() {
148 + const urlParams = new URLSearchParams();
149 + const tmpFilters = filters;
150 + tmpFilters.roles = tmpFilters.roles.join("+");
151 + for(filter in tmpFilters) {
152 + urlParams.set(filter, tmpFilters[filter]);
153 + }
154 + console.log(urlParams);
155 + }
156 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
157 + const contextSearchType = document.getElementById("context-search-type");
158 + const contextSearchText = document.getElementById("context-search-text");
159 + const contextSearchResponse = document.getElementById("context-search-response");
160 + const contextSearchButton = document.getElementById("context-search-button");
161 + contextSearchButton.addEventListener('click', function() {
162 + const context = contextSearchType.options[contextSearchType.selectedIndex].value;
163 + const term = contextSearchText.value;
164 + switch(context) {
165 + case 'collabs':
166 + document.location.href = `/bin/view/Collabs/#search=${term}`;
167 + break;
168 + case 'current-collab':
169 + handleXWikiSearch('bougaultx');
170 + break
171 + default:
172 + handleXWikiSearch('')
173 + }
174 +
175 + });
176 + function handleXWikiSearch(space, callback) {
177 + require(['jquery'], function($) {
178 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
179 + const contextSearchButton = document.getElementById("context-search-button");
180 + const xwikiSpace = space ? `.${space}` : '';
181 + contextSearchButton.addEventListener('click', function() {
182 + $.post(solrServiceURL, {
183 + outputSyntax: 'plain',
184 + media: 'json',
185 + query: [
186 + 'q="__INPUT__"~100',
187 + 'fq=type:DOCUMENT',
188 + `fq=space:Collabs${xwikiSpace}.*`
189 + ].join('\n'),
190 + input: $('#context-search-text').val()
191 + }).then(res => {
192 + if(callback) {
193 + callback(res).then(results => {
194 + contextSearchResponse.innerText = JSON.stringify(results, null, 2);
195 + })
196 + } else {
197 + contextSearchResponse.innerText = JSON.stringify(res, null, 2);
198 + }
199 + });
200 + });
201 + });
202 + }
203 + function applyAdministratorFilter(results) {
204 + return new Promise((resolve, reject) => {
205 + //fetch("/rest/v1/collabs?roles=administrator")
206 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
207 + .then(res => res.json())
208 + .then(collabs => {
209 + const spaces = collabs.map(collab => `Collabs.${collab.name}`);
210 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
211 + resolve(filtered);
212 + })
213 +
214 + })
215 + }
216 +});
217 +</script>
218 +-->
176 176  {{/html}}