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';
...	...	@@ -8,13 +8,21 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
	10	+ /*
11	11	static properties = {
	12	+ searchText: { type: String },
	13	+ favoritesFilter: { type: Boolean },
	14	+ administratorFilter: { type: Boolean },
	15	+ editorFilter: { type: Boolean },
	16	+ viewerFilter: { type: Boolean },
	17	+ publicFilter: { type: Boolean },
	18	+ privateFilter: { type: Boolean },
	19	+ }
	20	+ */
	21	+ static properties = {
12	12	results: { type: Array }
13	13	}
14	14	static styles = css`
15		- :host > div {
16		- padding-bottom: 4em;
17		- }
18	18	.result {
19	19	margin-top: 1em;
20	20	}
...	...	@@ -34,18 +34,14 @@
34	34	this.editor = false;
35	35	this.viewer = false;
36	36	this.rolesFilter = [];
37		- 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=`);
38	38	this.results = [];
39		- this.resultsCache = [];
40	40	}
41		- firstUpdated() {
42		- this.renderRoot.getElementById('searchInput').focus();
43		- }
44	44	toggleRoleFilter(roleName) {
45		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
46	46	this.rolesFilter.push(roleName);
47	47	} else {
48		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
49	49	}
50	50	this[roleName] = !this[roleName];
51	51	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
...	...	@@ -54,26 +54,20 @@
54	54	setSearchText(e) {
55	55	this.searchText = e.target.value;
56	56	}
57		- handleSearch(textSearch) {
58		- if(this.searchText !== "" || textSearch) {
59		- if(this.searchText !== this.prevSearchText) {
60		- this.clearResults();
61		- this.prevSearchText = this.searchText;
62		- this.fetchWikiSearch().then(results => {
63		- this.resultsCache = results;
64		- if(this.hasActiveFilters()) {
65		- this.fetchFilterSearch().then(this.filterResults);
66		- } else {
67		- this.results = results;
68		- }
69		- })
70		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
71		- this.fetchFilterSearch().then(this.filterResults)
72		- } else {
73		- this.results = this.resultsCache;
74		- }
	60	+ handleSearch() {
	61	+ if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
	62	+ console.log(this.searchText, this.prevSearchText);
	63	+ this.prevSearchText = this.searchText;
	64	+ Promise.all([
	65	+ this.fetchWikiSearch(),
	66	+ this.fetchFilterSearch()
	67	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	68	+ console.log(wikiSearchResults, collabSearchResults);
	69	+ });
	70	+ } else if (this.searchText === this.prevSearchText) {
	71	+ console.log("Only apply filter on results");
	72	+ this.fetchFilterSearch().then(this.filterResults)
75	75	} else {
76		- this.clearResults();
77	77	console.log("no search text, should return filter search results if any");
78	78	this.fetchFilterSearch().then(collabs => {
79	79	console.log("Format and display collabs", collabs);
...	...	@@ -82,7 +82,7 @@
82	82	}
83	83	hasActiveFilters() {
84	84	// we only look at role filters for POC.
85		- return this.rolesFilter.length > 0;
	82	+ return this.roles.length > 0;
86	86	}
87	87	fetchWikiSearch() {
88	88	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -90,35 +90,25 @@
90	90	}
91	91	fetchFilterSearch() {
92	92	return new Promise((resolve) => {
93		- if(this.hasActiveFilters()) {
	90	+ if(this.hasActiveFilters) {
94	94	fetch(this.filterUrl).then(res => res.json()).then(resolve);
95	95	} else {
96		- resolve([]);
	93	+ resolve(null);
97	97	}
98	98	});
99	99	}
100	100	filterResults = (filteredCollabs) => {
101		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
102		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	98	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
103	103	}
104		- clearResults() {
105		- this.results = [];
106		- this.resultsCache = [];
107		- }
108	108	getLink(xwikiDocSpace) {
109	109	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
110	110	}
111		- handleKeyPress(e) {
112		- if (e.keyCode === 13) {
113		- this.handleSearch(true);
114		- }
115		- }
116	116	render() {
117	117	return html`
118	118	<div>
119	119	<div>
120		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
121		- <button @click="${() => this.handleSearch(true)}">Search</button>
	107	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	108	+ <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>
...	...	@@ -161,5 +161,7 @@
161	161	}
162	162	});
163	163	</script>
	151	+
164	164	<clb-unified-search></clb-unified-search>
	153	+
165	165	{{/html}}