Merge branch 'main' into feature/set-up-language-localization-for-static-portfolio-analysis-rule-emergency-fund-setup

3 months ago · b7588b92bd
13 changed files with 815 additions and 1180 deletions
--- a/.env.dev
+++ b/.env.dev
@ -22,4 +22,3 @@ JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
 # For more info, see: https://nx.dev/concepts/inferred-tasks
 NX_ADD_PLUGINS=false

-NX_NATIVE_COMMAND_RUNNER=false
--- a/.gitignore
+++ b/.gitignore
@ -25,8 +25,10 @@ npm-debug.log

 # misc
 /.angular/cache
+.cursor/rules/nx-rules.mdc
 .env
 .env.prod
+.github/instructions/nx.instructions.md
 .nx/cache
 .nx/workspace-data
 /.sass-cache
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -11,6 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - Set up the language localization for the static portfolio analysis rule: _Emergency Fund_ (Setup)
 - Set up the language localization for the static portfolio analysis rule: _Fees_ (Fee Ratio)
+
+### Changed
+
+- Upgraded `Nx` from version `20.8.1` to `21.1.2`
+
+## 2.166.0 - 2025-06-05
+
+### Added
+
 - Added support to create custom tags in the create or update activity dialog (experimental)

 ### Changed
@ -26,6 +35,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Fixed

+- Respected the filter by holding when deleting activities on the portfolio activities page
+- Respected the filter by holding when exporting activities on the portfolio activities page
 - Fixed an exception with currencies in the historical market data editor of the admin control panel

 ## 2.165.0 - 2025-05-31
--- a/1
+++ b/1
@ -33,6 +33,7 @@ COPY ./nx.json nx.json
 COPY ./replace.build.mjs replace.build.mjs
 COPY ./tsconfig.base.json tsconfig.base.json

+ENV NX_DAEMON=false
 RUN npm run build:production

 # Prepare the dist image with additional node_modules
--- a/apps/api/src/app/export/export.controller.ts
+++ b/apps/api/src/app/export/export.controller.ts
@ -1,9 +1,17 @@
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
+import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';
 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';
+import {
+  Controller,
+  Get,
+  Inject,
+  Query,
+  UseGuards,
+  UseInterceptors
+} from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';

