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