Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,7 +1,6 @@
1		-
2		-{{html clean="false"}}<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4		- !!! Many optimisations can be done !!!
	1	+{{html clean="false"}}
	2	+<!--
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
5	5	-->
6	6	<script type="module">
7	7	import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
...	...	@@ -8,15 +8,21 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
	10	+ /*
11	11	static properties = {
12		- results: { type: Array },
13		- resultsCache: { type: Array },
14		- collabFiltersResults: { type: Array}
	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 },
15	15	}
	20	+ */
	21	+ static properties = {
	22	+ results: { type: Array }
	23	+ }
16	16	static styles = css`
17		- :host > div {
18		- padding-bottom: 4em;
19		- }
20	20	.result {
21	21	margin-top: 1em;
22	22	}
...	...	@@ -36,20 +36,14 @@
36	36	this.editor = false;
37	37	this.viewer = false;
38	38	this.rolesFilter = [];
39		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
40	40	this.results = [];
41		- this.resultsCache = [];
42		- this.offset = 0;
43		- this.nb = 10;
44	44	}
45		- firstUpdated() {
46		- this.renderRoot.getElementById('searchInput').focus();
47		- }
48	48	toggleRoleFilter(roleName) {
49		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
50	50	this.rolesFilter.push(roleName);
51	51	} else {
52		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -58,35 +58,20 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
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		- */
	60	+ handleSearch() {
	61	+ if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
	62	+ console.log(this.searchText, this.prevSearchText);
	63	+ this.prevSearchText = this.searchText;
	64	+ Promise.all([
	65	+ this.fetchWikiSearch(),
	66	+ this.fetchFilterSearch()
	67	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	68	+ console.log(wikiSearchResults, collabSearchResults);
	69	+ });
	70	+ } else if (this.searchText === this.prevSearchText) {
	71	+ console.log("Only apply filter on results");
	72	+ this.fetchFilterSearch().then(this.filterResults)
88	88	} else {
89		- this.clearResults();
90	90	console.log("no search text, should return filter search results if any");
91	91	this.fetchFilterSearch().then(collabs => {
92	92	console.log("Format and display collabs", collabs);
...	...	@@ -95,45 +95,33 @@
95	95	}
96	96	hasActiveFilters() {
97	97	// we only look at role filters for POC.
98		- return this.rolesFilter.length > 0;
	82	+ return this.roles.length > 0;
99	99	}
100	100	fetchWikiSearch() {
101	101	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
102		- return handleXWikiSearch(this.searchText, this.offset, this.nb);
	86	+ return handleXWikiSearch(this.searchText);
103	103	}
104	104	fetchFilterSearch() {
105	105	return new Promise((resolve) => {
106		- if(this.hasActiveFilters()) {
107		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	90	+ if(this.hasActiveFilters) {
	91	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
108	108	} else {
109		- resolve([]);
	93	+ resolve(null);
110	110	}
111	111	});
112	112	}
113	113	filterResults = (filteredCollabs) => {
114		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
115		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	98	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
116	116	}
117		- clearResults() {
118		- this.results = [];
119		- this.resultsCache = [];
120		- }
121	121	getLink(xwikiDocSpace) {
122	122	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
123	123	}
124		- handleKeyPress(e) {
125		- if (e.keyCode === 13) {
126		- this.handleSearch(true);
127		- }
128		- }
129	129	render() {
130	130	return html`
131	131	<div>
132	132	<div>
133		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
134		- <input @change="${this.setNb}"" type="text" value="${this.nb}" />
135		- <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
136		- <button @click="${() => this.handleSearch(true)}">Search</button>
	107	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	108	+ <button @click="${this.handleSearch}">Search</button>
137	137	</div>
138	138	<div>
139	139	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -149,21 +149,20 @@
149	149	</div>
150	150	`)}
151	151	</div>
	124	+</div>
152	152	`
153	153	}
154	154	}
155	155	customElements.define('clb-unified-search', UnifiedSearch);
156	156
157		- function handleXWikiSearch(searchString, offset, nb) {
	130	+ function handleXWikiSearch(searchString) {
158	158	return new Promise((resolve) => {
159	159	require(['jquery'], function($) {
160	160	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
161	161	//contextSearchButton.addEventListener('click', function() {
162		- $.get(solrServiceURL, {
	135	+ $.post(solrServiceURL, {
163	163	outputSyntax: 'plain',
164	164	media: 'json',
165		- nb: nb,
166		- offset: offset,
167	167	query: [
168	168	'q="__INPUT__"~100',
169	169	'fq=type:DOCUMENT',
...	...	@@ -177,4 +177,7 @@
177	177	}
178	178	});
179	179	</script>
180		-<clb-unified-search></clb-unified-search>{{/html}}
	151	+
	152	+<clb-unified-search></clb-unified-search>
	153	+
	154	+{{/html}}