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';
...	...	@@ -37,79 +37,38 @@
37	37	constructor() {
38	38	super();
39	39	this.searchText = "";
40		- this.prevSearchText = "";
41	41	this.administrator = false;
42	42	this.editor = false;
43	43	this.viewer = false;
44	44	this.rolesFilter = [];
45		- 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=`);
46	46	this.results = [];
47		- this.resultsCache = [];
48	48	}
49	49	toggleRoleFilter(roleName) {
50		- if(this.rolesFilter.indexOf(roleName) === -1) {
	47	+ if(this.rolesFilter.indexOf(roleName) == -1) {
51	51	this.rolesFilter.push(roleName);
52	52	} else {
53		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	50	+ this.rolesFilter.filter(role => role !== roleName);
54	54	}
55	55	this[roleName] = !this[roleName];
56	56	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
57		- this.handleSearch();
	54	+ console.log(this.filterUrl.toString());
58	58	}
59	59	setSearchText(e) {
60	60	this.searchText = e.target.value;
61	61	}
62		- handleSearch(textSearch) {
63		- if(this.searchText !== "" || textSearch) {
64		- if(this.searchText !== this.prevSearchText) {
65		- this.clearResults();
66		- this.prevSearchText = this.searchText;
67		- this.fetchWikiSearch().then(results => {
68		- this.resultsCache = results;
69		- if(this.hasActiveFilters()) {
70		- this.fetchFilterSearch().then(this.filterResults);
71		- } else {
72		- this.results = results;
73		- }
74		- })
75		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
76		- this.fetchFilterSearch().then(this.filterResults)
77		- } else {
78		- this.results = this.resultsCache;
79		- }
80		- } else {
81		- this.clearResults();
82		- console.log("no search text, should return filter search results if any");
83		- this.fetchFilterSearch().then(collabs => {
84		- console.log("Format and display collabs", collabs);
85		- })
	59	+ handleSearch() {
	60	+ console.log(this.searchText);
	61	+ if(this.searchText !== "") {
	62	+ this.fetchWikiSearch();
86	86	}
87	87	}
88		- hasActiveFilters() {
89		- // we only look at role filters for POC.
90		- return this.rolesFilter.length > 0;
91		- }
92	92	fetchWikiSearch() {
93	93	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
94		- return handleXWikiSearch(this.searchText);
	67	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
95	95	}
96		- fetchFilterSearch() {
97		- return new Promise((resolve) => {
98		- if(this.hasActiveFilters()) {
99		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
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	}
...	...	@@ -118,7 +118,7 @@
118	118	<div>
119	119	<div>
120	120	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
121		- <button @click="${() => this.handleSearch(true)}">Search</button>
	79	+ <button @click="${this.handleSearch}">Search</button>
122	122	</div>
123	123	<div>
124	124	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>