Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,17 +36,15 @@
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=true&roles=`);
45	45	this.results = [];
46	46	}
47	47	toggleRoleFilter(roleName) {
48		- console.log("toggleRoleFilter", roleName, this.rolesFilter, this.rolesFilter.indexOf(roleName));
49		- if(this.rolesFilter.indexOf(roleName) === -1) {
	47	+ if(this.rolesFilter.indexOf(roleName) == -1) {
50	50	this.rolesFilter.push(roleName);
51	51	} else {
52	52	this.rolesFilter.filter(role => role !== roleName);
...	...	@@ -53,59 +53,23 @@
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56		- this.handleSearch();
57	57	}
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61	61	handleSearch() {
62		- console.log(this.rolesFilter)
	59	+ console.log(this.searchText);
63	63	if(this.searchText !== "") {
64		- if(this.searchText !== this.prevSearchText) {
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		- }
78		- } else {
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		- })
	61	+ this.fetchWikiSearch();
83	83	}
84	84	}
85		- hasActiveFilters() {
86		- // we only look at role filters for POC.
87		- console.log('rolesfilter', this.rolesFilter);
88		- return this.rolesFilter.length > 0;
89		- }
90	90	fetchWikiSearch() {
91	91	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
92		- return handleXWikiSearch(this.searchText);
	66	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
93	93	}
94		- fetchFilterSearch() {
95		- return new Promise((resolve) => {
96		- if(this.hasActiveFilters()) {
97		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
98		- } else {
99		- resolve(null);
100		- }
101		- });
	68	+ buildFilter() {
	69	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
102	102	}
103		- filterResults = (filteredCollabs) => {
104		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
105		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
106		- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107		- console.log(filteredResults);
108		- }
109	109	getLink(xwikiDocSpace) {
110	110	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
111	111	}
...	...	@@ -159,5 +159,4 @@
159	159	</script>
160	160
161	161	<clb-unified-search></clb-unified-search>
162		-
163	163	{{/html}}