Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -41,15 +41,14 @@
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&limit=10000&favorite=false&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
45	45	this.results = [];
46		- this.resultsCache = [];
47	47	}
48	48	toggleRoleFilter(roleName) {
49		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
50	50	this.rolesFilter.push(roleName);
51	51	} else {
52		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -58,33 +58,22 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
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		- console.log(results);
67		- //this.results = results;
68		- this.resultsCache = results;
69		- this.fetchFilterSearch().then(this.filterResults);
70		- })
71		- /*
72		- Promise.all([
73		- this.fetchWikiSearch(),
74		- this.fetchFilterSearch()
75		- ]).then(([wikiSearchResults, collabSearchResults]) => {
76		- this.results = wikiSearchResults;
77		- this.resultsCache = wikiSearchResults;
78		- console.log(wikiSearchResults, collabSearchResults);
79		- });
80		- */
81		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
82		- this.fetchFilterSearch().then(this.filterResults)
83		- } else {
84		- this.results = this.resultsCache;
85		- }
	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	+ console.log(wikiSearchResults, collabSearchResults);
	70	+ });
	71	+ } else if (this.searchText === this.prevSearchText) {
	72	+ console.log("Only apply filter on results");
	73	+ this.fetchFilterSearch().then(this.filterResults)
	74	+ }
86	86	} else {
87		- this.clearResults();
88	88	console.log("no search text, should return filter search results if any");
89	89	this.fetchFilterSearch().then(collabs => {
90	90	console.log("Format and display collabs", collabs);
...	...	@@ -93,7 +93,7 @@
93	93	}
94	94	hasActiveFilters() {
95	95	// we only look at role filters for POC.
96		- return this.rolesFilter.length > 0;
	84	+ return this.roles.length > 0;
97	97	}
98	98	fetchWikiSearch() {
99	99	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -101,21 +101,16 @@
101	101	}
102	102	fetchFilterSearch() {
103	103	return new Promise((resolve) => {
104		- if(this.hasActiveFilters()) {
	92	+ if(this.hasActiveFilters) {
105	105	fetch(this.filterUrl).then(res => res.json()).then(resolve);
106	106	} else {
107		- resolve([]);
	95	+ resolve(null);
108	108	}
109	109	});
110	110	}
111	111	filterResults = (filteredCollabs) => {
112		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
113		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	100	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
114	114	}
115		- clearResults() {
116		- this.results = [];
117		- this.resultsCache = [];
118		- }
119	119	getLink(xwikiDocSpace) {
120	120	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
121	121	}
...	...	@@ -124,7 +124,7 @@
124	124	<div>
125	125	<div>
126	126	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
127		- <button @click="${() => this.handleSearch(true)}">Search</button>
	110	+ <button @click="${this.handleSearch}">Search</button>
128	128	</div>
129	129	<div>
130	130	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>