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,18 @@
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 = [];
46	46	}
	43	+ firstUpdated() {
	44	+ this.renderRoot.getElementById('searchInput').focus();
	45	+ }
47	47	toggleRoleFilter(roleName) {
48		- if(this.rolesFilter.indexOf(roleName) == -1) {
	47	+ if(this.rolesFilter.indexOf(roleName) === -1) {
49	49	this.rolesFilter.push(roleName);
50	50	} else {
51		- this.rolesFilter.filter(role => role !== roleName);
	50	+ 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,21 +57,28 @@
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60		- handleSearch() {
61		- if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
62		- this.prevSearchText = this.searchText;
63		- Promise.all([
64		- this.fetchWikiSearch(),
65		- this.fetchFilterSearch()
66		- ]).then(([wikiSearchResults, collabSearchResults]) => {
67		- console.log(wikiSearchResults, collabSearchResults);
68		- });
69		- } else if (this.searchText === this.prevSearchText) {
70		- console.log("Only apply filter on results");
71		- this.fetchFilterSearch().then(res => res.json()).then(this.filterResults)
	59	+ handleSearch(textSearch) {
	60	+ if(this.searchText !== "" || textSearch) {
	61	+ if(this.searchText !== this.prevSearchText) {
	62	+ this.clearResults();
	63	+ this.prevSearchText = this.searchText;
	64	+ this.fetchWikiSearch().then(results => {
	65	+ this.resultsCache = results;
	66	+ if(this.hasActiveFilters()) {
	67	+ this.fetchFilterSearch().then(this.filterResults);
	68	+ } else {
	69	+ this.results = results;
	70	+ }
	71	+ })
	72	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	73	+ this.fetchFilterSearch().then(this.filterResults)
	74	+ } else {
	75	+ this.results = this.resultsCache;
	76	+ }
72	72	} else {
	78	+ this.clearResults();
73	73	console.log("no search text, should return filter search results if any");
74		- this.fetchFilterSearch().then(res => res.json()).then(collabs => {
	80	+ this.fetchFilterSearch().then(collabs => {
75	75	console.log("Format and display collabs", collabs);
76	76	})
77	77	}
...	...	@@ -78,7 +78,7 @@
78	78	}
79	79	hasActiveFilters() {
80	80	// we only look at role filters for POC.
81		- return this.roles.length > 0;
	87	+ return this.rolesFilter.length > 0;
82	82	}
83	83	fetchWikiSearch() {
84	84	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -86,25 +86,35 @@
86	86	}
87	87	fetchFilterSearch() {
88	88	return new Promise((resolve) => {
89		- if(hasActiveFilters) {
90		- fetch(this.filterUrl).then(console.log);
	95	+ if(this.hasActiveFilters()) {
	96	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
91	91	} else {
92		- resolve(null);
	98	+ resolve([]);
93	93	}
94	94	});
95	95	}
96		- filterResults(filteredCollabs) {
97		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	102	+ filterResults = (filteredCollabs) => {
	103	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	104	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
98	98	}
	106	+ clearResults() {
	107	+ this.results = [];
	108	+ this.resultsCache = [];
	109	+ }
99	99	getLink(xwikiDocSpace) {
100	100	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
101	101	}
	113	+ handleKeyPress(e) {
	114	+ if (e.keyCode === 13) {
	115	+ this.handleSearch(true);
	116	+ }
	117	+ }
102	102	render() {
103	103	return html`
104	104	<div>
105	105	<div>
106		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
107		- <button @click="${this.handleSearch}">Search</button>
	122	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	123	+ <button @click="${() => this.handleSearch(true)}">Search</button>
108	108	</div>
109	109	<div>
110	110	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -120,7 +120,6 @@
120	120	</div>
121	121	`)}
122	122	</div>
123		-</div>
124	124	`
125	125	}
126	126	}
...	...	@@ -131,9 +131,11 @@
131	131	require(['jquery'], function($) {
132	132	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
133	133	//contextSearchButton.addEventListener('click', function() {
134		- $.post(solrServiceURL, {
	149	+ $.get(solrServiceURL, {
135	135	outputSyntax: 'plain',
136	136	media: 'json',
	152	+ nb:100,
	153	+ offset:10,
137	137	query: [
138	138	'q="__INPUT__"~100',
139	139	'fq=type:DOCUMENT',
...	...	@@ -147,7 +147,4 @@
147	147	}
148	148	});
149	149	</script>
150		-
151		-<clb-unified-search></clb-unified-search>
152		-
153		-{{/html}}
	167	+<clb-unified-search></clb-unified-search>{{/html}}