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,56 @@
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
54		- console.log(this.filterUrl.toString());
	55	+ this.handleSearch();
55	55	}
56	56	setSearchText(e) {
57	57	this.searchText = e.target.value;
58	58	}
59	59	handleSearch() {
60		- console.log(this.searchText);
61	61	if(this.searchText !== "") {
62		- this.fetchWikiSearch();
	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	+ console.log(wikiSearchResults, collabSearchResults);
	70	+ });
	71	+ } else if (this.searchText === this.prevSearchText) {
	72	+ console.log("Only apply filter on results");
	73	+ this.fetchFilterSearch().then(this.filterResults)
63	63	}
	75	+ } else {
	76	+ console.log("no search text, should return filter search results if any");
	77	+ this.fetchFilterSearch().then(collabs => {
	78	+ console.log("Format and display collabs", collabs);
	79	+ })
	80	+ }
64	64	}
	82	+ hasActiveFilters() {
	83	+ // we only look at role filters for POC.
	84	+ return this.roles.length > 0;
	85	+ }
65	65	fetchWikiSearch() {
66	66	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
67		- handleXWikiSearch(this.searchText).then(results => this.results = results);
	88	+ return handleXWikiSearch(this.searchText);
68	68	}
69		-
70		-
	90	+ fetchFilterSearch() {
	91	+ return new Promise((resolve) => {
	92	+ if(this.hasActiveFilters) {
	93	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
	94	+ } else {
	95	+ resolve(null);
	96	+ }
	97	+ });
	98	+ }
	99	+ filterResults = (filteredCollabs) => {
	100	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	101	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	102	+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
	103	+ console.log(filteredResults);
	104	+ }
71	71	getLink(xwikiDocSpace) {
72	72	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
73	73	}