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.30
edited by bougault
on 2022/11/16 15:24
Change comment: There is no comment for this version
To version 27.80
edited by bougault
on 2022/11/17 15:02
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,113 +1,195 @@
1 1  {{html clean="false"}}
2 +<!--
3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 + !!! Many optimisations can be done !!!
5 +-->
6 +<script type="module">
7 +import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
8 +window.addEventListener('DOMContentLoaded', function() {
2 2  
3 -<select id="context-search-type">
4 - <option value="all">All</option>
5 - <option value="collabs">Collabs</option>
6 - <option value="current-collab">Current Collab</option>
7 -</select>
8 -<div>
9 -<label>
10 - <input type="checkbox" data-role-filter="administrator"> Administrator
11 -</label>
12 -<input type="text" id="context-search-text" />
13 -<button id="context-search-button" class="btn btn-primary">Search</button>
14 -
15 -<pre id="context-search-response"></pre>
16 -<script>
17 - window.addEventListener('DOMContentLoaded', function() {
18 - const filters = {
19 - search: '',
20 - offset: 0,
21 - orderField: 'title',
22 - order: 'asc',
23 - favorite: false,
24 - roles: [] // to be joined as administrator+editor+viewer
25 - };
26 -
27 - function addRole(role) {
28 - if(filters.roles.indexOf(role) == -1) {
29 - filters.roles.push(role);
10 + class UnifiedSearch extends LitElement {
11 + static properties = {
12 + results: { type: Array },
13 + resultsCache: { type: Array },
14 + collabFiltersResults: { type: Array}
15 + }
16 + static styles = css`
17 + :host > div {
18 + padding-bottom: 4em;
30 30   }
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 + `;
44 + constructor() {
45 + super();
46 + this.searchText = "";
47 + this.prevSearchText = "";
48 + this.administrator = false;
49 + this.editor = false;
50 + this.viewer = false;
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 = [];
31 31   }
32 -
33 - function removeRole(role) {
34 - filters.roles.filter(r => r !== 'administrator')
57 + firstUpdated() {
58 + this.renderRoot.getElementById('searchInput').focus();
35 35   }
36 -
37 - document.querySelector('checkbox[data-role-filter]').forEach(function(filter) {
38 - filter.addEventListener('click', {
39 - const role = this.getAttribute('data-role-filter');
40 - if(this.checked) {
41 - addRole(role);
60 + toggleRoleFilter(roleName) {
61 + if(this.rolesFilter.indexOf(roleName) === -1) {
62 + this.rolesFilter.push(roleName);
63 + } else {
64 + this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
65 + }
66 + this[roleName] = !this[roleName];
67 + this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
68 + this.handleSearch();
69 + }
70 + setSearchText(e) {
71 + this.searchText = e.target.value;
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)
42 42   } else {
43 - removeRole(role);
89 + this.results = this.resultsCache;
44 44   }
45 - console.log(filters);
46 - })
47 - });
48 -
49 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
50 - const contextSearchType = document.getElementById("context-search-type");
51 - const contextSearchText = document.getElementById("context-search-text");
52 - const contextSearchResponse = document.getElementById("context-search-response");
53 - const contextSearchButton = document.getElementById("context-search-button");
54 - contextSearchButton.addEventListener('click', function() {
55 - const context = contextSearchType.options[contextSearchType.selectedIndex].value;
56 - const term = contextSearchText.value;
57 - switch(context) {
58 - case 'collabs':
59 - document.location.href = `/bin/view/Collabs/#search=${term}`;
60 - break;
61 - case 'current-collab':
62 - handleXWikiSearch('bougaultx');
63 - break
64 - default:
65 - handleXWikiSearch('', applyAdministratorFilter)
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 + })
66 66   }
98 + }
99 + hasActiveFilters() {
100 + // we only look at role filters for POC.
101 + return this.rolesFilter.length > 0;
102 + }
103 + fetchWikiSearch() {
104 + // request should be built from component, not from "external" dependency. Leave it here like this for POC.
105 + return handleXWikiSearch(this.searchText);
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 + });
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 + render() {
137 + return html`
138 +<div>
139 + <div>
140 + <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
141 + <button @click="${() => this.handleSearch(true)}">Search</button>
142 + </div>
143 + <div>
144 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
145 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
146 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
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 +</div>
168 +`
169 + }
170 + }
171 + customElements.define('clb-unified-search', UnifiedSearch);
67 67  
68 - });
69 - function handleXWikiSearch(space, callback) {
173 + function handleXWikiSearch(searchString) {
174 + return new Promise((resolve) => {
70 70   require(['jquery'], function($) {
71 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
72 - const contextSearchButton = document.getElementById("context-search-button");
73 - const xwikiSpace = space ? `.${space}` : '';
74 - contextSearchButton.addEventListener('click', function() {
176 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
177 + //contextSearchButton.addEventListener('click', function() {
75 75   $.post(solrServiceURL, {
76 - outputSyntax: 'plain',
77 - media: 'json',
78 - query: [
79 - 'q="__INPUT__"~100',
80 - 'fq=type:DOCUMENT',
81 - `fq=space:Collabs${xwikiSpace}.*`
82 - ].join('\n'),
83 - input: $('#context-search-text').val()
84 - }).then(res => {
85 - if(callback) {
86 - callback(res).then(results => {
87 - contextSearchResponse.innerText = JSON.stringify(results, null, 2);
88 - })
89 - } else {
90 - contextSearchResponse.innerText = JSON.stringify(res, null, 2);
91 - }
92 - });
93 - });
179 + outputSyntax: 'plain',
180 + media: 'json',
181 + query: [
182 + 'q="__INPUT__"~100',
183 + 'fq=type:DOCUMENT',
184 + `fq=space:Collabs.*`
185 + ].join('\n'),
186 + input: searchString
187 + }).then(resolve);
188 + //});
189 + });
94 94   });
95 95   }
96 - function applyAdministratorFilter(results) {
97 - return new Promise((resolve, reject) => {
98 - //fetch("/rest/v1/collabs?roles=administrator")
99 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
100 - .then(res => res.json())
101 - .then(collabs => {
102 - const spaces = collabs.map(collab => `Collabs.${collab.name}`);
103 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
104 - resolve(filtered);
105 - })
106 -
107 - })
108 - }
109 109  });
110 -
111 -
112 112  </script>
194 +<clb-unified-search></clb-unified-search>
113 113  {{/html}}