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,33 +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	65	this.fetchWikiSearch().then(results => {
66		- this.resultsCache = results;
	73	+ //this.resultsCache = results;
67	67	if(this.hasActiveFilters()) {
68	68	this.fetchFilterSearch().then(this.filterResults);
69	69	} else {
70		- this.results = results;
	77	+ this.results = results ? results || [];
71	71	}
72	72	})
73		- /*
74		- Promise.all([
75		- this.fetchWikiSearch(),
76		- this.fetchFilterSearch()
77		- ]).then(([wikiSearchResults, collabSearchResults]) => {
78		- this.results = wikiSearchResults;
79		- this.resultsCache = wikiSearchResults;
80		- console.log(wikiSearchResults, collabSearchResults);
81		- });
82		- */
83		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	80	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
84	84	this.fetchFilterSearch().then(this.filterResults)
85	85	} else {
86	86	this.results = this.resultsCache;
87	87	}
	85	+ */
88	88	} else {
89	89	this.clearResults();
90	90	console.log("no search text, should return filter search results if any");
...	...	@@ -99,12 +99,12 @@
99	99	}
100	100	fetchWikiSearch() {
101	101	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
102		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
103	103	}
104	104	fetchFilterSearch() {
105	105	return new Promise((resolve) => {
106	106	if(this.hasActiveFilters()) {
107		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
108	108	} else {
109	109	resolve([]);
110	110	}
...	...	@@ -121,11 +121,18 @@
121	121	getLink(xwikiDocSpace) {
122	122	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
123	123	}
	122	+ handleKeyPress(e) {
	123	+ if (e.keyCode === 13) {
	124	+ this.handleSearch(true);
	125	+ }
	126	+ }
124	124	render() {
125	125	return html`
126	126	<div>
127	127	<div>
128		- <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}" />
129	129	<button @click="${() => this.handleSearch(true)}">Search</button>
130	130	</div>
131	131	<div>
...	...	@@ -142,20 +142,21 @@
142	142	</div>
143	143	`)}
144	144	</div>
145		-</div>
146	146	`
147	147	}
148	148	}
149	149	customElements.define('clb-unified-search', UnifiedSearch);
150	150
151		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
152	152	return new Promise((resolve) => {
153	153	require(['jquery'], function($) {
154	154	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
155	155	//contextSearchButton.addEventListener('click', function() {
156		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
157	157	outputSyntax: 'plain',
158	158	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
159	159	query: [
160	160	'q="__INPUT__"~100',
161	161	'fq=type:DOCUMENT',
...	...	@@ -169,7 +169,4 @@
169	169	}
170	170	});
171	171	</script>
172		-
173		-<clb-unified-search></clb-unified-search>
174		-
175		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}