Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,7 +1,6 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4		- !!! Many optimisations can be done !!!
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
5	5	-->
6	6	<script type="module">
7	7	import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
...	...	@@ -42,15 +42,14 @@
42	42	this.editor = false;
43	43	this.viewer = false;
44	44	this.rolesFilter = [];
45		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
46	46	this.results = [];
47		- this.resultsCache = [];
48	48	}
49	49	toggleRoleFilter(roleName) {
50		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
51	51	this.rolesFilter.push(roleName);
52	52	} else {
53		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
54	54	}
55	55	this[roleName] = !this[roleName];
56	56	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -59,26 +59,19 @@
59	59	setSearchText(e) {
60	60	this.searchText = e.target.value;
61	61	}
62		- handleSearch(textSearch) {
63		- if(this.searchText !== "" || textSearch) {
64		- if(this.searchText !== this.prevSearchText) {
65		- this.clearResults();
66		- this.prevSearchText = this.searchText;
67		- this.fetchWikiSearch().then(results => {
68		- this.resultsCache = results;
69		- if(this.hasActiveFilters()) {
70		- this.fetchFilterSearch().then(this.filterResults);
71		- } else {
72		- this.results = results;
73		- }
74		- })
75		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
76		- this.fetchFilterSearch().then(this.filterResults)
77		- } else {
78		- this.results = this.resultsCache;
79		- }
	60	+ handleSearch() {
	61	+ if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
	62	+ this.prevSearchText = this.searchText;
	63	+ Promise.all([
	64	+ this.fetchWikiSearch(),
	65	+ this.fetchFilterSearch()
	66	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	67	+ console.log(wikiSearchResults, collabSearchResults);
	68	+ });
	69	+ } else if (this.searchText === this.prevSearchText) {
	70	+ console.log("Only apply filter on results");
	71	+ this.fetchFilterSearch().then(this.filterResults)
80	80	} else {
81		- this.clearResults();
82	82	console.log("no search text, should return filter search results if any");
83	83	this.fetchFilterSearch().then(collabs => {
84	84	console.log("Format and display collabs", collabs);
...	...	@@ -87,7 +87,7 @@
87	87	}
88	88	hasActiveFilters() {
89	89	// we only look at role filters for POC.
90		- return this.rolesFilter.length > 0;
	81	+ return this.roles.length > 0;
91	91	}
92	92	fetchWikiSearch() {
93	93	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -95,21 +95,16 @@
95	95	}
96	96	fetchFilterSearch() {
97	97	return new Promise((resolve) => {
98		- if(this.hasActiveFilters()) {
	89	+ if(this.hasActiveFilters) {
99	99	fetch(this.filterUrl).then(res => res.json()).then(resolve);
100	100	} else {
101		- resolve([]);
	92	+ resolve(null);
102	102	}
103	103	});
104	104	}
105		- filterResults = (filteredCollabs) => {
106		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
107		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	96	+ filterResults(filteredCollabs) {
	97	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
108	108	}
109		- clearResults() {
110		- this.results = [];
111		- this.resultsCache = [];
112		- }
113	113	getLink(xwikiDocSpace) {
114	114	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
115	115	}
...	...	@@ -118,7 +118,7 @@
118	118	<div>
119	119	<div>
120	120	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
121		- <button @click="${() => this.handleSearch(true)}">Search</button>
	107	+ <button @click="${this.handleSearch}">Search</button>
122	122	</div>
123	123	<div>
124	124	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>