Changes for page Context Search

Summary

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

Details

Page properties

Content

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