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 31.5
edited by bougault
on 2023/01/11 14:46
Change comment: There is no comment for this version
To version 26.88
edited by bougault
on 2022/11/17 10:57
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,6 @@
1 -
2 -{{html clean="false"}}<!--
3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 - !!! Many optimisations can be done !!!
1 +{{html clean="false"}}
2 +<!--
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   }
... ... @@ -31,107 +31,47 @@
31 31   constructor() {
32 32   super();
33 33   this.searchText = "";
34 - this.prevSearchText = "";
35 35   this.administrator = false;
36 36   this.editor = false;
37 37   this.viewer = false;
38 38   this.rolesFilter = [];
39 - 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=`);
40 40   this.results = [];
41 - this.resultsCache = [];
42 - this.offset = 0;
43 - this.nb = 10;
44 44   }
45 - firstUpdated() {
46 - this.renderRoot.getElementById('searchInput').focus();
47 - }
48 48   toggleRoleFilter(roleName) {
49 - if(this.rolesFilter.indexOf(roleName) === -1) {
47 + if(this.rolesFilter.indexOf(roleName) == -1) {
50 50   this.rolesFilter.push(roleName);
51 51   } else {
52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
50 + this.rolesFilter.filter(role => role !== roleName);
53 53   }
54 54   this[roleName] = !this[roleName];
55 55   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56 - this.handleSearch();
57 57   }
58 58   setSearchText(e) {
59 59   this.searchText = e.target.value;
60 60   }
61 - setOffset(e) {
62 - this.offset = e.target.value;
63 - }
64 - setNb(e) {
65 - this.nb = e.target.value;
66 - }
67 - handleSearch(textSearch) {
68 - if(this.searchText !== "" || textSearch) {
69 - // if(this.searchText !== this.prevSearchText) {
70 - this.clearResults();
71 - this.prevSearchText = this.searchText;
72 - this.fetchWikiSearch().then(results => {
73 - //this.resultsCache = results;
74 - if(this.hasActiveFilters()) {
75 - this.fetchFilterSearch().then(this.filterResults);
76 - } else {
77 - this.results = results ? results : [];
78 - }
79 - })
80 - /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
81 - this.fetchFilterSearch().then(this.filterResults)
82 - } else {
83 - this.results = this.resultsCache;
84 - }
85 - */
86 - } else {
87 - this.clearResults();
88 - console.log("no search text, should return filter search results if any");
89 - this.fetchFilterSearch().then(collabs => {
90 - console.log("Format and display collabs", collabs);
91 - })
58 + handleSearch() {
59 + console.log(this.searchText);
60 + if(this.searchText !== "") {
61 + this.fetchWikiSearch();
92 92   }
93 93   }
94 - hasActiveFilters() {
95 - // we only look at role filters for POC.
96 - return this.rolesFilter.length > 0;
97 - }
98 98   fetchWikiSearch() {
99 99   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
100 - return handleXWikiSearch(this.searchText, this.offset, this.nb);
66 + handleXWikiSearch(this.searchText).then(results => this.results = results);
101 101   }
102 - fetchFilterSearch() {
103 - return new Promise((resolve) => {
104 - if(this.hasActiveFilters()) {
105 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
106 - } else {
107 - resolve([]);
108 - }
109 - });
68 + buildFilter() {
69 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
110 110   }
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)));
71 + getLink(xwikiDocId) {
72 + return `/bin/view/${xwikiDocId.replace('.', '/')}`;
114 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 - }
127 127   render() {
128 128   return html`
129 129  <div>
130 130   <div>
131 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
132 - <input @change="${this.setNb}"" type="text" value="${this.nb}" />
133 - <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
134 - <button @click="${() => this.handleSearch(true)}">Search</button>
78 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
79 + <button @click="${this.handleSearch}">Search</button>
135 135   </div>
136 136   <div>
137 137   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
... ... @@ -141,27 +141,26 @@
141 141   <div>
142 142   ${this.results.map(result => html`
143 143   <div class="result">
144 - <a href="${this.getLink(result.space)}">${result.title_}</a>
89 + <a href="${this.getLink(result.id)}">${result.title_}</a>
90 + <div class="light">${result.space}</div>
145 145   <div>${result.doccontent_.substring(0, 150)}
146 - <div class="light">${result.space.replaceAll('.', ' / ')}</div>
147 147   </div>
148 148   `)}
149 149   </div>
95 +</div>
150 150  `
151 151   }
152 152   }
153 153   customElements.define('clb-unified-search', UnifiedSearch);
154 154  
155 - function handleXWikiSearch(searchString, offset, nb) {
101 + function handleXWikiSearch(searchString) {
156 156   return new Promise((resolve) => {
157 157   require(['jquery'], function($) {
158 158   const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
159 159   //contextSearchButton.addEventListener('click', function() {
160 - $.get(solrServiceURL, {
106 + $.post(solrServiceURL, {
161 161   outputSyntax: 'plain',
162 162   media: 'json',
163 - nb: nb,
164 - offset: offset,
165 165   query: [
166 166   'q="__INPUT__"~100',
167 167   'fq=type:DOCUMENT',
... ... @@ -175,4 +175,132 @@
175 175   }
176 176  });
177 177  </script>
178 -<clb-unified-search></clb-unified-search>{{/html}}
122 +
123 +<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 +-->
250 +{{/html}}