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,44 +32,74 @@
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 pre {
	37	+ overflow: scroll;
	38	+ }
35	35	`;
36	36	constructor() {
37	37	super();
38	38	this.searchText = "";
	43	+ this.prevSearchText = "";
39	39	this.administrator = false;
40	40	this.editor = false;
41	41	this.viewer = false;
42	42	this.rolesFilter = [];
43		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
	48	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
44	44	this.results = [];
	50	+ this.resultsCache = [];
	51	+ this.collabFiltersResults = [];
45	45	}
	53	+ firstUpdated() {
	54	+ this.renderRoot.getElementById('searchInput').focus();
	55	+ }
46	46	toggleRoleFilter(roleName) {
47		- if(this.rolesFilter.indexOf(roleName) == -1) {
	57	+ if(this.rolesFilter.indexOf(roleName) === -1) {
48	48	this.rolesFilter.push(roleName);
49	49	} else {
50		- this.rolesFilter.filter(role => role !== roleName);
	60	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
51	51	}
52	52	this[roleName] = !this[roleName];
53	53	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
54		- // if search text then apply filter
55		- // else return filters result
	64	+ this.handleSearch();
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60		- handleSearch() {
61		- if(this.searchText !== "") {
62		- Promise.all([
63		- this.fetchWikiSearch(),
64		- this.fetchFilterSearch()
65		- ])
	69	+ handleSearch(textSearch) {
	70	+ if(this.searchText !== "" || textSearch) {
	71	+ if(this.searchText !== this.prevSearchText) {
	72	+ this.clearResults();
	73	+ this.prevSearchText = this.searchText;
	74	+ this.fetchWikiSearch().then(results => {
	75	+ this.resultsCache = results;
	76	+ if(this.hasActiveFilters()) {
	77	+ this.fetchFilterSearch().then(this.filterResults);
	78	+ } else {
	79	+ this.results = results;
	80	+ }
	81	+ })
	82	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	83	+ this.fetchFilterSearch().then(this.filterResults)
	84	+ } else {
	85	+ this.results = this.resultsCache;
	86	+ }
66	66	} else {
	88	+ this.clearResults();
67	67	console.log("no search text, should return filter search results if any");
	90	+ this.fetchFilterSearch().then(collabs => {
	91	+ console.log("Format and display collabs", collabs);
	92	+ })
68	68	}
69	69	}
70	70	hasActiveFilters() {
71	71	// we only look at role filters for POC.
72		- return this.roles.length > 0;
	97	+ return this.rolesFilter.length > 0;
73	73	}
74	74	fetchWikiSearch() {
75	75	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
...	...	@@ -77,22 +77,38 @@
77	77	}
78	78	fetchFilterSearch() {
79	79	return new Promise((resolve) => {
80		- if(hasActiveFilters) {
81		- fetch(this.filterUrl).then(console.log);
	105	+ if(this.hasActiveFilters()) {
	106	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	107	+ this.collabFiltersResults = res;
	108	+ resolve(res);
	109	+ });
82	82	} else {
83		- resolve(null);
	111	+ resolve([]);
84	84	}
85	85	});
86	86	}
	115	+ filterResults = (filteredCollabs) => {
	116	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	117	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	118	+ }
	119	+ clearResults() {
	120	+ this.results = [];
	121	+ this.resultsCache = [];
	122	+ }
87	87	getLink(xwikiDocSpace) {
88	88	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
89	89	}
	126	+ handleKeyPress(e) {
	127	+ if (e.keyCode === 13) {
	128	+ this.handleSearch(true);
	129	+ }
	130	+ }
90	90	render() {
91	91	return html`
92	92	<div>
93	93	<div>
94		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
95		- <button @click="${this.handleSearch}">Search</button>
	135	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	136	+ <button @click="${() => this.handleSearch(true)}">Search</button>
96	96	</div>
97	97	<div>
98	98	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
...	...	@@ -108,6 +108,16 @@
108	108	</div>
109	109	`)}
110	110	</div>
	152	+ <div class="rawResults">
	153	+ <div>
	154	+ <strong>XWiki Search Results</strong>
	155	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	156	+ </div>
	157	+ <div>
	158	+ <strong>Collab Search Results (Filters)</strong>
	159	+ <pre>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</pre>
	160	+ </div>
	161	+ </div>
111	111	</div>
112	112	`
113	113	}
...	...	@@ -135,7 +135,5 @@
135	135	}
136	136	});
137	137	</script>
138		-
139	139	<clb-unified-search></clb-unified-search>
140		-
141	141	{{/html}}