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.80
edited by bougault
on 2022/11/17 15:02
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,144 +1,63 @@
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 - width: 100%;
32 - display: flex;
33 - font-size: 12px;
34 - margin-top: 2em;
35 - }
36 - .rawResults > div {
37 - width: 100%;
38 - }
39 - .rawResults ul {
40 - list-style-type: none;
41 - padding: 0;
42 - }
43 - `;
20 + */
44 44   constructor() {
45 45   super();
46 46   this.searchText = "";
47 - this.prevSearchText = "";
48 48   this.administrator = false;
49 49   this.editor = false;
50 50   this.viewer = false;
51 51   this.rolesFilter = [];
52 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
53 - this.results = [];
54 - this.resultsCache = [];
55 - this.collabFiltersResults = [];
28 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
56 56   }
57 - firstUpdated() {
58 - this.renderRoot.getElementById('searchInput').focus();
59 - }
60 60   toggleRoleFilter(roleName) {
61 - if(this.rolesFilter.indexOf(roleName) === -1) {
31 + if(this.rolesFilter.indexOf(roleName) == -1) {
62 62   this.rolesFilter.push(roleName);
63 63   } else {
64 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
34 + this.rolesFilter.filter(role => role !== roleName);
65 65   }
66 66   this[roleName] = !this[roleName];
67 67   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
68 - this.handleSearch();
69 69   }
70 70   setSearchText(e) {
71 71   this.searchText = e.target.value;
72 72   }
73 - handleSearch(textSearch) {
74 - if(this.searchText !== "" || textSearch) {
75 - if(this.searchText !== this.prevSearchText) {
76 - this.clearResults();
77 - this.prevSearchText = this.searchText;
78 - this.fetchWikiSearch().then(results => {
79 - this.resultsCache = results;
80 - if(this.hasActiveFilters()) {
81 - this.fetchFilterSearch().then(this.filterResults);
82 - } else {
83 - this.results = results;
84 - }
85 - })
86 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
87 - this.fetchFilterSearch().then(this.filterResults)
88 - } else {
89 - this.results = this.resultsCache;
90 - }
91 - } else {
92 - this.clearResults();
93 - console.log("no search text, should return filter search results if any");
94 - this.fetchFilterSearch().then(collabs => {
95 - console.log("Format and display collabs", collabs);
96 - })
42 + handleSearch() {
43 + console.log(this.searchText);
44 + if(this.searchText !== "") {
45 + this.fetchWikiSearch();
97 97   }
98 98   }
99 - hasActiveFilters() {
100 - // we only look at role filters for POC.
101 - return this.rolesFilter.length > 0;
102 - }
103 103   fetchWikiSearch() {
104 104   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
105 - return handleXWikiSearch(this.searchText);
50 + handleXWikiSearch(this.searchText).then(results => console.log(results));
106 106   }
107 - fetchFilterSearch() {
108 - return new Promise((resolve) => {
109 - if(this.hasActiveFilters()) {
110 - fetch(this.filterUrl).then(res => res.json()).then((res) => {
111 - this.collabFiltersResults = res;
112 - resolve(res);
113 - });
114 - } else {
115 - resolve([]);
116 - }
117 - });
52 + buildFilter() {
53 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
118 118   }
119 - filterResults = (filteredCollabs) => {
120 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
121 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
122 - }
123 - clearResults() {
124 - this.results = [];
125 - this.resultsCache = [];
126 - this.collabFiltersResults = [];
127 - }
128 - getLink(xwikiDocSpace) {
129 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
130 - }
131 - handleKeyPress(e) {
132 - if (e.keyCode === 13) {
133 - this.handleSearch(true);
134 - }
135 - }
136 136   render() {
137 137   return html`
138 138  <div>
139 139   <div>
140 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
141 - <button @click="${() => this.handleSearch(true)}">Search</button>
59 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
60 + <button @click="${this.handleSearch}">Search</button>
142 142   </div>
143 143   <div>
144 144   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
... ... @@ -145,25 +145,6 @@
145 145   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
146 146   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
147 147   </div>
148 - <div>
149 - ${this.results.map(result => html`
150 - <div class="result">
151 - <a href="${this.getLink(result.space)}">${result.title_}</a>
152 - <div>${result.doccontent_.substring(0, 150)}
153 - <div class="light">${result.space.replaceAll('.', ' / ')}</div>
154 - </div>
155 - `)}
156 - </div>
157 - <div class="rawResults">
158 - <div>
159 - <strong>XWiki Search Results</strong>
160 - <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
161 - </div>
162 - <div>
163 - <strong>Collab Search Results (Filters)</strong>
164 - <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
165 - </div>
166 - </div>
167 167  </div>
168 168  `
169 169   }
... ... @@ -173,8 +173,8 @@
173 173   function handleXWikiSearch(searchString) {
174 174   return new Promise((resolve) => {
175 175   require(['jquery'], function($) {
176 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
177 - //contextSearchButton.addEventListener('click', function() {
76 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
77 + contextSearchButton.addEventListener('click', function() {
178 178   $.post(solrServiceURL, {
179 179   outputSyntax: 'plain',
180 180   media: 'json',
... ... @@ -185,11 +185,138 @@
185 185   ].join('\n'),
186 186   input: searchString
187 187   }).then(resolve);
188 - //});
88 + });
189 189   });
190 190   });
191 191   }
192 192  });
193 193  </script>
94 +
194 194  <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>
112 +
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 +-->
195 195  {{/html}}