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	}
...	...	@@ -32,6 +32,11 @@
32	32	a {
33	33	color: var(--color-brand-primary, blue);
34	34	}
	30	+ .rawResults {
	31	+ display: flex;
	32	+ font-size: 12px;
	33	+ margin-top: 2em;
	34	+ }
35	35	`;
36	36	constructor() {
37	37	super();
...	...	@@ -43,12 +43,16 @@
43	43	this.rolesFilter = [];
44	44	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 = [];
	46	+ this.resultsCache = [];
46	46	}
	48	+ firstUpdated() {
	49	+ this.renderRoot.getElementById('searchInput').focus();
	50	+ }
47	47	toggleRoleFilter(roleName) {
48		- if(this.rolesFilter.indexOf(roleName) == -1) {
	52	+ if(this.rolesFilter.indexOf(roleName) === -1) {
49	49	this.rolesFilter.push(roleName);
50	50	} else {
51		- this.rolesFilter.filter(role => role !== roleName);
	55	+ 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,24 +57,26 @@
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60		- handleSearch() {
61		- console.log(this.rolesFilter)
62		- if(this.searchText !== "") {
	64	+ handleSearch(textSearch) {
	65	+ if(this.searchText !== "" || textSearch) {
63	63	if(this.searchText !== this.prevSearchText) {
64		- console.log(this.searchText, this.prevSearchText);
	67	+ 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		- console.log(wikiSearchResults, collabSearchResults);
72		- });
73		- } else if (this.searchText === this.prevSearchText) {
74		- console.log("Only apply filter on results");
	69	+ this.fetchWikiSearch().then(results => {
	70	+ this.resultsCache = results;
	71	+ if(this.hasActiveFilters()) {
	72	+ this.fetchFilterSearch().then(this.filterResults);
	73	+ } else {
	74	+ this.results = results;
	75	+ }
	76	+ })
	77	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
75	75	this.fetchFilterSearch().then(this.filterResults)
	79	+ } else {
	80	+ this.results = this.resultsCache;
76	76	}
77	77	} else {
	83	+ 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);
...	...	@@ -83,7 +83,6 @@
83	83	}
84	84	hasActiveFilters() {
85	85	// we only look at role filters for POC.
86		- console.log('rolesfilter', this.rolesFilter);
87	87	return this.rolesFilter.length > 0;
88	88	}
89	89	fetchWikiSearch() {
...	...	@@ -93,27 +93,37 @@
93	93	fetchFilterSearch() {
94	94	return new Promise((resolve) => {
95	95	if(this.hasActiveFilters()) {
96		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	101	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	102	+ this.collabFiltersResults = res;
	103	+ resolve(res);
	104	+ });
97	97	} else {
98		- resolve(null);
	106	+ resolve([]);
99	99	}
100	100	});
101	101	}
102	102	filterResults = (filteredCollabs) => {
103		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
104	104	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
105		- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
106		- console.log(filteredResults);
	112	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107	107	}
	114	+ clearResults() {
	115	+ this.results = [];
	116	+ this.resultsCache = [];
	117	+ }
108	108	getLink(xwikiDocSpace) {
109	109	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
110	110	}
	121	+ handleKeyPress(e) {
	122	+ if (e.keyCode === 13) {
	123	+ this.handleSearch(true);
	124	+ }
	125	+ }
111	111	render() {
112	112	return html`
113	113	<div>
114	114	<div>
115		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
116		- <button @click="${this.handleSearch}">Search</button>
	130	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	131	+ <button @click="${() => this.handleSearch(true)}">Search</button>
117	117	</div>
118	118	<div>
119	119	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -129,6 +129,16 @@
129	129	</div>
130	130	`)}
131	131	</div>
	147	+ <div class="rawResults">
	148	+ <div>
	149	+ <strong>XWiki Search Results</strong>
	150	+ <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre>
	151	+ </div>
	152	+ <div>
	153	+ <strong>Collab Search Results (Filters)</strong>
	154	+ <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre>
	155	+ </div>
	156	+ </div>
132	132	</div>
133	133	`
134	134	}
...	...	@@ -156,7 +156,5 @@
156	156	}
157	157	});
158	158	</script>
159		-
160	160	<clb-unified-search></clb-unified-search>
161		-
162	162	{{/html}}