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,29 +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		- console.log(this.searchText, this.prevSearchText);
63		- this.prevSearchText = this.searchText;
	61	+ if(this.searchText !== "") {
64	64	Promise.all([
65	65	this.fetchWikiSearch(),
66	66	this.fetchFilterSearch()
67		- ]).then(([wikiSearchResults, collabSearchResults]) => {
68		- console.log(wikiSearchResults, collabSearchResults);
69		- });
70		- } else if (this.searchText === this.prevSearchText) {
71		- console.log("Only apply filter on results");
72		- this.fetchFilterSearch().then(this.filterResults)
	65	+ ])
73	73	} else {
74	74	console.log("no search text, should return filter search results if any");
75		- this.fetchFilterSearch().then(collabs => {
76		- console.log("Format and display collabs", collabs);
77		- })
78	78	}
79	79	}
80	80	hasActiveFilters() {
...	...	@@ -87,16 +87,13 @@
87	87	}
88	88	fetchFilterSearch() {
89	89	return new Promise((resolve) => {
90		- if(this.hasActiveFilters) {
91		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	80	+ if(hasActiveFilters) {
	81	+ fetch(this.filterUrl).then(console.log);
92	92	} else {
93	93	resolve(null);
94	94	}
95	95	});
96	96	}
97		- filterResults = (filteredCollabs) => {
98		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
99		- }
100	100	getLink(xwikiDocSpace) {
101	101	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
102	102	}