@ -19,16 +27,21 @@ export class ExportController {

  @Get()
  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  public async export(
    @Query('accounts') filterByAccounts?: string,
    @Query('activityIds') filterByActivityIds?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('dataSource') filterByDataSource?: string,
+    @Query('symbol') filterBySymbol?: string,
    @Query('tags') filterByTags?: string
  ): Promise<Export> {
    const activityIds = filterByActivityIds?.split(',') ?? [];
    const filters = this.apiService.buildFiltersFromQueryParams({
      filterByAccounts,
      filterByAssetClasses,
+      filterByDataSource,
+      filterBySymbol,
      filterByTags
    });

--- a/apps/api/src/app/export/export.module.ts
+++ b/apps/api/src/app/export/export.module.ts
@ -1,5 +1,6 @@
 import { AccountModule } from '@ghostfolio/api/app/account/account.module';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
+import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { TagModule } from '@ghostfolio/api/services/tag/tag.module';

@ -9,8 +10,14 @@ import { ExportController } from './export.controller';
 import { ExportService } from './export.service';

@Module({
-  imports: [AccountModule, ApiModule, OrderModule, TagModule],
  controllers: [ExportController],
+  imports: [
+    AccountModule,
+    ApiModule,
+    OrderModule,
+    TagModule,
+    TransformDataSourceInRequestModule
+  ],
  providers: [ExportService]
 })
 export class ExportModule {}
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -53,14 +53,19 @@ export class OrderController {
  @Delete()
  @HasPermission(permissions.deleteOrder)
  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  public async deleteOrders(
    @Query('accounts') filterByAccounts?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('dataSource') filterByDataSource?: string,
+    @Query('symbol') filterBySymbol?: string,
    @Query('tags') filterByTags?: string
  ): Promise<number> {
    const filters = this.apiService.buildFiltersFromQueryParams({
      filterByAccounts,
      filterByAssetClasses,
+      filterByDataSource,
+      filterBySymbol,
      filterByTags
    });

--- a/apps/client-e2e/project.json
+++ b/apps/client-e2e/project.json
@ -3,12 +3,13 @@
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/client-e2e/src",
  "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["client"],
  "targets": {
    "e2e": {
      "executor": "@nx/cypress:cypress",
      "options": {
        "cypressConfig": "apps/client-e2e/cypress.json",
-        "tsConfig": "apps/client-e2e/tsconfig.e2e.json",
        "devServerTarget": "client:serve"
      },
      "configurations": {
@ -17,7 +18,5 @@
        }
      }
    }
-  },
-  "tags": [],
-  "implicitDependencies": ["client"]
+  }
 }
--- a/apps/client/project.json
+++ b/apps/client/project.json
@ -2,13 +2,63 @@
  "name": "client",
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "projectType": "application",
+  "sourceRoot": "apps/client/src",
+  "prefix": "gf",
+  "i18n": {
+    "locales": {
+      "ca": {
+        "baseHref": "/ca/",
+        "translation": "apps/client/src/locales/messages.ca.xlf"
+      },
+      "de": {
+        "baseHref": "/de/",
+        "translation": "apps/client/src/locales/messages.de.xlf"
+      },
+      "es": {
+        "baseHref": "/es/",
+        "translation": "apps/client/src/locales/messages.es.xlf"
+      },
+      "fr": {
+        "baseHref": "/fr/",
+        "translation": "apps/client/src/locales/messages.fr.xlf"
+      },
+      "it": {
+        "baseHref": "/it/",
+        "translation": "apps/client/src/locales/messages.it.xlf"
+      },
+      "nl": {
+        "baseHref": "/nl/",
+        "translation": "apps/client/src/locales/messages.nl.xlf"
+      },
+      "pl": {
+        "baseHref": "/pl/",
+        "translation": "apps/client/src/locales/messages.pl.xlf"
+      },
+      "pt": {
+        "baseHref": "/pt/",
+        "translation": "apps/client/src/locales/messages.pt.xlf"
+      },
+      "tr": {
+        "baseHref": "/tr/",
+        "translation": "apps/client/src/locales/messages.tr.xlf"
+      },
+      "uk": {
+        "baseHref": "/uk/",
+        "translation": "apps/client/src/locales/messages.uk.xlf"
+      },
+      "zh": {
+        "baseHref": "/zh/",
+        "translation": "apps/client/src/locales/messages.zh.xlf"
+      }
+    },
+    "sourceLocale": "en"
+  },
+  "tags": [],
  "generators": {
    "@schematics/angular:component": {
      "style": "scss"
    }
  },
-  "sourceRoot": "apps/client/src",
-  "prefix": "gf",
  "targets": {
    "build": {
      "executor": "@nx/angular:webpack-browser",
@ -211,7 +261,8 @@
        "production": {
          "buildTarget": "client:build:production"
        }
-      }
+      },
+      "continuous": true
    },
    "extract-i18n": {
      "executor": "ng-extract-i18n-merge:ng-extract-i18n-merge",
@ -247,55 +298,5 @@
      },
      "outputs": ["{workspaceRoot}/coverage/apps/client"]
    }
