Merge branch 'master' into pajri

frontend/dashboard/src/routes/index.tsx

@@ -89,50 +89,81 @@ export default function Router() {
           element: <CorporateCreate />,
         },
         {
-          path: 'corporates/:corporate_id',
-          element: <CorporateShow />,
+          path: 'corporate',
+          element: <ConfigLayout />, // Layout that use the context
+          children: [
+            {
+              path: ':corporate_id',
+              element: <CorporateShow />,
+            },
+            {
+              path: ':corporate_id/services',
+              element: <CorporateServices />,
+            },
+            {
+              path: ':corporate_id/services/:service_code',
+              element: <CorporateServicesCreate />,
+            },
+            {
+              path: ':corporate_id/plans/create',
+              element: <PlanCreate />,
+            },
+            {
+              path: ':corporate_id/plans',
+              element: <Plans />,
+            },
+            {
+              path: ':corporate_id/benefits/create',
+              element: <BenefitCreate />,
+            },
+            {
+              path: ':corporate_id/benefits',
+              element: <Benefits />,
+            },
+
+            {
+              path: ':corporate_id/members',
+              element: <CorporateMembers />,
+            },
+
+            {
+              path: ':corporate_id/divisions',
+              element: <CorporateDivisions />,
+            },
+            {
+              path: ':corporate_id/divisions/create',
+              element: <CorporateDivisionsCreate />,
+            },
+            {
+              path: ':corporate_id/divisions/:id/edit',
+              element: <CorporateDivisionsCreate />,
+            },
+            {
+              path: ':corporate_id/formularium',
+              element: <CorporateFormularium />,
+            },
+
+            {
+              path: ':corporate_id/diagnosis-exclusions',
+              element: <DiagnosisExclusions />,
+            },
+
+            {
+              path: ':corporate_id/hospitals',
+              element: <CorporateHospitals />,
+            },
+
+            {
+              path: ':corporate_id/claim-history',
+              element: <CorporateClaimHistories />,
+            },
+          ],
         },
         {
           path: 'corporates/:corporate_id/edit',
           element: <CorporateCreate />,
         },
 
-        {
-          path: 'corporates/:corporate_id/divisions',
-          element: <CorporateDivisions />,
-        },
-        {
-          path: 'corporates/:corporate_id/divisions/create',
-          element: <CorporateDivisionsCreate />,
-        },
-        {
-          path: 'corporates/:corporate_id/divisions/:id/edit',
-          element: <CorporateDivisionsCreate />,
-        },
-
-        {
-          path: 'corporates/:corporate_id/members',
-          element: <CorporateMembers />,
-        },
-
-        {
-          path: 'corporates/:corporate_id/services',
-          element: <CorporateServices />,
-        },
-        {
-          path: 'corporates/:corporate_id/services/:service_code',
-          element: <CorporateServicesCreate />,
-        },
-
-        {
-          path: 'corporates/:corporate_id/plans/create',
-          element: <PlanCreate />,
-        },
-        {
-          path: 'corporates/:corporate_id/plans',
-          element: <Plans />,
-        },
-
         {
           path: 'corporates/:corporate_id/corporate-plans/create',
           element: <CorporatePlanCreate />,
@@ -146,15 +177,6 @@ export default function Router() {
           element: <CorporatePlans />,
         },
 
-        {
-          path: 'corporates/:corporate_id/benefits/create',
-          element: <BenefitCreate />,
-        },
-        {
-          path: 'corporates/:corporate_id/benefits',
-          element: <Benefits />,
-        },
-
         {
           path: 'corporates/:corporate_id/corporate-benefits/create',
           element: <CorporateBenefitsCreate />,
@@ -168,26 +190,6 @@ export default function Router() {
           element: <CorporateBenefitsCreate />,
         },
 
-        {
-          path: 'corporates/:corporate_id/formularium',
-          element: <CorporateFormularium />,
-        },
-
-        {
-          path: 'corporates/:corporate_id/diagnosis-exclusions',
-          element: <DiagnosisExclusions />,
-        },
-
-        {
-          path: 'corporates/:corporate_id/hospitals',
-          element: <CorporateHospitals />,
-        },
-
-        {
-          path: 'corporates/:corporate_id/claim-history',
-          element: <CorporateClaimHistories />,
-        },
-
         {
           path: 'master/doctors',
           element: <MasterDoctors />,
@@ -272,6 +274,9 @@ const NotFound = Loadable(lazy(() => import('../pages/Page404')));
 const Members = Loadable(lazy(() => import('../pages/Members/Index')));
 const MedicinesCreate = Loadable(lazy(() => import('../pages/Medicines/Create')));
 
+// Corporate
+const ConfigLayout = Loadable(lazy(() => import('../pages/Corporates/ConfigLayout')));
+
 const Corporate = Loadable(lazy(() => import('../pages/Corporates/Index')));
 const CorporateCreate = Loadable(lazy(() => import('../pages/Corporates/CreateUpdate')));
 const CorporateShow = Loadable(lazy(() => import('../pages/Corporates/Show')));