Refactoring

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({
+      .subscribe(() => {
-        next: () => {
+        this.fetchActivities();
-          this.fetchActivities();
-        }
       });
   }
 
-  public onDeleteAllActivities() {
+  public onDeleteActivity(aId: string) {
-    const confirmation = confirm(
+    this.dataService
-      $localize`Do you really want to delete all your activities?`
+      .deleteActivity(aId)
-    );
+      .pipe(takeUntil(this.unsubscribeSubject))
-
+      .subscribe(() => {
-    if (confirmation) {
+        this.fetchActivities();
-      this.dataService
+      });
-        .deleteAllActivities({
-          filters: this.userService.getFilters()
-        })
-        .pipe(takeUntil(this.unsubscribeSubject))
-        .subscribe({
-          next: () => {
-            this.fetchActivities();
-          }
-        });
-    }
   }
 
   public onExport(activityIds?: string[]) {

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()"

apps/client/src/app/services/data.service.ts

@@ -256,16 +256,16 @@ export class DataService {
     return this.http.delete<any>(`/api/v1/account-balance/${aId}`);
   }
 
-  public deleteActivity(aId: string) {
+  public deleteActivities({ filters }) {
-    return this.http.delete<any>(`/api/v1/order/${aId}`);
-  }
-
-  public deleteAllActivities({ filters }) {
     let params = this.buildFiltersAsQueryParams({ filters });
 
     return this.http.delete<any>(`/api/v1/order`, { params });
   }
 
+  public deleteActivity(aId: string) {
+    return this.http.delete<any>(`/api/v1/order/${aId}`);
+  }
+
   public deleteBenchmark({ dataSource, symbol }: UniqueAsset) {
     return this.http.delete<any>(`/api/v1/benchmark/${dataSource}/${symbol}`);
   }

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()"
       >
         <span class="align-items-center d-flex">
           <ion-icon class="mr-2" name="trash-outline" />
-          <span i18n>Delete all Activities</span>
+          <span i18n>Delete Activities</span>
         </span>
       </button>
     </mat-menu>

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<void>();
   @Output() activityDeleted = new EventEmitter<string>();
   @Output() activityToClone = new EventEmitter<OrderWithAccount>();
   @Output() activityToUpdate = new EventEmitter<OrderWithAccount>();
-  @Output() deleteAllActivities = new EventEmitter<void>();
   @Output() export = new EventEmitter<void>();
   @Output() exportDrafts = new EventEmitter<string[]>();
   @Output() import = new EventEmitter<void>();
@@ -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();
   }