Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,7 +1,6 @@
1		-
2		-{{html clean="false"}}<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4		- !!! Many optimisations can be done !!!
	1	+{{html clean="false"}}
	2	+<!--
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
5	5	-->
6	6	<script type="module">
7	7	import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
...	...	@@ -8,15 +8,21 @@
8	8	window.addEventListener('DOMContentLoaded', function() {
9	9
10	10	class UnifiedSearch extends LitElement {
	10	+ /*
11	11	static properties = {
12		- results: { type: Array },
13		- resultsCache: { type: Array },
14		- collabFiltersResults: { type: Array}
	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 },
15	15	}
	20	+ */
	21	+ static properties = {
	22	+ results: { type: Array }
	23	+ }
16	16	static styles = css`
17		- :host > div {
18		- padding-bottom: 4em;
19		- }
20	20	.result {
21	21	margin-top: 1em;
22	22	}
...	...	@@ -39,12 +39,7 @@
39	39	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
40	40	this.results = [];
41	41	this.resultsCache = [];
42		- this.offset = 0;
43		- this.nb = 10;
44	44	}
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,15 +58,9 @@
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		- }
67	67	handleSearch(textSearch) {
68	68	if(this.searchText !== "" || textSearch) {
69		- // if(this.searchText !== this.prevSearchText) {
	63	+ if(this.searchText !== this.prevSearchText) {
70	70	this.clearResults();
71	71	this.prevSearchText = this.searchText;
72	72	this.fetchWikiSearch().then(results => {
...	...	@@ -77,12 +77,21 @@
77	77	this.results = results;
78	78	}
79	79	})
80		- /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	74	+ /*
	75	+ Promise.all([
	76	+ this.fetchWikiSearch(),
	77	+ this.fetchFilterSearch()
	78	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	79	+ this.results = wikiSearchResults;
	80	+ this.resultsCache = wikiSearchResults;
	81	+ console.log(wikiSearchResults, collabSearchResults);
	82	+ });
	83	+ */
	84	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
81	81	this.fetchFilterSearch().then(this.filterResults)
82	82	} else {
83	83	this.results = this.resultsCache;
84	84	}
85		- */
86	86	} else {
87	87	this.clearResults();
88	88	console.log("no search text, should return filter search results if any");
...	...	@@ -97,12 +97,12 @@
97	97	}
98	98	fetchWikiSearch() {
99	99	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
100		- return handleXWikiSearch(this.searchText, this.offset, this.nb);
	103	+ return handleXWikiSearch(this.searchText);
101	101	}
102	102	fetchFilterSearch() {
103	103	return new Promise((resolve) => {
104	104	if(this.hasActiveFilters()) {
105		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	108	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
106	106	} else {
107	107	resolve([]);
108	108	}
...	...	@@ -119,18 +119,11 @@
119	119	getLink(xwikiDocSpace) {
120	120	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
121	121	}
122		- handleKeyPress(e) {
123		- if (e.keyCode === 13) {
124		- this.handleSearch(true);
125		- }
126		- }
127	127	render() {
128	128	return html`
129	129	<div>
130	130	<div>
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	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
134	134	<button @click="${() => this.handleSearch(true)}">Search</button>
135	135	</div>
136	136	<div>
...	...	@@ -147,21 +147,20 @@
147	147	</div>
148	148	`)}
149	149	</div>
	146	+</div>
150	150	`
151	151	}
152	152	}
153	153	customElements.define('clb-unified-search', UnifiedSearch);
154	154
155		- function handleXWikiSearch(searchString, offset, nb) {
	152	+ function handleXWikiSearch(searchString) {
156	156	return new Promise((resolve) => {
157	157	require(['jquery'], function($) {
158	158	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
159	159	//contextSearchButton.addEventListener('click', function() {
160		- $.get(solrServiceURL, {
	157	+ $.post(solrServiceURL, {
161	161	outputSyntax: 'plain',
162	162	media: 'json',
163		- nb: nb,
164		- offset: offset,
165	165	query: [
166	166	'q="__INPUT__"~100',
167	167	'fq=type:DOCUMENT',
...	...	@@ -175,4 +175,7 @@
175	175	}
176	176	});
177	177	</script>
178		-<clb-unified-search></clb-unified-search>{{/html}}
	173	+
	174	+<clb-unified-search></clb-unified-search>
	175	+
	176	+{{/html}}