Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -8,11 +8,20 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
	11	+ /*
11	11	static properties = {
12		- results: { type: Array },
13		- resultsCache: { type: Array },
14		- collabFiltersResults: { type: Array}
	13	+ searchText: { type: String },
	14	+ favoritesFilter: { type: Boolean },
	15	+ administratorFilter: { type: Boolean },
	16	+ editorFilter: { type: Boolean },
	17	+ viewerFilter: { type: Boolean },
	18	+ publicFilter: { type: Boolean },
	19	+ privateFilter: { type: Boolean },
15	15	}
	21	+ */
	22	+ static properties = {
	23	+ results: { type: Array }
	24	+ }
16	16	static styles = css`
17	17	:host > div {
18	18	padding-bottom: 4em;
...	...	@@ -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);
...	...	@@ -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		- });
	102	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
114	114	} else {
115	115	resolve([]);
116	116	}
...	...	@@ -123,13 +123,13 @@
123	123	clearResults() {
124	124	this.results = [];
125	125	this.resultsCache = [];
126		- this.collabFiltersResults = [];
127	127	}
128	128	getLink(xwikiDocSpace) {
129	129	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
130	130	}
131	131	handleKeyPress(e) {
132		- if (e.keyCode === 13) {
	120	+ if(e.keyCode === 13) {
	121	+ e.preventDefault()
133	133	this.handleSearch(true);
134	134	}
135	135	}
...	...	@@ -137,7 +137,7 @@
137	137	return html`
138	138	<div>
139	139	<div>
140		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	129	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
141	141	<button @click="${() => this.handleSearch(true)}">Search</button>
142	142	</div>
143	143	<div>
...	...	@@ -154,16 +154,6 @@
154	154	</div>
155	155	`)}
156	156	</div>
157		- <div class="rawResults">
158		- <div>
159		- <strong>XWiki Search Results</strong>
160		- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
161		- </div>
162		- <div>
163		- <strong>Collab Search Results (Filters)</strong>
164		- <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
165		- </div>
166		- </div>
167	167	</div>
168	168	`
169	169	}
...	...	@@ -191,5 +191,7 @@
191	191	}
192	192	});
193	193	</script>
	173	+
194	194	<clb-unified-search></clb-unified-search>
	175	+
195	195	{{/html}}