Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -36,90 +36,38 @@
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	+ console.log(this.filterUrl.toString());
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.clearResults();
65		- this.prevSearchText = this.searchText;
66		- this.fetchWikiSearch().then(results => {
67		- console.log(results);
68		- this.resultsCache = results;
69		- if(this.hasActiveFilters()) {
70		- this.fetchFilterSearch().then(this.filterResults);
71		- } else {
72		- this.results = results;
73		- }
74		- })
75		- /*
76		- Promise.all([
77		- this.fetchWikiSearch(),
78		- this.fetchFilterSearch()
79		- ]).then(([wikiSearchResults, collabSearchResults]) => {
80		- this.results = wikiSearchResults;
81		- this.resultsCache = wikiSearchResults;
82		- console.log(wikiSearchResults, collabSearchResults);
83		- });
84		- */
85		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
86		- this.fetchFilterSearch().then(this.filterResults)
87		- } else {
88		- this.results = this.resultsCache;
89		- }
90		- } else {
91		- this.clearResults();
92		- console.log("no search text, should return filter search results if any");
93		- this.fetchFilterSearch().then(collabs => {
94		- console.log("Format and display collabs", collabs);
95		- })
	59	+ handleSearch() {
	60	+ console.log(this.searchText);
	61	+ if(this.searchText !== "") {
	62	+ this.fetchWikiSearch();
96	96	}
97	97	}
98		- hasActiveFilters() {
99		- // we only look at role filters for POC.
100		- return this.rolesFilter.length > 0;
101		- }
102	102	fetchWikiSearch() {
103	103	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
104		- return handleXWikiSearch(this.searchText);
	67	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
105	105	}
106		- fetchFilterSearch() {
107		- return new Promise((resolve) => {
108		- if(this.hasActiveFilters()) {
109		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
110		- } else {
111		- resolve([]);
112		- }
113		- });
114		- }
115		- filterResults = (filteredCollabs) => {
116		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
117		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
118		- }
119		- clearResults() {
120		- this.results = [];
121		- this.resultsCache = [];
122		- }
	69	+
	70	+
123	123	getLink(xwikiDocSpace) {
124	124	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
125	125	}
...	...	@@ -128,7 +128,7 @@
128	128	<div>
129	129	<div>
130	130	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
131		- <button @click="${() => this.handleSearch(true)}">Search</button>
	79	+ <button @click="${this.handleSearch}">Search</button>
132	132	</div>
133	133	<div>
134	134	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>