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	}
...	...	@@ -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,23 +57,26 @@
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		- }
	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	+ }
76	76	} else {
	78	+ 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);
...	...	@@ -82,7 +82,6 @@
82	82	}
83	83	hasActiveFilters() {
84	84	// we only look at role filters for POC.
85		- console.log('rolesfilter', this.rolesFilter);
86	86	return this.rolesFilter.length > 0;
87	87	}
88	88	fetchWikiSearch() {
...	...	@@ -92,27 +92,37 @@
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) => {
	97	+ this.collabFiltersResults = res;
	98	+ resolve(res);
	99	+ });
96	96	} else {
97		- resolve(null);
	101	+ resolve([]);
98	98	}
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		- const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
105		- console.log(filteredResults);
	107	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
106	106	}
	109	+ clearResults() {
	110	+ this.results = [];
	111	+ this.resultsCache = [];
	112	+ }
107	107	getLink(xwikiDocSpace) {
108	108	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
109	109	}
	116	+ handleKeyPress(e) {
	117	+ if (e.keyCode === 13) {
	118	+ this.handleSearch(true);
	119	+ }
	120	+ }
110	110	render() {
111	111	return html`
112	112	<div>
113	113	<div>
114		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
115		- <button @click="${this.handleSearch}">Search</button>
	125	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	126	+ <button @click="${() => this.handleSearch(true)}">Search</button>
116	116	</div>
117	117	<div>
118	118	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -128,6 +128,16 @@
128	128	</div>
129	129	`)}
130	130	</div>
	142	+ <div class="rawResults">
	143	+ <div>
	144	+ <strong>XWiki Search Results</strong>
	145	+ <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre>
	146	+ </div>
	147	+ <div>
	148	+ <strong>Collab Search Results (Filters)</strong>
	149	+ <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre>
	150	+ </div>
	151	+ </div>
131	131	</div>
132	132	`
133	133	}
...	...	@@ -155,7 +155,5 @@
155	155	}
156	156	});
157	157	</script>
158		-
159	159	<clb-unified-search></clb-unified-search>
160		-
161	161	{{/html}}