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.75
edited by bougault
on 2022/11/17 10:37
Change comment: There is no comment for this version
To version 30.2
edited by bougault
on 2023/01/11 14:18
Change comment: There is no comment for this version

Summary

Details

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