Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,7 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	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	}
...	...	@@ -32,6 +32,19 @@
32	32	a {
33	33	color: var(--color-brand-primary, blue);
34	34	}
	30	+ .rawResults {
	31	+ width: 100%;
	32	+ display: flex;
	33	+ font-size: 12px;
	34	+ margin-top: 2em;
	35	+ }
	36	+ .rawResults > div {
	37	+ width: 100%;
	38	+ }
	39	+ .rawResults ul {
	40	+ list-style-type: none;
	41	+ padding: 0;
	42	+ }
35	35	`;
36	36	constructor() {
37	37	super();
...	...	@@ -44,7 +44,11 @@
44	44	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
45	45	this.results = [];
46	46	this.resultsCache = [];
	55	+ this.collabFiltersResults = [];
47	47	}
	57	+ firstUpdated() {
	58	+ this.renderRoot.getElementById('searchInput').focus();
	59	+ }
48	48	toggleRoleFilter(roleName) {
49	49	if(this.rolesFilter.indexOf(roleName) === -1) {
50	50	this.rolesFilter.push(roleName);
...	...	@@ -58,23 +58,26 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch() {
62		-
63		- if(this.searchText !== "") {
	73	+ handleSearch(textSearch) {
	74	+ if(this.searchText !== "" || textSearch) {
64	64	if(this.searchText !== this.prevSearchText) {
	76	+ this.clearResults();
65	65	this.prevSearchText = this.searchText;
66		- Promise.all([
67		- this.fetchWikiSearch(),
68		- this.fetchFilterSearch()
69		- ]).then(([wikiSearchResults, collabSearchResults]) => {
70		- this.results = wikiSearchResults;
71		- this.resultsCache = wikiSearchResults;
72		- console.log(wikiSearchResults, collabSearchResults);
73		- });
	78	+ this.fetchWikiSearch().then(results => {
	79	+ this.resultsCache = results;
	80	+ if(this.hasActiveFilters()) {
	81	+ this.fetchFilterSearch().then(this.filterResults);
	82	+ } else {
	83	+ this.results = results;
	84	+ }
	85	+ })
74	74	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
75	75	this.fetchFilterSearch().then(this.filterResults)
	88	+ } else {
	89	+ this.results = this.resultsCache;
76	76	}
77	77	} else {
	92	+ this.clearResults();
78	78	console.log("no search text, should return filter search results if any");
79	79	this.fetchFilterSearch().then(collabs => {
80	80	console.log("Format and display collabs", collabs);
...	...	@@ -92,8 +92,12 @@
92	92	fetchFilterSearch() {
93	93	return new Promise((resolve) => {
94	94	if(this.hasActiveFilters()) {
95		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
	110	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	111	+ this.collabFiltersResults = res;
	112	+ resolve(res);
	113	+ });
96	96	} else {
	115	+ this.collabFiltersResults = res;
97	97	resolve([]);
98	98	}
99	99	});
...	...	@@ -102,15 +102,25 @@
102	102	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
103	103	this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
104	104	}
	124	+ clearResults() {
	125	+ this.results = [];
	126	+ this.resultsCache = [];
	127	+ this.collabFiltersResults = [];
	128	+ }
105	105	getLink(xwikiDocSpace) {
106	106	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
107	107	}
	132	+ handleKeyPress(e) {
	133	+ if (e.keyCode === 13) {
	134	+ this.handleSearch(true);
	135	+ }
	136	+ }
108	108	render() {
109	109	return html`
110	110	<div>
111	111	<div>
112		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
113		- <button @click="${this.handleSearch}">Search</button>
	141	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	142	+ <button @click="${() => this.handleSearch(true)}">Search</button>
114	114	</div>
115	115	<div>
116	116	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -126,6 +126,16 @@
126	126	</div>
127	127	`)}
128	128	</div>
	158	+ <div class="rawResults">
	159	+ <div>
	160	+ <strong>XWiki Search Results</strong>
	161	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	162	+ </div>
	163	+ <div>
	164	+ <strong>Collab Search Results (Filters)</strong>
	165	+ <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
	166	+ </div>
	167	+ </div>
129	129	</div>
130	130	`
131	131	}
...	...	@@ -153,7 +153,5 @@
153	153	}
154	154	});
155	155	</script>
156		-
157	157	<clb-unified-search></clb-unified-search>
158		-
159	159	{{/html}}