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	}
...	...	@@ -36,63 +36,107 @@
36	36	constructor() {
37	37	super();
38	38	this.searchText = "";
	34	+ this.prevSearchText = "";
39	39	this.administrator = false;
40	40	this.editor = false;
41	41	this.viewer = false;
42	42	this.rolesFilter = [];
43		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
	39	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
44	44	this.results = [];
	41	+ this.resultsCache = [];
	42	+ this.offset = 0;
	43	+ this.nb = 10;
45	45	}
	45	+ firstUpdated() {
	46	+ this.renderRoot.getElementById('searchInput').focus();
	47	+ }
46	46	toggleRoleFilter(roleName) {
47		- if(this.rolesFilter.indexOf(roleName) == -1) {
	49	+ if(this.rolesFilter.indexOf(roleName) === -1) {
48	48	this.rolesFilter.push(roleName);
49	49	} else {
50		- this.rolesFilter.filter(role => role !== roleName);
	52	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
54		- // if search text then apply filter
55		- // else return filters result
	56	+ this.handleSearch();
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60		- handleSearch() {
61		- if(this.searchText !== "") {
62		- Promise.all([
63		- this.fetchWikiSearch(),
64		- this.fetchFilterSearch()
65		- ])
	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) {
	69	+ // if(this.searchText !== this.prevSearchText) {
	70	+ this.clearResults();
	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 ? results || [];
	78	+ }
	79	+ })
	80	+ /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	81	+ this.fetchFilterSearch().then(this.filterResults)
	82	+ } else {
	83	+ this.results = this.resultsCache;
	84	+ }
	85	+ */
66	66	} else {
	87	+ this.clearResults();
67	67	console.log("no search text, should return filter search results if any");
	89	+ this.fetchFilterSearch().then(collabs => {
	90	+ console.log("Format and display collabs", collabs);
	91	+ })
68	68	}
69	69	}
70	70	hasActiveFilters() {
71	71	// we only look at role filters for POC.
72		- return this.roles.length > 0;
	96	+ return this.rolesFilter.length > 0;
73	73	}
74	74	fetchWikiSearch() {
75	75	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
76		- return handleXWikiSearch(this.searchText);
	100	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
77	77	}
78	78	fetchFilterSearch() {
79	79	return new Promise((resolve) => {
80		- if(hasActiveFilters) {
81		- fetch(this.filterUrl).then(console.log);
	104	+ if(this.hasActiveFilters()) {
	105	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
82	82	} else {
83		- resolve(null);
	107	+ resolve([]);
84	84	}
85	85	});
86	86	}
	111	+ filterResults = (filteredCollabs) => {
	112	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	113	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	114	+ }
	115	+ clearResults() {
	116	+ this.results = [];
	117	+ this.resultsCache = [];
	118	+ }
87	87	getLink(xwikiDocSpace) {
88	88	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
89	89	}
	122	+ handleKeyPress(e) {
	123	+ if (e.keyCode === 13) {
	124	+ this.handleSearch(true);
	125	+ }
	126	+ }
90	90	render() {
91	91	return html`
92	92	<div>
93	93	<div>
94		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
95		- <button @click="${this.handleSearch}">Search</button>
	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}" />
	134	+ <button @click="${() => this.handleSearch(true)}">Search</button>
96	96	</div>
97	97	<div>
98	98	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -108,20 +108,21 @@
108	108	</div>
109	109	`)}
110	110	</div>
111		-</div>
112	112	`
113	113	}
114	114	}
115	115	customElements.define('clb-unified-search', UnifiedSearch);
116	116
117		- function handleXWikiSearch(searchString) {
	155	+ function handleXWikiSearch(searchString, offset, nb) {
118	118	return new Promise((resolve) => {
119	119	require(['jquery'], function($) {
120	120	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
121	121	//contextSearchButton.addEventListener('click', function() {
122		- $.post(solrServiceURL, {
	160	+ $.get(solrServiceURL, {
123	123	outputSyntax: 'plain',
124	124	media: 'json',
	163	+ nb: nb,
	164	+ offset: offset,
125	125	query: [
126	126	'q="__INPUT__"~100',
127	127	'fq=type:DOCUMENT',
...	...	@@ -135,7 +135,4 @@
135	135	}
136	136	});
137	137	</script>
138		-
139		-<clb-unified-search></clb-unified-search>
140		-
141		-{{/html}}
	178	+<clb-unified-search></clb-unified-search>{{/html}}