From b0c53d050ab94d65b8aaf1b6e82ba6b27d1a608e Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 9 Jul 2024 18:20:25 +0200
Subject: [PATCH 01/14] Feature/harmonize delete labels in admin market data
(#3552)
---
.../src/app/components/admin-market-data/admin-market-data.html | 2 +-
.../components/admin-market-data/admin-market-data.service.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index 00931d77c..3dc3dd5a9 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -178,7 +178,7 @@
[disabled]="!selection.hasValue()"
(click)="onDeleteAssetProfiles()"
>
- Delete Asset Profiles
+ Delete Profiles
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
index ded1a2263..0753327f6 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
@@ -42,7 +42,7 @@ export class AdminMarketDataService {
forkJoin(deleteRequests)
.pipe(
catchError(() => {
- alert($localize`Oops! Could not delete asset profiles.`);
+ alert($localize`Oops! Could not delete profiles.`);
return EMPTY;
}),
From 744dc51dcd5ba6061e13cebef2757de5617f6d9a Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 9 Jul 2024 18:42:03 +0200
Subject: [PATCH 02/14] Bugfix/fix pagination issue in activities endpoint by
adding secondary sort criterion (#3554)
* Add id as secondary sort criterion to ensure consistent ordering
* Update changelog
---
CHANGELOG.md | 6 ++++++
apps/api/src/app/order/order.service.ts | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2320e41f..408708fea 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 a pagination issue in the activities endpoint by adding `id` as a secondary sort criterion to `date` to ensure consistent ordering
+
## 2.93.0 - 2024-07-07
### Added
diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index a1fa4db6c..0255a5011 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -291,7 +291,8 @@ export class OrderService {
withExcludedAccounts?: boolean;
}): Promise {
let orderBy: Prisma.Enumerable = [
- { date: 'asc' }
+ { date: 'asc' },
+ { id: 'asc' }
];
const where: Prisma.OrderWhereInput = { userId };
@@ -367,7 +368,7 @@ export class OrderService {
}
if (sortColumn) {
- orderBy = [{ [sortColumn]: sortDirection }];
+ orderBy = [{ [sortColumn]: sortDirection }, { id: sortDirection }];
}
if (types) {
From 5dc331e3863577dcf53bbe61248216aa7025d91c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 9 Jul 2024 18:43:20 +0200
Subject: [PATCH 03/14] Feature/improve language localization for de 20240709
(#3555)
* Update translations
* Update changelog
---
CHANGELOG.md | 4 +
.../admin-market-data.service.ts | 2 +-
apps/client/src/locales/messages.de.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.es.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.fr.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.it.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.nl.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.pl.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.pt.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.tr.xlf | 158 +++++++++++-------
apps/client/src/locales/messages.xlf | 154 ++++++++++-------
apps/client/src/locales/messages.zh.xlf | 158 +++++++++++-------
12 files changed, 951 insertions(+), 631 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 408708fea..c322a4c6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
+### Changed
+
+- Improved the language localization for German (`de`)
+
### Fixed
- Fixed a pagination issue in the activities endpoint by adding `id` as a secondary sort criterion to `date` to ensure consistent ordering
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
index 0753327f6..8f3084cd8 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
@@ -31,7 +31,7 @@ export class AdminMarketDataService {
public deleteAssetProfiles(uniqueAssets: UniqueAsset[]) {
const confirmation = confirm(
- $localize`Do you really want to delete these asset profiles?`
+ $localize`Do you really want to delete these profiles?`
);
if (confirmation) {
diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf
index 2a8923cbf..4a4462405 100644
--- a/apps/client/src/locales/messages.de.xlf
+++ b/apps/client/src/locales/messages.de.xlf
@@ -94,7 +94,7 @@
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 150
+ 152
apps/client/src/app/components/admin-tag/admin-tag.component.html
@@ -126,11 +126,11 @@
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 38
+ 60
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 226
+ 228
apps/client/src/app/components/admin-platform/admin-platform.component.html
@@ -250,7 +250,7 @@
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 177
+ 206
apps/client/src/app/components/admin-overview/admin-overview.html
@@ -278,11 +278,11 @@
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 196
+ 227
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 62
+ 64
apps/client/src/app/components/admin-overview/admin-overview.html
@@ -334,11 +334,11 @@
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 24
+ 46
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 115
+ 117
apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html
@@ -358,11 +358,11 @@
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 55
+ 77
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 125
+ 127
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
@@ -490,7 +490,7 @@
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 376
+ 378
apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html
@@ -534,7 +534,7 @@
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 383
+ 385
apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html
@@ -566,11 +566,11 @@
Erste Aktivität
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 82
+ 104
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 141
+ 143
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -594,11 +594,11 @@
Historische Daten
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 100
+ 122
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 82
+ 84
@@ -662,7 +662,7 @@
Letzte Daten einholen
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 146
+ 168
@@ -670,7 +670,7 @@
Alle Daten einholen
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 149
+ 171
@@ -678,7 +678,7 @@
Profildaten herunterladen
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 152
+ 174
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@@ -1006,7 +1006,7 @@
Registrieren
apps/client/src/app/pages/features/features-page.html
- 300
+ 301
apps/client/src/app/pages/public/public-page.html
@@ -1302,11 +1302,11 @@
Sektoren
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 202
+ 204
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 327
+ 329
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -1322,11 +1322,11 @@
Länder
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 212
+ 214
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 338
+ 340
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -1510,15 +1510,15 @@
apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
- 183
+ 184
apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html
- 183
+ 184
apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html
- 183
+ 184
apps/client/src/app/pages/blog/2022/07/how-do-i-get-my-finances-in-order/how-do-i-get-my-finances-in-order-page.html
@@ -1526,7 +1526,7 @@
apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
- 195
+ 196
apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
@@ -1550,7 +1550,7 @@
apps/client/src/app/pages/blog/2023/03/1000-stars-on-github/1000-stars-on-github-page.html
- 252
+ 253
apps/client/src/app/pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.html
@@ -1758,7 +1758,7 @@
apps/client/src/app/pages/features/features-page.html
- 190
+ 191
@@ -1846,11 +1846,11 @@
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 130
+ 132
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 233
+ 235
apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -2282,7 +2282,7 @@
Kommentar
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 363
+ 365
apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -2298,15 +2298,15 @@
Anlageklasse
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 64
+ 86
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 159
+ 161
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 243
+ 245
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -2666,15 +2666,15 @@
Anlageunterklasse
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 73
+ 95
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 168
+ 170
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 256
+ 258
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -2690,7 +2690,7 @@
Sektor
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 185
+ 187
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html
@@ -2702,7 +2702,7 @@
Land
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 196
+ 198
apps/client/src/app/components/admin-users/admin-users.html
@@ -2798,7 +2798,7 @@
Anzahl Länder
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 118
+ 140
@@ -2806,7 +2806,7 @@
Anzahl Sektoren
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 109
+ 131
@@ -2838,7 +2838,7 @@
Filtern nach...
apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
- 282
+ 300
@@ -3234,7 +3234,7 @@
apps/client/src/app/pages/features/features-page.html
- 256
+ 257
@@ -3242,7 +3242,7 @@
Anzahl Aktivitäten
apps/client/src/app/components/admin-market-data/admin-market-data.html
- 91
+ 113
@@ -3258,7 +3258,7 @@
Symbol Zuordnung
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 290
+ 292
@@ -3310,7 +3310,7 @@
Importieren
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 108
+ 110
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
@@ -3722,7 +3722,7 @@
apps/client/src/app/pages/features/features-page.html
- 160
+ 161
apps/client/src/app/pages/pricing/pricing-page.html
@@ -3926,7 +3926,7 @@
Url
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 350
+ 352
apps/client/src/app/components/admin-platform/admin-platform.component.html
@@ -4266,7 +4266,7 @@
Dark Mode
apps/client/src/app/pages/features/features-page.html
- 177
+ 178
@@ -4274,7 +4274,7 @@
Marktstimmung
apps/client/src/app/pages/features/features-page.html
- 205
+ 206
@@ -4282,7 +4282,7 @@
Statische Analyse
apps/client/src/app/pages/features/features-page.html
- 224
+ 225
@@ -4290,7 +4290,7 @@
Mehrsprachigkeit
apps/client/src/app/pages/features/features-page.html
- 241
+ 242
@@ -4298,7 +4298,7 @@
Open Source Software
apps/client/src/app/pages/features/features-page.html
- 275
+ 276
@@ -4314,7 +4314,7 @@
Scraper Konfiguration
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 302
+ 304
@@ -4510,7 +4510,7 @@
Lexikon
apps/client/src/app/pages/resources/resources-page.html
- 92
+ 124
@@ -4562,7 +4562,7 @@
ETFs ohne Länder
apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
- 78
+ 84
@@ -4570,7 +4570,7 @@
ETFs ohne Sektoren
apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
- 83
+ 89
@@ -4798,7 +4798,7 @@
Währungen
apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
- 73
+ 79
@@ -5834,7 +5834,7 @@
Benchmark
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 284
+ 286
@@ -5934,7 +5934,7 @@
Möchtest du dieses Anlageprofil wirklich löschen?
apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
- 13
+ 18
@@ -6134,7 +6134,7 @@
Test
apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
- 320
+ 322
@@ -6625,6 +6625,38 @@
81
+
+ Benchmarks
+ Benchmarks
+
+ apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+ 74
+
+
+
+ Delete Profiles
+ Profile löschen
+
+ apps/client/src/app/components/admin-market-data/admin-market-data.html
+ 181
+
+
+
+ Do you really want to delete these profiles?
+ Möchtest du diese Profile wirklich löschen?
+
+ apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
+ 34
+
+
+
+ Oops! Could not delete profiles.
+ Ups! Die Profile konnten nicht gelöscht werden.
+
+ apps/client/src/app/components/admin-market-data/admin-market-data.service.ts
+ 45
+
+
diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf
index e3c6b47e6..4bd27a6b2 100644
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@@ -95,7 +95,7 @@