wrap up initial cleanup

Author: abailly-akamai

packages/manager/src/features/Profile/Settings/settingsLazyRoute.ts

@@ -2,14 +2,6 @@ import { createLazyRoute } from '@tanstack/react-router';
 
 import { ProfileSettings } from './Settings';
 
-export const settingsLazyRoute = createLazyRoute('/profile/settings')({
-  component: ProfileSettings,
-});
-
-/**
- *  @todo As part of the IAM Primary Nav flag (iamRbacPrimaryNavChanges) cleanup, /profile/settings will be removed.
- * Adding the lazy route in this file will also require the necessary cleanup work, such as renaming the file and removing settingsLazyRoute(/profile/settings), as part of the flag cleanup.
- */
 export const preferencesLazyRoute = createLazyRoute('/profile/preferences')({
   component: ProfileSettings,
 });

packages/manager/src/routes/account/index.ts

@@ -31,13 +31,11 @@ const accountBillingRoute = createRoute({
   getParentRoute: () => accountTabsRoute,
   path: 'billing',
   validateSearch: (search: AccountBillingSearch) => search,
-  beforeLoad: ({ context, params }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/billing`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/billing`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Billing/billingDetailLazyRoute').then(
@@ -58,10 +56,6 @@ const accountUsersRoute = createRoute({
     if (isIAMEnabled) {
       throw redirect({ to: '/iam/users' });
     }
-
-    if (context?.flags?.iamRbacPrimaryNavChanges && !isIAMEnabled) {
-      throw redirect({ to: '/users' });
-    }
   },
 }).lazy(() =>
   import('src/features/Users/usersLandingLazyRoute').then(
@@ -72,13 +66,11 @@ const accountUsersRoute = createRoute({
 const accountQuotasRoute = createRoute({
   getParentRoute: () => accountTabsRoute,
   path: '/quotas',
-  beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/quotas`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/quotas`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Account/Quotas/quotasLazyRoute').then(
@@ -90,12 +82,10 @@ const accountLoginHistoryRoute = createRoute({
   getParentRoute: () => accountTabsRoute,
   path: '/login-history',
   beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/login-history`,
-        replace: true,
-      });
-    }
+    throw redirect({
+      to: `/login-history`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Account/accountLoginsLazyRoute').then(
@@ -106,13 +96,11 @@ const accountLoginHistoryRoute = createRoute({
 const accountServiceTransfersRoute = createRoute({
   getParentRoute: () => accountTabsRoute,
   path: '/service-transfers',
-  beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/service-transfers`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/service-transfers`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import(
@@ -123,13 +111,11 @@ const accountServiceTransfersRoute = createRoute({
 const accountMaintenanceRoute = createRoute({
   getParentRoute: () => accountTabsRoute,
   path: '/maintenance',
-  beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/maintenance`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/maintenance`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Account/Maintenance/maintenanceLandingLazyRoute').then(
@@ -140,13 +126,11 @@ const accountMaintenanceRoute = createRoute({
 const accountSettingsRoute = createRoute({
   getParentRoute: () => accountTabsRoute,
   path: '/settings',
-  beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account-settings`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/account-settings`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Account/globalSettingsLazyRoute').then(
@@ -182,18 +166,16 @@ const accountUsersUsernameRoute = createRoute({
       });
     }
 
-    if (context?.flags?.iamRbacPrimaryNavChanges && !isIAMEnabled) {
-      const url = location.pathname.endsWith('/profile')
-        ? '/users/$username/profile'
-        : location.pathname.endsWith('/permissions')
-          ? '/users/$username/permissions'
-          : '/users/$username';
-      throw redirect({
-        to: url,
-        params: { username },
-        replace: true,
-      });
-    }
+    const url = location.pathname.endsWith('/profile')
+      ? '/users/$username/profile'
+      : location.pathname.endsWith('/permissions')
+        ? '/users/$username/permissions'
+        : '/users/$username';
+    throw redirect({
+      to: url,
+      params: { username },
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Users/userDetailLazyRoute').then(
@@ -225,14 +207,12 @@ const accountInvoiceDetailsRoute = createRoute({
     invoiceId: Number(params.invoiceId),
   }),
   path: 'billing/invoices/$invoiceId',
-  beforeLoad: ({ context, params }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/billing/invoices/$invoiceId`,
-        params: { invoiceId: params.invoiceId },
-        replace: true,
-      });
-    }
+  beforeLoad: ({ params }) => {
+    throw redirect({
+      to: `/billing/invoices/$invoiceId`,
+      params: { invoiceId: params.invoiceId },
+      replace: true,
+    });
   },
 }).lazy(() =>
   import('src/features/Billing/InvoiceDetail/InvoiceDetail').then(
@@ -243,13 +223,11 @@ const accountInvoiceDetailsRoute = createRoute({
 const accountEntityTransfersCreateRoute = createRoute({
   getParentRoute: () => accountRoute,
   path: 'service-transfers/create',
-  beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/service-transfers/create`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/service-transfers/create`,
+      replace: true,
+    });
   },
 }).lazy(() =>
   import(

packages/manager/src/routes/accountSettings/index.ts

@@ -22,14 +22,6 @@ const accountSettingsCatchAllRoute = createRoute({
 const accountSettingsIndexRoute = createRoute({
   getParentRoute: () => accountSettingsRoute,
   path: '/',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/settings`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/AccountSettings/accountSettingsLandingLazyRoute').then(
     (m) => m.accountSettingsLandingLazyRoute

packages/manager/src/routes/billing/index.ts

@@ -30,14 +30,6 @@ const billingCatchAllRoute = createRoute({
 const billingIndexRoute = createRoute({
   getParentRoute: () => billingRoute,
   path: '/',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/billing`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/Billing/BillingLanding/billingLandingLazyRoute').then(
     (m) => m.billingLandingLazyRoute
@@ -50,15 +42,6 @@ const billingInvoiceDetailsRoute = createRoute({
     invoiceId: Number(params.invoiceId),
   }),
   path: 'invoices/$invoiceId',
-  beforeLoad: ({ context, params }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/billing/invoices/$invoiceId`,
-        params: { invoiceId: params.invoiceId },
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/Billing/InvoiceDetail/InvoiceDetail').then(
     (m) => m.invoiceDetailLazyRoute

packages/manager/src/routes/loginHistory/index.ts

@@ -22,14 +22,6 @@ const loginHistoryCatchAllRoute = createRoute({
 const loginHistoryIndexRoute = createRoute({
   getParentRoute: () => loginHistoryRoute,
   path: '/',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/login-history`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/LoginHistory/loginHistoryLandingLazyRoute').then(
     (m) => m.loginHistoryLandingLazyRoute

packages/manager/src/routes/maintenance/index.ts

@@ -22,14 +22,6 @@ const maintenanceCatchAllRoute = createRoute({
 const maintenanceIndexRoute = createRoute({
   getParentRoute: () => maintenanceRoute,
   path: '/',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/maintenance`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/Maintenance/maintenanceLandingLazyRoute').then(
     (m) => m.maintenanceLandingLandingLazyRoute

packages/manager/src/routes/profile/index.ts

@@ -98,14 +98,6 @@ const profileReferralsRoute = createRoute({
  */
 
 const profilePreferencesRoute = createRoute({
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/profile/settings`,
-        replace: true,
-      });
-    }
-  },
   getParentRoute: () => profileRoute,
   path: 'preferences',
   validateSearch: (search: ProfileSettingsSearchParams) => search,
@@ -116,20 +108,18 @@ const profilePreferencesRoute = createRoute({
 );
 
 const profileSettingsRoute = createRoute({
-  beforeLoad: ({ context }) => {
-    if (context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/profile/preferences`,
-        replace: true,
-      });
-    }
+  beforeLoad: () => {
+    throw redirect({
+      to: `/profile/preferences`,
+      replace: true,
+    });
   },
   getParentRoute: () => profileRoute,
   path: 'settings',
   validateSearch: (search: ProfileSettingsSearchParams) => search,
 }).lazy(() =>
   import('src/features/Profile/Settings/settingsLazyRoute').then(
-    (m) => m.settingsLazyRoute
+    (m) => m.preferencesLazyRoute
   )
 );
 

packages/manager/src/routes/quotas/index.ts

@@ -22,14 +22,6 @@ const quotasCatchAllRoute = createRoute({
 const quotasIndexRoute = createRoute({
   getParentRoute: () => quotasRoute,
   path: '/',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/quotas`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/Quotas//quotasLandingLazyRoute').then(
     (m) => m.quotasLandingLazyRoute

packages/manager/src/routes/serviceTransfers/index.ts

@@ -22,14 +22,6 @@ const serviceTransfersCatchAllRoute = createRoute({
 const serviceTransfersIndexRoute = createRoute({
   getParentRoute: () => serviceTransfersRoute,
   path: '/',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/service-transfers`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/ServiceTransfers/serviceTransfersLandingLazyRoute').then(
     (m) => m.serviceTransfersLandingLazyRoute
@@ -39,14 +31,6 @@ const serviceTransfersIndexRoute = createRoute({
 const serviceTransfersCreateRoute = createRoute({
   getParentRoute: () => serviceTransfersRoute,
   path: 'create',
-  beforeLoad: ({ context }) => {
-    if (!context?.flags?.iamRbacPrimaryNavChanges) {
-      throw redirect({
-        to: `/account/service-transfers/create`,
-        replace: true,
-      });
-    }
-  },
 }).lazy(() =>
   import('src/features/ServiceTransfers/serviceTransfersCreateLazyRoute').then(
     (m) => m.serviceTransfersCreateLazyRoute