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	}
...	...	@@ -38,13 +38,7 @@
38	38	this.rolesFilter = [];
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		- 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,32 +58,24 @@
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		- handleSearch(textSearch) {
68		- if(this.searchText !== "" || textSearch) {
	60	+ handleSearch() {
	61	+
	62	+ if(this.searchText !== "") {
69	69	if(this.searchText !== this.prevSearchText) {
70		- this.clearResults();
	64	+ console.log("1st")
	65	+ console.log(this.searchText, this.prevSearchText);
71	71	this.prevSearchText = this.searchText;
72		- this.fetchWikiSearch().then(results => {
73		- this.resultsCache = results;
74		- if(this.hasActiveFilters()) {
75		- this.fetchFilterSearch().then(this.filterResults);
76		- } else {
77		- this.results = results;
78		- }
79		- })
	67	+ Promise.all([
	68	+ this.fetchWikiSearch(),
	69	+ this.fetchFilterSearch()
	70	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	71	+ this.results = wikiSearchResults;
	72	+ console.log(wikiSearchResults, collabSearchResults);
	73	+ });
80	80	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
81	81	this.fetchFilterSearch().then(this.filterResults)
82		- } else {
83		- this.results = this.resultsCache;
84	84	}
85	85	} else {
86		- this.clearResults();
87	87	console.log("no search text, should return filter search results if any");
88	88	this.fetchFilterSearch().then(collabs => {
89	89	console.log("Format and display collabs", collabs);
...	...	@@ -96,12 +96,12 @@
96	96	}
97	97	fetchWikiSearch() {
98	98	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
99		- return handleXWikiSearch(this.searchText, this.offset, this.nb);
	90	+ return handleXWikiSearch(this.searchText);
100	100	}
101	101	fetchFilterSearch() {
102	102	return new Promise((resolve) => {
103	103	if(this.hasActiveFilters()) {
104		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	95	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
105	105	} else {
106	106	resolve([]);
107	107	}
...	...	@@ -108,29 +108,20 @@
108	108	});
109	109	}
110	110	filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
111	111	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
112		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	104	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ this.results = filteredResults;
113	113	}
114		- clearResults() {
115		- this.results = [];
116		- this.resultsCache = [];
117		- }
118	118	getLink(xwikiDocSpace) {
119	119	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
120	120	}
121		- handleKeyPress(e) {
122		- if (e.keyCode === 13) {
123		- this.handleSearch(true);
124		- }
125		- }
126	126	render() {
127	127	return html`
128	128	<div>
129	129	<div>
130		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
131		- <input @change="${this.setNb}"" type="text" value="${this.nb}" />
132		- <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
133		- <button @click="${() => this.handleSearch(true)}">Search</button>
	114	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	115	+ <button @click="${this.handleSearch}">Search</button>
134	134	</div>
135	135	<div>
136	136	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -146,21 +146,20 @@
146	146	</div>
147	147	`)}
148	148	</div>
	131	+</div>
149	149	`
150	150	}
151	151	}
152	152	customElements.define('clb-unified-search', UnifiedSearch);
153	153
154		- function handleXWikiSearch(searchString, offset, nb) {
	137	+ function handleXWikiSearch(searchString) {
155	155	return new Promise((resolve) => {
156	156	require(['jquery'], function($) {
157	157	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
158	158	//contextSearchButton.addEventListener('click', function() {
159		- $.get(solrServiceURL, {
	142	+ $.post(solrServiceURL, {
160	160	outputSyntax: 'plain',
161	161	media: 'json',
162		- nb: nb,
163		- offset: offset,
164	164	query: [
165	165	'q="__INPUT__"~100',
166	166	'fq=type:DOCUMENT',
...	...	@@ -174,4 +174,7 @@
174	174	}
175	175	});
176	176	</script>
177		-<clb-unified-search></clb-unified-search>{{/html}}
	158	+
	159	+<clb-unified-search></clb-unified-search>
	160	+
	161	+{{/html}}