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