Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,6 +36,7 @@
36	36	constructor() {
37	37	super();
38	38	this.searchText = "";
	39	+ this.prevSearchText = "";
39	39	this.administrator = false;
40	40	this.editor = false;
41	41	this.viewer = false;
...	...	@@ -51,8 +51,7 @@
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
54		- // if search text then apply filter
55		- // else return filters result
	55	+ this.handleSearch();
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
...	...	@@ -59,17 +59,30 @@
59	59	}
60	60	handleSearch() {
61	61	if(this.searchText !== "") {
	62	+ if(this.searchText !== this.prevSearchText) {
	63	+ console.log(this.searchText, this.prevSearchText);
	64	+ this.prevSearchText = this.searchText;
62	62	Promise.all([
63	63	this.fetchWikiSearch(),
64	64	this.fetchFilterSearch()
65		- ])
	68	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	69	+ this.results = wikiSearchResults;
	70	+ console.log(wikiSearchResults, collabSearchResults);
	71	+ });
	72	+ } else if (this.searchText === this.prevSearchText) {
	73	+ console.log("Only apply filter on results");
	74	+ this.fetchFilterSearch().then(this.filterResults)
	75	+ }
66	66	} else {
67	67	console.log("no search text, should return filter search results if any");
	78	+ this.fetchFilterSearch().then(collabs => {
	79	+ console.log("Format and display collabs", collabs);
	80	+ })
68	68	}
69	69	}
70	70	hasActiveFilters() {
71	71	// we only look at role filters for POC.
72		- return this.roles.length > 0;
	85	+ return this.rolesFilter.length > 0;
73	73	}
74	74	fetchWikiSearch() {
75	75	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -77,13 +77,19 @@
77	77	}
78	78	fetchFilterSearch() {
79	79	return new Promise((resolve) => {
80		- if(hasActiveFilters) {
81		- fetch(this.filterUrl).then(console.log);
	93	+ if(this.hasActiveFilters) {
	94	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
82	82	} else {
83	83	resolve(null);
84	84	}
85	85	});
86	86	}
	100	+ filterResults = (filteredCollabs) => {
	101	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	102	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	103	+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
	104	+ console.log(filteredResults);
	105	+ }
87	87	getLink(xwikiDocSpace) {
88	88	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
89	89	}