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	}
...	...	@@ -32,6 +32,11 @@
32	32	a {
33	33	color: var(--color-brand-primary, blue);
34	34	}
	30	+ .rawResults {
	31	+ display: flex;
	32	+ font-size: 12px;
	33	+ margin-top: 2em;
	34	+ }
35	35	`;
36	36	constructor() {
37	37	super();
...	...	@@ -45,6 +45,9 @@
45	45	this.results = [];
46	46	this.resultsCache = [];
47	47	}
	48	+ firstUpdated() {
	49	+ this.renderRoot.getElementById('searchInput').focus();
	50	+ }
48	48	toggleRoleFilter(roleName) {
49	49	if(this.rolesFilter.indexOf(roleName) === -1) {
50	50	this.rolesFilter.push(roleName);
...	...	@@ -61,6 +61,7 @@
61	61	handleSearch(textSearch) {
62	62	if(this.searchText !== "" || textSearch) {
63	63	if(this.searchText !== this.prevSearchText) {
	67	+ this.clearResults();
64	64	this.prevSearchText = this.searchText;
65	65	this.fetchWikiSearch().then(results => {
66	66	this.resultsCache = results;
...	...	@@ -70,16 +70,6 @@
70	70	this.results = results;
71	71	}
72	72	})
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		- */
83	83	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
84	84	this.fetchFilterSearch().then(this.filterResults)
85	85	} else {
...	...	@@ -104,7 +104,10 @@
104	104	fetchFilterSearch() {
105	105	return new Promise((resolve) => {
106	106	if(this.hasActiveFilters()) {
107		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	101	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	102	+ this.collabFiltersResults = res;
	103	+ resolve(res);
	104	+ });
108	108	} else {
109	109	resolve([]);
110	110	}
...	...	@@ -121,11 +121,16 @@
121	121	getLink(xwikiDocSpace) {
122	122	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
123	123	}
	121	+ handleKeyPress(e) {
	122	+ if (e.keyCode === 13) {
	123	+ this.handleSearch(true);
	124	+ }
	125	+ }
124	124	render() {
125	125	return html`
126	126	<div>
127	127	<div>
128		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	130	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
129	129	<button @click="${() => this.handleSearch(true)}">Search</button>
130	130	</div>
131	131	<div>
...	...	@@ -142,6 +142,16 @@
142	142	</div>
143	143	`)}
144	144	</div>
	147	+ <div class="rawResults">
	148	+ <div>
	149	+ <strong>XWiki Search Results</strong>
	150	+ <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre>
	151	+ </div>
	152	+ <div>
	153	+ <strong>Collab Search Results (Filters)</strong>
	154	+ <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre>
	155	+ </div>
	156	+ </div>
145	145	</div>
146	146	`
147	147	}
...	...	@@ -169,7 +169,5 @@
169	169	}
170	170	});
171	171	</script>
172		-
173	173	<clb-unified-search></clb-unified-search>
174		-
175	175	{{/html}}