Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,7 +1,6 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4		- !!! Many optimisations can be done !!!
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
5	5	-->
6	6	<script type="module">
7	7	import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
...	...	@@ -23,9 +23,6 @@
23	23	results: { type: Array }
24	24	}
25	25	static styles = css`
26		- :host > div {
27		- padding-bottom: 4em;
28		- }
29	29	.result {
30	30	margin-top: 1em;
31	31	}
...	...	@@ -47,7 +47,6 @@
47	47	this.rolesFilter = [];
48	48	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49	49	this.results = [];
50		- this.resultsCache = [];
51	51	}
52	52	toggleRoleFilter(roleName) {
53	53	if(this.rolesFilter.indexOf(roleName) === -1) {
...	...	@@ -55,6 +55,7 @@
55	55	} else {
56	56	this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
57	57	}
	53	+ console.log(this.rolesFilter);
58	58	this[roleName] = !this[roleName];
59	59	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
60	60	this.handleSearch();
...	...	@@ -62,26 +62,24 @@
62	62	setSearchText(e) {
63	63	this.searchText = e.target.value;
64	64	}
65		- handleSearch(textSearch) {
66		- if(this.searchText !== "" || textSearch) {
	61	+ handleSearch() {
	62	+ console.log(this.rolesFilter)
	63	+ if(this.searchText !== "") {
67	67	if(this.searchText !== this.prevSearchText) {
68		- this.clearResults();
	65	+ console.log(this.searchText, this.prevSearchText);
69	69	this.prevSearchText = this.searchText;
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()) {
	67	+ Promise.all([
	68	+ this.fetchWikiSearch(),
	69	+ this.fetchFilterSearch()
	70	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	71	+ this.results = wikiSearchResults;
	72	+ console.log(wikiSearchResults, collabSearchResults);
	73	+ });
	74	+ } else if (this.searchText === this.prevSearchText) {
	75	+ console.log("Only apply filter on results");
79	79	this.fetchFilterSearch().then(this.filterResults)
80		- } else {
81		- this.results = this.resultsCache;
82	82	}
83	83	} else {
84		- this.clearResults();
85	85	console.log("no search text, should return filter search results if any");
86	86	this.fetchFilterSearch().then(collabs => {
87	87	console.log("Format and display collabs", collabs);
...	...	@@ -90,6 +90,7 @@
90	90	}
91	91	hasActiveFilters() {
92	92	// we only look at role filters for POC.
	87	+ console.log('rolesfilter', this.rolesFilter);
93	93	return this.rolesFilter.length > 0;
94	94	}
95	95	fetchWikiSearch() {
...	...	@@ -106,28 +106,20 @@
106	106	});
107	107	}
108	108	filterResults = (filteredCollabs) => {
	104	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
109	109	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
110		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	106	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	107	+ this.results = filteredResults;
111	111	}
112		- clearResults() {
113		- this.results = [];
114		- this.resultsCache = [];
115		- }
116	116	getLink(xwikiDocSpace) {
117	117	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118	118	}
119		- handleKeyPress(e) {
120		- if (e.keyCode === 13) {
121		- console.log('zzz');
122		- this.handleSearch(true);
123		- }
124		- }
125	125	render() {
126	126	return html`
127	127	<div>
128	128	<div>
129		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
130		- <button @click="${() => this.handleSearch(true)}">Search</button>
	116	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	117	+ <button @click="${this.handleSearch}">Search</button>
131	131	</div>
132	132	<div>
133	133	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>