Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -41,7 +41,7 @@
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&favorite=false&roles=`);
45	45	this.results = [];
46	46	}
47	47	toggleRoleFilter(roleName) {
...	...	@@ -52,27 +52,30 @@
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55		- // if search text then apply filter
56		- // else return filters result
	55	+ this.handleSearch();
57	57	}
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61	61	handleSearch() {
62		- if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
	61	+ if(this.searchText !== "") {
	62	+ if(this.searchText !== this.prevSearchText) {
	63	+ console.log(this.searchText, this.prevSearchText);
63	63	this.prevSearchText = this.searchText;
64	64	Promise.all([
65	65	this.fetchWikiSearch(),
66	66	this.fetchFilterSearch()
67	67	]).then(([wikiSearchResults, collabSearchResults]) => {
	69	+ this.results = wikiSearchResults;
68	68	console.log(wikiSearchResults, collabSearchResults);
69	69	});
70	70	} else if (this.searchText === this.prevSearchText) {
71	71	console.log("Only apply filter on results");
72		- this.fetchFilterSearch().then(res => res.json()).then(this.filterResults)
	74	+ this.fetchFilterSearch().then(this.filterResults)
	75	+ }
73	73	} else {
74	74	console.log("no search text, should return filter search results if any");
75		- this.fetchFilterSearch().then(res => res.json()).then(collabs => {
	78	+ this.fetchFilterSearch().then(collabs => {
76	76	console.log("Format and display collabs", collabs);
77	77	})
78	78	}
...	...	@@ -79,7 +79,8 @@
79	79	}
80	80	hasActiveFilters() {
81	81	// we only look at role filters for POC.
82		- return this.roles.length > 0;
	85	+ console.log('rolesfilter', this.rolesFilter);
	86	+ return this.rolesFilter.length > 0;
83	83	}
84	84	fetchWikiSearch() {
85	85	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -87,15 +87,18 @@
87	87	}
88	88	fetchFilterSearch() {
89	89	return new Promise((resolve) => {
90		- if(hasActiveFilters) {
91		- fetch(this.filterUrl).then(console.log);
	94	+ if(this.hasActiveFilters()) {
	95	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
92	92	} else {
93	93	resolve(null);
94	94	}
95	95	});
96	96	}
97		- filterResults(filteredCollabs) {
	101	+ filterResults = (filteredCollabs) => {
98	98	console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	103	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	104	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ console.log(filteredResults);
99	99	}
100	100	getLink(xwikiDocSpace) {
101	101	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;