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,12 +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	36	`;
37	37	constructor() {
38	38	super();
...	...	@@ -44,11 +44,7 @@
44	44	this.rolesFilter = [];
45	45	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
46	46	this.results = [];
47		- this.resultsCache = [];
48	48	}
49		- firstUpdated() {
50		- this.renderRoot.getElementById('searchInput').focus();
51		- }
52	52	toggleRoleFilter(roleName) {
53	53	if(this.rolesFilter.indexOf(roleName) === -1) {
54	54	this.rolesFilter.push(roleName);
...	...	@@ -62,26 +62,25 @@
62	62	setSearchText(e) {
63	63	this.searchText = e.target.value;
64	64	}
65		- handleSearch(textSearch) {
66		- if(this.searchText !== "" || textSearch) {
	60	+ handleSearch() {
	61	+
	62	+ if(this.searchText !== "") {
67	67	if(this.searchText !== this.prevSearchText) {
68		- this.clearResults();
	64	+ console.log("1st")
	65	+ console.log(this.searchText, this.prevSearchText);
69	69	this.prevSearchText = this.searchText;
70		- this.fetchWikiSearch().then(results => {
71		- this.resultsCache = results;
72		- if(this.hasActiveFilters()) {
73		- this.fetchFilterSearch().then(this.filterResults);
74		- } else {
75		- this.results = results;
76		- }
77		- })
78		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	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");
79	79	this.fetchFilterSearch().then(this.filterResults)
80		- } else {
81		- this.results = this.resultsCache;
82	82	}
83	83	} else {
84		- this.clearResults();
85	85	console.log("no search text, should return filter search results if any");
86	86	this.fetchFilterSearch().then(collabs => {
87	87	console.log("Format and display collabs", collabs);
...	...	@@ -99,10 +99,7 @@
99	99	fetchFilterSearch() {
100	100	return new Promise((resolve) => {
101	101	if(this.hasActiveFilters()) {
102		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
103		- this.collabFiltersResults = res;
104		- resolve(res);
105		- });
	96	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
106	106	} else {
107	107	resolve([]);
108	108	}
...	...	@@ -109,27 +109,20 @@
109	109	});
110	110	}
111	111	filterResults = (filteredCollabs) => {
	103	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
112	112	const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
113		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	105	+ const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	106	+ this.results = filteredResults;
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		- <button @click="${() => this.handleSearch(true)}">Search</button>
	115	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	116	+ <button @click="${this.handleSearch}">Search</button>
133	133	</div>
134	134	<div>
135	135	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -145,16 +145,6 @@
145	145	</div>
146	146	`)}
147	147	</div>
148		- <div class="rawResults">
149		- <div>
150		- <strong>XWiki Search Results</strong>
151		- <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre>
152		- </div>
153		- <div>
154		- <strong>Collab Search Results (Filters)</strong>
155		- <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre>
156		- </div>
157		- </div>
158	158	</div>
159	159	`
160	160	}
...	...	@@ -182,5 +182,7 @@
182	182	}
183	183	});
184	184	</script>
	159	+
185	185	<clb-unified-search></clb-unified-search>
	161	+
186	186	{{/html}}