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,15 +8,21 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
	10	+ /*
11	11	static properties = {
12		- results: { type: Array },
13		- resultsCache: { type: Array },
14		- collabFiltersResults: { type: Array}
	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 },
15	15	}
	20	+ */
	21	+ static properties = {
	22	+ results: { type: Array }
	23	+ }
16	16	static styles = css`
17		- :host > div {
18		- padding-bottom: 4em;
19		- }
20	20	.result {
21	21	margin-top: 1em;
22	22	}
...	...	@@ -40,9 +40,6 @@
40	40	this.results = [];
41	41	this.resultsCache = [];
42	42	}
43		- firstUpdated() {
44		- this.renderRoot.getElementById('searchInput').focus();
45		- }
46	46	toggleRoleFilter(roleName) {
47	47	if(this.rolesFilter.indexOf(roleName) === -1) {
48	48	this.rolesFilter.push(roleName);
...	...	@@ -59,16 +59,15 @@
59	59	handleSearch(textSearch) {
60	60	if(this.searchText !== "" || textSearch) {
61	61	if(this.searchText !== this.prevSearchText) {
62		- this.clearResults();
63	63	this.prevSearchText = this.searchText;
64		- this.fetchWikiSearch().then(results => {
65		- this.resultsCache = results;
66		- if(this.hasActiveFilters()) {
67		- this.fetchFilterSearch().then(this.filterResults);
68		- } else {
69		- this.results = results;
70		- }
71		- })
	65	+ Promise.all([
	66	+ this.fetchWikiSearch(),
	67	+ this.fetchFilterSearch()
	68	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	69	+ this.results = wikiSearchResults;
	70	+ this.resultsCache = wikiSearchResults;
	71	+ console.log(wikiSearchResults, collabSearchResults);
	72	+ });
72	72	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
73	73	this.fetchFilterSearch().then(this.filterResults)
74	74	} else {
...	...	@@ -93,7 +93,7 @@
93	93	fetchFilterSearch() {
94	94	return new Promise((resolve) => {
95	95	if(this.hasActiveFilters()) {
96		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	97	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
97	97	} else {
98	98	resolve([]);
99	99	}
...	...	@@ -110,17 +110,12 @@
110	110	getLink(xwikiDocSpace) {
111	111	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
112	112	}
113		- handleKeyPress(e) {
114		- if (e.keyCode === 13) {
115		- this.handleSearch(true);
116		- }
117		- }
118	118	render() {
119	119	return html`
120	120	<div>
121	121	<div>
122		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
123		- <button @click="${() => this.handleSearch(true)}">Search</button>
	118	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	119	+ <button @click="${this.handleSearch}">Search</button>
124	124	</div>
125	125	<div>
126	126	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -136,6 +136,7 @@
136	136	</div>
137	137	`)}
138	138	</div>
	135	+</div>
139	139	`
140	140	}
141	141	}
...	...	@@ -162,5 +162,7 @@
162	162	}
163	163	});
164	164	</script>
	162	+
165	165	<clb-unified-search></clb-unified-search>
	164	+
166	166	{{/html}}