Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,12 +36,11 @@
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&favorite=&roles=`);
	43	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
45	45	this.results = [];
46	46	}
47	47	toggleRoleFilter(roleName) {
...	...	@@ -52,50 +52,23 @@
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55		- this.handleSearch();
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60	60	handleSearch() {
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		- })
	59	+ console.log(this.searchText);
	60	+ if(this.searchText !== "") {
	61	+ this.fetchWikiSearch();
77	77	}
78	78	}
79		- hasActiveFilters() {
80		- // we only look at role filters for POC.
81		- return this.roles.length > 0;
82		- }
83	83	fetchWikiSearch() {
84	84	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
85		- return handleXWikiSearch(this.searchText);
	66	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
86	86	}
87		- fetchFilterSearch() {
88		- return new Promise((resolve) => {
89		- if(this.hasActiveFilters) {
90		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
91		- } else {
92		- resolve(null);
93		- }
94		- });
	68	+ buildFilter() {
	69	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
95	95	}
96		- filterResults(filteredCollabs) {
97		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
98		- }
99	99	getLink(xwikiDocSpace) {
100	100	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
101	101	}