diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts index 22b31e77d..abd99042d 100644 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts +++ b/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts @@ -147,9 +147,9 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { }); } - public onExport() { + public onExport(activityIds?: string[]) { this.dataService - .fetchExport() + .fetchExport(activityIds) .pipe(takeUntil(this.unsubscribeSubject)) .subscribe((data) => { downloadAsFile( diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.html b/apps/client/src/app/pages/portfolio/transactions/transactions-page.html index 4cd2f462c..0df0171b9 100644 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.html +++ b/apps/client/src/app/pages/portfolio/transactions/transactions-page.html @@ -14,7 +14,7 @@ (activityDeleted)="onDeleteTransaction($event)" (activityToClone)="onCloneTransaction($event)" (activityToUpdate)="onUpdateTransaction($event)" - (export)="onExport()" + (export)="onExport($event)" (import)="onImport()" > 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 0b83c7355..563a56d8e 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -54,7 +54,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { @Output() activityDeleted = new EventEmitter(); @Output() activityToClone = new EventEmitter(); @Output() activityToUpdate = new EventEmitter(); - @Output() export = new EventEmitter(); + @Output() export = new EventEmitter(); @Output() import = new EventEmitter(); @ViewChild('autocomplete') matAutocomplete: MatAutocomplete; @@ -182,7 +182,15 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy { } public onExport() { - this.export.emit(); + if (this.searchKeywords.length > 0) { + this.export.emit( + this.dataSource.filteredData.map((activity) => { + return activity.id; + }) + ); + } else { + this.export.emit(); + } } public onImport() {