Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,5 @@
1		-{{html clean="false"}}
2		-<!--
	1	+
	2	+{{html clean="false"}}<!--
3	3	!!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4	4	!!! Many optimisations can be done !!!
5	5	-->
...	...	@@ -8,22 +8,13 @@
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		- :host {
	17	+ :host > div {
27	27	padding-bottom: 4em;
28	28	}
29	29	.result {
...	...	@@ -48,7 +48,12 @@
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 = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
51	51	}
	45	+ firstUpdated() {
	46	+ this.renderRoot.getElementById('searchInput').focus();
	47	+ }
52	52	toggleRoleFilter(roleName) {
53	53	if(this.rolesFilter.indexOf(roleName) === -1) {
54	54	this.rolesFilter.push(roleName);
...	...	@@ -62,25 +62,35 @@
62	62	setSearchText(e) {
63	63	this.searchText = e.target.value;
64	64	}
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
65	65	handleSearch(textSearch) {
	68	+ console.log(textSearch);
66	66	if(this.searchText !== "" || textSearch) {
67		- if(this.searchText !== this.prevSearchText) {
	70	+ // if(this.searchText !== this.prevSearchText) {
68	68	this.clearResults();
69	69	this.prevSearchText = this.searchText;
70	70	this.fetchWikiSearch().then(results => {
71		- this.resultsCache = results;
	74	+ console.log('results', results);
	75	+ //this.resultsCache = results;
72	72	if(this.hasActiveFilters()) {
73	73	this.fetchFilterSearch().then(this.filterResults);
74	74	} else {
75		- this.results = results;
	79	+ this.results = results ? results : [];
76	76	}
77	77	})
78		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	82	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
79	79	this.fetchFilterSearch().then(this.filterResults)
80	80	} else {
81	81	this.results = this.resultsCache;
82	82	}
	87	+ */
83	83	} else {
	89	+ this.results = [];
84	84	this.clearResults();
85	85	console.log("no search text, should return filter search results if any");
86	86	this.fetchFilterSearch().then(collabs => {
...	...	@@ -94,12 +94,12 @@
94	94	}
95	95	fetchWikiSearch() {
96	96	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
97		- return handleXWikiSearch(this.searchText);
	103	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
98	98	}
99	99	fetchFilterSearch() {
100	100	return new Promise((resolve) => {
101	101	if(this.hasActiveFilters()) {
102		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	108	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
103	103	} else {
104	104	resolve([]);
105	105	}
...	...	@@ -116,11 +116,18 @@
116	116	getLink(xwikiDocSpace) {
117	117	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118	118	}
	125	+ handleKeyPress(e) {
	126	+ if (e.keyCode === 13) {
	127	+ this.handleSearch(true);
	128	+ }
	129	+ }
119	119	render() {
120	120	return html`
121	121	<div>
122	122	<div>
123		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	134	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	135	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	136	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
124	124	<button @click="${() => this.handleSearch(true)}">Search</button>
125	125	</div>
126	126	<div>
...	...	@@ -137,20 +137,21 @@
137	137	</div>
138	138	`)}
139	139	</div>
140		-</div>
141	141	`
142	142	}
143	143	}
144	144	customElements.define('clb-unified-search', UnifiedSearch);
145	145
146		- function handleXWikiSearch(searchString) {
	158	+ function handleXWikiSearch(searchString, offset, nb) {
147	147	return new Promise((resolve) => {
148	148	require(['jquery'], function($) {
149	149	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
150	150	//contextSearchButton.addEventListener('click', function() {
151		- $.post(solrServiceURL, {
	163	+ $.get(solrServiceURL, {
152	152	outputSyntax: 'plain',
153	153	media: 'json',
	166	+ nb: nb,
	167	+ offset: offset,
154	154	query: [
155	155	'q="__INPUT__"~100',
156	156	'fq=type:DOCUMENT',
...	...	@@ -164,7 +164,4 @@
164	164	}
165	165	});
166	166	</script>
167		-
168		-<clb-unified-search></clb-unified-search>
169		-
170		-{{/html}}
	181	+<clb-unified-search></clb-unified-search>{{/html}}