Browse Source

Merge branch 'main' into task/improve-grantee-display-in-access-table

pull/7135/head
Thomas Kaul 3 weeks ago
committed by GitHub
parent
commit
90f7f8b6ed
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      CHANGELOG.md
  2. 2
      apps/client/src/app/components/admin-jobs/admin-jobs.html
  3. 4
      apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts
  4. 8
      libs/common/src/lib/personal-finance-tools.ts
  5. 40
      package-lock.json
  6. 6
      package.json

5
CHANGELOG.md

@ -10,8 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Improved the grantee display in the access table to share the portfolio - Improved the grantee display in the access table to share the portfolio
- Upgraded `bull-board` from version `7.2.1` to `8.0.1`
- Upgraded `prettier` from version `3.8.3` to `3.8.4` - Upgraded `prettier` from version `3.8.3` to `3.8.4`
### Fixed
- Improved the table headers’ alignment in the queue jobs table of the admin control panel
## 3.16.0 - 2026-06-24 ## 3.16.0 - 2026-06-24
### Added ### Added

2
apps/client/src/app/components/admin-jobs/admin-jobs.html

@ -27,7 +27,7 @@
<ng-container matColumnDef="index"> <ng-container matColumnDef="index">
<th <th
*matHeaderCellDef *matHeaderCellDef
class="px-1 py-2 text-right" class="justify-content-end px-1 py-2"
mat-header-cell mat-header-cell
mat-sort-header="id" mat-sort-header="id"
> >

4
apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts

