Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/fix export in lazy-loaded activities table (#2939)
Arshad Jamale82dcc8ace06
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 8532f7fd04..f0831e1bf1 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).+## Unreleased++### Fixed++- Fixed the export in the lazy-loaded activities table on the portfolio activities page (experimental)+## 2.46.0 - 2024-01-28### Addeddiff --git a/apps/api/src/app/export/export.controller.ts b/apps/api/src/app/export/export.controller.tsindex 88ba799892..baa0179bba 100644--- a/apps/api/src/app/export/export.controller.ts+++ b/apps/api/src/app/export/export.controller.ts@@ -1,4 +1,5 @@import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';+import { ApiService } from '@ghostfolio/api/services/api/api.service';import { Export } from '@ghostfolio/common/interfaces';import type { RequestWithUser } from '@ghostfolio/common/types';import { Controller, Get, Inject, Query, UseGuards } from '@nestjs/common';@@ -10,6 +11,7 @@ import { ExportService } from './export.service';@Controller('export')export class ExportController {public constructor(+ private readonly apiService: ApiService,private readonly exportService: ExportService,@Inject(REQUEST) private readonly request: RequestWithUser) {}@@ -17,10 +19,20 @@ export class ExportController {@Get()@UseGuards(AuthGuard('jwt'), HasPermissionGuard)public async export(- @Query('activityIds') activityIds?: string[]+ @Query('accounts') filterByAccounts?: string,+ @Query('activityIds') activityIds?: string[],+ @Query('assetClasses') filterByAssetClasses?: string,+ @Query('tags') filterByTags?: string): Promise<Export> {+ const filters = this.apiService.buildFiltersFromQueryParams({+ filterByAccounts,+ filterByAssetClasses,+ filterByTags+ });+return this.exportService.export({activityIds,+ filters,userCurrency: this.request.user.Settings.settings.baseCurrency,userId: this.request.user.id});diff --git a/apps/api/src/app/export/export.module.ts b/apps/api/src/app/export/export.module.tsindex ca4588925a..847695d17e 100644--- a/apps/api/src/app/export/export.module.ts+++ b/apps/api/src/app/export/export.module.ts@@ -1,6 +1,7 @@import { AccountModule } from '@ghostfolio/api/app/account/account.module';import { OrderModule } from '@ghostfolio/api/app/order/order.module';import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';+import { ApiModule } from '@ghostfolio/api/services/api/api.module';import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';@@ -12,6 +13,7 @@ import { ExportService } from './export.service';@Module({imports: [AccountModule,+ ApiModule,ConfigurationModule,DataGatheringModule,DataProviderModule,diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.tsindex 031111d7f5..64cd139296 100644--- a/apps/api/src/app/export/export.service.ts+++ b/apps/api/src/app/export/export.service.ts@@ -1,7 +1,7 @@import { AccountService } from '@ghostfolio/api/app/account/account.service';import { OrderService } from '@ghostfolio/api/app/order/order.service';import { environment } from '@ghostfolio/api/environments/environment';-import { Export } from '@ghostfolio/common/interfaces';+import { Filter, Export } from '@ghostfolio/common/interfaces';import { Injectable } from '@nestjs/common';@Injectable()@@ -13,10 +13,12 @@ export class ExportService {public async export({activityIds,+ filters,userCurrency,userId}: {activityIds?: string[];+ filters?: Filter[];userCurrency: string;userId: string;}): Promise<Export> {@@ -42,6 +44,7 @@ export class ExportService {);let { activities } = await this.orderService.getOrders({+ filters,userCurrency,userId,includeDrafts: true,diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.tsindex 90736d7cfa..d5dfc76802 100644--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts+++ b/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({diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.tsindex 053d1d3057..55dcadec3b 100644--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts+++ b/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({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.tsindex b125dd784d..01f939905e 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@@ -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({diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.htmlindex 534a8089ef..3322ff184b 100644--- a/apps/client/src/app/pages/portfolio/activities/activities-page.html+++ b/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()"diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.tsindex e6c99dd7f7..0dfbcb716d 100644--- a/apps/client/src/app/services/data.service.ts+++ b/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(','));diff --git a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.ts b/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.tsindex 0ceb69bef8..a58651a419 100644--- a/libs/ui/src/lib/activities-table-lazy/activities-table-lazy.component.ts+++ b/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>();