diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts index d4d97a7d6..fa67af0db 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts @@ -138,6 +138,16 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { this.fetchActivities(); } + public onClickActivity({ SymbolProfile }: Activity) { + this.router.navigate([], { + queryParams: { + dataSource: SymbolProfile.dataSource, + holdingDetailDialog: true, + symbol: SymbolProfile.symbol + } + }); + } + public onCloneActivity(aActivity: Activity) { this.openCreateActivityDialog(aActivity); } @@ -255,16 +265,6 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { }); } - public onClickActivity(aActivity: Activity) { - this.router.navigate([], { - queryParams: { - dataSource: aActivity.SymbolProfile.dataSource, - symbol: aActivity.SymbolProfile.symbol, - holdingDetailDialog: true - } - }); - } - public openUpdateActivityDialog(activity: Activity) { const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, { data: { diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index c89ac1929..fc1e6c6b5 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -42,7 +42,6 @@ import { } from '@angular/material/sort'; import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { Router, RouterModule } from '@angular/router'; import { isUUID } from 'class-validator'; import { endOfToday, isAfter } from 'date-fns'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; @@ -64,8 +63,7 @@ import { Subject, Subscription, takeUntil } from 'rxjs'; MatSortModule, MatTableModule, MatTooltipModule, - NgxSkeletonLoaderModule, - RouterModule + NgxSkeletonLoaderModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA], selector: 'gf-activities-table', @@ -94,6 +92,7 @@ export class GfActivitiesTableComponent @Input() sortDisabled = false; @Input() totalItems = Number.MAX_SAFE_INTEGER; + @Output() activityClicked = new EventEmitter(); @Output() activitiesDeleted = new EventEmitter(); @Output() activityDeleted = new EventEmitter(); @Output() activityToClone = new EventEmitter(); @@ -105,7 +104,6 @@ export class GfActivitiesTableComponent @Output() pageChanged = new EventEmitter(); @Output() selectedActivities = new EventEmitter(); @Output() sortChanged = new EventEmitter(); - @Output() activityClicked = new EventEmitter(); @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -123,10 +121,7 @@ export class GfActivitiesTableComponent private unsubscribeSubject = new Subject(); - public constructor( - private notificationService: NotificationService, - private router: Router - ) {} + public constructor(private notificationService: NotificationService) {} public ngOnInit() { if (this.showCheckbox) {