Merge branch 'main' into feat/user_detail_dialog

1 week ago · 2315bf9022
11 changed files with 104 additions and 75 deletions
--- a/.config/prisma.ts
+++ b/.config/prisma.ts
@ -0,0 +1,14 @@
+import { defineConfig } from '@prisma/config';
+import { config } from 'dotenv';
+import { expand } from 'dotenv-expand';
+import { join } from 'node:path';
+
+expand(config({ quiet: true }));
+
+export default defineConfig({
+  migrations: {
+    path: join(__dirname, '..', 'prisma', 'migrations'),
+    seed: `node ${join(__dirname, '..', 'prisma', 'seed.mts')}`
+  },
+  schema: join(__dirname, '..', 'prisma', 'schema.prisma')
+});
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,10 +6,19 @@ 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
+- Added User detail dialog component to view user information in admin users management

- User detail dialog component to view user information in admin users management
+### Added
+
+- Extended the export functionality by the user account’s performance calculation type
+
+### Changed
+
+- Localized the number formatting in the static portfolio analysis rule: _Liquidity_ (Buying Power)
+- Moved the _Prisma Configuration File_ from `prisma.config.ts` to `.config/prisma.ts`
+- Upgraded `prisma` from version `6.17.1` to `6.18.0`

-## 2.210.0 - 2025-10-22
+## 2.210.1 - 2025-10-22

 ### Added

@ -71,7 +80,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed the deprecated endpoint `GET api/v1/portfolio/position/:dataSource/:symbol`
 - Removed the deprecated endpoint `PUT api/v1/portfolio/position/:dataSource/:symbol/tags`
 - Improved the language localization for German (`de`)
- Upgraded `prisma` from version `6.16.1` to `6.16.3`
+- Upgraded `prisma` from version `6.16.1` to `6.17.1`

 ### Fixed

--- a/4
+++ b/4
@ -13,11 +13,11 @@ RUN apt-get update && apt-get install -y --no-install-suggests \

 # Only add basic files without the application itself to avoid rebuilding
 # layers when files (package.json etc.) have not changed
+COPY ./.config .config/
 COPY ./CHANGELOG.md CHANGELOG.md
 COPY ./LICENSE LICENSE
 COPY ./package.json package.json
 COPY ./package-lock.json package-lock.json
-COPY ./prisma.config.ts prisma.config.ts
 COPY ./prisma/schema.prisma prisma/

 RUN npm install
@ -44,7 +44,7 @@ WORKDIR /ghostfolio/dist/apps/api
 COPY ./package-lock.json /ghostfolio/dist/apps/api/

 RUN npm install
-COPY prisma.config.ts /ghostfolio/dist/apps/api/
+COPY .config /ghostfolio/dist/apps/api/.config/
 COPY prisma /ghostfolio/dist/apps/api/prisma/

 # Overwrite the generated package.json with the original one to ensure having
--- a/apps/api/src/app/export/export.controller.ts
+++ b/apps/api/src/app/export/export.controller.ts
@ -48,8 +48,8 @@ export class ExportController {
    return this.exportService.export({
      activityIds,
      filters,
-      userCurrency: this.request.user.settings.settings.baseCurrency,
-      userId: this.request.user.id
+      userId: this.request.user.id,
+      userSettings: this.request.user.settings.settings
    });
  }
 }
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@ -3,7 +3,11 @@ import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { environment } from '@ghostfolio/api/environments/environment';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
-import { ExportResponse, Filter } from '@ghostfolio/common/interfaces';
+import {
+  ExportResponse,
+  Filter,
+  UserSettings
+} from '@ghostfolio/common/interfaces';

 import { Injectable } from '@nestjs/common';
 import { Platform, Prisma } from '@prisma/client';
