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';
...	...	@@ -22,6 +22,9 @@
22	22	results: { type: Array }
23	23	}
24	24	static styles = css`
	26	+ :host > div {
	27	+ padding-bottom: 4em;
	28	+ }
25	25	.result {
26	26	margin-top: 1em;
27	27	}
...	...	@@ -61,15 +61,16 @@
61	61	handleSearch(textSearch) {
62	62	if(this.searchText !== "" || textSearch) {
63	63	if(this.searchText !== this.prevSearchText) {
	68	+ this.clearResults();
64	64	this.prevSearchText = this.searchText;
65		- Promise.all([
66		- this.fetchWikiSearch(),
67		- this.fetchFilterSearch()
68		- ]).then(([wikiSearchResults, collabSearchResults]) => {
69		- this.results = wikiSearchResults;
70		- this.resultsCache = wikiSearchResults;
71		- console.log(wikiSearchResults, collabSearchResults);
72		- });
	70	+ this.fetchWikiSearch().then(results => {
	71	+ this.resultsCache = results;
	72	+ if(this.hasActiveFilters()) {
	73	+ this.fetchFilterSearch().then(this.filterResults);
	74	+ } else {
	75	+ this.results = results;
	76	+ }
	77	+ })
73	73	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
74	74	this.fetchFilterSearch().then(this.filterResults)
75	75	} else {
...	...	@@ -111,12 +111,17 @@
111	111	getLink(xwikiDocSpace) {
112	112	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
113	113	}
	119	+ handleKeyPress(e) {
	120	+ if (e.keyCode === 13) {
	121	+ this.handleSearch(true);
	122	+ }
	123	+ }
114	114	render() {
115	115	return html`
116	116	<div>
117	117	<div>
118		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
119		- <button @click="${this.handleSearch}">Search</button>
	128	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	129	+ <button @click="${() => this.handleSearch(true)}">Search</button>
120	120	</div>
121	121	<div>
122	122	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>