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,47 +36,106 @@
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		- console.log(this.filterUrl.toString());
	56	+ this.handleSearch();
55	55	}
56	56	setSearchText(e) {
57	57	this.searchText = e.target.value;
58	58	}
59		- handleSearch() {
60		- console.log(this.searchText);
61		- if(this.searchText !== "") {
62		- this.fetchWikiSearch();
	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;
	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	+ } else {
	86	+ this.clearResults();
	87	+ console.log("no search text, should return filter search results if any");
	88	+ this.fetchFilterSearch().then(collabs => {
	89	+ console.log("Format and display collabs", collabs);
	90	+ })
63	63	}
64	64	}
	93	+ hasActiveFilters() {
	94	+ // we only look at role filters for POC.
	95	+ return this.rolesFilter.length > 0;
	96	+ }
65	65	fetchWikiSearch() {
66	66	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
67		- handleXWikiSearch(this.searchText).then(results => this.results = results);
	99	+ return handleXWikiSearch(this.searchText, this.offset, this.nb);
68	68	}
69		-
70		-
	101	+ fetchFilterSearch() {
	102	+ return new Promise((resolve) => {
	103	+ if(this.hasActiveFilters()) {
	104	+ fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	105	+ } else {
	106	+ resolve([]);
	107	+ }
	108	+ });
	109	+ }
	110	+ filterResults = (filteredCollabs) => {
	111	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	112	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	113	+ }
	114	+ clearResults() {
	115	+ this.results = [];
	116	+ this.resultsCache = [];
	117	+ }
71	71	getLink(xwikiDocSpace) {
72	72	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
73	73	}
	121	+ handleKeyPress(e) {
	122	+ if (e.keyCode === 13) {
	123	+ this.handleSearch(true);
	124	+ }
	125	+ }
74	74	render() {
75	75	return html`
76	76	<div>
77	77	<div>
78		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
79		- <button @click="${this.handleSearch}">Search</button>
	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>
80	80	</div>
81	81	<div>
82	82	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -92,7 +92,6 @@
92	92	</div>
93	93	`)}
94	94	</div>
95		-</div>
96	96	`
97	97	}
98	98	}
...	...	@@ -103,9 +103,11 @@
103	103	require(['jquery'], function($) {
104	104	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
105	105	//contextSearchButton.addEventListener('click', function() {
106		- $.post(solrServiceURL, {
	159	+ $.get(solrServiceURL, {
107	107	outputSyntax: 'plain',
108	108	media: 'json',
	162	+ nb:100,
	163	+ offset:10,
109	109	query: [
110	110	'q="__INPUT__"~100',
111	111	'fq=type:DOCUMENT',
...	...	@@ -119,7 +119,4 @@
119	119	}
120	120	});
121	121	</script>
122		-
123		-<clb-unified-search></clb-unified-search>
124		-
125		-{{/html}}
	177	+<clb-unified-search></clb-unified-search>{{/html}}