Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,7 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	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	}
...	...	@@ -45,6 +45,9 @@
45	45	this.results = [];
46	46	this.resultsCache = [];
47	47	}
	43	+ firstUpdated() {
	44	+ this.renderRoot.getElementById('searchInput').focus();
	45	+ }
48	48	toggleRoleFilter(roleName) {
49	49	if(this.rolesFilter.indexOf(roleName) === -1) {
50	50	this.rolesFilter.push(roleName);
...	...	@@ -58,23 +58,26 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch() {
62		-
63		- if(this.searchText !== "") {
	59	+ handleSearch(textSearch) {
	60	+ if(this.searchText !== "" || textSearch) {
64	64	if(this.searchText !== this.prevSearchText) {
	62	+ this.clearResults();
65	65	this.prevSearchText = this.searchText;
66		- Promise.all([
67		- this.fetchWikiSearch(),
68		- this.fetchFilterSearch()
69		- ]).then(([wikiSearchResults, collabSearchResults]) => {
70		- this.results = wikiSearchResults;
71		- this.resultsCache = wikiSearchResults;
72		- console.log(wikiSearchResults, collabSearchResults);
73		- });
	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	+ })
74	74	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
75	75	this.fetchFilterSearch().then(this.filterResults)
	74	+ } else {
	75	+ this.results = this.resultsCache;
76	76	}
77	77	} else {
	78	+ this.clearResults();
78	78	console.log("no search text, should return filter search results if any");
79	79	this.fetchFilterSearch().then(collabs => {
80	80	console.log("Format and display collabs", collabs);
...	...	@@ -92,7 +92,7 @@
92	92	fetchFilterSearch() {
93	93	return new Promise((resolve) => {
94	94	if(this.hasActiveFilters()) {
95		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	96	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
96	96	} else {
97	97	resolve([]);
98	98	}
...	...	@@ -99,19 +99,27 @@
99	99	});
100	100	}
101	101	filterResults = (filteredCollabs) => {
102		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
103	103	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
104	104	this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
105	105	}
	106	+ clearResults() {
	107	+ this.results = [];
	108	+ this.resultsCache = [];
	109	+ }
106	106	getLink(xwikiDocSpace) {
107	107	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
108	108	}
	113	+ handleKeyPress(e) {
	114	+ if (e.keyCode === 13) {
	115	+ this.handleSearch(true);
	116	+ }
	117	+ }
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>
	122	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	123	+ <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,7 +127,6 @@
127	127	</div>
128	128	`)}
129	129	</div>
130		-</div>
131	131	`
132	132	}
133	133	}
...	...	@@ -138,7 +138,7 @@
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, {
	149	+ $.get(solrServiceURL, {
142	142	outputSyntax: 'plain',
143	143	media: 'json',
144	144	query: [
...	...	@@ -154,7 +154,5 @@
154	154	}
155	155	});
156	156	</script>
157		-
158	158	<clb-unified-search></clb-unified-search>
159		-
160	160	{{/html}}