Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -43,13 +43,13 @@
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 = [];
47	47	}
48	48	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 = this.rolesFilter.filter(role => role !== roleName);
	52	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -59,9 +59,10 @@
59	59	this.searchText = e.target.value;
60	60	}
61	61	handleSearch() {
62		-
	62	+ console.log(this.rolesFilter)
63	63	if(this.searchText !== "") {
64	64	if(this.searchText !== this.prevSearchText) {
	65	+ console.log(this.searchText, this.prevSearchText);
65	65	this.prevSearchText = this.searchText;
66	66	Promise.all([
67	67	this.fetchWikiSearch(),
...	...	@@ -68,10 +68,10 @@
68	68	this.fetchFilterSearch()
69	69	]).then(([wikiSearchResults, collabSearchResults]) => {
70	70	this.results = wikiSearchResults;
71		- this.resultsCache = wikiSearchResults;
72	72	console.log(wikiSearchResults, collabSearchResults);
73	73	});
74		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	74	+ } else if (this.searchText === this.prevSearchText) {
	75	+ console.log("Only apply filter on results");
75	75	this.fetchFilterSearch().then(this.filterResults)
76	76	}
77	77	} else {
...	...	@@ -83,6 +83,7 @@
83	83	}
84	84	hasActiveFilters() {
85	85	// we only look at role filters for POC.
	87	+ console.log('rolesfilter', this.rolesFilter);
86	86	return this.rolesFilter.length > 0;
87	87	}
88	88	fetchWikiSearch() {
...	...	@@ -94,7 +94,7 @@
94	94	if(this.hasActiveFilters()) {
95	95	fetch(this.filterUrl).then(res => res.json()).then(resolve);
96	96	} else {
97		- resolve([]);
	99	+ resolve(null);
98	98	}
99	99	});
100	100	}
...	...	@@ -101,7 +101,8 @@
101	101	filterResults = (filteredCollabs) => {
102	102	console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
103	103	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
104		- 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	+ console.log(filteredResults);
105	105	}
106	106	getLink(xwikiDocSpace) {
107	107	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;