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';
...	...	@@ -44,7 +44,6 @@
44	44	this.rolesFilter = [];
45	45	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
46	46	this.results = [];
47		- this.resultsCache = [];
48	48	}
49	49	toggleRoleFilter(roleName) {
50	50	if(this.rolesFilter.indexOf(roleName) === -1) {
...	...	@@ -59,26 +59,25 @@
59	59	setSearchText(e) {
60	60	this.searchText = e.target.value;
61	61	}
62		- handleSearch(textSearch) {
63		- if(this.searchText !== "" || textSearch) {
	60	+ handleSearch() {
	61	+
	62	+ if(this.searchText !== "") {
64	64	if(this.searchText !== this.prevSearchText) {
65		- this.clearResults();
	64	+ console.log("1st")
	65	+ console.log(this.searchText, this.prevSearchText);
66	66	this.prevSearchText = this.searchText;
67		- this.fetchWikiSearch().then(results => {
68		- this.resultsCache = results;
69		- if(this.hasActiveFilters()) {
70		- this.fetchFilterSearch().then(this.filterResults);
71		- } else {
72		- this.results = results;
73		- }
74		- })
75		- } 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");
76	76	this.fetchFilterSearch().then(this.filterResults)
77		- } else {
78		- this.results = this.resultsCache;
79	79	}
80	80	} else {
81		- this.clearResults();
82	82	console.log("no search text, should return filter search results if any");
83	83	this.fetchFilterSearch().then(collabs => {
84	84	console.log("Format and display collabs", collabs);
...	...	@@ -103,13 +103,11 @@
103	103	});
104	104	}
105	105	filterResults = (filteredCollabs) => {
	103	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
106	106	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
107		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	106	+ this.results = filteredResults;
108	108	}
109		- clearResults() {
110		- this.results = [];
111		- this.resultsCache = [];
112		- }
113	113	getLink(xwikiDocSpace) {
114	114	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
115	115	}
...	...	@@ -118,7 +118,7 @@
118	118	<div>
119	119	<div>
120	120	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
121		- <button @click="${() => this.handleSearch(true)}">Search</button>
	116	+ <button @click="${this.handleSearch}">Search</button>
122	122	</div>
123	123	<div>
124	124	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>