Merge branch 'main' into revert-3901-revert-3875-ENG-3009-test

frontend/src/routes.ts

@@ -18,16 +18,7 @@ const adminRoute = route("/admin", [
 ]);
 
 const organizationRoutes = route("/organization", [
-  route("/secret-manager/overview", "organization/SecretManagerOverviewPage/route.tsx"),
-  route("/secret-manager/settings", "organization/SecretManagerSettingsPage/route.tsx"),
-  route("/cert-manager/overview", "organization/CertManagerOverviewPage/route.tsx"),
-  route("/cert-manager/settings", "organization/CertManagerSettingsPage/route.tsx"),
-  route("/ssh/overview", "organization/SshOverviewPage/route.tsx"),
-  route("/ssh/settings", "organization/SshSettingsPage/route.tsx"),
-  route("/secret-scanning/overview", "organization/SecretScanningOverviewPage/route.tsx"),
-  route("/secret-scanning/settings", "organization/SecretScanningSettingsPage/route.tsx"),
-  route("/kms/overview", "organization/KmsOverviewPage/route.tsx"),
-  route("/kms/settings", "organization/KmsSettingsPage/route.tsx"),
+  route("/projects", "organization/ProjectsPage/route.tsx"),
   route("/access-management", "organization/AccessManagementPage/route.tsx"),
   route("/admin", "organization/AdminPage/route.tsx"),
   route("/audit-logs", "organization/AuditLogsPage/route.tsx"),
@@ -41,7 +32,6 @@ const organizationRoutes = route("/organization", [
     route("/oauth/callback", "organization/SettingsPage/OauthCallbackPage/route.tsx")
   ]),
   route("/sso", "organization/SsoPage/route.tsx"),
-  // route("/secret-scanning", "organization/SecretScanningPage/route.tsx"),
   route("/groups/$groupId", "organization/GroupDetailsByIDPage/route.tsx"),
   route("/members/$membershipId", "organization/UserDetailsByIDPage/route.tsx"),
   route("/roles/$roleId", "organization/RoleByIDPage/route.tsx"),
@@ -56,7 +46,7 @@ const organizationRoutes = route("/organization", [
   route("/gateways", [index("organization/Gateways/GatewayListPage/route.tsx")])
 ]);
 
-const secretManagerRoutes = route("/secret-manager/$projectId", [
+const secretManagerRoutes = route("/secret-manager", [
   layout("secret-manager-layout", "secret-manager/layout.tsx", [
     route("/overview", "secret-manager/OverviewPage/route.tsx"),
     route("/secrets/$envSlug", "secret-manager/SecretDashboardPage/route.tsx"),
@@ -277,12 +267,7 @@ const secretManagerRoutes = route("/secret-manager/$projectId", [
         "secret-manager/integrations/HerokuOauthCallbackPage/route.tsx"
       ),
       route("/heroku/create", "secret-manager/integrations/HerokuConfigurePage/route.tsx")
-    ]),
-    route("/access-management", "project/AccessControlPage/route-secret-manager.tsx"),
-    route("/roles/$roleSlug", "project/RoleDetailsBySlugPage/route-secret-manager.tsx"),
-    route("/identities/$identityId", "project/IdentityDetailsByIDPage/route-secret-manager.tsx"),
-    route("/members/$membershipId", "project/MemberDetailsByIDPage/route-secret-manager.tsx"),
-    route("/groups/$groupId", "project/GroupDetailsByIDPage/route-secret-manager.tsx")
+    ])
   ])
 ]);
 
@@ -310,7 +295,7 @@ const secretManagerIntegrationsRedirect = route("/integrations", [
   )
 ]);
 
