Changes for page Context Search

Summary

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

Details

Page properties

Content

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