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.73
edited by bougault
on 2022/11/17 14:53
Change comment: There is no comment for this version
To version 26.76
edited by bougault
on 2022/11/17 10:43
Change comment: There is no comment for this version

Summary

Details

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