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