Changes for page Context Search

Summary

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

Details

Page properties

Content

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