Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

hide general settings if single project

Matheus Nogueira2116ee7823bf
diff --git a/frontend/src/hooks/api/secretScanningV2/queries.tsx b/frontend/src/hooks/api/secretScanningV2/queries.tsx
index acc11f778e..83979a0cf4 100644
--- a/frontend/src/hooks/api/secretScanningV2/queries.tsx
+++ b/frontend/src/hooks/api/secretScanningV2/queries.tsx
@@ -70,7 +70,10 @@ export type TSecretScanningInstanceState = {
isMultiInstance: boolean;
};
-export const useGetSecretScanningInstanceState = (orgId: string) =>
+export const useGetSecretScanningInstanceState = (
+ orgId: string,
+ { enabled = true }: { enabled?: boolean } = {}
+) =>
useQuery({
queryKey: secretScanningV2Keys.instanceState(orgId),
queryFn: async () => {
@@ -79,7 +82,7 @@ export const useGetSecretScanningInstanceState = (orgId: string) =>
);
return data;
},
- enabled: Boolean(orgId)
+ enabled: Boolean(orgId) && enabled
});
export const useSecretScanningDataSourceOptions = (
diff --git a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/ProjectNav.tsx b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/ProjectNav.tsx
index d50ab97fbd..78558536de 100644
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/ProjectNav.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/ProjectNav.tsx
@@ -11,6 +11,7 @@ import {
projectTypeToUrlSlug
} from "@app/helpers/project";
import { ProjectType } from "@app/hooks/api/projects/types";
+import { useGetSecretScanningInstanceState } from "@app/hooks/api/secretScanningV2";
import { AgentVaultNav } from "./AgentVaultNav";
import { CertManagerNav } from "./CertManagerNav";
@@ -22,8 +23,8 @@ import {
CERT_APPROVALS_SUBMENU,
CERT_CERTIFICATES_SUBMENU,
CERT_INTEGRATIONS_SUBMENU,
+ getSecretScanningSettingsSubmenu,
PROJECT_ACCESS_CONTROL_SUBMENU,
- SECRET_SCANNING_SETTINGS_SUBMENU,
SM_SETTINGS_SUBMENU
} from "./submenus";
import { ProjectSubmenuView } from "./SubmenuViews";
@@ -56,6 +57,10 @@ export const ProjectNav = () => {
const isFromRootRequests = (locationSearch as { from?: string })?.from === "root-requests";
const hasSignerContext = Boolean((locationSearch as { signerId?: string })?.signerId);
const intermediateAvailable = hasIntermediateProjectsView(currentProject.type);
+ const { data: secretScanningInstance } = useGetSecretScanningInstanceState(currentOrg.id, {
+ enabled: currentProject.type === ProjectType.SecretScanning
+ });
+ const hasMultipleSecretScanningProjects = Boolean(secretScanningInstance?.isMultiInstance);
let projectLabel: string;
if (intermediateAvailable) projectLabel = "Projects";
else if (isSubOrganization) projectLabel = "Sub-Organization";
@@ -88,7 +93,7 @@ export const ProjectNav = () => {
if (isOnProjectSettings && currentProject.type === ProjectType.SecretManager)
return SM_SETTINGS_SUBMENU;
if (isOnProjectSettings && currentProject.type === ProjectType.SecretScanning)
- return SECRET_SCANNING_SETTINGS_SUBMENU;
+ return getSecretScanningSettingsSubmenu(hasMultipleSecretScanningProjects);
if (isOnCertPolicies) return CERT_CERTIFICATES_SUBMENU;
if (isOnCertApprovals) return CERT_APPROVALS_SUBMENU;
return null;
@@ -98,7 +103,7 @@ export const ProjectNav = () => {
useEffect(() => {
setActiveSubmenu(getInitialProjectSubmenu());
- }, [pathname]); // eslint-disable-line react-hooks/exhaustive-deps
+ }, [pathname, hasMultipleSecretScanningProjects]); // eslint-disable-line react-hooks/exhaustive-deps
const handleSubmenuOpen = (submenu: Submenu) => {
setActiveSubmenu(submenu);
diff --git a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx
index e8e22e2424..d46d344248 100644
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/SecretScanningNav.tsx
@@ -2,15 +2,19 @@ import { Cable, Database, FileText, Search, Settings, Shield } from "lucide-reac
import {
ProjectPermissionSub,
+ useOrganization,
useProject,
useProjectPermission,
useSubscription
} from "@app/context";
import { ProjectPermissionSecretScanningFindingActions } from "@app/context/ProjectPermissionContext/types";
-import { useGetSecretScanningUnresolvedFindingCount } from "@app/hooks/api/secretScanningV2";
+import {
+ useGetSecretScanningInstanceState,
+ useGetSecretScanningUnresolvedFindingCount
+} from "@app/hooks/api/secretScanningV2";
import { ProjectNavList } from "./ProjectNavLink";
-import { PROJECT_ACCESS_CONTROL_SUBMENU, SECRET_SCANNING_SETTINGS_SUBMENU } from "./submenus";
+import { getSecretScanningSettingsSubmenu, PROJECT_ACCESS_CONTROL_SUBMENU } from "./submenus";
import type { NavItem, Submenu } from "./types";
export const SecretScanningNav = ({
@@ -19,8 +23,10 @@ export const SecretScanningNav = ({
onSubmenuOpen: (submenu: Submenu) => void;
}) => {
const { currentProject } = useProject();
+ const { currentOrg } = useOrganization();
const { permission } = useProjectPermission();
const { subscription } = useSubscription();
+ const { data: instanceState } = useGetSecretScanningInstanceState(currentOrg.id);
const { data: unresolvedFindings } = useGetSecretScanningUnresolvedFindingCount(
currentProject.id,
@@ -56,7 +62,7 @@ export const SecretScanningNav = ({
label: "Settings",
icon: Settings,
pathSuffix: "settings",
- submenu: SECRET_SCANNING_SETTINGS_SUBMENU
+ submenu: getSecretScanningSettingsSubmenu(Boolean(instanceState?.isMultiInstance))
}
];
return <ProjectNavList items={items} onSubmenuOpen={onSubmenuOpen} />;
diff --git a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/submenus.ts b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/submenus.ts
index 424937d436..f21682f514 100644
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/submenus.ts
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/submenus.ts
@@ -129,3 +129,16 @@ export const SECRET_SCANNING_SETTINGS_SUBMENU: Submenu = {
{ label: "Scanning Settings", icon: ScanSearch, tab: "scanning-settings" }
]
};
+
+// With a single project there is no project to rename or delete, so General is left out.
+const SECRET_SCANNING_SINGLE_PROJECT_SETTINGS_SUBMENU: Submenu = {
+ title: "Settings",
+ pathSuffix: "settings",
+ defaultTab: "scanning-settings",
+ items: [{ label: "Scanning Settings", icon: ScanSearch, tab: "scanning-settings" }]
+};
+
+export const getSecretScanningSettingsSubmenu = (hasMultipleProjects: boolean): Submenu =>
+ hasMultipleProjects
+ ? SECRET_SCANNING_SETTINGS_SUBMENU
+ : SECRET_SCANNING_SINGLE_PROJECT_SETTINGS_SUBMENU;
diff --git a/frontend/src/pages/secret-scanning/SettingsPage/SettingsPage.tsx b/frontend/src/pages/secret-scanning/SettingsPage/SettingsPage.tsx
index 7ad78b5ca7..48dd14e59b 100644
--- a/frontend/src/pages/secret-scanning/SettingsPage/SettingsPage.tsx
+++ b/frontend/src/pages/secret-scanning/SettingsPage/SettingsPage.tsx
@@ -5,9 +5,10 @@ import { useSearch } from "@tanstack/react-router";
import { ProjectPermissionCan } from "@app/components/permissions";
import { LookingForOrgPageLink } from "@app/components/v3";
import { PageHeader } from "@app/components/v3/platform";
-import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionSub, useOrganization } from "@app/context";
import { ProjectPermissionSecretScanningConfigActions } from "@app/context/ProjectPermissionContext/types";
import { ProjectType } from "@app/hooks/api/projects/types";
+import { useGetSecretScanningInstanceState } from "@app/hooks/api/secretScanningV2";
import { ProjectGeneralTab } from "@app/pages/project/SettingsPage/components/ProjectGeneralTab";
import { ProjectScanningConfigTab } from "./components/ProjectScanningConfigTab";
@@ -18,7 +19,15 @@ export const SettingsPage = () => {
from: "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout/settings"
});
- const activeTab = selectedTab || "general";
+ const { currentOrg } = useOrganization();
+ const { data: instanceState } = useGetSecretScanningInstanceState(currentOrg.id);
+ const hasMultipleProjects = Boolean(instanceState?.isMultiInstance);
+
+ // General only exists while there are several projects to rename or delete.
+ const activeTab =
+ !hasMultipleProjects && (!selectedTab || selectedTab === "general")
+ ? "scanning-settings"
+ : selectedTab || "general";
return (
<div className="flex h-full w-full justify-center bg-page text-foreground-inverse">