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.18
edited by bougault
on 2022/11/17 13:28
Change comment: There is no comment for this version
To version 26.73
edited by bougault
on 2022/11/17 10:34
Change comment: There is no comment for this version

Summary

Details

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