Integrate filters

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@@ -178,7 +178,7 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
     }
 
     this.dataService
-      .fetchExport(activityIds)
+      .fetchExport({ activityIds })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((data) => {
         downloadAsFile({

apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts

@@ -281,7 +281,7 @@ export class PositionDetailDialog implements OnDestroy, OnInit {
     }
 
     this.dataService
-      .fetchExport(activityIds)
+      .fetchExport({ activityIds })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((data) => {
         downloadAsFile({

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

@@ -199,8 +199,14 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
   }
 
   public onExport(activityIds?: string[]) {
+    let fetchExportParams: any = { activityIds };
+
+    if (!activityIds) {
+      fetchExportParams = { filters: this.userService.getFilters() };
+    }
+
     this.dataService
-      .fetchExport(activityIds)
+      .fetchExport(fetchExportParams)
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((data) => {
         for (const activity of data.activities) {
@@ -220,7 +226,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
 
   public onExportDrafts(activityIds?: string[]) {
     this.dataService
-      .fetchExport(activityIds)
+      .fetchExport({ activityIds })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((data) => {
         downloadAsFile({

apps/client/src/app/pages/portfolio/activities/activities-page.html

@@ -20,7 +20,7 @@
         (activityToClone)="onCloneActivity($event)"
         (activityToUpdate)="onUpdateActivity($event)"
         (deleteAllActivities)="onDeleteAllActivities()"
-        (export)="onExport($event)"
+        (export)="onExport()"
         (exportDrafts)="onExportDrafts($event)"
         (import)="onImport()"
         (importDividends)="onImportDividends()"

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

@@ -279,8 +279,14 @@ export class DataService {
     return this.http.get<BenchmarkResponse>('/api/v1/benchmark');
   }
 
-  public fetchExport(activityIds?: string[]) {
-    let params = new HttpParams();
+  public fetchExport({
+    activityIds,
+    filters
+  }: {
+    activityIds?: string[];
+    filters?: Filter[];
+  } = {}) {
+    let params = this.buildFiltersAsQueryParams({ filters });
 
     if (activityIds) {
       params = params.append('activityIds', activityIds.join(','));

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

@@ -55,7 +55,7 @@ export class ActivitiesTableLazyComponent
   @Output() activityToClone = new EventEmitter<OrderWithAccount>();
   @Output() activityToUpdate = new EventEmitter<OrderWithAccount>();
   @Output() deleteAllActivities = new EventEmitter<void>();
-  @Output() export = new EventEmitter<string[]>();
+  @Output() export = new EventEmitter<void>();
   @Output() exportDrafts = new EventEmitter<string[]>();
   @Output() import = new EventEmitter<void>();
   @Output() importDividends = new EventEmitter<UniqueAsset>();