Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -43,7 +43,6 @@
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	49	if(this.rolesFilter.indexOf(roleName) === -1) {
...	...	@@ -58,32 +58,24 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch(textSearch) {
62		- if(this.searchText !== "" || textSearch) {
	60	+ handleSearch() {
	61	+
	62	+ if(this.searchText !== "") {
63	63	if(this.searchText !== this.prevSearchText) {
	64	+ console.log("1st")
	65	+ console.log(this.searchText, this.prevSearchText);
64	64	this.prevSearchText = this.searchText;
65		- this.fetchWikiSearch().then(results => {
66		- //this.results = results;
67		- this.resultsCache = results;
68		- this.fetchFilterSearch().then(this.filterResults);
69		- })
70		- /*
71	71	Promise.all([
72	72	this.fetchWikiSearch(),
73	73	this.fetchFilterSearch()
74	74	]).then(([wikiSearchResults, collabSearchResults]) => {
75	75	this.results = wikiSearchResults;
76		- this.resultsCache = wikiSearchResults;
77	77	console.log(wikiSearchResults, collabSearchResults);
78	78	});
79		- */
80	80	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
81	81	this.fetchFilterSearch().then(this.filterResults)
82		- } else {
83		- this.results = this.resultsCache;
84	84	}
85	85	} else {
86		- this.clearResults();
87	87	console.log("no search text, should return filter search results if any");
88	88	this.fetchFilterSearch().then(collabs => {
89	89	console.log("Format and display collabs", collabs);
...	...	@@ -108,13 +108,11 @@
108	108	});
109	109	}
110	110	filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
111	111	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
112		- 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	+ this.results = filteredResults;
113	113	}
114		- clearResults() {
115		- this.results = [];
116		- this.resultsCache = [];
117		- }
118	118	getLink(xwikiDocSpace) {
119	119	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
120	120	}
...	...	@@ -123,7 +123,7 @@
123	123	<div>
124	124	<div>
125	125	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
126		- <button @click="${() => this.handleSearch(true)}">Search</button>
	115	+ <button @click="${this.handleSearch}">Search</button>
127	127	</div>
128	128	<div>
129	129	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>