Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,40 +36,66 @@
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=&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
44	44	this.results = [];
	46	+ this.resultsCache = [];
45	45	}
46	46	toggleRoleFilter(roleName) {
47		- if(this.rolesFilter.indexOf(roleName) == -1) {
	49	+ if(this.rolesFilter.indexOf(roleName) === -1) {
48	48	this.rolesFilter.push(roleName);
49	49	} else {
50		- this.rolesFilter.filter(role => role !== roleName);
	52	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
54		- // if search text then apply filter
55		- // else return filters result
	56	+ this.handleSearch();
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60		- handleSearch() {
61		- if(this.searchText !== "") {
62		- Promise.all([
63		- this.fetchWikiSearch(),
64		- this.fetchFilterSearch()
65		- ])
	61	+ handleSearch(textSearch) {
	62	+ if(this.searchText !== "" || textSearch) {
	63	+ if(this.searchText !== this.prevSearchText) {
	64	+ this.prevSearchText = this.searchText;
	65	+ this.fetchWikiSearch().then(results => {
	66	+ this.resultsCache = results;
	67	+ if(this.hasActiveFilters()) {
	68	+ this.fetchFilterSearch().then(this.filterResults);
	69	+ } else {
	70	+ this.results = results;
	71	+ }
	72	+ })
	73	+ /*
	74	+ Promise.all([
	75	+ this.fetchWikiSearch(),
	76	+ this.fetchFilterSearch()
	77	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	78	+ this.results = wikiSearchResults;
	79	+ this.resultsCache = wikiSearchResults;
	80	+ console.log(wikiSearchResults, collabSearchResults);
	81	+ });
	82	+ */
	83	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	84	+ this.fetchFilterSearch().then(this.filterResults)
	85	+ } else {
	86	+ this.results = this.resultsCache;
	87	+ }
66	66	} else {
	89	+ this.clearResults();
67	67	console.log("no search text, should return filter search results if any");
	91	+ this.fetchFilterSearch().then(collabs => {
	92	+ console.log("Format and display collabs", collabs);
	93	+ })
68	68	}
69	69	}
70	70	hasActiveFilters() {
71	71	// we only look at role filters for POC.
72		- return this.roles.length > 0;
	98	+ return this.rolesFilter.length > 0;
73	73	}
74	74	fetchWikiSearch() {
75	75	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -77,13 +77,21 @@
77	77	}
78	78	fetchFilterSearch() {
79	79	return new Promise((resolve) => {
80		- if(hasActiveFilters) {
81		- fetch(this.filterUrl).then(console.log);
	106	+ if(this.hasActiveFilters()) {
	107	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
82	82	} else {
83		- resolve(null);
	109	+ resolve([]);
84	84	}
85	85	});
86	86	}
	113	+ filterResults = (filteredCollabs) => {
	114	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	115	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	116	+ }
	117	+ clearResults() {
	118	+ this.results = [];
	119	+ this.resultsCache = [];
	120	+ }
87	87	getLink(xwikiDocSpace) {
88	88	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
89	89	}
...	...	@@ -92,7 +92,7 @@
92	92	<div>
93	93	<div>
94	94	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
95		- <button @click="${this.handleSearch}">Search</button>
	129	+ <button @click="${() => this.handleSearch(true)}">Search</button>
96	96	</div>
97	97	<div>
98	98	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>