Browse Source

ISSUE #3836 | click in activities table component

* removed router import
* alphabetical order of functions
pull/3856/head
Dmytro Werner 11 months ago
parent
commit
b919160087
  1. 20
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  2. 11
      libs/ui/src/lib/activities-table/activities-table.component.ts

20
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -138,6 +138,16 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
this.fetchActivities(); this.fetchActivities();
} }
public onClickActivity({ SymbolProfile }: Activity) {
this.router.navigate([], {
queryParams: {
dataSource: SymbolProfile.dataSource,
holdingDetailDialog: true,
symbol: SymbolProfile.symbol
}
});
}
public onCloneActivity(aActivity: Activity) { public onCloneActivity(aActivity: Activity) {
this.openCreateActivityDialog(aActivity); 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) { public openUpdateActivityDialog(activity: Activity) {
const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, { const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, {
data: { data: {

11
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -42,7 +42,6 @@ import {
} from '@angular/material/sort'; } from '@angular/material/sort';
import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTooltipModule } from '@angular/material/tooltip';
import { Router, RouterModule } from '@angular/router';
import { isUUID } from 'class-validator'; import { isUUID } from 'class-validator';
import { endOfToday, isAfter } from 'date-fns'; import { endOfToday, isAfter } from 'date-fns';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@ -64,8 +63,7 @@ import { Subject, Subscription, takeUntil } from 'rxjs';
MatSortModule, MatSortModule,
MatTableModule, MatTableModule,
MatTooltipModule, MatTooltipModule,
NgxSkeletonLoaderModule, NgxSkeletonLoaderModule
RouterModule
], ],
schemas: [CUSTOM_ELEMENTS_SCHEMA], schemas: [CUSTOM_ELEMENTS_SCHEMA],
selector: 'gf-activities-table', selector: 'gf-activities-table',
@ -94,6 +92,7 @@ export class GfActivitiesTableComponent
@Input() sortDisabled = false; @Input() sortDisabled = false;
@Input() totalItems = Number.MAX_SAFE_INTEGER; @Input() totalItems = Number.MAX_SAFE_INTEGER;
@Output() activityClicked = new EventEmitter<AssetProfileIdentifier>();
@Output() activitiesDeleted = new EventEmitter<void>(); @Output() activitiesDeleted = new EventEmitter<void>();
@Output() activityDeleted = new EventEmitter<string>(); @Output() activityDeleted = new EventEmitter<string>();
@Output() activityToClone = new EventEmitter<OrderWithAccount>(); @Output() activityToClone = new EventEmitter<OrderWithAccount>();
@ -105,7 +104,6 @@ export class GfActivitiesTableComponent
@Output() pageChanged = new EventEmitter<PageEvent>(); @Output() pageChanged = new EventEmitter<PageEvent>();
@Output() selectedActivities = new EventEmitter<Activity[]>(); @Output() selectedActivities = new EventEmitter<Activity[]>();
@Output() sortChanged = new EventEmitter<Sort>(); @Output() sortChanged = new EventEmitter<Sort>();
@Output() activityClicked = new EventEmitter<AssetProfileIdentifier>();
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
@ -123,10 +121,7 @@ export class GfActivitiesTableComponent
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
public constructor( public constructor(private notificationService: NotificationService) {}
private notificationService: NotificationService,
private router: Router
) {}
public ngOnInit() { public ngOnInit() {
if (this.showCheckbox) { if (this.showCheckbox) {

Loading…
Cancel
Save