Changes for page Context Search

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,200 +1,178 @@
1		-{{html clean="false"}}
2		-<!--
3		- !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
	1	+
	2	+{{html clean="false"}}<!--
	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 = "";
22		- this.favoritesFilter = false;
	34	+ 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);
	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 = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
30	30	}
31		- toggleBooleanFilter(filterName) {
32		- this[filterName] = !this[filterName];
	45	+ firstUpdated() {
	46	+ this.renderRoot.getElementById('searchInput').focus();
33	33	}
34	34	toggleRoleFilter(roleName) {
35		- if(this.rolesFilter.indexOf(roleName) == -1) {
	49	+ if(this.rolesFilter.indexOf(roleName) === -1) {
36	36	this.rolesFilter.push(roleName);
37	37	} else {
38		- this.rolesFilter.filter(role => role !== roleName);
	52	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
39	39	}
40		- this.toggleBooleanFilter(roleName);
	54	+ this[roleName] = !this[roleName];
	55	+ this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
	56	+ this.handleSearch();
41	41	}
42	42	setSearchText(e) {
43	43	this.searchText = e.target.value;
44	44	}
45		- handleSearch() {
46		- console.log(this.searchText);
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
47	47	}
48		- buildFilter() {
49		- //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
50	50	}
	67	+ handleSearch(textSearch) {
	68	+ console.log('search');
	69	+ if(this.searchText !== "" || textSearch) {
	70	+ if(this.searchText !== this.prevSearchText) {
	71	+ this.clearResults();
	72	+ this.prevSearchText = this.searchText;
	73	+ this.fetchWikiSearch().then(results => {
	74	+ this.resultsCache = results;
	75	+ if(this.hasActiveFilters()) {
	76	+ this.fetchFilterSearch().then(this.filterResults);
	77	+ } else {
	78	+ this.results = results;
	79	+ }
	80	+ })
	81	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	82	+ this.fetchFilterSearch().then(this.filterResults)
	83	+ } else {
	84	+ this.results = this.resultsCache;
	85	+ }
	86	+ } else {
	87	+ this.clearResults();
	88	+ console.log("no search text, should return filter search results if any");
	89	+ this.fetchFilterSearch().then(collabs => {
	90	+ console.log("Format and display collabs", collabs);
	91	+ })
	92	+ }
	93	+ }
	94	+ hasActiveFilters() {
	95	+ // we only look at role filters for POC.
	96	+ return this.rolesFilter.length > 0;
	97	+ }
	98	+ fetchWikiSearch() {
	99	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
	101	+ }
	102	+ fetchFilterSearch() {
	103	+ return new Promise((resolve) => {
	104	+ if(this.hasActiveFilters()) {
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	106	+ } else {
	107	+ resolve([]);
	108	+ }
	109	+ });
	110	+ }
	111	+ filterResults = (filteredCollabs) => {
	112	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	113	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	114	+ }
	115	+ clearResults() {
	116	+ this.results = [];
	117	+ this.resultsCache = [];
	118	+ }
	119	+ getLink(xwikiDocSpace) {
	120	+ return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
	121	+ }
	122	+ handleKeyPress(e) {
	123	+ if (e.keyCode === 13) {
	124	+ this.handleSearch(true);
	125	+ }
	126	+ }
51	51	render() {
52	52	return html`
53	53	<div>
54	54	<div>
55		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
56		- <button @click="${this.handleSearch}">Search</button>
	131	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	132	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	133	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
	134	+ <button @click="${() => this.handleSearch(true)}">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>
66		-</div>
	141	+ <div>
	142	+ ${this.results.map(result => html`
	143	+ <div class="result">
	144	+ <a href="${this.getLink(result.space)}">${result.title_}</a>
	145	+ <div>${result.doccontent_.substring(0, 150)}
	146	+ <div class="light">${result.space.replaceAll('.', ' / ')}</div>
	147	+ </div>
	148	+ `)}
	149	+ </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) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
	156	+ 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() {
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		- });
	158	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	159	+ //contextSearchButton.addEventListener('click', function() {
	160	+ $.get(solrServiceURL, {
	161	+ outputSyntax: 'plain',
	162	+ media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
	165	+ query: [
	166	+ 'q="__INPUT__"~100',
	167	+ 'fq=type:DOCUMENT',
	168	+ `fq=space:Collabs.*`
	169	+ ].join('\n'),
	170	+ input: searchString
	171	+ }).then(resolve);
	172	+ //});
	173	+ });
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		--->
200		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}