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.60
edited by bougault
on 2022/11/17 09:49
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,195 +1,177 @@
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 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() {
9 -
3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
10 10   class UnifiedSearch extends LitElement {
11 11   static properties = {
12 - results: { type: Array },
13 - resultsCache: { type: Array },
14 - collabFiltersResults: { type: Array}
6 + searchText: { type: String },
7 + favoritesFilter: { type: Boolean },
8 + administratorFilter: { type: Boolean },
9 + editorFilter: { type: Boolean },
10 + viewerFilter: { type: Boolean },
11 + publicFilter: { type: Boolean },
12 + 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 - `;
44 44   constructor() {
45 45   super();
46 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 = [];
17 + this.favoritesFilter = false;
18 + this.administratorFilter = true;
19 + this.editorFilter = false;
20 + this.viewerFilter = false;
21 + this.publicFilter = false;
22 + this.privateFilter = false;
56 56   }
57 - firstUpdated() {
58 - this.renderRoot.getElementById('searchInput').focus();
24 + toggleFilter(filterName) {
25 + this[filterName] = !this[filterName];
26 + console.log(this.administratorFilter);
59 59   }
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 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 - })
97 - }
31 + handleSearch() {
32 + console.log(this.searchText);
98 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 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>
38 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
39 + <button @click="${this.handleSearch}">Search</button>
142 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>
41 + <label><input type="checkbox" @change="${() => this.toggleFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label>
167 167  </div>
168 168  `
169 169   }
170 170   }
171 171   customElements.define('clb-unified-search', UnifiedSearch);
47 +</script>
172 172  
173 - function handleXWikiSearch(searchString) {
174 - return new Promise((resolve) => {
49 +<clb-unified-search></clb-unified-search>
50 +
51 +<select id="context-search-type">
52 + <option value="all">All</option>
53 + <option value="collabs">Collabs</option>
54 + <option value="current-collab">Current Collab</option>
55 +</select>
56 +<input type="text" id="context-search-text" />
57 +<button id="context-search-button" class="btn btn-primary">Search</button>
58 +<div class="form-group">
59 + <label>
60 + <input type="checkbox" data-role-filter="administrator"> Administrator
61 + </label>
62 + <label>
63 + <input type="checkbox" data-role-filter="editor"> Editor
64 + </label>
65 +</div>
66 +
67 +
68 +<pre id="context-search-response"></pre>
69 +<script>
70 + window.addEventListener('DOMContentLoaded', function() {
71 + const filters = {
72 + search: '',
73 + offset: 0,
74 + orderField: 'title',
75 + order: 'asc',
76 + favorite: false,
77 + roles: [] // to be joined as administrator+editor+viewer
78 + };
79 +
80 + function addRole(role) {
81 + if(filters.roles.indexOf(role) == -1) {
82 + filters.roles.push(role);
83 + }
84 + }
85 +
86 + function removeRole(role) {
87 + filters.roles = filters.roles.filter(r => r !== role)
88 + }
89 +
90 + const filterInputs = document.querySelectorAll('input[data-role-filter]');
91 +
92 + filterInputs.forEach(function(filterIpt) {
93 + filterIpt.addEventListener('click', function() {
94 + const role = this.getAttribute('data-role-filter');
95 + if(this.checked) {
96 + addRole(role);
97 + } else {
98 + removeRole(role);
99 + }
100 + runFilteredRequest();
101 + })
102 + });
103 +
104 + function runFilteredRequest() {
105 + const urlParams = new URLSearchParams();
106 + const tmpFilters = filters;
107 + tmpFilters.roles = tmpFilters.roles.join("+");
108 + for(filter in tmpFilters) {
109 + urlParams.set(filter, tmpFilters[filter]);
110 + }
111 + console.log(urlParams);
112 + }
113 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
114 + const contextSearchType = document.getElementById("context-search-type");
115 + const contextSearchText = document.getElementById("context-search-text");
116 + const contextSearchResponse = document.getElementById("context-search-response");
117 + const contextSearchButton = document.getElementById("context-search-button");
118 + contextSearchButton.addEventListener('click', function() {
119 + const context = contextSearchType.options[contextSearchType.selectedIndex].value;
120 + const term = contextSearchText.value;
121 + switch(context) {
122 + case 'collabs':
123 + document.location.href = `/bin/view/Collabs/#search=${term}`;
124 + break;
125 + case 'current-collab':
126 + handleXWikiSearch('bougaultx');
127 + break
128 + default:
129 + handleXWikiSearch('')
130 + }
131 +
132 + });
133 + function handleXWikiSearch(space, callback) {
175 175   require(['jquery'], function($) {
176 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
177 - //contextSearchButton.addEventListener('click', function() {
135 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
136 + const contextSearchButton = document.getElementById("context-search-button");
137 + const xwikiSpace = space ? `.${space}` : '';
138 + contextSearchButton.addEventListener('click', function() {
178 178   $.post(solrServiceURL, {
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 - });
140 + outputSyntax: 'plain',
141 + media: 'json',
142 + query: [
143 + 'q="__INPUT__"~100',
144 + 'fq=type:DOCUMENT',
145 + `fq=space:Collabs${xwikiSpace}.*`
146 + ].join('\n'),
147 + input: $('#context-search-text').val()
148 + }).then(res => {
149 + if(callback) {
150 + callback(res).then(results => {
151 + contextSearchResponse.innerText = JSON.stringify(results, null, 2);
152 + })
153 + } else {
154 + contextSearchResponse.innerText = JSON.stringify(res, null, 2);
155 + }
156 + });
157 + });
190 190   });
191 191   }
160 + function applyAdministratorFilter(results) {
161 + return new Promise((resolve, reject) => {
162 + //fetch("/rest/v1/collabs?roles=administrator")
163 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
164 + .then(res => res.json())
165 + .then(collabs => {
166 + const spaces = collabs.map(collab => `Collabs.${collab.name}`);
167 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
168 + resolve(filtered);
169 + })
170 +
171 + })
172 + }
192 192  });
174 +
175 +
193 193  </script>
194 -<clb-unified-search></clb-unified-search>
195 195  {{/html}}