Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -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 = [];
	46	+ 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();
...	...	@@ -59,10 +59,9 @@
59	59	this.searchText = e.target.value;
60	60	}
61	61	handleSearch() {
62		- console.log(this.rolesFilter)
	62	+
63	63	if(this.searchText !== "") {
64	64	if(this.searchText !== this.prevSearchText) {
65		- console.log(this.searchText, this.prevSearchText);
66	66	this.prevSearchText = this.searchText;
67	67	Promise.all([
68	68	this.fetchWikiSearch(),
...	...	@@ -69,11 +69,13 @@
69	69	this.fetchFilterSearch()
70	70	]).then(([wikiSearchResults, collabSearchResults]) => {
71	71	this.results = wikiSearchResults;
	71	+ this.resultsCache = wikiSearchResults;
72	72	console.log(wikiSearchResults, collabSearchResults);
73	73	});
74		- } else if (this.searchText === this.prevSearchText) {
75		- console.log("Only apply filter on results");
	74	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
76	76	this.fetchFilterSearch().then(this.filterResults)
	76	+ } else {
	77	+ this.results = this.resultsCache;
77	77	}
78	78	} else {
79	79	console.log("no search text, should return filter search results if any");
...	...	@@ -100,10 +100,8 @@
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;
	105	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107	107	}
108	108	getLink(xwikiDocSpace) {
109	109	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;