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);
...	...	@@ -69,6 +69,16 @@
69	69	this.results = results;
70	70	}
71	71	})
	74	+ /*
	75	+ Promise.all([
	76	+ this.fetchWikiSearch(),
	77	+ this.fetchFilterSearch()
	78	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	79	+ this.results = wikiSearchResults;
	80	+ this.resultsCache = wikiSearchResults;
	81	+ console.log(wikiSearchResults, collabSearchResults);
	82	+ });
	83	+ */
72	72	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
73	73	this.fetchFilterSearch().then(this.filterResults)
74	74	} else {
...	...	@@ -93,10 +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) => {
97		- this.collabFiltersResults = res;
98		- resolve(res);
99		- });
	108	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
100	100	} else {
101	101	resolve([]);
102	102	}
...	...	@@ -113,16 +113,11 @@
113	113	getLink(xwikiDocSpace) {
114	114	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
115	115	}
116		- handleKeyPress(e) {
117		- if (e.keyCode === 13) {
118		- this.handleSearch(true);
119		- }
120		- }
121	121	render() {
122	122	return html`
123	123	<div>
124	124	<div>
125		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	129	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
126	126	<button @click="${() => this.handleSearch(true)}">Search</button>
127	127	</div>
128	128	<div>
...	...	@@ -139,16 +139,6 @@
139	139	</div>
140	140	`)}
141	141	</div>
142		- <div class="rawResults">
143		- <div>
144		- <strong>XWiki Search Results</strong>
145		- <pre>${this.resultsCache}</pre>
146		- </div>
147		- <div>
148		- <strong>Collab Search Results (Filters)</strong>
149		- <pre>${this.collabFiltersResults}</pre>
150		- </div>
151		- </div>
152	152	</div>
153	153	`
154	154	}
...	...	@@ -176,5 +176,7 @@
176	176	}
177	177	});
178	178	</script>
	173	+
179	179	<clb-unified-search></clb-unified-search>
	175	+
180	180	{{/html}}