Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,7 @@
1		-{{html clean="false"}}
2		-<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	1	+
	2	+{{html clean="false"}}<!--
	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	}
...	...	@@ -44,7 +44,12 @@
44	44	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
45	45	this.results = [];
46	46	this.resultsCache = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
47	47	}
	45	+ firstUpdated() {
	46	+ this.renderRoot.getElementById('searchInput').focus();
	47	+ }
48	48	toggleRoleFilter(roleName) {
49	49	if(this.rolesFilter.indexOf(roleName) === -1) {
50	50	this.rolesFilter.push(roleName);
...	...	@@ -58,23 +58,31 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
61	61	handleSearch(textSearch) {
62	62	if(this.searchText !== "" || textSearch) {
63		- if(this.searchText !== this.prevSearchText) {
	69	+ // if(this.searchText !== this.prevSearchText) {
	70	+ 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		- });
73		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	72	+ this.fetchWikiSearch().then(results => {
	73	+ //this.resultsCache = results;
	74	+ if(this.hasActiveFilters()) {
	75	+ this.fetchFilterSearch().then(this.filterResults);
	76	+ } else {
	77	+ this.results = results ? results || [];
	78	+ }
	79	+ })
	80	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
74	74	this.fetchFilterSearch().then(this.filterResults)
75	75	} else {
76	76	this.results = this.resultsCache;
77	77	}
	85	+ */
78	78	} else {
79	79	this.clearResults();
80	80	console.log("no search text, should return filter search results if any");
...	...	@@ -89,12 +89,12 @@
89	89	}
90	90	fetchWikiSearch() {
91	91	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
92		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
93	93	}
94	94	fetchFilterSearch() {
95	95	return new Promise((resolve) => {
96	96	if(this.hasActiveFilters()) {
97		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
98	98	} else {
99	99	resolve([]);
100	100	}
...	...	@@ -111,11 +111,18 @@
111	111	getLink(xwikiDocSpace) {
112	112	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
113	113	}
	122	+ handleKeyPress(e) {
	123	+ if (e.keyCode === 13) {
	124	+ this.handleSearch(true);
	125	+ }
	126	+ }
114	114	render() {
115	115	return html`
116	116	<div>
117	117	<div>
118		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	131	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	132	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	133	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
119	119	<button @click="${() => this.handleSearch(true)}">Search</button>
120	120	</div>
121	121	<div>
...	...	@@ -132,20 +132,21 @@
132	132	</div>
133	133	`)}
134	134	</div>
135		-</div>
136	136	`
137	137	}
138	138	}
139	139	customElements.define('clb-unified-search', UnifiedSearch);
140	140
141		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
142	142	return new Promise((resolve) => {
143	143	require(['jquery'], function($) {
144	144	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
145	145	//contextSearchButton.addEventListener('click', function() {
146		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
147	147	outputSyntax: 'plain',
148	148	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
149	149	query: [
150	150	'q="__INPUT__"~100',
151	151	'fq=type:DOCUMENT',
...	...	@@ -159,7 +159,4 @@
159	159	}
160	160	});
161	161	</script>
162		-
163		-<clb-unified-search></clb-unified-search>
164		-
165		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}