Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -41,15 +41,14 @@
41	41	this.editor = false;
42	42	this.viewer = false;
43	43	this.rolesFilter = [];
44		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&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,32 +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		- this.fetchWikiSearch().then(results => {
66		- this.results = wikiSearchResults;
67		- this.resultsCache = wikiSearchResults;
68		- this.fetchFilterSearch().then(this.filterResults);
69		- })
70		- /*
71		- Promise.all([
72		- this.fetchWikiSearch(),
73		- this.fetchFilterSearch()
74		- ]).then(([wikiSearchResults, collabSearchResults]) => {
75		- this.results = wikiSearchResults;
76		- this.resultsCache = wikiSearchResults;
77		- console.log(wikiSearchResults, collabSearchResults);
78		- });
79		- */
80		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
81		- this.fetchFilterSearch().then(this.filterResults)
82		- } else {
83		- this.results = this.resultsCache;
84		- }
	60	+ handleSearch() {
	61	+ if(this.searchText !== "") {
	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	+ }
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);
...	...	@@ -100,21 +100,19 @@
100	100	}
101	101	fetchFilterSearch() {
102	102	return new Promise((resolve) => {
103		- if(this.hasActiveFilters()) {
	93	+ if(this.hasActiveFilters) {
104	104	fetch(this.filterUrl).then(res => res.json()).then(resolve);
105	105	} else {
106		- resolve([]);
	96	+ resolve(null);
107	107	}
108	108	});
109	109	}
110	110	filterResults = (filteredCollabs) => {
	101	+ 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)));
	103	+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
	104	+ console.log(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>
	114	+ <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>