Changes for page Context Search

Summary

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

Details

Page properties

Content

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