Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,55 +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	46	}
47	47	toggleRoleFilter(roleName) {
48		- if(this.rolesFilter.indexOf(roleName) === -1) {
	47	+ if(this.rolesFilter.indexOf(roleName) == -1) {
49	49	this.rolesFilter.push(roleName);
50	50	} else {
51		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	50	+ this.rolesFilter.filter(role => role !== roleName);
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55		- this.handleSearch();
	54	+ // if search text then apply filter
	55	+ // else return filters result
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60	60	handleSearch() {
61		-
62	62	if(this.searchText !== "") {
63		- if(this.searchText !== this.prevSearchText) {
64		- console.log("1st")
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		- }
	62	+ Promise.all([
	63	+ this.fetchWikiSearch(),
	64	+ this.fetchFilterSearch()
	65	+ ])
78	78	} else {
79	79	console.log("no search text, should return filter search results if any");
80		- this.fetchFilterSearch().then(collabs => {
81		- console.log("Format and display collabs", collabs);
82		- })
83	83	}
84	84	}
85	85	hasActiveFilters() {
86	86	// we only look at role filters for POC.
87		- return this.rolesFilter.length > 0;
	72	+ 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,19 +92,13 @@
92	92	}
93	93	fetchFilterSearch() {
94	94	return new Promise((resolve) => {
95		- if(this.hasActiveFilters()) {
96		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	80	+ if(hasActiveFilters) {
	81	+ fetch(this.filterUrl).then(console.log);
97	97	} else {
98		- resolve([]);
	83	+ resolve(null);
99	99	}
100	100	});
101	101	}
102		- filterResults = (filteredCollabs) => {
103		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
104		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
105		- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
106		- this.results = filteredResults;
107		- }
108	108	getLink(xwikiDocSpace) {
109	109	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
110	110	}