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();
...	...	@@ -43,7 +43,12 @@
43	43	this.rolesFilter = [];
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 = [];
	54	+ this.resultsCache = [];
	55	+ this.collabFiltersResults = [];
46	46	}
	57	+ firstUpdated() {
	58	+ this.renderRoot.getElementById('searchInput').focus();
	59	+ }
47	47	toggleRoleFilter(roleName) {
48	48	if(this.rolesFilter.indexOf(roleName) === -1) {
49	49	this.rolesFilter.push(roleName);
...	...	@@ -50,7 +50,6 @@
50	50	} else {
51	51	this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
52	52	}
53		- console.log(this.rolesFilter);
54	54	this[roleName] = !this[roleName];
55	55	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56	56	this.handleSearch();
...	...	@@ -58,24 +58,26 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- handleSearch() {
62		- console.log(this.rolesFilter)
63		- if(this.searchText !== "") {
	73	+ handleSearch(textSearch) {
	74	+ if(this.searchText !== "" || textSearch) {
64	64	if(this.searchText !== this.prevSearchText) {
65		- console.log(this.searchText, this.prevSearchText);
	76	+ this.clearResults();
66	66	this.prevSearchText = this.searchText;
67		- Promise.all([
68		- this.fetchWikiSearch(),
69		- this.fetchFilterSearch()
70		- ]).then(([wikiSearchResults, collabSearchResults]) => {
71		- this.results = wikiSearchResults;
72		- console.log(wikiSearchResults, collabSearchResults);
73		- });
74		- } else if (this.searchText === this.prevSearchText) {
75		- console.log("Only apply filter on results");
	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	+ })
	86	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
76	76	this.fetchFilterSearch().then(this.filterResults)
	88	+ } else {
	89	+ this.results = this.resultsCache;
77	77	}
78	78	} else {
	92	+ this.clearResults();
79	79	console.log("no search text, should return filter search results if any");
80	80	this.fetchFilterSearch().then(collabs => {
81	81	console.log("Format and display collabs", collabs);
...	...	@@ -84,7 +84,6 @@
84	84	}
85	85	hasActiveFilters() {
86	86	// we only look at role filters for POC.
87		- console.log('rolesfilter', this.rolesFilter);
88	88	return this.rolesFilter.length > 0;
89	89	}
90	90	fetchWikiSearch() {
...	...	@@ -94,27 +94,37 @@
94	94	fetchFilterSearch() {
95	95	return new Promise((resolve) => {
96	96	if(this.hasActiveFilters()) {
97		- 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	+ });
98	98	} else {
99		- resolve(null);
	115	+ resolve([]);
100	100	}
101	101	});
102	102	}
103	103	filterResults = (filteredCollabs) => {
104		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
105	105	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
106		- const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
107		- console.log(filteredResults);
	121	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
108	108	}
	123	+ clearResults() {
	124	+ this.results = [];
	125	+ this.resultsCache = [];
	126	+ }
109	109	getLink(xwikiDocSpace) {
110	110	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
111	111	}
	130	+ handleKeyPress(e) {
	131	+ if (e.keyCode === 13) {
	132	+ this.handleSearch(true);
	133	+ }
	134	+ }
112	112	render() {
113	113	return html`
114	114	<div>
115	115	<div>
116		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
117		- <button @click="${this.handleSearch}">Search</button>
	139	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	140	+ <button @click="${() => this.handleSearch(true)}">Search</button>
118	118	</div>
119	119	<div>
120	120	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -130,6 +130,16 @@
130	130	</div>
131	131	`)}
132	132	</div>
	156	+ <div class="rawResults">
	157	+ <div>
	158	+ <strong>XWiki Search Results</strong>
	159	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	160	+ </div>
	161	+ <div>
	162	+ <strong>Collab Search Results (Filters)</strong>
	163	+ <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
	164	+ </div>
	165	+ </div>
133	133	</div>
134	134	`
135	135	}
...	...	@@ -157,7 +157,5 @@
157	157	}
158	158	});
159	159	</script>
160		-
161	161	<clb-unified-search></clb-unified-search>
162		-
163	163	{{/html}}