routes widget myjob, mylearn

src/app/portal-manage/myjob/myjob.routes.ts

@@ -7,10 +7,10 @@ export const MYJOB_ROUTES: Routes = [
     path: '',
     component: MyjobComponent,
     children: [
-      {
-        path: 'dashboard',
-        component: MyjobDashboardComponent
-      },
+      // {
+      //   path: 'dashboard',
+      //   component: MyjobDashboardComponent
+      // },
       {
         //////////////MyJob/////////////////
         path: 'home',
@@ -203,10 +203,40 @@ export const MYJOB_ROUTES: Routes = [
           import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
       },
       {
-        path: '',
-        redirectTo: 'dashboard',
-        pathMatch: 'full'
-      }
+        path: 'dashboard-home',
+        loadComponent: () =>
+          import('../dashboard-management/dashboard-management.component').then((m) => m.DashboardManagementComponent),
+      },
+      {
+        path: 'widget-list',
+        loadComponent: () =>
+          import('../dashboard-management/widget-management/widget-list.component').then((m) => m.WidgetListComponent),
+      },
+      {
+        path: 'dataset-widget-linker',
+        loadComponent: () =>
+          import('../dashboard-management/widget-management/dataset-widget-linker.component').then((m) => m.DatasetWidgetLinkerComponent),
+      },
+      {
+        path: 'dashboard-viewer',
+        loadComponent: () =>
+          import('../dashboard-management/dashboard-viewer/dashboard-viewer.component').then((m) => m.DashboardViewerComponent),
+      },
+      // {
+      //   path: 'widget-warehouse',
+      //   loadComponent: () =>
+      //     import('../dashboard-management/dashboard-management.component').then((m) => m.DashboardManagementComponent),
+      // },
+      // {
+      //   path: 'widget-linker',
+      //   loadComponent: () =>
+      //     import('../dashboard-management/widget-management/dataset-widget-linker.component').then((m) => m.DatasetWidgetLinkerComponent),
+      // },
+      // {
+      //   path: '',
+      //   redirectTo: 'dashboard',
+      //   pathMatch: 'full'
+      // }
     ]
   }
 ];

src/app/portal-manage/mylearn/mylearn.routes.ts

@@ -139,9 +139,24 @@ export const MYLEARN_ROUTES: Routes = [
           import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
       },
       {
-        path: '',
-        redirectTo: 'dashboard',
-        pathMatch: 'full'
+        path: 'dashboard-home',
+        loadComponent: () =>
+          import('../dashboard-management/dashboard-management.component').then((m) => m.DashboardManagementComponent),
+      },
+      {
+        path: 'widget-list',
+        loadComponent: () =>
+          import('../dashboard-management/widget-management/widget-list.component').then((m) => m.WidgetListComponent),
+      },
+      {
+        path: 'dataset-widget-linker',
+        loadComponent: () =>
+          import('../dashboard-management/widget-management/dataset-widget-linker.component').then((m) => m.DatasetWidgetLinkerComponent),
+      },
+      {
+        path: 'dashboard-viewer',
+        loadComponent: () =>
+          import('../dashboard-management/dashboard-viewer/dashboard-viewer.component').then((m) => m.DashboardViewerComponent),
       }
     ]
   }

src/app/shared/services/nav.service.ts

@@ -99,7 +99,7 @@ export class NavService implements OnDestroy {
       active: false,
       children: [
         {
-          path: `/portal-manage/dashboard-management/dashboard-home`,
+          path: `/portal-manage/${appName}/dashboard-home`,
           title: 'แดชบอร์ดหลัก',
           type: 'link'
         },
@@ -110,7 +110,7 @@ export class NavService implements OnDestroy {
           active: false,
           children: [
             {
-              path: `/portal-manage/dashboard-management/widget-list`,
+              path: `/portal-manage/${appName}/widget-list`,
               title: 'รายการวิดเจ็ต',
               type: 'link'
             },
@@ -120,7 +120,7 @@ export class NavService implements OnDestroy {
             //   type: 'link'
             // },
             {
-              path: `/portal-manage/dashboard-management/dataset-widget-linker`,
+              path: `/portal-manage/${appName}/dataset-widget-linker`,
               title: 'เชื่อมโยงข้อมูลกับวิดเจ็ต',
               type: 'link'
             },
@@ -138,22 +138,22 @@ export class NavService implements OnDestroy {
           active: false,
           children: [
             {
-              path: `/portal-manage/dashboard-management/dashboard-viewer`,
+              path: `/portal-manage/${appName}/dashboard-viewer`,
               title: 'ดูแดชบอร์ด',
               type: 'link'
             }
           ]
         },
-        {
-          path: `/portal-manage/${appName}/widget-warehouse`,
-          title: 'คลังวิดเจ็ต',
-          type: 'link'
-        },
-        {
-          path: `/portal-manage/${appName}/widget-linker`,
-          title: 'เชื่อมโยงวิดเจ็ตกับชุดข้อมูล',
-          type: 'link'
-        }
+        // {
+        //   path: `/portal-manage/${appName}/widget-warehouse`,
+        //   title: 'คลังวิดเจ็ต',
+        //   type: 'link'
+        // },
+        // {
+        //   path: `/portal-manage/${appName}/widget-linker`,
+        //   title: 'เชื่อมโยงวิดเจ็ตกับชุดข้อมูล',
+        //   type: 'link'
+        // }
       ]
     };
   }