Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -43,13 +43,12 @@
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) {
49		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
50	50	this.rolesFilter.push(roleName);
51	51	} else {
52		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -58,26 +58,23 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		-
62	62	handleSearch() {
63	63	if(this.searchText !== "") {
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		- } else {
77		- this.results = this.resultsCache;
78		- }
	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	+ }
79	79	} else {
80		- this.clearResults();
81	81	console.log("no search text, should return filter search results if any");
82	82	this.fetchFilterSearch().then(collabs => {
83	83	console.log("Format and display collabs", collabs);
...	...	@@ -86,6 +86,7 @@
86	86	}
87	87	hasActiveFilters() {
88	88	// we only look at role filters for POC.
	85	+ console.log('rolesfilter', this.rolesFilter);
89	89	return this.rolesFilter.length > 0;
90	90	}
91	91	fetchWikiSearch() {
...	...	@@ -97,18 +97,16 @@
97	97	if(this.hasActiveFilters()) {
98	98	fetch(this.filterUrl).then(res => res.json()).then(resolve);
99	99	} else {
100		- resolve([]);
	97	+ resolve(null);
101	101	}
102	102	});
103	103	}
104	104	filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
105	105	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
106		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	104	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ console.log(filteredResults);
107	107	}
108		- clearResults() {
109		- this.results = [];
110		- this.resultsCache = [];
111		- }
112	112	getLink(xwikiDocSpace) {
113	113	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
114	114	}