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,57 +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() {
	59	+ console.log(this.searchText);
61	61	if(this.searchText !== "") {
62		- if(this.searchText !== this.prevSearchText) {
63		- console.log(this.searchText, this.prevSearchText);
64		- this.prevSearchText = this.searchText;
65		- Promise.all([
66		- this.fetchWikiSearch(),
67		- this.fetchFilterSearch()
68		- ]).then(([wikiSearchResults, collabSearchResults]) => {
69		- this.results = wikiSearchResults;
70		- console.log(wikiSearchResults, collabSearchResults);
71		- });
72		- } else if (this.searchText === this.prevSearchText) {
73		- console.log("Only apply filter on results");
74		- this.fetchFilterSearch().then(this.filterResults)
	61	+ this.fetchWikiSearch();
75	75	}
76		- } else {
77		- console.log("no search text, should return filter search results if any");
78		- this.fetchFilterSearch().then(collabs => {
79		- console.log("Format and display collabs", collabs);
80		- })
81		- }
82	82	}
83		- hasActiveFilters() {
84		- // we only look at role filters for POC.
85		- return this.rolesFilter.length > 0;
86		- }
87	87	fetchWikiSearch() {
88	88	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
89		- return handleXWikiSearch(this.searchText);
	66	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
90	90	}
91		- fetchFilterSearch() {
92		- return new Promise((resolve) => {
93		- if(this.hasActiveFilters) {
94		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
95		- } else {
96		- resolve(null);
97		- }
98		- });
	68	+ buildFilter() {
	69	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
99	99	}
100		- filterResults = (filteredCollabs) => {
101		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
102		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
103		- const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
104		- console.log(filteredResults);
105		- }
106	106	getLink(xwikiDocSpace) {
107	107	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
108	108	}
...	...	@@ -156,5 +156,4 @@
156	156	</script>
157	157
158	158	<clb-unified-search></clb-unified-search>
159		-
160	160	{{/html}}