Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,6 +36,7 @@
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;
...	...	@@ -51,23 +51,58 @@
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	+ 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)
63	63	}
	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	+ }
64	64	}
	83	+ hasActiveFilters() {
	84	+ // we only look at role filters for POC.
	85	+ console.log('rolesfilter', this.rolesFilter);
	86	+ return this.rolesFilter.length > 0;
	87	+ }
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);
	90	+ return handleXWikiSearch(this.searchText);
68	68	}
69		-
70		-
	92	+ fetchFilterSearch() {
	93	+ return new Promise((resolve) => {
	94	+ if(this.hasActiveFilters()) {
	95	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
	96	+ } else {
	97	+ resolve(null);
	98	+ }
	99	+ });
	100	+ }
	101	+ filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	103	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	104	+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
	105	+ console.log(filteredResults);
	106	+ }
71	71	getLink(xwikiDocSpace) {
72	72	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
73	73	}