Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -43,6 +43,7 @@
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	48	if(this.rolesFilter.indexOf(roleName) === -1) {
...	...	@@ -50,7 +50,6 @@
50	50	} else {
51	51	this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
52	52	}
53		- console.log(this.rolesFilter);
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56	56	this.handleSearch();
...	...	@@ -58,24 +58,26 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch() {
62		- console.log(this.rolesFilter)
63		- if(this.searchText !== "") {
	61	+ handleSearch(textSearch) {
	62	+ if(this.searchText !== "" || textSearch) {
64	64	if(this.searchText !== this.prevSearchText) {
65		- console.log(this.searchText, this.prevSearchText);
	64	+ this.clearResults();
66	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");
	66	+ this.fetchWikiSearch().then(results => {
	67	+ this.resultsCache = results;
	68	+ if(this.hasActiveFilters()) {
	69	+ this.fetchFilterSearch().then(this.filterResults);
	70	+ } else {
	71	+ this.results = results;
	72	+ }
	73	+ })
	74	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
76	76	this.fetchFilterSearch().then(this.filterResults)
	76	+ } else {
	77	+ this.results = this.resultsCache;
77	77	}
78	78	} else {
	80	+ this.clearResults();
79	79	console.log("no search text, should return filter search results if any");
80	80	this.fetchFilterSearch().then(collabs => {
81	81	console.log("Format and display collabs", collabs);
...	...	@@ -84,7 +84,6 @@
84	84	}
85	85	hasActiveFilters() {
86	86	// we only look at role filters for POC.
87		- console.log('rolesfilter', this.rolesFilter);
88	88	return this.rolesFilter.length > 0;
89	89	}
90	90	fetchWikiSearch() {
...	...	@@ -101,11 +101,13 @@
101	101	});
102	102	}
103	103	filterResults = (filteredCollabs) => {
104		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
105	105	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
106		- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107		- console.log(filteredResults);
	106	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
108	108	}
	108	+ clearResults() {
	109	+ this.results = [];
	110	+ this.resultsCache = [];
	111	+ }
109	109	getLink(xwikiDocSpace) {
110	110	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
111	111	}
...	...	@@ -114,7 +114,7 @@
114	114	<div>
115	115	<div>
116	116	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
117		- <button @click="${this.handleSearch}">Search</button>
	120	+ <button @click="${() => this.handleSearch(true)}">Search</button>
118	118	</div>
119	119	<div>
120	120	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>