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';
...	...	@@ -23,9 +23,6 @@
23	23	results: { type: Array }
24	24	}
25	25	static styles = css`
26		- :host > div {
27		- padding-bottom: 4em;
28		- }
29	29	.result {
30	30	margin-top: 1em;
31	31	}
...	...	@@ -62,19 +62,19 @@
62	62	setSearchText(e) {
63	63	this.searchText = e.target.value;
64	64	}
65		- handleSearch(textSearch) {
66		- if(this.searchText !== "" || textSearch) {
	61	+ handleSearch() {
	62	+
	63	+ if(this.searchText !== "") {
67	67	if(this.searchText !== this.prevSearchText) {
68		- this.clearResults();
69	69	this.prevSearchText = this.searchText;
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		- })
	66	+ Promise.all([
	67	+ this.fetchWikiSearch(),
	68	+ this.fetchFilterSearch()
	69	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	70	+ this.results = wikiSearchResults;
	71	+ this.resultsCache = wikiSearchResults;
	72	+ console.log(wikiSearchResults, collabSearchResults);
	73	+ });
78	78	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
79	79	this.fetchFilterSearch().then(this.filterResults)
80	80	} else {
...	...	@@ -116,18 +116,12 @@
116	116	getLink(xwikiDocSpace) {
117	117	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118	118	}
119		- handleKeyPress(e) {
120		- if (e.keyCode === 13) {
121		- e.preventDefault();
122		- this.handleSearch(true);
123		- }
124		- }
125	125	render() {
126	126	return html`
127	127	<div>
128	128	<div>
129		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
130		- <button @click="${() => this.handleSearch(true)}">Search</button>
	119	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	120	+ <button @click="${this.handleSearch}">Search</button>
131	131	</div>
132	132	<div>
133	133	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>