Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,66 +36,40 @@
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=&roles=`);
45	45	this.results = [];
46		- this.resultsCache = [];
47	47	}
48	48	toggleRoleFilter(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		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	50	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56		- this.handleSearch();
	54	+ // if search text then apply filter
	55	+ // else return filters result
57	57	}
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
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		- }
	60	+ handleSearch() {
	61	+ if(this.searchText !== "") {
	62	+ Promise.all([
	63	+ this.fetchWikiSearch(),
	64	+ this.fetchFilterSearch()
	65	+ ])
88	88	} else {
89		- this.clearResults();
90	90	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		- })
94	94	}
95	95	}
96	96	hasActiveFilters() {
97	97	// we only look at role filters for POC.
98		- return this.rolesFilter.length > 0;
	72	+ return this.roles.length > 0;
99	99	}
100	100	fetchWikiSearch() {
101	101	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -103,21 +103,13 @@
103	103	}
104	104	fetchFilterSearch() {
105	105	return new Promise((resolve) => {
106		- if(this.hasActiveFilters()) {
107		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	80	+ if(hasActiveFilters) {
	81	+ fetch(this.filterUrl).then(console.log);
108	108	} else {
109		- resolve([]);
	83	+ resolve(null);
110	110	}
111	111	});
112	112	}
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		- }
121	121	getLink(xwikiDocSpace) {
122	122	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
123	123	}
...	...	@@ -126,7 +126,7 @@
126	126	<div>
127	127	<div>
128	128	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
129		- <button @click="${() => this.handleSearch(true)}">Search</button>
	95	+ <button @click="${this.handleSearch}">Search</button>
130	130	</div>
131	131	<div>
132	132	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>