@ -70,7 +70,9 @@ export class GfProductPageComponent {
if (mappedProduct.regions) { if (mappedProduct.regions) {
mappedProduct.regions = mappedProduct.regions.map((region) => { mappedProduct.regions = mappedProduct.regions.map((region) => {
return translate(region); return region === 'Global'
? translate(region)
: getCountryName({ code: region });
}); });
} }

8
libs/common/src/lib/personal-finance-tools.ts

@ -780,7 +780,7 @@ export const personalFinanceTools: Product[] = [
note: 'Maybe Finance was discontinued in 2023, relaunched in 2024, and discontinued again in 2025', note: 'Maybe Finance was discontinued in 2023, relaunched in 2024, and discontinued again in 2025',
origin: 'US', origin: 'US',
pricingPerYear: '$145', pricingPerYear: '$145',
regions: ['United States'], regions: ['US'],
slogan: 'Your financial future, in your control', slogan: 'Your financial future, in your control',
url: 'https://github.com/maybe-finance/maybe' url: 'https://github.com/maybe-finance/maybe'
}, },
@ -792,7 +792,7 @@ export const personalFinanceTools: Product[] = [
name: 'Merlin', name: 'Merlin',
origin: 'US', origin: 'US',
pricingPerYear: '$204', pricingPerYear: '$204',
regions: ['Canada', 'United States'], regions: ['CA', 'US'],
slogan: 'The smartest way to track your crypto', slogan: 'The smartest way to track your crypto',
url: 'https://www.merlincrypto.com' url: 'https://www.merlincrypto.com'
}, },
@ -967,7 +967,7 @@ export const personalFinanceTools: Product[] = [
note: 'Originally named as Tresor One', note: 'Originally named as Tresor One',
origin: 'DE', origin: 'DE',
pricingPerYear: '€99.99', pricingPerYear: '€99.99',
regions: ['Austria', 'Germany', 'Switzerland'], regions: ['AT', 'CH', 'DE'],
slogan: 'Dein Vermögen immer im Blick', slogan: 'Dein Vermögen immer im Blick',
url: 'https://www.parqet.com' url: 'https://www.parqet.com'
}, },
@ -1354,7 +1354,7 @@ export const personalFinanceTools: Product[] = [
name: 'Tresor One', name: 'Tresor One',
note: 'Renamed to Parqet', note: 'Renamed to Parqet',
origin: 'DE', origin: 'DE',
regions: ['Austria', 'Germany', 'Switzerland'], regions: ['AT', 'CH', 'DE'],
slogan: 'Dein Vermögen immer im Blick' slogan: 'Dein Vermögen immer im Blick'
}, },
{ {

40
package-lock.json

@ -21,9 +21,9 @@
"@angular/platform-browser-dynamic": "21.2.7", "@angular/platform-browser-dynamic": "21.2.7",
"@angular/router": "21.2.7", "@angular/router": "21.2.7",
"@angular/service-worker": "21.2.7", "@angular/service-worker": "21.2.7",
"@bull-board/api": "7.2.1", "@bull-board/api": "8.0.1",
"@bull-board/express": "7.2.1", "@bull-board/express": "8.0.1",
"@bull-board/nestjs": "7.2.1", "@bull-board/nestjs": "8.0.1",
"@codewithdan/observable-store": "2.2.15", "@codewithdan/observable-store": "2.2.15",
"@date-fns/utc": "2.1.1", "@date-fns/utc": "2.1.1",
"@internationalized/number": "3.6.7", "@internationalized/number": "3.6.7",
@ -3543,25 +3543,25 @@
"license": "(Apache-2.0 AND BSD-3-Clause)" "license": "(Apache-2.0 AND BSD-3-Clause)"
}, },
"node_modules/@bull-board/api": { "node_modules/@bull-board/api": {
"version": "7.2.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/@bull-board/api/-/api-7.2.1.tgz", "resolved": "https://registry.npmjs.org/@bull-board/api/-/api-8.0.1.tgz",
"integrity": "sha512-ldRG4POJLHf6oDrbDA7AsbTKliBmV4eySlwdUAumiRDtfvtbRSdXGE4Md2uPDova1r/ck7ExEe1+pHEQAZElqw==", "integrity": "sha512-7FELJHRQPtjH9+r/DUArr4pDVU8r1yeDS9azQUzFtIbsUT5xGjyg5R1RB0I/RfwFfK5bqho/4cpzxJ/UnQjSKA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"redis-info": "^3.1.0" "redis-info": "^3.1.0"
}, },
"peerDependencies": { "peerDependencies": {
"@bull-board/ui": "7.2.1" "@bull-board/ui": "8.0.1"
} }
}, },
"node_modules/@bull-board/express": { "node_modules/@bull-board/express": {
"version": "7.2.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/@bull-board/express/-/express-7.2.1.tgz", "resolved": "https://registry.npmjs.org/@bull-board/express/-/express-8.0.1.tgz",
"integrity": "sha512-tBr/xV5letzKYPRGRkilTQZmfoCoy3mCuUo4M2dDoDKOhbrF360mK5v9/rIcSgYSyI9c7BgEgrve80LhmexNxQ==", "integrity": "sha512-VOEhLNlaaVk3mBBoREXO/Dopzr9rKK5TpOGyaCbcnpzLKlrlwhj6BAeWWreB7/3Wu+pNnbKmrAhK8OOnYdzxLg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@bull-board/api": "7.2.1", "@bull-board/api": "8.0.1",
"@bull-board/ui": "7.2.1", "@bull-board/ui": "8.0.1",
"ejs": "^6.0.1", "ejs": "^6.0.1",
"express": "^5.2.1" "express": "^5.2.1"
} }
@ -3579,12 +3579,12 @@
} }
}, },
"node_modules/@bull-board/nestjs": { "node_modules/@bull-board/nestjs": {
"version": "7.2.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/@bull-board/nestjs/-/nestjs-7.2.1.tgz", "resolved": "https://registry.npmjs.org/@bull-board/nestjs/-/nestjs-8.0.1.tgz",
"integrity": "sha512-Uq2Z3+0ORgHJSw4TDV1kBrHdksRnK8CZdda63hrStduPnvKHPBxIZUGNfBN/vL08UqizpNkjFmNyNXiHOgf0LQ==", "integrity": "sha512-yBB+S7ibdrcO6y01VQTzd51Qxx19bPnte5TSdA59BWSeH6oVagB+EkCqHXTbfdGrvLrwZEF3tnSCE6339nB7MQ==",
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {
"@bull-board/api": "^7.2.1", "@bull-board/api": "^8.0.1",
"@nestjs/bull-shared": "^10.0.0 || ^11.0.0", "@nestjs/bull-shared": "^10.0.0 || ^11.0.0",
"@nestjs/common": "^9.0.0 || ^10.0.0 || ^11.0.0", "@nestjs/common": "^9.0.0 || ^10.0.0 || ^11.0.0",
"@nestjs/core": "^9.0.0 || ^10.0.0 || ^11.0.0", "@nestjs/core": "^9.0.0 || ^10.0.0 || ^11.0.0",
@ -3593,12 +3593,12 @@
} }
}, },
"node_modules/@bull-board/ui": { "node_modules/@bull-board/ui": {
"version": "7.2.1", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/@bull-board/ui/-/ui-7.2.1.tgz", "resolved": "https://registry.npmjs.org/@bull-board/ui/-/ui-8.0.1.tgz",
"integrity": "sha512-O4ykrXrl2UJNHnhJrCvJxrw1ar+DlUBgyZUeZ8Ci+Ne5Wbq6rBv1gfpQH54/eu3IFbLso0S/kjc6WUGb2HPqZw==", "integrity": "sha512-gKEGSD8dlUoWFGJJ4I4Q5bDtfB7yJwGfpgA2DVn1G1TzlUSN5n4fzzcGpLf5fS+QhR7tB/niydUiFRQ2zrjVrQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@bull-board/api": "7.2.1" "@bull-board/api": "8.0.1"
} }
}, },
"node_modules/@cacheable/utils": { "node_modules/@cacheable/utils": {

6
package.json

@ -65,9 +65,9 @@
"@angular/platform-browser-dynamic": "21.2.7", "@angular/platform-browser-dynamic": "21.2.7",
"@angular/router": "21.2.7", "@angular/router": "21.2.7",
"@angular/service-worker": "21.2.7", "@angular/service-worker": "21.2.7",
"@bull-board/api": "7.2.1", "@bull-board/api": "8.0.1",
"@bull-board/express": "7.2.1", "@bull-board/express": "8.0.1",
"@bull-board/nestjs": "7.2.1", "@bull-board/nestjs": "8.0.1",
"@codewithdan/observable-store": "2.2.15", "@codewithdan/observable-store": "2.2.15",
"@date-fns/utc": "2.1.1", "@date-fns/utc": "2.1.1",
"@internationalized/number": "3.6.7", "@internationalized/number": "3.6.7",

Loading…
Cancel
Save