@ -21,13 +25,13 @@ export class ExportService {
  public async export({
    activityIds,
    filters,
-    userCurrency,
-    userId
+    userId,
+    userSettings
  }: {
    activityIds?: string[];
    filters?: Filter[];
-    userCurrency: string;
    userId: string;
+    userSettings: UserSettings;
  }): Promise<ExportResponse> {
    const { ACCOUNT: filtersByAccount } = groupBy(filters, ({ type }) => {
      return type;
@ -36,11 +40,11 @@ export class ExportService {

    let { activities } = await this.orderService.getOrders({
      filters,
-      userCurrency,
      userId,
      includeDrafts: true,
      sortColumn: 'date',
      sortDirection: 'asc',
+      userCurrency: userSettings?.baseCurrency,
      withExcludedAccountsAndActivities: true
    });

@ -244,7 +248,10 @@ export class ExportService {
        }
      ),
      user: {
-        settings: { currency: userCurrency }
+        settings: {
+          currency: userSettings?.baseCurrency,
+          performanceCalculationType: userSettings?.performanceCalculationType
+        }
      }
    };
  }
--- a/apps/api/src/dependencies.ts
+++ b/apps/api/src/dependencies.ts
@ -0,0 +1,3 @@
+// Dependencies required by .config/prisma.ts in Docker container
+import 'dotenv';
+import 'dotenv-expand';
--- a/apps/api/src/models/rules/liquidity/buying-power.ts
+++ b/apps/api/src/models/rules/liquidity/buying-power.ts
@ -40,7 +40,9 @@ export class BuyingPower extends Rule<Settings> {
          languageCode: this.getLanguageCode(),
          placeholders: {
            baseCurrency: ruleSettings.baseCurrency,
-            thresholdMin: ruleSettings.thresholdMin
+            thresholdMin: ruleSettings.thresholdMin.toLocaleString(
+              ruleSettings.locale
+            )
          }
        }),
        value: false
@ -53,7 +55,9 @@ export class BuyingPower extends Rule<Settings> {
        languageCode: this.getLanguageCode(),
        placeholders: {
          baseCurrency: ruleSettings.baseCurrency,
-          thresholdMin: ruleSettings.thresholdMin
+          thresholdMin: ruleSettings.thresholdMin.toLocaleString(
+            ruleSettings.locale
+          )
        }
      }),
      value: true
--- a/libs/common/src/lib/interfaces/responses/export-response.interface.ts
+++ b/libs/common/src/lib/interfaces/responses/export-response.interface.ts
@ -9,6 +9,7 @@ import {

 import { AccountBalance } from '../account-balance.interface';
 import { MarketData } from '../market-data.interface';
+import { UserSettings } from '../user-settings.interface';

 export interface ExportResponse {
  accounts: (Omit<Account, 'createdAt' | 'updatedAt' | 'userId'> & {
@ -36,5 +37,10 @@ export interface ExportResponse {
  };
  platforms: Platform[];
  tags: Omit<Tag, 'userId'>[];
-  user: { settings: { currency: string } };
+  user: {
+    settings: {
+      currency: UserSettings['baseCurrency'];
+      performanceCalculationType: UserSettings['performanceCalculationType'];
+    };
+  };
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "ghostfolio",
-  "version": "2.210.0",
+  "version": "2.210.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ghostfolio",
-      "version": "2.210.0",
+      "version": "2.210.1",
      "hasInstallScript": true,
      "license": "AGPL-3.0",
      "dependencies": {
@ -43,7 +43,7 @@
        "@nestjs/schedule": "6.0.0",
        "@nestjs/serve-static": "5.0.3",
        "@openrouter/ai-sdk-provider": "0.7.2",
-        "@prisma/client": "6.17.1",
+        "@prisma/client": "6.18.0",
        "@simplewebauthn/browser": "13.1.0",
        "@simplewebauthn/server": "13.1.1",
        "@stripe/stripe-js": "7.9.0",
@ -151,7 +151,7 @@
        "nx": "21.5.1",
        "prettier": "3.6.2",
        "prettier-plugin-organize-attributes": "1.0.0",
-        "prisma": "6.17.1",
+        "prisma": "6.18.0",
        "react": "18.2.0",
        "react-dom": "18.2.0",
        "replace-in-file": "8.3.0",
@ -11983,9 +11983,9 @@
      "license": "MIT"
    },
    "node_modules/@prisma/client": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-6.17.1.tgz",
-      "integrity": "sha512-zL58jbLzYamjnNnmNA51IOZdbk5ci03KviXCuB0Tydc9btH2kDWsi1pQm2VecviRTM7jGia0OPPkgpGnT3nKvw==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-6.18.0.tgz",
+      "integrity": "sha512-jnL2I9gDnPnw4A+4h5SuNn8Gc+1mL1Z79U/3I9eE2gbxJG1oSA+62ByPW4xkeDgwE0fqMzzpAZ7IHxYnLZ4iQA==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "engines": {
@ -12005,66 +12005,66 @@
      }
    },
    "node_modules/@prisma/config": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/@prisma/config/-/config-6.17.1.tgz",
-      "integrity": "sha512-fs8wY6DsvOCzuiyWVckrVs1LOcbY4LZNz8ki4uUIQ28jCCzojTGqdLhN2Jl5lDnC1yI8/gNIKpsWDM8pLhOdwA==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/config/-/config-6.18.0.tgz",
+      "integrity": "sha512-rgFzspCpwsE+q3OF/xkp0fI2SJ3PfNe9LLMmuSVbAZ4nN66WfBiKqJKo/hLz3ysxiPQZf8h1SMf2ilqPMeWATQ==",
      "devOptional": true,
      "license": "Apache-2.0",
      "dependencies": {
        "c12": "3.1.0",
        "deepmerge-ts": "7.1.5",
-        "effect": "3.16.12",
+        "effect": "3.18.4",
        "empathic": "2.0.0"
      }
    },
    "node_modules/@prisma/debug": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.17.1.tgz",
-      "integrity": "sha512-Vf7Tt5Wh9XcndpbmeotuqOMLWPTjEKCsgojxXP2oxE1/xYe7PtnP76hsouG9vis6fctX+TxgmwxTuYi/+xc7dQ==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.18.0.tgz",
+      "integrity": "sha512-PMVPMmxPj0ps1VY75DIrT430MoOyQx9hmm174k6cmLZpcI95rAPXOQ+pp8ANQkJtNyLVDxnxVJ0QLbrm/ViBcg==",
      "devOptional": true,
      "license": "Apache-2.0"
    },
    "node_modules/@prisma/engines": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.17.1.tgz",
