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.68
edited by bougault
on 2022/11/17 10:08
Change comment: There is no comment for this version
To version 27.15
edited by bougault
on 2022/11/17 13:26
Change comment: There is no comment for this version

Summary

Details

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