Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -41,14 +41,15 @@
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&favorite=&roles=`);
	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	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -57,23 +57,36 @@
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
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		- }
	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 = [];
	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	+ }
76	76	} else {
	90	+ this.clearResults();
77	77	console.log("no search text, should return filter search results if any");
78	78	this.fetchFilterSearch().then(collabs => {
79	79	console.log("Format and display collabs", collabs);
...	...	@@ -90,19 +90,21 @@
90	90	}
91	91	fetchFilterSearch() {
92	92	return new Promise((resolve) => {
93		- if(this.hasActiveFilters) {
	107	+ if(this.hasActiveFilters()) {
94	94	fetch(this.filterUrl).then(res => res.json()).then(resolve);
95	95	} else {
96		- resolve(null);
	110	+ resolve([]);
97	97	}
98	98	});
99	99	}
100	100	filterResults = (filteredCollabs) => {
101		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
102	102	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
103		- const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
104		- console.log(filteredResults);
	116	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
105	105	}
	118	+ clearResults() {
	119	+ this.results = [];
	120	+ this.resultsCache = [];
	121	+ }
106	106	getLink(xwikiDocSpace) {
107	107	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
108	108	}
...	...	@@ -111,7 +111,7 @@
111	111	<div>
112	112	<div>
113	113	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
114		- <button @click="${this.handleSearch}">Search</button>
	130	+ <button @click="${() => this.handleSearch(true)}">Search</button>
115	115	</div>
116	116	<div>
117	117	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>