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.8
edited by bougault
on 2023/01/11 14:50
Change comment: There is no comment for this version
To version 26.80
edited by bougault
on 2022/11/17 10:47
Change comment: There is no comment for this version

Summary

Details

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