Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,54 +36,40 @@
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;
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=`);
	43	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
45	45	this.results = [];
46		- this.resultsCache = [];
47	47	}
48	48	toggleRoleFilter(roleName) {
49		- if(this.rolesFilter.indexOf(roleName) === -1) {
	47	+ if(this.rolesFilter.indexOf(roleName) == -1) {
50	50	this.rolesFilter.push(roleName);
51	51	} else {
52		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	50	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56		- this.handleSearch();
	54	+ // if search text then apply filter
	55	+ // else return filters result
57	57	}
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61	61	handleSearch() {
62		-
63	63	if(this.searchText !== "") {
64		- if(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		- this.resultsCache = wikiSearchResults;
72		- console.log(wikiSearchResults, collabSearchResults);
73		- });
74		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
75		- this.fetchFilterSearch().then(this.filterResults)
76		- }
	62	+ Promise.all([
	63	+ this.fetchWikiSearch(),
	64	+ this.fetchFilterSearch()
	65	+ ])
77	77	} else {
78	78	console.log("no search text, should return filter search results if any");
79		- this.fetchFilterSearch().then(collabs => {
80		- console.log("Format and display collabs", collabs);
81		- })
82	82	}
83	83	}
84	84	hasActiveFilters() {
85	85	// we only look at role filters for POC.
86		- return this.rolesFilter.length > 0;
	72	+ 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,17 +91,13 @@
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);
	80	+ if(hasActiveFilters) {
	81	+ fetch(this.filterUrl).then(console.log);
96	96	} else {
97		- resolve([]);
	83	+ resolve(null);
98	98	}
99	99	});
100	100	}
101		- filterResults = (filteredCollabs) => {
102		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
103		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
104		- }
105	105	getLink(xwikiDocSpace) {
106	106	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
107	107	}