Changes for page Context Search

Summary

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

Details

Page properties

Content

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