Changes for page Context Search

Summary

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

Details

Page properties

Content

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