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) {
...	...	@@ -51,6 +51,7 @@
51	51	} else {
52	52	this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
53	53	}
	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,35 +58,24 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch(textSearch) {
62		- if(this.searchText !== "" || textSearch) {
	61	+ handleSearch() {
	62	+ console.log(this.rolesFilter)
	63	+ if(this.searchText !== "") {
63	63	if(this.searchText !== this.prevSearchText) {
	65	+ console.log(this.searchText, this.prevSearchText);
64	64	this.prevSearchText = this.searchText;
65		- this.fetchWikiSearch().then(results => {
66		- this.resultsCache = results;
67		- if(this.hasActiveFilters()) {
68		- this.fetchFilterSearch().then(this.filterResults);
69		- } else {
70		- this.results = results;
71		- }
72		- })
73		- /*
74	74	Promise.all([
75	75	this.fetchWikiSearch(),
76	76	this.fetchFilterSearch()
77	77	]).then(([wikiSearchResults, collabSearchResults]) => {
78	78	this.results = wikiSearchResults;
79		- this.resultsCache = wikiSearchResults;
80	80	console.log(wikiSearchResults, collabSearchResults);
81	81	});
82		- */
83		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	74	+ } else if (this.searchText === this.prevSearchText) {
	75	+ console.log("Only apply filter on results");
84	84	this.fetchFilterSearch().then(this.filterResults)
85		- } else {
86		- this.results = this.resultsCache;
87	87	}
88	88	} else {
89		- this.clearResults();
90	90	console.log("no search text, should return filter search results if any");
91	91	this.fetchFilterSearch().then(collabs => {
92	92	console.log("Format and display collabs", collabs);
...	...	@@ -95,6 +95,7 @@
95	95	}
96	96	hasActiveFilters() {
97	97	// we only look at role filters for POC.
	87	+ console.log('rolesfilter', this.rolesFilter);
98	98	return this.rolesFilter.length > 0;
99	99	}
100	100	fetchWikiSearch() {
...	...	@@ -106,18 +106,16 @@
106	106	if(this.hasActiveFilters()) {
107	107	fetch(this.filterUrl).then(res => res.json()).then(resolve);
108	108	} else {
109		- resolve([]);
	99	+ resolve(null);
110	110	}
111	111	});
112	112	}
113	113	filterResults = (filteredCollabs) => {
	104	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
114	114	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
115		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	106	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	107	+ console.log(filteredResults);
116	116	}
117		- clearResults() {
118		- this.results = [];
119		- this.resultsCache = [];
120		- }
121	121	getLink(xwikiDocSpace) {
122	122	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
123	123	}
...	...	@@ -126,7 +126,7 @@
126	126	<div>
127	127	<div>
128	128	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
129		- <button @click="${() => this.handleSearch(true)}">Search</button>
	117	+ <button @click="${this.handleSearch}">Search</button>
130	130	</div>
131	131	<div>
132	132	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>