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 69638e694..9b1d603de 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 @@ -153,34 +153,24 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { this.openCreateActivityDialog(aActivity); } - public onDeleteActivity(aId: string) { + public onDeleteActivities() { this.dataService - .deleteActivity(aId) + .deleteActivities({ + filters: this.userService.getFilters() + }) .pipe(takeUntil(this.unsubscribeSubject)) - .subscribe({ - next: () => { - this.fetchActivities(); - } + .subscribe(() => { + this.fetchActivities(); }); } - public onDeleteAllActivities() { - const confirmation = confirm( - $localize`Do you really want to delete all your activities?` - ); - - if (confirmation) { - this.dataService - .deleteAllActivities({ - filters: this.userService.getFilters() - }) - .pipe(takeUntil(this.unsubscribeSubject)) - .subscribe({ - next: () => { - this.fetchActivities(); - } - }); - } + public onDeleteActivity(aId: string) { + this.dataService + .deleteActivity(aId) + .pipe(takeUntil(this.unsubscribeSubject)) + .subscribe(() => { + this.fetchActivities(); + }); } public onExport(activityIds?: string[]) { diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.html index c16d8a689..9edb400ab 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page.html +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html @@ -20,10 +20,10 @@ [sortColumn]="sortColumn" [sortDirection]="sortDirection" [totalItems]="totalItems" + (activitiesDeleted)="onDeleteActivities()" (activityDeleted)="onDeleteActivity($event)" (activityToClone)="onCloneActivity($event)" (activityToUpdate)="onUpdateActivity($event)" - (deleteAllActivities)="onDeleteAllActivities()" (export)="onExport()" (exportDrafts)="onExportDrafts($event)" (import)="onImport()" diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index 1a309fa70..b6f438ad5 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -256,16 +256,16 @@ export class DataService { return this.http.delete(`/api/v1/account-balance/${aId}`); } - public deleteActivity(aId: string) { - return this.http.delete(`/api/v1/order/${aId}`); - } - - public deleteAllActivities({ filters }) { + public deleteActivities({ filters }) { let params = this.buildFiltersAsQueryParams({ filters }); return this.http.delete(`/api/v1/order`, { params }); } + public deleteActivity(aId: string) { + return this.http.delete(`/api/v1/order/${aId}`); + } + public deleteBenchmark({ dataSource, symbol }: UniqueAsset) { return this.http.delete(`/api/v1/benchmark/${dataSource}/${symbol}`); } diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html index 7aa5d0ee1..68950a0c0 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -59,11 +59,11 @@ class="align-items-center d-flex" mat-menu-item [disabled]="!hasPermissionToDeleteActivity" - (click)="onDeleteAllActivities()" + (click)="onDeleteActivities()" > - Delete all Activities + Delete Activities 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 daaec3258..66d6f21c4 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -92,10 +92,10 @@ export class GfActivitiesTableComponent @Input() sortDisabled = false; @Input() totalItems = Number.MAX_SAFE_INTEGER; + @Output() activitiesDeleted = new EventEmitter(); @Output() activityDeleted = new EventEmitter(); @Output() activityToClone = new EventEmitter(); @Output() activityToUpdate = new EventEmitter(); - @Output() deleteAllActivities = new EventEmitter(); @Output() export = new EventEmitter(); @Output() exportDrafts = new EventEmitter(); @Output() import = new EventEmitter(); @@ -211,6 +211,16 @@ export class GfActivitiesTableComponent this.activityToClone.emit(aActivity); } + public onDeleteActivities() { + const confirmation = confirm( + $localize`Do you really want to delete these activities?` + ); + + if (confirmation) { + this.activitiesDeleted.emit(); + } + } + public onDeleteActivity(aId: string) { const confirmation = confirm( $localize`Do you really want to delete this activity?` @@ -241,10 +251,6 @@ export class GfActivitiesTableComponent ); } - public onDeleteAllActivities() { - this.deleteAllActivities.emit(); - } - public onImport() { this.import.emit(); }