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,37 @@
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.clearResults();
	65	+ this.prevSearchText = this.searchText;
	66	+ this.fetchWikiSearch().then(results => {
	67	+ console.log(results);
	68	+ this.resultsCache = results;
	69	+ if(this.hasActiveFilters()) {
	70	+ this.fetchFilterSearch().then(this.filterResults);
	71	+ } else {
	72	+ this.results = results;
	73	+ }
	74	+ })
	75	+ /*
	76	+ Promise.all([
	77	+ this.fetchWikiSearch(),
	78	+ this.fetchFilterSearch()
	79	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	80	+ this.results = wikiSearchResults;
	81	+ this.resultsCache = wikiSearchResults;
	82	+ console.log(wikiSearchResults, collabSearchResults);
	83	+ });
	84	+ */
	85	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	86	+ this.fetchFilterSearch().then(this.filterResults)
	87	+ } else {
	88	+ this.results = this.resultsCache;
	89	+ }
76	76	} else {
	91	+ 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);
...	...	@@ -82,7 +82,6 @@
82	82	}
83	83	hasActiveFilters() {
84	84	// we only look at role filters for POC.
85		- console.log('rolesfilter', this.rolesFilter);
86	86	return this.rolesFilter.length > 0;
87	87	}
88	88	fetchWikiSearch() {
...	...	@@ -91,19 +91,21 @@
91	91	}
92	92	fetchFilterSearch() {
93	93	return new Promise((resolve) => {
94		- if(this.hasActiveFilters) {
	108	+ if(this.hasActiveFilters()) {
95	95	fetch(this.filterUrl).then(res => res.json()).then(resolve);
96	96	} else {
97		- resolve(null);
	111	+ resolve([]);
98	98	}
99	99	});
100	100	}
101	101	filterResults = (filteredCollabs) => {
102		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
103	103	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
104		- const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
105		- console.log(filteredResults);
	117	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
106	106	}
	119	+ clearResults() {
	120	+ this.results = [];
	121	+ this.resultsCache = [];
	122	+ }
107	107	getLink(xwikiDocSpace) {
108	108	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
109	109	}
...	...	@@ -112,7 +112,7 @@
112	112	<div>
113	113	<div>
114	114	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
115		- <button @click="${this.handleSearch}">Search</button>
	131	+ <button @click="${() => this.handleSearch(true)}">Search</button>
116	116	</div>
117	117	<div>
118	118	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>