diff --git a/frontend/src/ts/ervu-dashboard/FilterRouteHandlerScript.ts b/frontend/src/ts/ervu-dashboard/FilterRouteHandlerScript.ts index 68c25d2e..09e2ff5d 100644 --- a/frontend/src/ts/ervu-dashboard/FilterRouteHandlerScript.ts +++ b/frontend/src/ts/ervu-dashboard/FilterRouteHandlerScript.ts @@ -70,7 +70,5 @@ export class FilterRouteHandlerScript extends Behavior { if (this.filtersSubscription) { this.filtersSubscription.unsubscribe(); } - this.filterGroup.clearFilters() } - } diff --git a/frontend/src/ts/ervu-dashboard/TextClickHandlerScript.ts b/frontend/src/ts/ervu-dashboard/TextClickHandlerScript.ts index 7f0e1b94..dfea58bd 100644 --- a/frontend/src/ts/ervu-dashboard/TextClickHandlerScript.ts +++ b/frontend/src/ts/ervu-dashboard/TextClickHandlerScript.ts @@ -18,21 +18,8 @@ export class TextClickHandlerScript extends Behavior { public route: string; private el: ElementRef; private router: Router; - private filterTransferService: FilterTransferService; - private onClickFunction = () => { - const filterData: Record = {}; - this.filters.forEach(filter => { - if (filter.name && filter.value) { - filterData[filter.name] = filter.value; - } - }); - - this.filterTransferService.setFilters(filterData); - this.router.navigate([this.route]); - }; - constructor(pageId?: string, objectId?: string, injector?: Injector, interfaces?: any[]) { super(pageId, objectId, injector, interfaces); } @@ -58,4 +45,15 @@ export class TextClickHandlerScript extends Behavior { this.el.nativeElement.removeEventListener('click', () => this.onClickFunction()); } } + + private onClickFunction() { + const filterData: Record = {}; + this.filters.forEach(filter => { + if (filter.name && filter.value) { + filterData[filter.name] = filter.value; + } + }); + this.filterTransferService.setFilters(filterData); + this.router.navigate([this.route]); + } }