Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,7 +1,6 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4		- !!! Many optimisations can be done !!!
	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	}
...	...	@@ -27,19 +27,6 @@
27	27	a {
28	28	color: var(--color-brand-primary, blue);
29	29	}
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		- }
43	43	`;
44	44	constructor() {
45	45	super();
...	...	@@ -52,11 +52,7 @@
52	52	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
53	53	this.results = [];
54	54	this.resultsCache = [];
55		- this.collabFiltersResults = [];
56	56	}
57		- firstUpdated() {
58		- this.renderRoot.getElementById('searchInput').focus();
59		- }
60	60	toggleRoleFilter(roleName) {
61	61	if(this.rolesFilter.indexOf(roleName) === -1) {
62	62	this.rolesFilter.push(roleName);
...	...	@@ -70,26 +70,23 @@
70	70	setSearchText(e) {
71	71	this.searchText = e.target.value;
72	72	}
73		- handleSearch(textSearch) {
74		- if(this.searchText !== "" || textSearch) {
	61	+ handleSearch() {
	62	+
	63	+ if(this.searchText !== "") {
75	75	if(this.searchText !== this.prevSearchText) {
76		- this.clearResults();
77	77	this.prevSearchText = this.searchText;
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		- })
	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	+ });
86	86	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
87	87	this.fetchFilterSearch().then(this.filterResults)
88		- } else {
89		- this.results = this.resultsCache;
90	90	}
91	91	} else {
92		- this.clearResults();
93	93	console.log("no search text, should return filter search results if any");
94	94	this.fetchFilterSearch().then(collabs => {
95	95	console.log("Format and display collabs", collabs);
...	...	@@ -107,10 +107,7 @@
107	107	fetchFilterSearch() {
108	108	return new Promise((resolve) => {
109	109	if(this.hasActiveFilters()) {
110		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
111		- this.collabFiltersResults = res;
112		- resolve(res);
113		- });
	95	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
114	114	} else {
115	115	resolve([]);
116	116	}
...	...	@@ -117,28 +117,20 @@
117	117	});
118	118	}
119	119	filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
120	120	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
121		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	104	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ this.results = filteredResults;
122	122	}
123		- clearResults() {
124		- this.results = [];
125		- this.resultsCache = [];
126		- this.collabFiltersResults = [];
127		- }
128	128	getLink(xwikiDocSpace) {
129	129	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
130	130	}
131		- handleKeyPress(e) {
132		- if (e.keyCode === 13) {
133		- this.handleSearch(true);
134		- }
135		- }
136	136	render() {
137	137	return html`
138	138	<div>
139	139	<div>
140		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
141		- <button @click="${() => this.handleSearch(true)}">Search</button>
	114	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	115	+ <button @click="${this.handleSearch}">Search</button>
142	142	</div>
143	143	<div>
144	144	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -154,16 +154,6 @@
154	154	</div>
155	155	`)}
156	156	</div>
157		- <div class="rawResults">
158		- <div>
159		- <strong>XWiki Search Results</strong>
160		- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
161		- </div>
162		- <div>
163		- <strong>Collab Search Results (Filters)</strong>
164		- <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
165		- </div>
166		- </div>
167	167	</div>
168	168	`
169	169	}
...	...	@@ -191,5 +191,7 @@
191	191	}
192	192	});
193	193	</script>
	158	+
194	194	<clb-unified-search></clb-unified-search>
	160	+
195	195	{{/html}}