Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -58,26 +58,23 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch(textSearch) {
62		- if(this.searchText !== "" || textSearch) {
	61	+ handleSearch() {
	62	+
	63	+ if(this.searchText !== "") {
63	63	if(this.searchText !== this.prevSearchText) {
64		- this.clearResults();
65	65	this.prevSearchText = this.searchText;
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		- })
	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	74	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
75	75	this.fetchFilterSearch().then(this.filterResults)
76		- } else {
77		- this.results = this.resultsCache;
78	78	}
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);
...	...	@@ -102,13 +102,10 @@
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	106	this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107	107	}
108		- clearResults() {
109		- this.results = [];
110		- this.resultsCache = [];
111		- }
112	112	getLink(xwikiDocSpace) {
113	113	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
114	114	}
...	...	@@ -117,7 +117,7 @@
117	117	<div>
118	118	<div>
119	119	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
120		- <button @click="${() => this.handleSearch(true)}">Search</button>
	114	+ <button @click="${this.handleSearch}">Search</button>
121	121	</div>
122	122	<div>
123	123	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>