feat: resolved review comments

frontend/src/pages/organization/SettingsPage/components/OrgGeneralTab/OrgGeneralTab.tsx

@@ -3,18 +3,14 @@ import { useOrgPermission } from "@app/context";
 import { OrgDeleteSection } from "../OrgDeleteSection";
 import { OrgIncidentContactsSection } from "../OrgIncidentContactsSection";
 import { OrgNameChangeSection } from "../OrgNameChangeSection";
-import { OrgProductSelectSection } from "../OrgProductSelectSection";
 
 export const OrgGeneralTab = () => {
   const { membership } = useOrgPermission();
   return (
-    <>
-      <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-6">
-        <OrgNameChangeSection />
-        <OrgIncidentContactsSection />
-        {membership && membership.role === "admin" && <OrgDeleteSection />}
-      </div>
-      {membership && membership.role === "admin" && <OrgProductSelectSection />}
-    </>
+    <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-6">
+      <OrgNameChangeSection />
+      <OrgIncidentContactsSection />
+      {membership && membership.role === "admin" && <OrgDeleteSection />}
+    </div>
   );
 };

frontend/src/pages/project/SettingsPage/components/ProjectGeneralTab/ProjectGeneralTab.tsx

@@ -1,6 +1,7 @@
 import { ProjectOverviewChangeSection } from "@app/components/project/ProjectOverviewChangeSection";
 
 import { AuditLogsRetentionSection } from "../AuditLogsRetentionSection";
+import { DeleteProjectProtection } from "../DeleteProjectProtection";
 import { DeleteProjectSection } from "../DeleteProjectSection";
 
 export const ProjectGeneralTab = () => {
@@ -8,6 +9,7 @@ export const ProjectGeneralTab = () => {
     <div>
       <ProjectOverviewChangeSection showSlugField />
       <AuditLogsRetentionSection />
+      <DeleteProjectProtection />
       <DeleteProjectSection />
     </div>
   );

frontend/src/pages/project/layout.tsx

@@ -1,37 +1,41 @@
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute } from '@tanstack/react-router'
 
-import { BreadcrumbTypes } from "@app/components/v2";
-import { workspaceKeys } from "@app/hooks/api";
-import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
-import { ProjectLayout } from "@app/layouts/ProjectLayout";
-import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
+import { BreadcrumbTypes } from '@app/components/v2'
+import { workspaceKeys } from '@app/hooks/api'
+import {
+  fetchUserProjectPermissions,
+  roleQueryKeys,
+} from '@app/hooks/api/roles/queries'
+import { fetchWorkspaceById } from '@app/hooks/api/workspace/queries'
+import { ProjectLayout } from '@app/layouts/ProjectLayout'
+import { ProjectSelect } from '@app/layouts/ProjectLayout/components/ProjectSelect'
 
 export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout"
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_project-layout-fallback-approval',
 )({
   component: ProjectLayout,
   beforeLoad: async ({ params, context }) => {
     const project = await context.queryClient.ensureQueryData({
       queryKey: workspaceKeys.getWorkspaceById(params.projectId),
-      queryFn: () => fetchWorkspaceById(params.projectId)
-    });
+      queryFn: () => fetchWorkspaceById(params.projectId),
+    })
 
     await context.queryClient.ensureQueryData({
       queryKey: roleQueryKeys.getUserProjectPermissions({
-        workspaceId: params.projectId
+        workspaceId: params.projectId,
       }),
-      queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
-    });
+      queryFn: () =>
+        fetchUserProjectPermissions({ workspaceId: params.projectId }),
+    })
 
     return {
       project,
       breadcrumbs: [
         {
           type: BreadcrumbTypes.Component,
-          component: ProjectSelect
-        }
-      ]
-    };
-  }
-});
+          component: ProjectSelect,
+        },
+      ],
+    }
+  },
+})

frontend/src/pages/secret-manager/SettingsPage/components/ProjectGeneralTab/ProjectGeneralTab.tsx

@@ -3,7 +3,6 @@ import { ProjectVersion } from "@app/hooks/api/workspace/types";
 
 import { AutoCapitalizationSection } from "../AutoCapitalizationSection";
 import { BackfillSecretReferenceSecretion } from "../BackfillSecretReferenceSection";
-import { DeleteProjectProtection } from "../DeleteProjectProtection";
 import { EnvironmentSection } from "../EnvironmentSection";
 import { PointInTimeVersionLimitSection } from "../PointInTimeVersionLimitSection";
 import { RebuildSecretIndicesSection } from "../RebuildSecretIndicesSection/RebuildSecretIndicesSection";
@@ -24,7 +23,6 @@ export const ProjectGeneralTab = () => {
       <PointInTimeVersionLimitSection />
       <BackfillSecretReferenceSecretion />
       {currentWorkspace?.version !== ProjectVersion.V3 && <RebuildSecretIndicesSection />}
-      <DeleteProjectProtection />
     </div>
   );
 };

frontend/src/pages/secret-manager/redirects/redirect-approval-page.tsx

@@ -0,0 +1,14 @@
+import { createFileRoute, redirect } from "@tanstack/react-router";
+
+// this is done as part of migration for multi product inside project
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_project-layout-fallback-approval/approval"
+)({
+  beforeLoad: ({ params, search }) => {
+    throw redirect({
+      to: "/projects/$projectId/secret-manager/approval",
+      params,
+      search
+    });
+  }
+});