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=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];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -58,36 +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.clearResults();
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		- })
74		- /*
75		- Promise.all([
76		- this.fetchWikiSearch(),
77		- this.fetchFilterSearch()
78		- ]).then(([wikiSearchResults, collabSearchResults]) => {
79		- this.results = wikiSearchResults;
80		- this.resultsCache = wikiSearchResults;
81		- console.log(wikiSearchResults, collabSearchResults);
82		- });
83		- */
84		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
85		- this.fetchFilterSearch().then(this.filterResults)
86		- } else {
87		- this.results = this.resultsCache;
88		- }
	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	+ }
89	89	} else {
90		- this.clearResults();
91	91	console.log("no search text, should return filter search results if any");
92	92	this.fetchFilterSearch().then(collabs => {
93	93	console.log("Format and display collabs", collabs);
...	...	@@ -96,6 +96,7 @@
96	96	}
97	97	hasActiveFilters() {
98	98	// we only look at role filters for POC.
	85	+ console.log('rolesfilter', this.rolesFilter);
99	99	return this.rolesFilter.length > 0;
100	100	}
101	101	fetchWikiSearch() {
...	...	@@ -107,18 +107,16 @@
107	107	if(this.hasActiveFilters()) {
108	108	fetch(this.filterUrl).then(res => res.json()).then(resolve);
109	109	} else {
110		- resolve([]);
	97	+ resolve(null);
111	111	}
112	112	});
113	113	}
114	114	filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
115	115	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
116		- 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	+ console.log(filteredResults);
117	117	}
118		- clearResults() {
119		- this.results = [];
120		- this.resultsCache = [];
121		- }
122	122	getLink(xwikiDocSpace) {
123	123	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
124	124	}
...	...	@@ -127,7 +127,7 @@
127	127	<div>
128	128	<div>
129	129	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
130		- <button @click="${() => this.handleSearch(true)}">Search</button>
	115	+ <button @click="${this.handleSearch}">Search</button>
131	131	</div>
132	132	<div>
133	133	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>