Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,7 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	4	+ !!! Many optimisations can be done !!!
4	4	-->
5	5	<script type="module">
6	6	import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
...	...	@@ -7,21 +7,15 @@
7	7	window.addEventListener('DOMContentLoaded', function() {
8	8
9	9	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 },
	12	+ results: { type: Array },
	13	+ resultsCache: { type: Array },
	14	+ collabFiltersResults: { type: Array}
19	19	}
20		- */
21		- static properties = {
22		- results: { type: Array }
23		- }
24	24	static styles = css`
	17	+ :host > div {
	18	+ padding-bottom: 4em;
	19	+ }
25	25	.result {
26	26	margin-top: 1em;
27	27	}
...	...	@@ -45,6 +45,9 @@
45	45	this.results = [];
46	46	this.resultsCache = [];
47	47	}
	43	+ firstUpdated() {
	44	+ this.renderRoot.getElementById('searchInput').focus();
	45	+ }
48	48	toggleRoleFilter(roleName) {
49	49	if(this.rolesFilter.indexOf(roleName) === -1) {
50	50	this.rolesFilter.push(roleName);
...	...	@@ -61,15 +61,16 @@
61	61	handleSearch(textSearch) {
62	62	if(this.searchText !== "" || textSearch) {
63	63	if(this.searchText !== this.prevSearchText) {
	62	+ this.clearResults();
64	64	this.prevSearchText = this.searchText;
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		- });
	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	+ })
73	73	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
74	74	this.fetchFilterSearch().then(this.filterResults)
75	75	} else {
...	...	@@ -94,7 +94,7 @@
94	94	fetchFilterSearch() {
95	95	return new Promise((resolve) => {
96	96	if(this.hasActiveFilters()) {
97		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	96	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
98	98	} else {
99	99	resolve([]);
100	100	}
...	...	@@ -111,12 +111,17 @@
111	111	getLink(xwikiDocSpace) {
112	112	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
113	113	}
	113	+ handleKeyPress(e) {
	114	+ if (e.keyCode === 13) {
	115	+ this.handleSearch(true);
	116	+ }
	117	+ }
114	114	render() {
115	115	return html`
116	116	<div>
117	117	<div>
118		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
119		- <button @click="${this.handleSearch}">Search</button>
	122	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	123	+ <button @click="${() => this.handleSearch(true)}">Search</button>
120	120	</div>
121	121	<div>
122	122	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -132,7 +132,6 @@
132	132	</div>
133	133	`)}
134	134	</div>
135		-</div>
136	136	`
137	137	}
138	138	}
...	...	@@ -159,7 +159,5 @@
159	159	}
160	160	});
161	161	</script>
162		-
163	163	<clb-unified-search></clb-unified-search>
164		-
165	165	{{/html}}