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,22 +57,36 @@
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		- console.log(wikiSearchResults, collabSearchResults);
70		- });
71		- } else if (this.searchText === this.prevSearchText) {
72		- console.log("Only apply filter on results");
73		- this.fetchFilterSearch().then(this.filterResults)
74		- }
	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(textSearch);
	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	+ console.log('results', results);
	75	+ //this.resultsCache = results;
	76	+ if(this.hasActiveFilters()) {
	77	+ this.fetchFilterSearch().then(this.filterResults);
	78	+ } else {
	79	+ this.results = results ? results : [];
	80	+ }
	81	+ })
	82	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	83	+ this.fetchFilterSearch().then(this.filterResults)
	84	+ } else {
	85	+ this.results = this.resultsCache;
	86	+ }
	87	+ */
75	75	} else {
	89	+ this.results = [];
	90	+ this.clearResults();
76	76	console.log("no search text, should return filter search results if any");
77	77	this.fetchFilterSearch().then(collabs => {
78	78	console.log("Format and display collabs", collabs);
...	...	@@ -81,33 +81,45 @@
81	81	}
82	82	hasActiveFilters() {
83	83	// we only look at role filters for POC.
84		- return this.roles.length > 0;
	99	+ return this.rolesFilter.length > 0;
85	85	}
86	86	fetchWikiSearch() {
87	87	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
88		- return handleXWikiSearch(this.searchText);
	103	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
89	89	}
90	90	fetchFilterSearch() {
91	91	return new Promise((resolve) => {
92		- if(this.hasActiveFilters) {
93		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	107	+ if(this.hasActiveFilters()) {
	108	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
94	94	} else {
95		- resolve(null);
	110	+ resolve([]);
96	96	}
97	97	});
98	98	}
99	99	filterResults = (filteredCollabs) => {
100		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	115	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	116	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
101	101	}
	118	+ clearResults() {
	119	+ this.results = [];
	120	+ this.resultsCache = [];
	121	+ }
102	102	getLink(xwikiDocSpace) {
103	103	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
104	104	}
	125	+ handleKeyPress(e) {
	126	+ if (e.keyCode === 13) {
	127	+ this.handleSearch(true);
	128	+ }
	129	+ }
105	105	render() {
106	106	return html`
107	107	<div>
108	108	<div>
109		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
110		- <button @click="${this.handleSearch}">Search</button>
	134	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	135	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	136	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
	137	+ <button @click="${() => this.handleSearch(true)}">Search</button>
111	111	</div>
112	112	<div>
113	113	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -123,20 +123,21 @@
123	123	</div>
124	124	`)}
125	125	</div>
126		-</div>
127	127	`
128	128	}
129	129	}
130	130	customElements.define('clb-unified-search', UnifiedSearch);
131	131
132		- function handleXWikiSearch(searchString) {
	158	+ function handleXWikiSearch(searchString, offset, nb) {
133	133	return new Promise((resolve) => {
134	134	require(['jquery'], function($) {
135	135	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
136	136	//contextSearchButton.addEventListener('click', function() {
137		- $.post(solrServiceURL, {
	163	+ $.get(solrServiceURL, {
138	138	outputSyntax: 'plain',
139	139	media: 'json',
	166	+ nb: nb,
	167	+ offset: offset,
140	140	query: [
141	141	'q="__INPUT__"~100',
142	142	'fq=type:DOCUMENT',
...	...	@@ -150,7 +150,4 @@
150	150	}
151	151	});
152	152	</script>
153		-
154		-<clb-unified-search></clb-unified-search>
155		-
156		-{{/html}}
	181	+<clb-unified-search></clb-unified-search>{{/html}}