Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,38 +36,74 @@
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;
42	42	this.rolesFilter = [];
43		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
44	44	this.results = [];
	46	+ this.resultsCache = [];
45	45	}
46	46	toggleRoleFilter(roleName) {
47		- if(this.rolesFilter.indexOf(roleName) == -1) {
	49	+ if(this.rolesFilter.indexOf(roleName) === -1) {
48	48	this.rolesFilter.push(roleName);
49	49	} else {
50		- this.rolesFilter.filter(role => role !== roleName);
	52	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
	56	+ this.handleSearch();
54	54	}
55	55	setSearchText(e) {
56	56	this.searchText = e.target.value;
57	57	}
58	58	handleSearch() {
59		- console.log(this.searchText);
	62	+
60	60	if(this.searchText !== "") {
61		- this.fetchWikiSearch();
	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	+ }
	77	+ } else {
	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	+ })
62	62	}
63	63	}
	84	+ hasActiveFilters() {
	85	+ // we only look at role filters for POC.
	86	+ return this.rolesFilter.length > 0;
	87	+ }
64	64	fetchWikiSearch() {
65	65	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
66		- handleXWikiSearch(this.searchText).then(results => this.results = results);
	90	+ return handleXWikiSearch(this.searchText);
67	67	}
68		- buildFilter() {
69		- //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
	92	+ fetchFilterSearch() {
	93	+ return new Promise((resolve) => {
	94	+ if(this.hasActiveFilters()) {
	95	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
	96	+ } else {
	97	+ resolve([]);
	98	+ }
	99	+ });
70	70	}
	101	+ filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	103	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	104	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ this.results = filteredResults;
	106	+ }
71	71	getLink(xwikiDocSpace) {
72	72	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
73	73	}
...	...	@@ -121,4 +121,5 @@
121	121	</script>
122	122
123	123	<clb-unified-search></clb-unified-search>
	160	+
124	124	{{/html}}