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,25 +58,35 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch() {
62		-
63		- if(this.searchText !== "") {
64		- if(this.searchText !== this.prevSearchText) {
	61	+ setOffset(e) {
	62	+ this.offset = e.target.value;
	63	+ }
	64	+ setNb(e) {
	65	+ this.nb = e.target.value;
	66	+ }
	67	+ handleSearch(textSearch) {
	68	+ console.log(textSearch);
	69	+ if(this.searchText !== "" || textSearch) {
	70	+ // if(this.searchText !== this.prevSearchText) {
	71	+ this.clearResults();
65	65	this.prevSearchText = this.searchText;
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		- });
74		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	73	+ this.fetchWikiSearch().then(results => {
	74	+ console.log('results', results);
	75	+ //this.resultsCache = results;
	76	+ if(this.hasActiveFilters()) {
	77	+ this.fetchFilterSearch().then(this.filterResults);
	78	+ } else {
	79	+ this.results = results ? results : [];
	80	+ }
	81	+ })
	82	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
75	75	this.fetchFilterSearch().then(this.filterResults)
76	76	} else {
77	77	this.results = this.resultsCache;
78	78	}
	87	+ */
79	79	} else {
	89	+ this.clearResults();
80	80	console.log("no search text, should return filter search results if any");
81	81	this.fetchFilterSearch().then(collabs => {
82	82	console.log("Format and display collabs", collabs);
...	...	@@ -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);
	102	+ 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);
	107	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
98	98	} else {
99	99	resolve([]);
100	100	}
...	...	@@ -104,15 +104,26 @@
104	104	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
105	105	this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
106	106	}
	117	+ clearResults() {
	118	+ this.results = [];
	119	+ this.resultsCache = [];
	120	+ }
107	107	getLink(xwikiDocSpace) {
108	108	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
109	109	}
	124	+ handleKeyPress(e) {
	125	+ if (e.keyCode === 13) {
	126	+ this.handleSearch(true);
	127	+ }
	128	+ }
110	110	render() {
111	111	return html`
112	112	<div>
113	113	<div>
114		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
115		- <button @click="${this.handleSearch}">Search</button>
	133	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	134	+ <input @change="${this.setNb}"" type="text" value="${this.nb}" />
	135	+ <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
	136	+ <button @click="${() => this.handleSearch(true)}">Search</button>
116	116	</div>
117	117	<div>
118	118	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -128,20 +128,21 @@
128	128	</div>
129	129	`)}
130	130	</div>
131		-</div>
132	132	`
133	133	}
134	134	}
135	135	customElements.define('clb-unified-search', UnifiedSearch);
136	136
137		- function handleXWikiSearch(searchString) {
	157	+ function handleXWikiSearch(searchString, offset, nb) {
138	138	return new Promise((resolve) => {
139	139	require(['jquery'], function($) {
140	140	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
141	141	//contextSearchButton.addEventListener('click', function() {
142		- $.post(solrServiceURL, {
	162	+ $.get(solrServiceURL, {
143	143	outputSyntax: 'plain',
144	144	media: 'json',
	165	+ nb: nb,
	166	+ offset: offset,
145	145	query: [
146	146	'q="__INPUT__"~100',
147	147	'fq=type:DOCUMENT',
...	...	@@ -155,7 +155,4 @@
155	155	}
156	156	});
157	157	</script>
158		-
159		-<clb-unified-search></clb-unified-search>
160		-
161		-{{/html}}
	180	+<clb-unified-search></clb-unified-search>{{/html}}