Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -43,15 +43,15 @@
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];
	54	+ console.log(this.rolesFilter);
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56	56	this.handleSearch();
57	57	}
...	...	@@ -58,25 +58,23 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch(textSearch) {
62		- if(this.searchText !== "" || textSearch) {
63		- if(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		- this.resultsCache = wikiSearchResults;
71		- console.log(wikiSearchResults, collabSearchResults);
72		- });
73		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
74		- this.fetchFilterSearch().then(this.filterResults)
75		- } else {
76		- this.results = this.resultsCache;
77		- }
	61	+ handleSearch() {
	62	+ if(this.searchText !== "") {
	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		- this.clearResults();
80	80	console.log("no search text, should return filter search results if any");
81	81	this.fetchFilterSearch().then(collabs => {
82	82	console.log("Format and display collabs", collabs);
...	...	@@ -85,6 +85,7 @@
85	85	}
86	86	hasActiveFilters() {
87	87	// we only look at role filters for POC.
	86	+ console.log('rolesfilter', this.rolesFilter);
88	88	return this.rolesFilter.length > 0;
89	89	}
90	90	fetchWikiSearch() {
...	...	@@ -96,18 +96,16 @@
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	}
103	103	filterResults = (filteredCollabs) => {
	103	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
104	104	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
105		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	106	+ console.log(filteredResults);
106	106	}
107		- clearResults() {
108		- this.results = [];
109		- this.resultsCache = [];
110		- }
111	111	getLink(xwikiDocSpace) {
112	112	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
113	113	}