Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,11 +36,12 @@
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&favorite=&roles=`);
44	44	this.results = [];
45	45	}
46	46	toggleRoleFilter(roleName) {
...	...	@@ -51,23 +51,50 @@
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
	55	+ 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);
60		- if(this.searchText !== "") {
61		- this.fetchWikiSearch();
	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)
	72	+ } else {
	73	+ console.log("no search text, should return filter search results if any");
	74	+ this.fetchFilterSearch().then(res => res.json()).then(collabs => {
	75	+ console.log("Format and display collabs", collabs);
	76	+ })
62	62	}
63	63	}
	79	+ hasActiveFilters() {
	80	+ // we only look at role filters for POC.
	81	+ return this.roles.length > 0;
	82	+ }
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);
	85	+ 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=
	87	+ fetchFilterSearch() {
	88	+ return new Promise((resolve) => {
	89	+ if(hasActiveFilters) {
	90	+ fetch(this.filterUrl).then(console.log);
	91	+ } else {
	92	+ resolve(null);
	93	+ }
	94	+ });
70	70	}
	96	+ filterResults(filteredCollabs) {
	97	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	98	+ }
71	71	getLink(xwikiDocSpace) {
72	72	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
73	73	}