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 26.84
edited by bougault
on 2022/11/17 10:49
Change comment: There is no comment for this version
To version 27.74
edited by bougault
on 2022/11/17 14:53
Change comment: There is no comment for this version

Summary

Details

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