Merge branch 'ghostfolio:main' into feature/extend-holdings-endpoint-for-cash

CHANGELOG.md

@@ -10,7 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Lifted the asset profile identifier editing restriction for `MANUAL` data sources in the asset profile details dialog of the admin control panel
+- Upgraded `angular` from version `20.2.4` to `20.3.9`
+- Upgraded `ng-extract-i18n-merge` from `3.1.0` to `3.2.1`
+- Upgraded `Nx` from version `21.5.1` to `22.1.3`
 - Upgraded `shx` from version `0.3.4` to `0.4.0`
+- Upgraded `storybook` from version `9.1.5` to `10.1.10`
 
 ### Fixed
 

apps/api/src/app/platform/platform.controller.ts

@@ -25,7 +25,7 @@ export class PlatformController {
   public constructor(private readonly platformService: PlatformService) {}
 
   @Get()
-  @HasPermission(permissions.readPlatforms)
+  @HasPermission(permissions.readPlatformsWithAccountCount)
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
   public async getPlatforms() {
     return this.platformService.getPlatformsWithAccountCount();

libs/common/src/lib/permissions.ts

@@ -45,6 +45,7 @@ export const permissions = {
   readMarketDataOfMarkets: 'readMarketDataOfMarkets',
   readMarketDataOfOwnAssetProfile: 'readMarketDataOfOwnAssetProfile',
   readPlatforms: 'readPlatforms',
+  readPlatformsWithAccountCount: 'readPlatformsWithAccountCount',
   readTags: 'readTags',
   readWatchlist: 'readWatchlist',
   reportDataGlitch: 'reportDataGlitch',
@@ -92,7 +93,7 @@ export function getPermissions(aRole: Role): string[] {
         permissions.readAiPrompt,
         permissions.readMarketData,
         permissions.readMarketDataOfOwnAssetProfile,
-        permissions.readPlatforms,
+        permissions.readPlatformsWithAccountCount,
         permissions.readTags,
         permissions.readWatchlist,
         permissions.updateAccount,

libs/ui/project.json

@@ -31,12 +31,7 @@
         "browserTarget": "ui:build-storybook",
         "compodoc": false,
         "configDir": "libs/ui/.storybook",
-        "port": 4400,
-        "styles": [
-          "apps/client/src/assets/fonts/inter.css",
-          "apps/client/src/styles/theme.scss",
-          "apps/client/src/styles.scss"
-        ]
+        "port": 4400
       },
       "configurations": {
         "ci": {

libs/ui/tsconfig.json

@@ -14,6 +14,7 @@
     }
   ],
   "compilerOptions": {
+    "moduleResolution": "bundler",
     "target": "es2020",
     // TODO: Remove once solved in tsconfig.base.json
     "strict": false,

package.json

@@ -54,17 +54,17 @@
     "workspace-generator": "nx workspace-generator"
   },
   "dependencies": {
-    "@angular/animations": "20.2.4",
-    "@angular/cdk": "20.2.2",
-    "@angular/common": "20.2.4",
-    "@angular/compiler": "20.2.4",
-    "@angular/core": "20.2.4",
-    "@angular/forms": "20.2.4",
-    "@angular/material": "20.2.2",
-    "@angular/platform-browser": "20.2.4",
-    "@angular/platform-browser-dynamic": "20.2.4",
-    "@angular/router": "20.2.4",
-    "@angular/service-worker": "20.2.4",
+    "@angular/animations": "20.3.9",
+    "@angular/cdk": "20.2.9",
+    "@angular/common": "20.3.9",
+    "@angular/compiler": "20.3.9",
+    "@angular/core": "20.3.9",
+    "@angular/forms": "20.3.9",
+    "@angular/material": "20.2.9",
+    "@angular/platform-browser": "20.3.9",
+    "@angular/platform-browser-dynamic": "20.3.9",
+    "@angular/router": "20.3.9",
+    "@angular/service-worker": "20.3.9",
     "@codewithdan/observable-store": "2.2.15",
     "@date-fns/utc": "2.1.0",
     "@internationalized/number": "3.6.5",
@@ -116,7 +116,7 @@
     "lodash": "4.17.21",
     "marked": "15.0.4",
     "ms": "3.0.0-canary.1",
-    "ng-extract-i18n-merge": "3.1.0",
+    "ng-extract-i18n-merge": "3.2.1",
     "ngx-device-detector": "10.1.0",
     "ngx-markdown": "20.0.0",
     "ngx-skeleton-loader": "11.3.0",
@@ -138,34 +138,34 @@
     "zone.js": "0.15.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "20.2.2",
-    "@angular-devkit/core": "20.2.2",
-    "@angular-devkit/schematics": "20.2.2",
-    "@angular-eslint/eslint-plugin": "20.2.0",
-    "@angular-eslint/eslint-plugin-template": "20.2.0",
-    "@angular-eslint/template-parser": "20.2.0",
-    "@angular/cli": "20.2.2",
-    "@angular/compiler-cli": "20.2.4",
-    "@angular/language-service": "20.2.4",
-    "@angular/localize": "20.2.4",
-    "@angular/pwa": "20.2.2",
+    "@angular-devkit/build-angular": "20.3.9",
+    "@angular-devkit/core": "20.3.9",
+    "@angular-devkit/schematics": "20.3.9",
+    "@angular-eslint/eslint-plugin": "20.7.0",
+    "@angular-eslint/eslint-plugin-template": "20.7.0",
+    "@angular-eslint/template-parser": "20.7.0",
+    "@angular/cli": "20.3.9",
+    "@angular/compiler-cli": "20.3.9",
+    "@angular/language-service": "20.3.9",
+    "@angular/localize": "20.3.9",
+    "@angular/pwa": "20.3.9",
     "@eslint/eslintrc": "3.3.1",
     "@eslint/js": "9.35.0",
     "@nestjs/schematics": "11.0.9",
     "@nestjs/testing": "11.1.8",
-    "@nx/angular": "21.5.1",
-    "@nx/eslint-plugin": "21.5.1",
-    "@nx/jest": "21.5.1",
-    "@nx/js": "21.5.1",
-    "@nx/module-federation": "21.5.1",
-    "@nx/nest": "21.5.1",
-    "@nx/node": "21.5.1",
-    "@nx/storybook": "21.5.1",
-    "@nx/web": "21.5.1",
-    "@nx/workspace": "21.5.1",
-    "@schematics/angular": "20.2.2",
-    "@storybook/addon-docs": "9.1.5",
-    "@storybook/angular": "9.1.5",
+    "@nx/angular": "22.1.3",
+    "@nx/eslint-plugin": "22.1.3",
+    "@nx/jest": "22.1.3",
+    "@nx/js": "22.1.3",
+    "@nx/module-federation": "22.1.3",
+    "@nx/nest": "22.1.3",
+    "@nx/node": "22.1.3",
+    "@nx/storybook": "22.1.3",
+    "@nx/web": "22.1.3",
+    "@nx/workspace": "22.1.3",
+    "@schematics/angular": "20.3.9",
+    "@storybook/addon-docs": "10.1.10",
+    "@storybook/angular": "10.1.10",
     "@trivago/prettier-plugin-sort-imports": "5.2.2",
     "@types/big.js": "6.2.2",
     "@types/google-spreadsheet": "3.1.5",
@@ -180,12 +180,12 @@
     "eslint": "9.35.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-storybook": "9.1.5",
+    "eslint-plugin-storybook": "10.1.10",
     "husky": "9.1.7",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jest-preset-angular": "14.6.0",
-    "nx": "21.5.1",
+    "nx": "22.1.3",
     "prettier": "3.7.4",
     "prettier-plugin-organize-attributes": "1.0.0",
     "prisma": "6.19.0",
@@ -193,7 +193,7 @@
     "react-dom": "18.2.0",
     "replace-in-file": "8.3.0",
     "shx": "0.4.0",
-    "storybook": "9.1.5",
+    "storybook": "10.1.10",
     "ts-jest": "29.4.0",
     "ts-node": "10.9.2",
     "tslib": "2.8.1",