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';
...	...	@@ -22,6 +22,9 @@
22	22	results: { type: Array }
23	23	}
24	24	static styles = css`
	26	+ :host {
	27	+ padding-bottom: 4em;
	28	+ }
25	25	.result {
26	26	margin-top: 1em;
27	27	}
...	...	@@ -43,6 +43,7 @@
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 = [];
	50	+ this.resultsCache = [];
46	46	}
47	47	toggleRoleFilter(roleName) {
48	48	if(this.rolesFilter.indexOf(roleName) === -1) {
...	...	@@ -50,7 +50,6 @@
50	50	} else {
51	51	this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
52	52	}
53		- console.log(this.rolesFilter);
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56	56	this.handleSearch();
...	...	@@ -58,24 +58,26 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch() {
62		- console.log(this.rolesFilter)
63		- if(this.searchText !== "") {
	65	+ handleSearch(textSearch) {
	66	+ if(this.searchText !== "" || textSearch) {
64	64	if(this.searchText !== this.prevSearchText) {
65		- console.log(this.searchText, this.prevSearchText);
	68	+ this.clearResults();
66	66	this.prevSearchText = this.searchText;
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");
	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()) {
76	76	this.fetchFilterSearch().then(this.filterResults)
	80	+ } else {
	81	+ this.results = this.resultsCache;
77	77	}
78	78	} else {
	84	+ this.clearResults();
79	79	console.log("no search text, should return filter search results if any");
80	80	this.fetchFilterSearch().then(collabs => {
81	81	console.log("Format and display collabs", collabs);
...	...	@@ -100,11 +100,13 @@
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		- this.results = filteredResults;
	110	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107	107	}
	112	+ clearResults() {
	113	+ this.results = [];
	114	+ this.resultsCache = [];
	115	+ }
108	108	getLink(xwikiDocSpace) {
109	109	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
110	110	}
...	...	@@ -113,7 +113,7 @@
113	113	<div>
114	114	<div>
115	115	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
116		- <button @click="${this.handleSearch}">Search</button>
	124	+ <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>