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	}
...	...	@@ -27,19 +27,6 @@
27	27	a {
28	28	color: var(--color-brand-primary, blue);
29	29	}
30		- .rawResults {
31		- width: 100%;
32		- display: flex;
33		- font-size: 12px;
34		- margin-top: 2em;
35		- }
36		- .rawResults > div {
37		- width: 100%;
38		- }
39		- .rawResults ul {
40		- list-style-type: none;
41		- padding: 0;
42		- }
43	43	`;
44	44	constructor() {
45	45	super();
...	...	@@ -52,11 +52,7 @@
52	52	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
53	53	this.results = [];
54	54	this.resultsCache = [];
55		- this.collabFiltersResults = [];
56	56	}
57		- firstUpdated() {
58		- this.renderRoot.getElementById('searchInput').focus();
59		- }
60	60	toggleRoleFilter(roleName) {
61	61	if(this.rolesFilter.indexOf(roleName) === -1) {
62	62	this.rolesFilter.push(roleName);
...	...	@@ -73,7 +73,6 @@
73	73	handleSearch(textSearch) {
74	74	if(this.searchText !== "" || textSearch) {
75	75	if(this.searchText !== this.prevSearchText) {
76		- this.clearResults();
77	77	this.prevSearchText = this.searchText;
78	78	this.fetchWikiSearch().then(results => {
79	79	this.resultsCache = results;
...	...	@@ -83,6 +83,16 @@
83	83	this.results = results;
84	84	}
85	85	})
	73	+ /*
	74	+ Promise.all([
	75	+ this.fetchWikiSearch(),
	76	+ this.fetchFilterSearch()
	77	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	78	+ this.results = wikiSearchResults;
	79	+ this.resultsCache = wikiSearchResults;
	80	+ console.log(wikiSearchResults, collabSearchResults);
	81	+ });
	82	+ */
86	86	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
87	87	this.fetchFilterSearch().then(this.filterResults)
88	88	} else {
...	...	@@ -107,10 +107,7 @@
107	107	fetchFilterSearch() {
108	108	return new Promise((resolve) => {
109	109	if(this.hasActiveFilters()) {
110		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
111		- this.collabFiltersResults = res;
112		- resolve(res);
113		- });
	107	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
114	114	} else {
115	115	resolve([]);
116	116	}
...	...	@@ -127,16 +127,11 @@
127	127	getLink(xwikiDocSpace) {
128	128	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
129	129	}
130		- handleKeyPress(e) {
131		- if (e.keyCode === 13) {
132		- this.handleSearch(true);
133		- }
134		- }
135	135	render() {
136	136	return html`
137	137	<div>
138	138	<div>
139		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	128	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
140	140	<button @click="${() => this.handleSearch(true)}">Search</button>
141	141	</div>
142	142	<div>
...	...	@@ -153,16 +153,6 @@
153	153	</div>
154	154	`)}
155	155	</div>
156		- <div class="rawResults">
157		- <div>
158		- <strong>XWiki Search Results</strong>
159		- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
160		- </div>
161		- <div>
162		- <strong>Collab Search Results (Filters)</strong>
163		- <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
164		- </div>
165		- </div>
166	166	</div>
167	167	`
168	168	}
...	...	@@ -190,5 +190,7 @@
190	190	}
191	191	});
192	192	</script>
	172	+
193	193	<clb-unified-search></clb-unified-search>
	174	+
194	194	{{/html}}