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.64
edited by bougault
on 2022/11/17 09:59
Change comment: There is no comment for this version
To version 27.13
edited by bougault
on 2022/11/17 13:18
Change comment: There is no comment for this version

Summary

Details

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