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	}
...	...	@@ -36,57 +36,38 @@
36	36	this.editor = false;
37	37	this.viewer = false;
38	38	this.rolesFilter = [];
39		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
	44	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&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		- if(this.rolesFilter.indexOf(roleName) === -1) {
	48	+ if(this.rolesFilter.indexOf(roleName) == -1) {
50	50	this.rolesFilter.push(roleName);
51	51	} else {
52		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	51	+ this.rolesFilter.filter(role => role !== roleName);
53	53	}
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56		- this.handleSearch();
	55	+ // if search text then apply filter
	56	+ // else return filters result
57	57	}
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) {
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		- */
	61	+ handleSearch() {
	62	+ if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
	63	+ this.prevSearchText = this.searchText;
	64	+ Promise.all([
	65	+ this.fetchWikiSearch(),
	66	+ this.fetchFilterSearch()
	67	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	68	+ console.log(wikiSearchResults, collabSearchResults);
	69	+ });
	70	+ } else if (this.searchText === this.prevSearchText) {
	71	+ console.log("Only apply filter on results");
	72	+ this.fetchFilterSearch().then(res => res.json()).then(this.filterResults)
86	86	} else {
87		- this.clearResults();
88	88	console.log("no search text, should return filter search results if any");
89		- this.fetchFilterSearch().then(collabs => {
	75	+ this.fetchFilterSearch().then(res => res.json()).then(collabs => {
90	90	console.log("Format and display collabs", collabs);
91	91	})
92	92	}
...	...	@@ -93,45 +93,33 @@
93	93	}
94	94	hasActiveFilters() {
95	95	// we only look at role filters for POC.
96		- return this.rolesFilter.length > 0;
	82	+ return this.roles.length > 0;
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);
	86	+ return handleXWikiSearch(this.searchText);
101	101	}
102	102	fetchFilterSearch() {
103	103	return new Promise((resolve) => {
104		- if(this.hasActiveFilters()) {
105		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	90	+ if(hasActiveFilters) {
	91	+ fetch(this.filterUrl).then(console.log);
106	106	} else {
107		- resolve([]);
	93	+ resolve(null);
108	108	}
109	109	});
110	110	}
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)));
	97	+ filterResults(filteredCollabs) {
	98	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
114	114	}
115		- clearResults() {
116		- this.results = [];
117		- this.resultsCache = [];
118		- }
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}" />
134		- <button @click="${() => this.handleSearch(true)}">Search</button>
	107	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	108	+ <button @click="${this.handleSearch}">Search</button>
135	135	</div>
136	136	<div>
137	137	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -147,21 +147,20 @@
147	147	</div>
148	148	`)}
149	149	</div>
	124	+</div>
150	150	`
151	151	}
152	152	}
153	153	customElements.define('clb-unified-search', UnifiedSearch);
154	154
155		- function handleXWikiSearch(searchString, offset, nb) {
	130	+ 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, {
	135	+ $.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}}
	151	+
	152	+<clb-unified-search></clb-unified-search>
	153	+
	154	+{{/html}}