Move activities to internalRoutes (subRoute)

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@@ -10,7 +10,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import { internalRoutes, routes } from '@ghostfolio/common/routes';
+import { internalRoutes } from '@ghostfolio/common/routes';
 import { OrderWithAccount } from '@ghostfolio/common/types';
 
 import {
@@ -94,7 +94,10 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
 
   public onCloneActivity(aActivity: Activity) {
     this.router.navigate(
-      ['/' + internalRoutes.portfolio.path, routes.activities],
+      [
+        '/' + internalRoutes.portfolio.path,
+        internalRoutes.portfolio.subRoutes.activities.path
+      ],
       {
         queryParams: { activityId: aActivity.id, createDialog: true }
       }
@@ -156,7 +159,10 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
 
   public onUpdateActivity(aActivity: Activity) {
     this.router.navigate(
-      ['/' + internalRoutes.portfolio.path, routes.activities],
+      [
+        '/' + 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

@@ -14,7 +14,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import { internalRoutes, routes } from '@ghostfolio/common/routes';
+import { internalRoutes } from '@ghostfolio/common/routes';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
 import { GfDataProviderCreditsComponent } from '@ghostfolio/ui/data-provider-credits';
 import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical-market-data-editor';
@@ -471,7 +471,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
 
   public onCloneActivity(aActivity: Activity) {
     this.router.navigate(
-      ['/' + internalRoutes.portfolio.path, routes.activities],
+      [
+        '/' + internalRoutes.portfolio.path,
+        internalRoutes.portfolio.subRoutes.activities.path
+      ],
       {
         queryParams: { activityId: aActivity.id, createDialog: true }
       }
@@ -516,7 +519,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
 
   public onUpdateActivity(aActivity: Activity) {
     this.router.navigate(
-      ['/' + internalRoutes.portfolio.path, routes.activities],
+      [
+        '/' + 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

@@ -8,7 +8,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import { internalRoutes, routes } from '@ghostfolio/common/routes';
+import { internalRoutes } from '@ghostfolio/common/routes';
 import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types';
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
@@ -39,7 +39,7 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
   ];
   public routerLinkPortfolioActivities = [
     '/' + internalRoutes.portfolio.path,
-    routes.activities
+    internalRoutes.portfolio.subRoutes.activities.path
   ];
   public user: User;
   public viewModeFormControl = new FormControl<HoldingsViewMode>(

apps/client/src/app/components/home-overview/home-overview.component.ts

@@ -11,7 +11,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import { internalRoutes, routes } from '@ghostfolio/common/routes';
+import { internalRoutes } from '@ghostfolio/common/routes';
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { DeviceDetectorService } from 'ngx-device-detector';
@@ -41,7 +41,7 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
   public routerLinkPortfolio = ['/' + internalRoutes.portfolio.path];
   public routerLinkPortfolioActivities = [
     '/' + internalRoutes.portfolio.path,
-    routes.activities
+    internalRoutes.portfolio.subRoutes.activities.path
   ];
   public showDetails = false;
   public unit: string;

apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts

@@ -1,4 +1,5 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
+import { internalRoutes } from '@ghostfolio/common/routes';
 
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
@@ -10,7 +11,7 @@ const routes: Routes = [
     canActivate: [AuthGuard],
     component: ActivitiesPageComponent,
     path: '',
-    title: $localize`Activities`
+    title: internalRoutes.portfolio.subRoutes.activities.title
   }
 ];
 

apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts

@@ -21,7 +21,7 @@ const routes: Routes = [
           )
       },
       {
-        path: ghostfolioRoutes.activities,
+        path: internalRoutes.portfolio.subRoutes.activities.path,
         loadChildren: () =>
           import('./activities/activities-page.module').then(
             (m) => m.ActivitiesPageModule

apps/client/src/app/pages/portfolio/portfolio-page.component.ts

@@ -38,8 +38,11 @@ export class PortfolioPageComponent implements OnDestroy, OnInit {
             },
             {
               iconName: 'swap-vertical-outline',
-              label: $localize`Activities`,
+              label: internalRoutes.portfolio.subRoutes.activities.title,
-              path: ['/' + internalRoutes.portfolio.path, routes.activities]
+              path: [
+                '/' + internalRoutes.portfolio.path,
+                internalRoutes.portfolio.subRoutes.activities.path
+              ]
             },
             {
               iconName: 'pie-chart-outline',

apps/client/src/app/pages/zen/zen-page.component.ts

@@ -38,7 +38,7 @@ export class ZenPageComponent implements OnDestroy, OnInit {
             },
             {
               iconName: 'wallet-outline',
-              label: $localize`Holdings`,
+              label: internalRoutes.zen.title,
               path: ['/' + internalRoutes.zen.path, routes.holdings]
             }
           ];

libs/common/src/lib/routes.ts

@@ -3,7 +3,6 @@ import '@angular/localize/init';
 export const routes = {
   access: 'access',
   account: 'account',
-  activities: 'activities',
   adminControl: 'admin',
   allocations: 'allocations',
   api: 'api',
@@ -60,7 +59,12 @@ export const internalRoutes = {
   },
   portfolio: {
     path: 'portfolio',
-    subRoutes: {},
+    subRoutes: {
+      activities: {
+        path: 'activities',
+        title: $localize`Activities`
+      }
+    },
     title: $localize`Portfolio`
   },
   zen: {

libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts

@@ -1,4 +1,4 @@
-import { internalRoutes, routes } from '@ghostfolio/common/routes';
+import { internalRoutes } from '@ghostfolio/common/routes';
 
 import {
   CUSTOM_ELEMENTS_SCHEMA,
@@ -25,6 +25,6 @@ export class GfNoTransactionsInfoComponent {
 
   public routerLinkPortfolioActivities = [
     '/' + internalRoutes.portfolio.path,
-    routes.activities
+    internalRoutes.portfolio.subRoutes.activities.path
   ];
 }