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.61
edited by bougault
on 2022/11/17 14:29
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,10 +1,9 @@
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 {
... ... @@ -19,115 +19,47 @@
19 19   privateFilter: { type: Boolean },
20 20   }
21 21   */
22 - static properties = {
23 - results: { type: Array }
24 - }
25 - static styles = css`
26 - :host > div {
27 - padding-bottom: 4em;
28 - }
29 - .result {
30 - margin-top: 1em;
31 - }
32 - .light {
33 - color: var(--color-gray-500, #CCC);
34 - font-size: 14px;
35 - }
36 - a {
37 - color: var(--color-brand-primary, blue);
38 - }
39 - `;
40 40   constructor() {
41 41   super();
42 42   this.searchText = "";
43 - this.prevSearchText = "";
44 44   this.administrator = false;
45 45   this.editor = false;
46 46   this.viewer = false;
47 47   this.rolesFilter = [];
48 - 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=`);
49 49   this.results = [];
50 - this.resultsCache = [];
51 51   }
52 52   toggleRoleFilter(roleName) {
53 - if(this.rolesFilter.indexOf(roleName) === -1) {
32 + if(this.rolesFilter.indexOf(roleName) == -1) {
54 54   this.rolesFilter.push(roleName);
55 55   } else {
56 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
35 + this.rolesFilter.filter(role => role !== roleName);
57 57   }
58 58   this[roleName] = !this[roleName];
59 59   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
60 - this.handleSearch();
61 61   }
62 62   setSearchText(e) {
63 63   this.searchText = e.target.value;
64 64   }
65 - handleSearch(textSearch) {
66 - if(this.searchText !== "" || textSearch) {
67 - if(this.searchText !== this.prevSearchText) {
68 - this.clearResults();
69 - this.prevSearchText = this.searchText;
70 - this.fetchWikiSearch().then(results => {
71 - this.resultsCache = results;
72 - if(this.hasActiveFilters()) {
73 - this.fetchFilterSearch().then(this.filterResults);
74 - } else {
75 - this.results = results;
76 - }
77 - })
78 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
79 - this.fetchFilterSearch().then(this.filterResults)
80 - } else {
81 - this.results = this.resultsCache;
82 - }
83 - } else {
84 - this.clearResults();
85 - console.log("no search text, should return filter search results if any");
86 - this.fetchFilterSearch().then(collabs => {
87 - console.log("Format and display collabs", collabs);
88 - })
43 + handleSearch() {
44 + console.log(this.searchText);
45 + if(this.searchText !== "") {
46 + this.fetchWikiSearch();
89 89   }
90 90   }
91 - hasActiveFilters() {
92 - // we only look at role filters for POC.
93 - return this.rolesFilter.length > 0;
94 - }
95 95   fetchWikiSearch() {
96 96   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
97 - return handleXWikiSearch(this.searchText);
51 + handleXWikiSearch(this.searchText).then(results => this.results = results);
98 98   }
99 - fetchFilterSearch() {
100 - return new Promise((resolve) => {
101 - if(this.hasActiveFilters()) {
102 - fetch(this.filterUrl).then(res => res.json()).then(resolve);
103 - } else {
104 - resolve([]);
105 - }
106 - });
53 + buildFilter() {
54 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
107 107   }
108 - filterResults = (filteredCollabs) => {
109 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
110 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
111 - }
112 - clearResults() {
113 - this.results = [];
114 - this.resultsCache = [];
115 - }
116 - getLink(xwikiDocSpace) {
117 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118 - }
119 - handleKeyPress(e) {
120 - if(e.keyCode === 13) {
121 - e.preventDefault()
122 - this.handleSearch(true);
123 - }
124 - }
125 125   render() {
126 126   return html`
127 127  <div>
128 128   <div>
129 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
130 - <button @click="${() => this.handleSearch(true)}">Search</button>
60 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
61 + <button @click="${this.handleSearch}">Search</button>
131 131   </div>
132 132   <div>
133 133   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
... ... @@ -136,10 +136,10 @@
136 136   </div>
137 137   <div>
138 138   ${this.results.map(result => html`
139 - <div class="result">
140 - <a href="${this.getLink(result.space)}">${result.title_}</a>
70 + <div>
71 + <a href="#">${result.title}</a>
72 + <div>${result.id}</div>
141 141   <div>${result.doccontent_.substring(0, 150)}
142 - <div class="light">${result.space.replaceAll('.', ' / ')}</div>
143 143   </div>
144 144   `)}
145 145   </div>
... ... @@ -172,5 +172,130 @@
172 172  </script>
173 173  
174 174  <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>
175 175  
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 +-->
176 176  {{/html}}