Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -45,13 +45,13 @@
45	45	this.results = [];
46	46	}
47	47	toggleRoleFilter(roleName) {
48		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
49	49	this.rolesFilter.push(roleName);
50	50	} else {
51		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
52	52	}
53		- console.log(this.rolesFilter);
54	54	this[roleName] = !this[roleName];
	54	+ console.log(this.rolesFilter)l
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56	56	this.handleSearch();
57	57	}
...	...	@@ -59,22 +59,21 @@
59	59	this.searchText = e.target.value;
60	60	}
61	61	handleSearch() {
62		- console.log(this.rolesFilter)
63	63	if(this.searchText !== "") {
64		- if(this.searchText !== this.prevSearchText) {
65		- console.log(this.searchText, this.prevSearchText);
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");
76		- this.fetchFilterSearch().then(this.filterResults)
77		- }
	63	+ if(this.searchText !== this.prevSearchText) {
	64	+ console.log(this.searchText, this.prevSearchText);
	65	+ this.prevSearchText = this.searchText;
	66	+ Promise.all([
	67	+ this.fetchWikiSearch(),
	68	+ this.fetchFilterSearch()
	69	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	70	+ this.results = wikiSearchResults;
	71	+ console.log(wikiSearchResults, collabSearchResults);
	72	+ });
	73	+ } else if (this.searchText === this.prevSearchText) {
	74	+ console.log("Only apply filter on results");
	75	+ this.fetchFilterSearch().then(this.filterResults)
	76	+ }
78	78	} else {
79	79	console.log("no search text, should return filter search results if any");
80	80	this.fetchFilterSearch().then(collabs => {
...	...	@@ -96,7 +96,7 @@
96	96	if(this.hasActiveFilters()) {
97	97	fetch(this.filterUrl).then(res => res.json()).then(resolve);
98	98	} else {
99		- resolve([]);
	98	+ resolve(null);
100	100	}
101	101	});
102	102	}
...	...	@@ -104,7 +104,7 @@
104	104	console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
105	105	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
106	106	const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107		- this.results = filteredResults;
	106	+ console.log(filteredResults);
108	108	}
109	109	getLink(xwikiDocSpace) {
110	110	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;