-const certManagerRoutes = route("/cert-manager/$projectId", [
+const certManagerRoutes = route("/cert-manager", [
   layout("cert-manager-layout", "cert-manager/layout.tsx", [
     route("/subscribers", [
       index("cert-manager/PkiSubscribersPage/route.tsx"),
@@ -322,60 +307,49 @@ const certManagerRoutes = route("/cert-manager/$projectId", [
     route("/alerting", "cert-manager/AlertingPage/route.tsx"),
     route("/ca/$caName", "cert-manager/CertAuthDetailsByIDPage/route.tsx"),
     route("/pki-collections/$collectionId", "cert-manager/PkiCollectionDetailsByIDPage/routes.tsx"),
-    route("/settings", "cert-manager/SettingsPage/route.tsx"),
-    route("/access-management", "project/AccessControlPage/route-cert-manager.tsx"),
-    route("/roles/$roleSlug", "project/RoleDetailsBySlugPage/route-cert-manager.tsx"),
-    route("/identities/$identityId", "project/IdentityDetailsByIDPage/route-cert-manager.tsx"),
-    route("/members/$membershipId", "project/MemberDetailsByIDPage/route-cert-manager.tsx"),
-    route("/groups/$groupId", "project/GroupDetailsByIDPage/route-cert-manager.tsx")
+    route("/settings", "cert-manager/SettingsPage/route.tsx")
   ])
 ]);
 
-const kmsRoutes = route("/kms/$projectId", [
+const kmsRoutes = route("/kms", [
   layout("kms-layout", "kms/layout.tsx", [
     route("/overview", "kms/OverviewPage/route.tsx"),
     route("/kmip", "kms/KmipPage/route.tsx"),
-    route("/settings", "kms/SettingsPage/route.tsx"),
-    route("/access-management", "project/AccessControlPage/route-kms.tsx"),
-    route("/roles/$roleSlug", "project/RoleDetailsBySlugPage/route-kms.tsx"),
-    route("/identities/$identityId", "project/IdentityDetailsByIDPage/route-kms.tsx"),
-    route("/members/$membershipId", "project/MemberDetailsByIDPage/route-kms.tsx"),
-    route("/groups/$groupId", "project/GroupDetailsByIDPage/route-kms.tsx")
+    route("/settings", "kms/SettingsPage/route.tsx")
   ])
 ]);
 
-const sshRoutes = route("/ssh/$projectId", [
+const sshRoutes = route("/ssh", [
   layout("ssh-layout", "ssh/layout.tsx", [
     route("/overview", "ssh/SshHostsPage/route.tsx"),
     route("/certificates", "ssh/SshCertsPage/route.tsx"),
     route("/cas", "ssh/SshCasPage/route.tsx"),
     route("/ca/$caId", "ssh/SshCaByIDPage/route.tsx"),
     route("/ssh-host-groups/$sshHostGroupId", "ssh/SshHostGroupDetailsByIDPage/route.tsx"),
-    route("/settings", "ssh/SettingsPage/route.tsx"),
-    route("/access-management", "project/AccessControlPage/route-ssh.tsx"),
-    route("/roles/$roleSlug", "project/RoleDetailsBySlugPage/route-ssh.tsx"),
-    route("/identities/$identityId", "project/IdentityDetailsByIDPage/route-ssh.tsx"),
-    route("/members/$membershipId", "project/MemberDetailsByIDPage/route-ssh.tsx"),
-    route("/groups/$groupId", "project/GroupDetailsByIDPage/route-ssh.tsx")
+    route("/settings", "ssh/SettingsPage/route.tsx")
   ])
 ]);
 
-const secretScanningRoutes = route("/secret-scanning/$projectId", [
+const secretScanningRoutes = route("/secret-scanning", [
   layout("secret-scanning-layout", "secret-scanning/layout.tsx", [
     route("/data-sources", [
       index("secret-scanning/SecretScanningDataSourcesPage/route.tsx"),
       route("/$type/$dataSourceId", "secret-scanning/SecretScanningDataSourceByIdPage/route.tsx")
     ]),
     route("/findings", "secret-scanning/SecretScanningFindingsPage/route.tsx"),
-    route("/settings", "secret-scanning/SettingsPage/route.tsx"),
-    route("/access-management", "project/AccessControlPage/route-secret-scanning.tsx"),
-    route("/roles/$roleSlug", "project/RoleDetailsBySlugPage/route-secret-scanning.tsx"),
-    route("/identities/$identityId", "project/IdentityDetailsByIDPage/route-secret-scanning.tsx"),
-    route("/members/$membershipId", "project/MemberDetailsByIDPage/route-secret-scanning.tsx"),
-    route("/groups/$groupId", "project/GroupDetailsByIDPage/route-secret-scanning.tsx")
+    route("/settings", "secret-scanning/SettingsPage/route.tsx")
   ])
 ]);
 
+const projectGeneralRoutes = layout("project-general-layout", "project/layout-general.tsx", [
+  route("/access-management", "project/AccessControlPage/route.tsx"),
+  route("/roles/$roleSlug", "project/RoleDetailsBySlugPage/route.tsx"),
+  route("/identities/$identityId", "project/IdentityDetailsByIDPage/route.tsx"),
+  route("/members/$membershipId", "project/MemberDetailsByIDPage/route.tsx"),
+  route("/groups/$groupId", "project/GroupDetailsByIDPage/route.tsx"),
+  route("/settings", "project/SettingsPage/route.tsx")
+]);
+
 export const routes = rootRoute("root.tsx", [
   index("index.tsx"),
   route("/shared/secret/$secretId", "public/ViewSharedSecretByIDPage/route.tsx"),
@@ -413,12 +387,20 @@ export const routes = rootRoute("root.tsx", [
       adminRoute,
       layout("org-layout", "organization/layout.tsx", [
         organizationRoutes,
-        secretManagerRoutes,
-        secretManagerIntegrationsRedirect,
-        certManagerRoutes,
-        kmsRoutes,
-        sshRoutes,
-        secretScanningRoutes
+        route("/secret-manager/$projectId", [
+          route("/approval", "secret-manager/redirects/redirect-approval-page.tsx")
+        ]),
+        route("/projects/$projectId", [
+          layout("project-layout", "project/layout.tsx", [
+            projectGeneralRoutes,
+            secretManagerRoutes,
+            secretManagerIntegrationsRedirect,
+            certManagerRoutes,
+            kmsRoutes,
+            sshRoutes,
+            secretScanningRoutes
+          ])
+        ])
       ])
     ])
   ])