Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -8,20 +8,11 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
11		- /*
12	12	static properties = {
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 },
	12	+ results: { type: Array },
	13	+ resultsCache: { type: Array },
	14	+ collabFiltersResults: { type: Array}
20	20	}
21		- */
22		- static properties = {
23		- results: { type: Array }
24		- }
25	25	static styles = css`
26	26	:host > div {
27	27	padding-bottom: 4em;
...	...	@@ -36,6 +36,19 @@
36	36	a {
37	37	color: var(--color-brand-primary, blue);
38	38	}
	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	+ }
39	39	`;
40	40	constructor() {
41	41	super();
...	...	@@ -48,7 +48,11 @@
48	48	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49	49	this.results = [];
50	50	this.resultsCache = [];
	55	+ this.collabFiltersResults = [];
51	51	}
	57	+ firstUpdated() {
	58	+ this.renderRoot.getElementById('searchInput').focus();
	59	+ }
52	52	toggleRoleFilter(roleName) {
53	53	if(this.rolesFilter.indexOf(roleName) === -1) {
54	54	this.rolesFilter.push(roleName);
...	...	@@ -99,7 +99,10 @@
99	99	fetchFilterSearch() {
100	100	return new Promise((resolve) => {
101	101	if(this.hasActiveFilters()) {
102		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	110	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	111	+ this.collabFiltersResults = res;
	112	+ resolve(res);
	113	+ });
103	103	} else {
104	104	resolve([]);
105	105	}
...	...	@@ -112,14 +112,13 @@
112	112	clearResults() {
113	113	this.results = [];
114	114	this.resultsCache = [];
	126	+ this.collabFiltersResults = [];
115	115	}
116	116	getLink(xwikiDocSpace) {
117	117	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118	118	}
119	119	handleKeyPress(e) {
120		- console.log(e);
121	121	if (e.keyCode === 13) {
122		- console.log('zzz');
123	123	this.handleSearch(true);
124	124	}
125	125	}
...	...	@@ -127,7 +127,7 @@
127	127	return html`
128	128	<div>
129	129	<div>
130		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	140	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
131	131	<button @click="${() => this.handleSearch(true)}">Search</button>
132	132	</div>
133	133	<div>
...	...	@@ -144,6 +144,16 @@
144	144	</div>
145	145	`)}
146	146	</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>
147	147	</div>
148	148	`
149	149	}
...	...	@@ -171,7 +171,5 @@
171	171	}
172	172	});
173	173	</script>
174		-
175	175	<clb-unified-search></clb-unified-search>
176		-
177	177	{{/html}}