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.79
edited by bougault
on 2022/11/17 15:00
Change comment: There is no comment for this version
To version 26.91
edited by bougault
on 2022/11/17 11:00
Change comment: There is no comment for this version

Summary

Details

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