Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,7 @@
1		-{{html clean="false"}}
2		-<!--
3		- !!! POC. Code 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	6	import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
...	...	@@ -7,21 +7,15 @@
7	7	window.addEventListener('DOMContentLoaded', function() {
8	8
9	9	class UnifiedSearch extends LitElement {
10		- /*
11	11	static properties = {
12		- searchText: { type: String },
13		- favoritesFilter: { type: Boolean },
14		- administratorFilter: { type: Boolean },
15		- editorFilter: { type: Boolean },
16		- viewerFilter: { type: Boolean },
17		- publicFilter: { type: Boolean },
18		- privateFilter: { type: Boolean },
	12	+ results: { type: Array },
	13	+ resultsCache: { type: Array },
	14	+ collabFiltersResults: { type: Array}
19	19	}
20		- */
21		- static properties = {
22		- results: { type: Array }
23		- }
24	24	static styles = css`
	17	+ :host > div {
	18	+ padding-bottom: 4em;
	19	+ }
25	25	.result {
26	26	margin-top: 1em;
27	27	}
...	...	@@ -41,14 +41,20 @@
41	41	this.editor = false;
42	42	this.viewer = false;
43	43	this.rolesFilter = [];
44		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
	39	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
45	45	this.results = [];
	41	+ this.resultsCache = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
46	46	}
	45	+ firstUpdated() {
	46	+ this.renderRoot.getElementById('searchInput').focus();
	47	+ }
47	47	toggleRoleFilter(roleName) {
48		- if(this.rolesFilter.indexOf(roleName) == -1) {
	49	+ if(this.rolesFilter.indexOf(roleName) === -1) {
49	49	this.rolesFilter.push(roleName);
50	50	} else {
51		- this.rolesFilter.filter(role => role !== roleName);
	52	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -57,23 +57,33 @@
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60		- handleSearch() {
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		- this.results = wikiSearchResults;
70		- console.log(wikiSearchResults, collabSearchResults);
71		- });
72		- } else if (this.searchText === this.prevSearchText) {
73		- console.log("Only apply filter on results");
74		- this.fetchFilterSearch().then(this.filterResults)
75		- }
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
	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	+ }
76	76	} else {
	87	+ this.clearResults();
77	77	console.log("no search text, should return filter search results if any");
78	78	this.fetchFilterSearch().then(collabs => {
79	79	console.log("Format and display collabs", collabs);
...	...	@@ -86,32 +86,41 @@
86	86	}
87	87	fetchWikiSearch() {
88	88	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
89		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
90	90	}
91	91	fetchFilterSearch() {
92	92	return new Promise((resolve) => {
93		- if(this.hasActiveFilters) {
94		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	104	+ if(this.hasActiveFilters()) {
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
95	95	} else {
96		- resolve(null);
	107	+ resolve([]);
97	97	}
98	98	});
99	99	}
100	100	filterResults = (filteredCollabs) => {
101		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
102	102	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
103		- const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
104		- console.log(filteredResults);
	113	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
105	105	}
	115	+ clearResults() {
	116	+ this.results = [];
	117	+ this.resultsCache = [];
	118	+ }
106	106	getLink(xwikiDocSpace) {
107	107	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
108	108	}
	122	+ handleKeyPress(e) {
	123	+ if (e.keyCode === 13) {
	124	+ this.handleSearch(true);
	125	+ }
	126	+ }
109	109	render() {
110	110	return html`
111	111	<div>
112	112	<div>
113		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
114		- <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>
115	115	</div>
116	116	<div>
117	117	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -127,20 +127,21 @@
127	127	</div>
128	128	`)}
129	129	</div>
130		-</div>
131	131	`
132	132	}
133	133	}
134	134	customElements.define('clb-unified-search', UnifiedSearch);
135	135
136		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
137	137	return new Promise((resolve) => {
138	138	require(['jquery'], function($) {
139	139	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
140	140	//contextSearchButton.addEventListener('click', function() {
141		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
142	142	outputSyntax: 'plain',
143	143	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
144	144	query: [
145	145	'q="__INPUT__"~100',
146	146	'fq=type:DOCUMENT',
...	...	@@ -154,7 +154,4 @@
154	154	}
155	155	});
156	156	</script>
157		-
158		-<clb-unified-search></clb-unified-search>
159		-
160		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}