-      "integrity": "sha512-D95Ik3GYZkqZ8lSR4EyFOJ/tR33FcYRP8kK61o+WMsyD10UfJwd7+YielflHfKwiGodcqKqoraWw8ElAgMDbPw==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.18.0.tgz",
+      "integrity": "sha512-i5RzjGF/ex6AFgqEe2o1IW8iIxJGYVQJVRau13kHPYEL1Ck8Zvwuzamqed/1iIljs5C7L+Opiz5TzSsUebkriA==",
      "devOptional": true,
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "6.17.1",
-        "@prisma/engines-version": "6.17.1-1.272a37d34178c2894197e17273bf937f25acdeac",
-        "@prisma/fetch-engine": "6.17.1",
-        "@prisma/get-platform": "6.17.1"
+        "@prisma/debug": "6.18.0",
+        "@prisma/engines-version": "6.18.0-8.34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
+        "@prisma/fetch-engine": "6.18.0",
+        "@prisma/get-platform": "6.18.0"
      }
    },
    "node_modules/@prisma/engines-version": {
-      "version": "6.17.1-1.272a37d34178c2894197e17273bf937f25acdeac",
-      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.17.1-1.272a37d34178c2894197e17273bf937f25acdeac.tgz",
-      "integrity": "sha512-17140E3huOuD9lMdJ9+SF/juOf3WR3sTJMVyyenzqUPbuH+89nPhSWcrY+Mf7tmSs6HvaO+7S+HkELinn6bhdg==",
+      "version": "6.18.0-8.34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.18.0-8.34b5a692b7bd79939a9a2c3ef97d816e749cda2f.tgz",
+      "integrity": "sha512-T7Af4QsJQnSgWN1zBbX+Cha5t4qjHRxoeoWpK4JugJzG/ipmmDMY5S+O0N1ET6sCBNVkf6lz+Y+ZNO9+wFU8pQ==",
      "devOptional": true,
      "license": "Apache-2.0"
    },
    "node_modules/@prisma/fetch-engine": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.17.1.tgz",
-      "integrity": "sha512-AYZiHOs184qkDMiTeshyJCtyL4yERkjfTkJiSJdYuSfc24m94lTNL5+GFinZ6vVz+ktX4NJzHKn1zIFzGTWrWg==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.18.0.tgz",
+      "integrity": "sha512-TdaBvTtBwP3IoqVYoGIYpD4mWlk0pJpjTJjir/xLeNWlwog7Sl3bD2J0jJ8+5+q/6RBg+acb9drsv5W6lqae7A==",
      "devOptional": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "6.17.1",
