Changes for page Context Search

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -36,12 +36,11 @@
36	36	constructor() {
37	37	super();
38	38	this.searchText = "";
39		- this.prevSearchText = "";
40	40	this.administrator = false;
41	41	this.editor = false;
42	42	this.viewer = false;
43	43	this.rolesFilter = [];
44		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
	43	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
45	45	this.results = [];
46	46	}
47	47	toggleRoleFilter(roleName) {
...	...	@@ -52,51 +52,23 @@
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55		- this.handleSearch();
	54	+ console.log(this.filterUrl.toString());
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60	60	handleSearch() {
61		- if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
62		- console.log(this.searchText, this.prevSearchText);
63		- this.prevSearchText = this.searchText;
64		- Promise.all([
65		- this.fetchWikiSearch(),
66		- this.fetchFilterSearch()
67		- ]).then(([wikiSearchResults, collabSearchResults]) => {
68		- console.log(wikiSearchResults, collabSearchResults);
69		- });
70		- } else if (this.searchText === this.prevSearchText) {
71		- console.log("Only apply filter on results");
72		- this.fetchFilterSearch().then(this.filterResults)
73		- } else {
74		- console.log("no search text, should return filter search results if any");
75		- this.fetchFilterSearch().then(collabs => {
76		- console.log("Format and display collabs", collabs);
77		- })
	60	+ console.log(this.searchText);
	61	+ if(this.searchText !== "") {
	62	+ this.fetchWikiSearch();
78	78	}
79	79	}
80		- hasActiveFilters() {
81		- // we only look at role filters for POC.
82		- return this.roles.length > 0;
83		- }
84	84	fetchWikiSearch() {
85	85	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
86		- return handleXWikiSearch(this.searchText);
	67	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
87	87	}
88		- fetchFilterSearch() {
89		- return new Promise((resolve) => {
90		- if(this.hasActiveFilters) {
91		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
92		- } else {
93		- resolve(null);
94		- }
95		- });
96		- }
97		- filterResults = (filteredCollabs) => {
98		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
99		- }
	69	+
	70	+
100	100	getLink(xwikiDocSpace) {
101	101	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
102	102	}