Add routerLink for subRoutes

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.subRoutes.activities.routerLink,
-        '/' + internalRoutes.portfolio.path,
-        internalRoutes.portfolio.subRoutes.activities.path
-      ],
       {
         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.subRoutes.activities.routerLink,
-        '/' + internalRoutes.portfolio.path,
-        internalRoutes.portfolio.subRoutes.activities.path
-      ],
       {
         queryParams: { activityId: aActivity.id, editDialog: true }
       }

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.subRoutes.activities.routerLink,
-        '/' + internalRoutes.portfolio.path,
-        internalRoutes.portfolio.subRoutes.activities.path
-      ],
       {
         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.subRoutes.activities.routerLink,
-        '/' + internalRoutes.portfolio.path,
-        internalRoutes.portfolio.subRoutes.activities.path
-      ],
       {
         queryParams: { activityId: aActivity.id, editDialog: true }
       }

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 = [
+  public routerLinkPortfolioActivities =
-    '/' + internalRoutes.portfolio.path,
+    internalRoutes.portfolio.subRoutes.activities.routerLink;
-    internalRoutes.portfolio.subRoutes.activities.path
-  ];
   public user: User;
   public viewModeFormControl = new FormControl<HoldingsViewMode>(
     HomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE

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 = [
+  public routerLinkPortfolioActivities =
-    '/' + internalRoutes.portfolio.path,
+    internalRoutes.portfolio.subRoutes.activities.routerLink;
-    internalRoutes.portfolio.subRoutes.activities.path
-  ];
   public showDetails = false;
   public unit: string;
   public user: User;

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: [
+              path: internalRoutes.home.subRoutes.holdings.routerLink
-                '/' + internalRoutes.home.path,
-                internalRoutes.home.subRoutes.holdings.path
-              ]
             },
             {
               iconName: 'reader-outline',

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: [
+              path: internalRoutes.portfolio.subRoutes.activities.routerLink
-                '/' + internalRoutes.portfolio.path,
-                internalRoutes.portfolio.subRoutes.activities.path
-              ]
             },
             {
               iconName: 'pie-chart-outline',

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: [
+              path: internalRoutes.zen.subRoutes.holdings.routerLink
-                '/' + internalRoutes.zen.path,
-                internalRoutes.zen.subRoutes.holdings.path
-              ]
             }
           ];
           this.user = state.user;

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`
       }
     },

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 = [
+  public routerLinkPortfolioActivities =
-    '/' + internalRoutes.portfolio.path,
+    internalRoutes.portfolio.subRoutes.activities.routerLink;
-    internalRoutes.portfolio.subRoutes.activities.path
-  ];
 }