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';
...	...	@@ -23,9 +23,6 @@
23	23	results: { type: Array }
24	24	}
25	25	static styles = css`
26		- :host > div {
27		- padding-bottom: 4em;
28		- }
29	29	.result {
30	30	margin-top: 1em;
31	31	}
...	...	@@ -40,94 +40,47 @@
40	40	constructor() {
41	41	super();
42	42	this.searchText = "";
43		- this.prevSearchText = "";
44	44	this.administrator = false;
45	45	this.editor = false;
46	46	this.viewer = false;
47	47	this.rolesFilter = [];
48		- 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=true&roles=`);
49	49	this.results = [];
50		- this.resultsCache = [];
51	51	}
52	52	toggleRoleFilter(roleName) {
53		- if(this.rolesFilter.indexOf(roleName) === -1) {
	47	+ if(this.rolesFilter.indexOf(roleName) == -1) {
54	54	this.rolesFilter.push(roleName);
55	55	} else {
56		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	50	+ this.rolesFilter.filter(role => role !== roleName);
57	57	}
58	58	this[roleName] = !this[roleName];
59	59	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
60		- this.handleSearch();
	54	+ console.log(this.filterUrl.toString());
61	61	}
62	62	setSearchText(e) {
63	63	this.searchText = e.target.value;
64	64	}
65		- handleSearch(textSearch) {
66		- if(this.searchText !== "" || textSearch) {
67		- if(this.searchText !== this.prevSearchText) {
68		- this.clearResults();
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()) {
79		- this.fetchFilterSearch().then(this.filterResults)
80		- } else {
81		- this.results = this.resultsCache;
82		- }
83		- } else {
84		- this.clearResults();
85		- console.log("no search text, should return filter search results if any");
86		- this.fetchFilterSearch().then(collabs => {
87		- console.log("Format and display collabs", collabs);
88		- })
	59	+ handleSearch() {
	60	+ console.log(this.searchText);
	61	+ if(this.searchText !== "") {
	62	+ this.fetchWikiSearch();
89	89	}
90	90	}
91		- hasActiveFilters() {
92		- // we only look at role filters for POC.
93		- return this.rolesFilter.length > 0;
94		- }
95	95	fetchWikiSearch() {
96	96	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
97		- return handleXWikiSearch(this.searchText);
	67	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
98	98	}
99		- fetchFilterSearch() {
100		- return new Promise((resolve) => {
101		- if(this.hasActiveFilters()) {
102		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
103		- } else {
104		- resolve([]);
105		- }
106		- });
107		- }
108		- filterResults = (filteredCollabs) => {
109		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
110		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
111		- }
112		- clearResults() {
113		- this.results = [];
114		- this.resultsCache = [];
115		- }
	69	+
	70	+
116	116	getLink(xwikiDocSpace) {
117	117	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118	118	}
119		- handleKeyPress(e) {
120		- if (e.keyCode === 13) {
121		- e.preventDefault();
122		- this.handleSearch(true);
123		- }
124		- }
125	125	render() {
126	126	return html`
127	127	<div>
128	128	<div>
129		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
130		- <button @click="${() => this.handleSearch(true)}">Search</button>
	78	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	79	+ <button @click="${this.handleSearch}">Search</button>
131	131	</div>
132	132	<div>
133	133	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>