Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,7 +36,6 @@
36	36	constructor() {
37	37	super();
38	38	this.searchText = "";
39		- this.prevSearchText = "";
40	40	this.administrator = false;
41	41	this.editor = false;
42	42	this.viewer = false;
...	...	@@ -52,28 +52,20 @@
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55		- this.handleSearch();
	54	+ // if search text then apply filter
	55	+ // else return filters result
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60	60	handleSearch() {
61		- if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
62		- this.prevSearchText = this.searchText;
	61	+ if(this.searchText !== "") {
63	63	Promise.all([
64	64	this.fetchWikiSearch(),
65	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(this.filterResults)
	65	+ ])
72	72	} else {
73	73	console.log("no search text, should return filter search results if any");
74		- this.fetchFilterSearch().then(collabs => {
75		- console.log("Format and display collabs", collabs);
76		- })
77	77	}
78	78	}
79	79	hasActiveFilters() {
...	...	@@ -86,16 +86,13 @@
86	86	}
87	87	fetchFilterSearch() {
88	88	return new Promise((resolve) => {
89		- if(this.hasActiveFilters) {
90		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	80	+ if(hasActiveFilters) {
	81	+ fetch(this.filterUrl).then(console.log);
91	91	} else {
92	92	resolve(null);
93	93	}
94	94	});
95	95	}
96		- filterResults(filteredCollabs) {
97		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
98		- }
99	99	getLink(xwikiDocSpace) {
100	100	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
101	101	}