-        "@prisma/engines-version": "6.17.1-1.272a37d34178c2894197e17273bf937f25acdeac",
-        "@prisma/get-platform": "6.17.1"
+        "@prisma/debug": "6.18.0",
+        "@prisma/engines-version": "6.18.0-8.34b5a692b7bd79939a9a2c3ef97d816e749cda2f",
+        "@prisma/get-platform": "6.18.0"
      }
    },
    "node_modules/@prisma/get-platform": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.17.1.tgz",
-      "integrity": "sha512-AKEn6fsfz0r482S5KRDFlIGEaq9wLNcgalD1adL+fPcFFblIKs1sD81kY/utrHdqKuVC6E1XSRpegDK3ZLL4Qg==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.18.0.tgz",
+      "integrity": "sha512-uXNJCJGhxTCXo2B25Ta91Rk1/Nmlqg9p7G9GKh8TPhxvAyXCvMNQoogj4JLEUy+3ku8g59cpyQIKFhqY2xO2bg==",
      "devOptional": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "6.17.1"
+        "@prisma/debug": "6.18.0"
      }
    },
    "node_modules/@redis/client": {
@ -21166,9 +21166,9 @@
      "license": "MIT"
    },
    "node_modules/effect": {
-      "version": "3.16.12",
-      "resolved": "https://registry.npmjs.org/effect/-/effect-3.16.12.tgz",
-      "integrity": "sha512-N39iBk0K71F9nb442TLbTkjl24FLUzuvx2i1I2RsEAQsdAdUTuUoW0vlfUXgkMTUOnYqKnWcFfqw4hK4Pw27hg==",
+      "version": "3.18.4",
+      "resolved": "https://registry.npmjs.org/effect/-/effect-3.18.4.tgz",
+      "integrity": "sha512-b1LXQJLe9D11wfnOKAk3PKxuqYshQ0Heez+y5pnkd3jLj1yx9QhM72zZ9uUrOQyNvrs2GZZd/3maL0ZV18YuDA==",
      "devOptional": true,
      "license": "MIT",
      "dependencies": {
@ -35802,15 +35802,15 @@
      }
    },
    "node_modules/prisma": {
-      "version": "6.17.1",
-      "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.17.1.tgz",
-      "integrity": "sha512-ac6h0sM1Tg3zu8NInY+qhP/S9KhENVaw9n1BrGKQVFu05JT5yT5Qqqmb8tMRIE3ZXvVj4xcRA5yfrsy4X7Yy5g==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.18.0.tgz",
+      "integrity": "sha512-bXWy3vTk8mnRmT+SLyZBQoC2vtV9Z8u7OHvEu+aULYxwiop/CPiFZ+F56KsNRNf35jw+8wcu8pmLsjxpBxAO9g==",
      "devOptional": true,
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/config": "6.17.1",
-        "@prisma/engines": "6.17.1"
+        "@prisma/config": "6.18.0",
+        "@prisma/engines": "6.18.0"
      },
      "bin": {
        "prisma": "build/index.js"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ghostfolio",
-  "version": "2.210.0",
+  "version": "2.210.1",
  "homepage": "https://ghostfol.io",
  "license": "AGPL-3.0",
  "repository": "https://github.com/ghostfolio/ghostfolio",
@ -89,7 +89,7 @@
    "@nestjs/schedule": "6.0.0",
    "@nestjs/serve-static": "5.0.3",
    "@openrouter/ai-sdk-provider": "0.7.2",
-    "@prisma/client": "6.17.1",
+    "@prisma/client": "6.18.0",
    "@simplewebauthn/browser": "13.1.0",
    "@simplewebauthn/server": "13.1.1",
    "@stripe/stripe-js": "7.9.0",
@ -197,7 +197,7 @@
    "nx": "21.5.1",
    "prettier": "3.6.2",
    "prettier-plugin-organize-attributes": "1.0.0",
-    "prisma": "6.17.1",
+    "prisma": "6.18.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "replace-in-file": "8.3.0",
--- a/prisma.config.ts
+++ b/prisma.config.ts
@ -1,14 +0,0 @@
-import { config } from 'dotenv';
-import { expand } from 'dotenv-expand';
-import { join } from 'node:path';
-import { defineConfig } from 'prisma/config';
-
-expand(config({ quiet: true }));
-
-export default defineConfig({
-  migrations: {
-    path: join('prisma', 'migrations'),
-    seed: `node ${join('prisma', 'seed.mts')}`
-  },
-  schema: join('prisma', 'schema.prisma')
-});