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.69
edited by bougault
on 2022/11/17 10:13
Change comment: There is no comment for this version
To version 27.71
edited by bougault
on 2022/11/17 14:51
Change comment: There is no comment for this version

Summary

Details

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