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 30.1
edited by bougault
on 2023/01/11 14:11
Change comment: There is no comment for this version
To version 26.84
edited by bougault
on 2022/11/17 10:49
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,119 +8,70 @@
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   }
23 23   .light {
24 - color: var(--color-gray-500, #CCC);
29 + color: var(--color-gray-100, #CCC);
25 25   font-size: 14px;
26 26   }
27 - a {
28 - color: var(--color-brand-primary, blue);
29 - }
30 30   `;
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=`);
40 + 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 42   }
43 - firstUpdated() {
44 - this.renderRoot.getElementById('searchInput').focus();
45 - }
46 46   toggleRoleFilter(roleName) {
47 - if(this.rolesFilter.indexOf(roleName) === -1) {
44 + if(this.rolesFilter.indexOf(roleName) == -1) {
48 48   this.rolesFilter.push(roleName);
49 49   } else {
50 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
47 + this.rolesFilter.filter(role => role !== roleName);
51 51   }
52 52   this[roleName] = !this[roleName];
53 53   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
54 - this.handleSearch();
55 55   }
56 56   setSearchText(e) {
57 57   this.searchText = e.target.value;
58 58   }
59 - handleSearch(textSearch) {
60 - if(this.searchText !== "" || textSearch) {
61 - if(this.searchText !== this.prevSearchText) {
62 - this.clearResults();
63 - this.prevSearchText = this.searchText;
64 - this.fetchWikiSearch().then(results => {
65 - this.resultsCache = results;
66 - if(this.hasActiveFilters()) {
67 - this.fetchFilterSearch().then(this.filterResults);
68 - } else {
69 - this.results = results;
70 - }
71 - })
72 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
73 - this.fetchFilterSearch().then(this.filterResults)
74 - } else {
75 - this.results = this.resultsCache;
76 - }
77 - } else {
78 - this.clearResults();
79 - console.log("no search text, should return filter search results if any");
80 - this.fetchFilterSearch().then(collabs => {
81 - console.log("Format and display collabs", collabs);
82 - })
55 + handleSearch() {
56 + console.log(this.searchText);
57 + if(this.searchText !== "") {
58 + this.fetchWikiSearch();
83 83   }
84 84   }
85 - hasActiveFilters() {
86 - // we only look at role filters for POC.
87 - return this.rolesFilter.length > 0;
88 - }
89 89   fetchWikiSearch() {
90 90   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
91 - return handleXWikiSearch(this.searchText);
63 + handleXWikiSearch(this.searchText).then(results => this.results = results);
92 92   }
93 - fetchFilterSearch() {
94 - return new Promise((resolve) => {
95 - if(this.hasActiveFilters()) {
96 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
97 - } else {
98 - resolve([]);
99 - }
100 - });
65 + buildFilter() {
66 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
101 101   }
102 - filterResults = (filteredCollabs) => {
103 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
104 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
105 - }
106 - clearResults() {
107 - this.results = [];
108 - this.resultsCache = [];
109 - }
110 - getLink(xwikiDocSpace) {
111 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
112 - }
113 - handleKeyPress(e) {
114 - if (e.keyCode === 13) {
115 - this.handleSearch(true);
116 - }
117 - }
118 118   render() {
119 119   return html`
120 120  <div>
121 121   <div>
122 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
123 - <button @click="${() => this.handleSearch(true)}">Search</button>
72 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
73 + <button @click="${this.handleSearch}">Search</button>
124 124   </div>
125 125   <div>
126 126   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
... ... @@ -130,12 +130,13 @@
130 130   <div>
131 131   ${this.results.map(result => html`
132 132   <div class="result">
133 - <a href="${this.getLink(result.space)}">${result.title_}</a>
83 + <a href="#">${result.title_}</a>
84 + <div class="light">${result.space}</div>
134 134   <div>${result.doccontent_.substring(0, 150)}
135 - <div class="light">${result.space.replaceAll('.', ' / ')}</div>
136 136   </div>
137 137   `)}
138 138   </div>
89 +</div>
139 139  `
140 140   }
141 141   }
... ... @@ -146,10 +146,9 @@
146 146   require(['jquery'], function($) {
147 147   const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
148 148   //contextSearchButton.addEventListener('click', function() {
149 - $.get(solrServiceURL, {
100 + $.post(solrServiceURL, {
150 150   outputSyntax: 'plain',
151 151   media: 'json',
152 - nb:1000,
153 153   query: [
154 154   'q="__INPUT__"~100',
155 155   'fq=type:DOCUMENT',
... ... @@ -163,4 +163,132 @@
163 163   }
164 164  });
165 165  </script>
166 -<clb-unified-search></clb-unified-search>{{/html}}
116 +
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 +{{/html}}