-  },
-  "i18n": {
-    "locales": {
-      "ca": {
-        "baseHref": "/ca/",
-        "translation": "apps/client/src/locales/messages.ca.xlf"
-      },
-      "de": {
-        "baseHref": "/de/",
-        "translation": "apps/client/src/locales/messages.de.xlf"
-      },
-      "es": {
-        "baseHref": "/es/",
-        "translation": "apps/client/src/locales/messages.es.xlf"
-      },
-      "fr": {
-        "baseHref": "/fr/",
-        "translation": "apps/client/src/locales/messages.fr.xlf"
-      },
-      "it": {
-        "baseHref": "/it/",
-        "translation": "apps/client/src/locales/messages.it.xlf"
-      },
-      "nl": {
-        "baseHref": "/nl/",
-        "translation": "apps/client/src/locales/messages.nl.xlf"
-      },
-      "pl": {
-        "baseHref": "/pl/",
-        "translation": "apps/client/src/locales/messages.pl.xlf"
-      },
-      "pt": {
-        "baseHref": "/pt/",
-        "translation": "apps/client/src/locales/messages.pt.xlf"
-      },
-      "tr": {
-        "baseHref": "/tr/",
-        "translation": "apps/client/src/locales/messages.tr.xlf"
-      },
-      "uk": {
-        "baseHref": "/uk/",
-        "translation": "apps/client/src/locales/messages.uk.xlf"
-      },
-      "zh": {
-        "baseHref": "/zh/",
-        "translation": "apps/client/src/locales/messages.zh.xlf"
-      }
-    },
-    "sourceLocale": "en"
-  },
-  "tags": []
+  }
 }
--- a/apps/ui-e2e/project.json
+++ b/apps/ui-e2e/project.json
@ -3,13 +3,14 @@
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
  "sourceRoot": "apps/ui-e2e/src",
  "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["ui"],
  "targets": {
    "e2e": {
      "executor": "@nx/cypress:cypress",
      "options": {
        "cypressConfig": "apps/ui-e2e/cypress.json",
-        "devServerTarget": "ui:storybook",
-        "tsConfig": "apps/ui-e2e/tsconfig.json"
+        "devServerTarget": "ui:storybook"
      },
      "configurations": {
        "ci": {
@ -23,7 +24,5 @@
        "lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"]
      }
    }
-  },
-  "tags": [],
-  "implicitDependencies": ["ui"]
+  }
 }
--- a/nx.json
+++ b/nx.json
@ -72,6 +72,5 @@
    ]
  },
  "parallel": 1,
-  "defaultBase": "origin/main",
-  "useLegacyCache": true
+  "defaultBase": "origin/main"
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ghostfolio",
-  "version": "2.165.0",
+  "version": "2.166.0",
  "homepage": "https://ghostfol.io",
  "license": "AGPL-3.0",
  "repository": "https://github.com/ghostfolio/ghostfolio",
@ -154,17 +154,17 @@
    "@eslint/js": "9.24.0",
    "@nestjs/schematics": "11.0.5",
    "@nestjs/testing": "11.1.0",
-    "@nx/angular": "20.8.1",
-    "@nx/cypress": "20.8.1",
-    "@nx/eslint-plugin": "20.8.1",
-    "@nx/jest": "20.8.1",
-    "@nx/js": "20.8.1",
-    "@nx/module-federation": "20.8.1",
-    "@nx/nest": "20.8.1",
-    "@nx/node": "20.8.1",
-    "@nx/storybook": "20.8.1",
-    "@nx/web": "20.8.1",
-    "@nx/workspace": "20.8.1",
+    "@nx/angular": "21.1.2",
+    "@nx/cypress": "21.1.2",
+    "@nx/eslint-plugin": "21.1.2",
+    "@nx/jest": "21.1.2",
+    "@nx/js": "21.1.2",
+    "@nx/module-federation": "21.1.2",
+    "@nx/nest": "21.1.2",
+    "@nx/node": "21.1.2",
+    "@nx/storybook": "21.1.2",
+    "@nx/web": "21.1.2",
+    "@nx/workspace": "21.1.2",
    "@schematics/angular": "19.2.1",
    "@storybook/addon-essentials": "8.6.12",
    "@storybook/addon-interactions": "8.6.12",
@ -191,7 +191,7 @@
    "jest": "29.7.0",
    "jest-environment-jsdom": "29.7.0",
    "jest-preset-angular": "14.4.2",
-    "nx": "20.8.1",
+    "nx": "21.1.2",
    "prettier": "3.5.3",
    "prettier-plugin-organize-attributes": "1.0.0",
    "prisma": "6.8.2",