From 89022f91301423a7e395d4d8661ef04ec3bf44f7 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 8 Jun 2025 13:30:33 +0200 Subject: [PATCH] Add routerLink for subRoutes --- .../account-detail-dialog.component.ts | 10 ++-------- .../holding-detail-dialog.component.ts | 10 ++-------- .../home-holdings/home-holdings.component.ts | 6 ++---- .../home-overview/home-overview.component.ts | 6 ++---- apps/client/src/app/pages/home/home-page.component.ts | 5 +---- .../app/pages/portfolio/portfolio-page.component.ts | 5 +---- apps/client/src/app/pages/zen/zen-page.component.ts | 5 +---- libs/common/src/lib/routes.ts | 6 +++--- .../no-transactions-info.component.ts | 6 ++---- 9 files changed, 16 insertions(+), 43 deletions(-) diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts index a753270e8..aea1c544c 100644 --- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts +++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts @@ -94,10 +94,7 @@ export class AccountDetailDialog implements OnDestroy, OnInit { public onCloneActivity(aActivity: Activity) { this.router.navigate( - [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ], + internalRoutes.portfolio.subRoutes.activities.routerLink, { queryParams: { activityId: aActivity.id, createDialog: true } } @@ -159,10 +156,7 @@ export class AccountDetailDialog implements OnDestroy, OnInit { public onUpdateActivity(aActivity: Activity) { this.router.navigate( - [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ], + internalRoutes.portfolio.subRoutes.activities.routerLink, { queryParams: { activityId: aActivity.id, editDialog: true } } diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts index 2630569bb..6e8fc2af5 100644 --- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts +++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts @@ -471,10 +471,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public onCloneActivity(aActivity: Activity) { this.router.navigate( - [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ], + internalRoutes.portfolio.subRoutes.activities.routerLink, { queryParams: { activityId: aActivity.id, createDialog: true } } @@ -519,10 +516,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public onUpdateActivity(aActivity: Activity) { this.router.navigate( - [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ], + internalRoutes.portfolio.subRoutes.activities.routerLink, { queryParams: { activityId: aActivity.id, editDialog: true } } diff --git a/apps/client/src/app/components/home-holdings/home-holdings.component.ts b/apps/client/src/app/components/home-holdings/home-holdings.component.ts index c84d2b7d7..03de79f44 100644 --- a/apps/client/src/app/components/home-holdings/home-holdings.component.ts +++ b/apps/client/src/app/components/home-holdings/home-holdings.component.ts @@ -37,10 +37,8 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit { { label: $localize`Active`, value: 'ACTIVE' }, { label: $localize`Closed`, value: 'CLOSED' } ]; - public routerLinkPortfolioActivities = [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ]; + public routerLinkPortfolioActivities = + internalRoutes.portfolio.subRoutes.activities.routerLink; public user: User; public viewModeFormControl = new FormControl( HomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE diff --git a/apps/client/src/app/components/home-overview/home-overview.component.ts b/apps/client/src/app/components/home-overview/home-overview.component.ts index e960dd078..776967c3d 100644 --- a/apps/client/src/app/components/home-overview/home-overview.component.ts +++ b/apps/client/src/app/components/home-overview/home-overview.component.ts @@ -39,10 +39,8 @@ export class HomeOverviewComponent implements OnDestroy, OnInit { public precision = 2; public routerLinkAccounts = internalRoutes.accounts.routerLink; public routerLinkPortfolio = internalRoutes.portfolio.routerLink; - public routerLinkPortfolioActivities = [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ]; + public routerLinkPortfolioActivities = + internalRoutes.portfolio.subRoutes.activities.routerLink; public showDetails = false; public unit: string; public user: User; diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts index 3b029ba0d..870930b4e 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -42,10 +42,7 @@ export class HomePageComponent implements OnDestroy, OnInit { { iconName: 'wallet-outline', label: internalRoutes.home.subRoutes.holdings.title, - path: [ - '/' + internalRoutes.home.path, - internalRoutes.home.subRoutes.holdings.path - ] + path: internalRoutes.home.subRoutes.holdings.routerLink }, { iconName: 'reader-outline', diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts index 543144700..8e0748f64 100644 --- a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts +++ b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts @@ -39,10 +39,7 @@ export class PortfolioPageComponent implements OnDestroy, OnInit { { iconName: 'swap-vertical-outline', label: internalRoutes.portfolio.subRoutes.activities.title, - path: [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ] + path: internalRoutes.portfolio.subRoutes.activities.routerLink }, { iconName: 'pie-chart-outline', diff --git a/apps/client/src/app/pages/zen/zen-page.component.ts b/apps/client/src/app/pages/zen/zen-page.component.ts index a1f876002..ae15c1532 100644 --- a/apps/client/src/app/pages/zen/zen-page.component.ts +++ b/apps/client/src/app/pages/zen/zen-page.component.ts @@ -39,10 +39,7 @@ export class ZenPageComponent implements OnDestroy, OnInit { { iconName: 'wallet-outline', label: internalRoutes.zen.subRoutes.holdings.title, - path: [ - '/' + internalRoutes.zen.path, - internalRoutes.zen.subRoutes.holdings.path - ] + path: internalRoutes.zen.subRoutes.holdings.routerLink } ]; this.user = state.user; diff --git a/libs/common/src/lib/routes.ts b/libs/common/src/lib/routes.ts index 103db28e5..bf4b40fee 100644 --- a/libs/common/src/lib/routes.ts +++ b/libs/common/src/lib/routes.ts @@ -57,7 +57,7 @@ export const internalRoutes = { subRoutes: { holdings: { path: 'holdings', - routerLink: [], // TODO + routerLink: ['/home', 'holdings'], title: $localize`Holdings` } }, @@ -69,7 +69,7 @@ export const internalRoutes = { subRoutes: { activities: { path: 'activities', - routerLink: [], // TODO + routerLink: ['/portfolio', 'activities'], title: $localize`Activities` } }, @@ -82,7 +82,7 @@ export const internalRoutes = { subRoutes: { holdings: { path: 'holdings', - routerLink: [], // TODO + routerLink: ['/zen', 'holdings'], title: $localize`Holdings` } }, diff --git a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts index e7537a9d3..f948edcca 100644 --- a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts +++ b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts @@ -23,8 +23,6 @@ import { GfLogoComponent } from '../logo'; export class GfNoTransactionsInfoComponent { @HostBinding('class.has-border') @Input() hasBorder = true; - public routerLinkPortfolioActivities = [ - '/' + internalRoutes.portfolio.path, - internalRoutes.portfolio.subRoutes.activities.path - ]; + public routerLinkPortfolioActivities = + internalRoutes.portfolio.subRoutes.activities.routerLink; }