Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -41,7 +41,7 @@
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) {
...	...	@@ -58,22 +58,21 @@
58	58	this.searchText = e.target.value;
59	59	}
60	60	handleSearch() {
61		- console.log(this.rolesFilter)
62	62	if(this.searchText !== "") {
63		- if(this.searchText !== this.prevSearchText) {
64		- console.log(this.searchText, this.prevSearchText);
65		- this.prevSearchText = this.searchText;
66		- Promise.all([
67		- this.fetchWikiSearch(),
68		- this.fetchFilterSearch()
69		- ]).then(([wikiSearchResults, collabSearchResults]) => {
70		- this.results = wikiSearchResults;
71		- console.log(wikiSearchResults, collabSearchResults);
72		- });
73		- } else if (this.searchText === this.prevSearchText) {
74		- console.log("Only apply filter on results");
75		- this.fetchFilterSearch().then(this.filterResults)
76		- }
	62	+ if(this.searchText !== this.prevSearchText) {
	63	+ console.log(this.searchText, this.prevSearchText);
	64	+ this.prevSearchText = this.searchText;
	65	+ Promise.all([
	66	+ this.fetchWikiSearch(),
	67	+ this.fetchFilterSearch()
	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	+ }
77	77	} else {
78	78	console.log("no search text, should return filter search results if any");
79	79	this.fetchFilterSearch().then(collabs => {
...	...	@@ -83,8 +83,7 @@
83	83	}
84	84	hasActiveFilters() {
85	85	// we only look at role filters for POC.
86		- console.log('rolesfilter', this.rolesFilter);
87		- return this.rolesFilter.length > 0;
	85	+ 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,7 +92,7 @@
92	92	}
93	93	fetchFilterSearch() {
94	94	return new Promise((resolve) => {
95		- if(this.hasActiveFilters()) {
	93	+ if(this.hasActiveFilters) {
96	96	fetch(this.filterUrl).then(res => res.json()).then(resolve);
97	97	} else {
98	98	resolve(null);
...	...	@@ -102,7 +102,7 @@
102	102	filterResults = (filteredCollabs) => {
103	103	console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
104	104	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
105		- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	103	+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
106	106	console.log(filteredResults);
107	107	}
108	108	getLink(xwikiDocSpace) {