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