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