Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
migrate to v3 modal and use secret-scanning variation
Matheus Nogueirabfaf470c75a7
diff --git a/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx b/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsxindex 13e210ede2..2b96c44189 100644--- a/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx+++ b/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx@@ -1,5 +1,5 @@import { createNotification } from "@app/components/notifications";-import { DeleteActionModal } from "@app/components/v2";+import { Alert, AlertDescription, DeleteConfirmDialog } from "@app/components/v3";import { SECRET_SCANNING_DATA_SOURCE_MAP } from "@app/helpers/secretScanningV2";import {TSecretScanningDataSource,@@ -44,16 +44,20 @@ export const DeleteSecretScanningDataSourceModal = ({};return (- <DeleteActionModal+ <DeleteConfirmDialogisOpen={isOpen}- onChange={onOpenChange}- title={`Are you sure you want to delete ${name}?`}- deleteKey={name}- onDeleteApproved={handleDeleteDataSource}- >- <p className="mt-1 font-sans text-sm text-muted">- This permanently deletes the findings and scan history of this data source.- </p>- </DeleteActionModal>+ onOpenChange={onOpenChange}+ title={`Delete ${name}?`}+ description={+ <Alert variant="danger" appearance="borderless">+ <AlertDescription>+ This permanently deletes the findings and scan history of this data source. This+ cannot be undone.+ </AlertDescription>+ </Alert>+ }+ confirmKey={name}+ onConfirm={handleDeleteDataSource}+ />);};diff --git a/frontend/src/components/v3/generic/Checkbox/Checkbox.tsx b/frontend/src/components/v3/generic/Checkbox/Checkbox.tsxindex 1ccbcef102..1319088746 100644--- a/frontend/src/components/v3/generic/Checkbox/Checkbox.tsx+++ b/frontend/src/components/v3/generic/Checkbox/Checkbox.tsx@@ -27,6 +27,7 @@ const checkboxVariants = cva("sub-org":"data-[state=checked]:border-sub-org/25 data-[state=checked]:bg-sub-org/10 data-[state=checked]:text-foreground data-[state=checked]:hover:bg-sub-org/15 data-[state=checked]:hover:border-sub-org/30",av: "data-[state=checked]:border-product-av/25 data-[state=checked]:bg-product-av/10 data-[state=checked]:text-foreground data-[state=checked]:hover:bg-product-av/15 data-[state=checked]:hover:border-product-av/30",+ ss: "data-[state=checked]:border-product-ss/25 data-[state=checked]:bg-product-ss/10 data-[state=checked]:text-foreground data-[state=checked]:hover:bg-product-ss/15 data-[state=checked]:hover:border-product-ss/30",success:"data-[state=checked]:border-success/25 data-[state=checked]:bg-success/10 data-[state=checked]:text-foreground data-[state=checked]:hover:bg-success/15 data-[state=checked]:hover:border-success/30",info: "data-[state=checked]:border-info/25 data-[state=checked]:bg-info/10 data-[state=checked]:text-foreground data-[state=checked]:hover:bg-info/15 data-[state=checked]:hover:border-info/30",diff --git a/frontend/src/components/v3/platform/DateRangeFilter/DateRangeFilter.tsx b/frontend/src/components/v3/platform/DateRangeFilter/DateRangeFilter.tsxindex 056b04703e..869cc28f60 100644--- a/frontend/src/components/v3/platform/DateRangeFilter/DateRangeFilter.tsx+++ b/frontend/src/components/v3/platform/DateRangeFilter/DateRangeFilter.tsx@@ -53,7 +53,7 @@ export type DateRangeFilterResult = {isUtc: boolean;};-export type DateRangeFilterAccent = "primary" | "secondary" | "av";+export type DateRangeFilterAccent = "primary" | "secondary" | "av" | "ss";type Props = {defaultValue?: DateRangeFilterValue;@@ -117,6 +117,19 @@ export const ACCENT_STYLES: Record<"border-product-av/25 bg-product-av/10 hover:bg-product-av/15 hover:border-product-av/30",calendarMiddle: "data-[range-middle=true]:!bg-muted/[12%]",activeVariant: "av"+ },+ ss: {+ selectedBorderBg: "border-product-ss bg-product-ss/5",+ selectedCard: "border-product-ss/40 bg-product-ss/5 shadow-xs",+ selectedBadge:+ "rounded-sm bg-product-ss/5 px-1.5 py-0.5 text-[11px] font-medium text-product-ss",+ selectedChip: "border-product-ss/40 bg-product-ss/5 text-foreground",+ switchChecked:+ "data-[state=checked]:border-product-ss/25 data-[state=checked]:bg-product-ss/10 data-[state=checked]:hover:border-product-ss/30 data-[state=checked]:hover:bg-product-ss/15",+ applyButton:+ "border-product-ss/25 bg-product-ss/10 hover:bg-product-ss/15 hover:border-product-ss/30",+ calendarMiddle: "data-[range-middle=true]:!bg-muted/[12%]",+ activeVariant: "ss"}};diff --git a/frontend/src/hooks/useScopeVariant.ts b/frontend/src/hooks/useScopeVariant.tsindex 1f74efe62d..f31545b22a 100644--- a/frontend/src/hooks/useScopeVariant.ts+++ b/frontend/src/hooks/useScopeVariant.ts@@ -4,7 +4,7 @@ import { useOrganization } from "@app/context";import { getOrgScopedProductFromPath } from "@app/helpers/project";import { ProjectType } from "@app/hooks/api/projects/types";-export type ScopeVariant = "org" | "project" | "sub-org" | "av";+export type ScopeVariant = "org" | "project" | "sub-org" | "av" | "ss";/*** Returns the scope-coloured variant to pass to v3 components (Button, TabsList, IconButton, etc.) so@@ -18,12 +18,8 @@ export const useScopeVariant = (): ScopeVariant => {const orgScopedProduct = getOrgScopedProductFromPath(pathname);if (orgScopedProduct === ProjectType.AgentVault) return "av";- if (- projectId ||- orgScopedProduct === ProjectType.CertificateManager ||- orgScopedProduct === ProjectType.SecretScanning- )- return "project";+ if (orgScopedProduct === ProjectType.SecretScanning) return "ss";+ if (projectId || orgScopedProduct === ProjectType.CertificateManager) return "project";if (isSubOrganization) return "sub-org";return "org";};diff --git a/frontend/src/pages/organization/AuditLogsPage/components/LogsSection.tsx b/frontend/src/pages/organization/AuditLogsPage/components/LogsSection.tsxindex 49397cea58..c84b67c292 100644--- a/frontend/src/pages/organization/AuditLogsPage/components/LogsSection.tsx+++ b/frontend/src/pages/organization/AuditLogsPage/components/LogsSection.tsx@@ -104,6 +104,7 @@ const LogsSectionComponent = ({// An org-scoped product has its own colour, and "primary" would paint its chrome the secrets yellow.let dateRangeAccent: DateRangeFilterAccent = project ? "primary" : "secondary";if (project?.type === ProjectType.AgentVault) dateRangeAccent = "av";+ if (project?.type === ProjectType.SecretScanning) dateRangeAccent = "ss";useEffect(() => {if (subscription && !subscription.auditLogs) {diff --git a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsxindex 79b9deeb14..9001a60b75 100644--- a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx+++ b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx@@ -12,6 +12,7 @@ import {} from "@app/components/v3";import { useOrganization, useProject } from "@app/context";import { getProjectBaseURL, hidesProjects } from "@app/helpers/project";+import { useScopeVariant } from "@app/hooks";import { ProjectType } from "@app/hooks/api/projects/types";import { ProjectAccessControlTabs } from "@app/types/project";@@ -24,6 +25,7 @@ import {} from "./components";const Page = () => {+ const scopeVariant = useScopeVariant();const navigate = useNavigate();const { currentOrg } = useOrganization();const { currentProject } = useProject();@@ -80,7 +82,7 @@ const Page = () => {</PageHeader>{hasTabs ? (<Tabs value={selectedTab} onValueChange={updateSelectedTab}>- <TabsList variant="project" aria-label="Project access control sections">+ <TabsList variant={scopeVariant} aria-label="Project access control sections"><TabsTrigger value={ProjectAccessControlTabs.Member}>Users</TabsTrigger><TabsTrigger value={ProjectAccessControlTabs.Identities}>Machine Identitiesdiff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsxindex 1e68ba7675..591aadca19 100644--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx@@ -27,7 +27,7 @@ import {} from "@app/components/v3";import { useOrganization, useProject } from "@app/context";import { getProjectLabel, hidesProjects } from "@app/helpers/project";-import { useDebounce } from "@app/hooks";+import { useDebounce, useScopeVariant } from "@app/hooks";import {useAddGroupToWorkspace,useGetProjectRoles,@@ -53,6 +53,7 @@ type Props = {// TODO: update backend to support adding multiple roles at onceconst Content = ({ onClose }: { onClose: () => void }) => {+ const scopeVariant = useScopeVariant();const { currentOrg } = useOrganization();const { currentProject } = useProject();const productLabel = getProjectLabel(currentProject?.type);@@ -146,7 +147,7 @@ const Content = ({ onClose }: { onClose: () => void }) => {<Button variant="ghost" type="button" onClick={onClose}>Cancel</Button>- <Button variant="project" type="button" isPending isDisabled>+ <Button variant={scopeVariant} type="button" isPending isDisabled>Add</Button></DialogFooter>@@ -256,7 +257,7 @@ const Content = ({ onClose }: { onClose: () => void }) => {<Button variant="ghost" type="button" onClick={onClose}>Cancel</Button>- <Button variant="project" type="submit" isPending={isSubmitting} isDisabled={isSubmitting}>+ <Button variant={scopeVariant} type="submit" isPending={isSubmitting} isDisabled={isSubmitting}>Add</Button></DialogFooter>diff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles.tsxindex 089e0c2e04..18123c3bc0 100644--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles.tsx@@ -38,7 +38,7 @@ import {useSubscription} from "@app/context";import { formatProjectRoleName, isCustomProjectRole } from "@app/helpers/roles";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useGetProjectRoles, useUpdateGroupWorkspaceRole } from "@app/hooks/api";import { TGroupMembership } from "@app/hooks/api/groups/types";import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";@@ -231,6 +231,7 @@ type FormProps = {};const GroupRolesForm = ({ projectRoles, roles, groupId, onClose }: FormProps) => {+ const scopeVariant = useScopeVariant();const { currentProject } = useProject();const { subscription } = useSubscription();const {@@ -375,7 +376,7 @@ const GroupRolesForm = ({ projectRoles, roles, groupId, onClose }: FormProps) =>size="xs"type="submit"isFullWidth- variant="project"+ variant={scopeVariant}form="role-update-form"isDisabled={!isDirty || isSubmitting}isPending={isSubmitting}diff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsxindex 0ec00ec452..2af82c789c 100644--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx@@ -21,13 +21,14 @@ import {useSubscription} from "@app/context";import { getProjectLabel, hidesProjects } from "@app/helpers/project";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useDeleteGroupFromWorkspace } from "@app/hooks/api";import { GroupModal } from "./GroupModal";import { GroupTable } from "./GroupsTable";export const GroupsSection = () => {+ const scopeVariant = useScopeVariant();const { subscription } = useSubscription();const { currentProject } = useProject();const productLabel = getProjectLabel(currentProject?.type);@@ -90,7 +91,7 @@ export const GroupsSection = () => {>{(isAllowed) => (<Button- variant="project"+ variant={scopeVariant}onClick={() => handleAddGroupModal()}isDisabled={!isAllowed}>diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsxindex 6b13eb2858..6fb0a7ca96 100644--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx@@ -75,7 +75,7 @@ import {setUserTablePreference} from "@app/helpers/userTablePreferences";import { withProjectPermission } from "@app/hoc";-import { usePagination, useResetPageHelper } from "@app/hooks";+import { usePagination, useResetPageHelper, useScopeVariant } from "@app/hooks";import {IdentityAuthMethod,identityAuthToNameMap,@@ -96,6 +96,7 @@ import { CreateProjectIdentitySheet } from "./components/CreateProjectIdentity/Cexport const IdentityTab = withProjectPermission(() => {+ const scopeVariant = useScopeVariant();const { currentProject, projectId } = useProject();const navigate = useNavigate();const { isSubOrganization, currentOrg } = useOrganization();@@ -230,7 +231,7 @@ export const IdentityTab = withProjectPermission(>{(isAllowed) => (<Button- variant="project"+ variant={scopeVariant}onClick={() => handlePopUpOpen("createIdentity")}isDisabled={!isAllowed}>@@ -264,7 +265,7 @@ export const IdentityTab = withProjectPermission(<DropdownMenuTrigger asChild><IconButtonaria-label="Filter machine identities"- variant={isTableFiltered ? "project" : "outline"}+ variant={isTableFiltered ? scopeVariant : "outline"}><FilterIcon /></IconButton>@@ -416,7 +417,7 @@ export const IdentityTab = withProjectPermission(variant={// eslint-disable-next-line no-nested-ternaryidentityProjectId- ? "project"+ ? scopeVariant: isSubOrganization && currentOrg.id === identityOrgId? "sub-org": "org"diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsxindex b21bedef07..564cbd83ba 100644--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx@@ -49,9 +49,10 @@ import {TCreateProjectIdentityForm} from "./schema";-const SUBMIT_VARIANT_BY_PRODUCT: Partial<Record<ProjectType, "pam" | "av">> = {+const SUBMIT_VARIANT_BY_PRODUCT: Partial<Record<ProjectType, "pam" | "av" | "ss">> = {[ProjectType.PAM]: "pam",- [ProjectType.AgentVault]: "av"+ [ProjectType.AgentVault]: "av",+ [ProjectType.SecretScanning]: "ss"};const buildTemplatePermissions = (diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsxindex 94b32ae7a6..7e397f13c8 100644--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx@@ -42,7 +42,9 @@ type ContentProps = {export const ProjectIdentityModal = ({ onClose, identity }: ContentProps) => {const { currentProject } = useProject();- const accentVariant = currentProject.type === ProjectType.AgentVault ? "av" : "project";+ let accentVariant: "av" | "ss" | "project" = "project";+ if (currentProject.type === ProjectType.AgentVault) accentVariant = "av";+ else if (currentProject.type === ProjectType.SecretScanning) accentVariant = "ss";const { mutateAsync: updateMutateAsync } = useUpdateProjectIdentity();diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsxindex 1b43a9f285..79cb5168b7 100644--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx@@ -37,6 +37,7 @@ import {useProjectPermission} from "@app/context";import { getProjectLabel, hidesProjects } from "@app/helpers/project";+import { useScopeVariant } from "@app/hooks";import {useAddUserToWsNonE2EE,useGetOrgUsers,@@ -69,6 +70,7 @@ type Props = {};export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {+ const scopeVariant = useScopeVariant();const { t } = useTranslation();const { currentOrg } = useOrganization();const { currentProject } = useProject();@@ -430,7 +432,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {</Button><Buttontype="submit"- variant="project"+ variant={scopeVariant}isPending={isSubmitting}isDisabled={isSubmitting ||diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsxindex 75a4d25bc0..6c4089e298 100644--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx@@ -26,7 +26,7 @@ import {useProject} from "@app/context";import { getProjectLabel, hidesProjects } from "@app/helpers/project";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useDeleteUserFromWorkspace } from "@app/hooks/api";import { ActorType } from "@app/hooks/api/auditLogs/enums";@@ -34,6 +34,7 @@ import { AddMemberModal } from "./AddMemberModal";import { MembersTable } from "./MembersTable";export const MembersSection = () => {+ const scopeVariant = useScopeVariant();const { currentOrg } = useOrganization();const { currentProject } = useProject();const productLabel = getProjectLabel(currentProject?.type);@@ -86,7 +87,7 @@ export const MembersSection = () => {{(isAllowed) => {const button = (<Button- variant="project"+ variant={scopeVariant}onClick={() => handlePopUpOpen("addMember")}isDisabled={!isAllowed}>diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsxindex 9353a8403e..805acf58a8 100644--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx@@ -65,7 +65,7 @@ import {PreferenceKey,setUserTablePreference} from "@app/helpers/userTablePreferences";-import { usePagination, useResetPageHelper } from "@app/hooks";+import { usePagination, useResetPageHelper, useScopeVariant } from "@app/hooks";import { useGetProjectRoles, useGetWorkspaceUsers } from "@app/hooks/api";import { OrderByDirection } from "@app/hooks/api/generic/types";import { ProjectType } from "@app/hooks/api/projects/types";@@ -90,6 +90,7 @@ type Filter = {};export const MembersTable = ({ handlePopUpOpen }: Props) => {+ const scopeVariant = useScopeVariant();const { currentProject } = useProject();const { user } = useUser();const navigate = useNavigate();@@ -225,7 +226,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {<DropdownMenu><DropdownMenuTrigger asChild><IconButton- variant={isTableFiltered ? "project" : "outline"}+ variant={isTableFiltered ? scopeVariant : "outline"}aria-label={isProjectRolesLoading ? "Loading role filters" : "Filter users by role"}isDisabled={isProjectRolesLoading || isProjectRolesError}>diff --git a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsxindex f66ff6c2fb..8c72e3ac1b 100644--- a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx@@ -56,7 +56,7 @@ import {PreferenceKey,setUserTablePreference} from "@app/helpers/userTablePreferences";-import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";+import { usePagination, usePopUp, useResetPageHelper, useScopeVariant } from "@app/hooks";import { useDeleteProjectRole, useGetProjectRoles } from "@app/hooks/api";import { OrderByDirection } from "@app/hooks/api/generic/types";import { ProjectType } from "@app/hooks/api/projects/types";@@ -77,6 +77,7 @@ type RoleSortState = {};export const ProjectRoleList = () => {+ const scopeVariant = useScopeVariant();const navigate = useNavigate();const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp(["role",@@ -194,7 +195,7 @@ export const ProjectRoleList = () => {>{(isAllowed) => (<Button- variant="project"+ variant={scopeVariant}onClick={() => handlePopUpOpen("role")}isDisabled={!isAllowed}>diff --git a/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsx b/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsxindex 70b859edae..ee4edfade3 100644--- a/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/AddServiceTokenModal.tsx@@ -41,7 +41,7 @@ import {TooltipTrigger} from "@app/components/v3";import { useProject } from "@app/context";-import { useTimedReset } from "@app/hooks";+import { useScopeVariant, useTimedReset } from "@app/hooks";import { useCreateServiceToken } from "@app/hooks/api";import { UsePopUpState } from "@app/hooks/usePopUp";@@ -92,6 +92,7 @@ type Props = {};const ServiceTokenForm = () => {+ const scopeVariant = useScopeVariant();const { t } = useTranslation();const fieldId = useId();@@ -378,7 +379,7 @@ const ServiceTokenForm = () => {<Field key={optionValue} orientation="horizontal"><Checkboxid={`permission-${optionValue}`}- variant="project"+ variant={scopeVariant}isChecked={value[optionValue]}isDisabled={optionValue === "read"}onCheckedChange={(state) =>@@ -408,7 +409,7 @@ const ServiceTokenForm = () => {<SheetFooter className="justify-end border-t">{hasServiceToken ? (<SheetClose asChild>- <Button type="button" variant="project">+ <Button type="button" variant={scopeVariant}>Done</Button></SheetClose>@@ -422,7 +423,7 @@ const ServiceTokenForm = () => {<Buttontype="submit"form="add-service-token-form"- variant="project"+ variant={scopeVariant}isPending={isSubmitting}isDisabled={isSubmitting}>diff --git a/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/ServiceTokenSection.tsx b/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/ServiceTokenSection.tsxindex 6ea3b29ff8..eefe0ca921 100644--- a/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/ServiceTokenSection.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/ServiceTokenTab/components/ServiceTokenSection/ServiceTokenSection.tsx@@ -30,7 +30,7 @@ import {} from "@app/components/v3";import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";import { withProjectPermission } from "@app/hoc";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useDeleteServiceToken } from "@app/hooks/api";import { AddServiceTokenModal } from "./AddServiceTokenModal";@@ -40,6 +40,7 @@ type DeleteModalData = { name: string; id: string };export const ServiceTokenSection = withProjectPermission(() => {+ const scopeVariant = useScopeVariant();const { t } = useTranslation();const deleteServiceToken = useDeleteServiceToken();@@ -88,7 +89,7 @@ export const ServiceTokenSection = withProjectPermission(>{(isAllowed) => (<Button- variant="project"+ variant={scopeVariant}onClick={() => {handlePopUpOpen("createAPIToken");}}diff --git a/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsx b/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsxindex 58612cf993..f5c8b3f97a 100644--- a/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsx+++ b/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsx@@ -4,10 +4,12 @@ import { LookingForOrgPageLink } from "@app/components/v3";import { PageHeader } from "@app/components/v3/platform";import { useProject } from "@app/context";import { hidesProjects } from "@app/helpers/project";+import { useScopeVariant } from "@app/hooks";import { ProjectAuditLogsTabs } from "./components";export const AuditLogsPage = () => {+ const scopeVariant = useScopeVariant();const { currentProject } = useProject();const projectsHidden = hidesProjects(currentProject.type);return (@@ -25,7 +27,7 @@ export const AuditLogsPage = () => {><LookingForOrgPageLink page="auditLogs" /></PageHeader>- <ProjectAuditLogsTabs variant="project" />+ <ProjectAuditLogsTabs variant={scopeVariant} /></div></div></div>diff --git a/frontend/src/pages/project/AuditLogsPage/components/AuditLogsRetentionSection/AuditLogsRetentionSection.tsx b/frontend/src/pages/project/AuditLogsPage/components/AuditLogsRetentionSection/AuditLogsRetentionSection.tsxindex 44d245af08..dafd85966f 100644--- a/frontend/src/pages/project/AuditLogsPage/components/AuditLogsRetentionSection/AuditLogsRetentionSection.tsx+++ b/frontend/src/pages/project/AuditLogsPage/components/AuditLogsRetentionSection/AuditLogsRetentionSection.tsx@@ -27,7 +27,7 @@ import {} from "@app/context";import { isInfisicalCloud } from "@app/helpers/platform";import { getProjectTitle, isOrgScopedProduct } from "@app/helpers/project";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useUpdateWorkspaceAuditLogsRetention } from "@app/hooks/api/projects/queries";const formSchema = z.object({@@ -37,6 +37,7 @@ const formSchema = z.object({type TForm = z.infer<typeof formSchema>;export const AuditLogsRetentionSection = () => {+ const scopeVariant = useScopeVariant();const { mutateAsync: updateAuditLogsRetention } = useUpdateWorkspaceAuditLogsRetention();const { currentProject } = useProject();@@ -142,7 +143,7 @@ export const AuditLogsRetentionSection = () => {</CardContent><CardFooter className="justify-end"><Button- variant="project"+ variant={scopeVariant}size="sm"type="submit"isPending={isSubmitting}diff --git a/frontend/src/pages/project/AuditLogsPage/components/ProjectAuditLogsTabs.tsx b/frontend/src/pages/project/AuditLogsPage/components/ProjectAuditLogsTabs.tsxindex 9639c8a6f6..d0112e0cb5 100644--- a/frontend/src/pages/project/AuditLogsPage/components/ProjectAuditLogsTabs.tsx+++ b/frontend/src/pages/project/AuditLogsPage/components/ProjectAuditLogsTabs.tsx@@ -13,7 +13,7 @@ export enum ProjectAuditLogsTab {}type Props = {- variant: "project" | "pam" | "av";+ variant: "project" | "pam" | "av" | "ss";};export const ProjectAuditLogsTabs = ({ variant }: Props) => {diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersTable.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersTable.tsxindex 4d964649c8..958495c1c0 100644--- a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersTable.tsx+++ b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersTable.tsx@@ -34,7 +34,7 @@ import {PreferenceKey,setUserTablePreference} from "@app/helpers/userTablePreferences";-import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";+import { usePagination, usePopUp, useResetPageHelper, useScopeVariant } from "@app/hooks";import { ActorType } from "@app/hooks/api/auditLogs/enums";import { OrderByDirection } from "@app/hooks/api/generic/types";import { useListGroupMembers } from "@app/hooks/api/groups/queries";@@ -53,6 +53,7 @@ type Props = {};export const GroupMembersTable = ({ groupMembership }: Props) => {+ const scopeVariant = useScopeVariant();const navigate = useNavigate();const { currentProject } = useProject();const canAssumePrivileges = supportsAssumePrivileges(currentProject.type);@@ -146,7 +147,7 @@ export const GroupMembersTable = ({ groupMembership }: Props) => {<DropdownMenu><DropdownMenuTrigger asChild><IconButton- variant={memberTypeFilter.length ? "project" : "outline"}+ variant={memberTypeFilter.length ? scopeVariant : "outline"}aria-label="Filter group members"><FilterIcon />diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeModifySection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeModifySection.tsxindex 936075ef48..b2f3b145ca 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeModifySection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeModifySection.tsx@@ -32,6 +32,7 @@ import {useProject,useProjectPermission} from "@app/context";+import { useScopeVariant } from "@app/hooks";import {useCreateIdentityProjectAdditionalPrivilege,useGetIdentityProjectPrivilegeDetails,@@ -94,6 +95,7 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({menuPortalContainerRef,initialPermissions}: Props) => {+ const scopeVariant = useScopeVariant();const isCreate = !privilegeId;const [openPolicies, setOpenPolicies] = useState<string[]>(() =>initialPermissions@@ -474,7 +476,7 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({<Button variant="ghost" onClick={onGoBack}>Cancel</Button>- <Button variant="project" type="submit" disabled={isSubmitting || !isDirty}>+ <Button variant={scopeVariant} type="submit" disabled={isSubmitting || !isDirty}><SaveIcon />Save</Button>diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsxindex d899076055..7c14ff9477 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx@@ -49,7 +49,7 @@ import {useProjectPermission} from "@app/context";import { getProjectLabel } from "@app/helpers/project";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useDeleteIdentityProjectAdditionalPrivilege } from "@app/hooks/api";import { IdentityProjectMembershipV1 } from "@app/hooks/api/identities/types";import { useListIdentityProjectPrivileges } from "@app/hooks/api/identityProjectAdditionalPrivilege/queries";@@ -66,6 +66,7 @@ type Props = {};export const IdentityProjectAdditionalPrivilegeSection = ({ identityMembershipDetails }: Props) => {+ const scopeVariant = useScopeVariant();const sheetContainerRef = useRef<HTMLDivElement>(null);const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp(["deletePrivilege",@@ -306,7 +307,7 @@ export const IdentityProjectAdditionalPrivilegeSection = ({ identityMembershipDeconst isEditDisabled = !isAllowed || !canModifyIdentityPrivileges;const button = (<Button- variant="project"+ variant={scopeVariant}size="xs"onClick={() => {handlePopUpOpen("modifyPrivilege");diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleDetailsSection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleDetailsSection.tsxindex 8a4990e702..f600e0b538 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleDetailsSection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleDetailsSection.tsx@@ -54,7 +54,7 @@ import {} from "@app/context";import { getProjectBaseURL } from "@app/helpers/project";import { formatProjectRoleName } from "@app/helpers/roles";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useUpdateProjectIdentityMembership } from "@app/hooks/api";import { IdentityProjectMembershipV1 } from "@app/hooks/api/identities/types";import { ProjectType } from "@app/hooks/api/projects/types";@@ -78,6 +78,7 @@ export const IdentityRoleDetailsSection = ({identityMembershipDetails,isMembershipDetailsLoading}: Props) => {+ const scopeVariant = useScopeVariant();const { currentProject } = useProject();const { permission } = useProjectPermission();const navigate = useNavigate();@@ -376,7 +377,7 @@ export const IdentityRoleDetailsSection = ({const isEditDisabled = !isAllowed || !canModifyIdentityRoles;const button = (<Button- variant="project"+ variant={scopeVariant}size="xs"onClick={() => {handlePopUpOpen("modifyRole");diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsxindex 7261529e3b..9783cc8fed 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentityRoleModify.tsx@@ -44,7 +44,7 @@ import {useSubscription} from "@app/context";import { isCustomProjectRole } from "@app/helpers/roles";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useUpdateProjectIdentityMembership } from "@app/hooks/api";import { IdentityProjectMembershipV1 } from "@app/hooks/api/identities/types";@@ -261,6 +261,7 @@ type Props = {};export const IdentityRoleModify = ({ identityProjectMembership, onClose }: Props) => {+ const scopeVariant = useScopeVariant();const { projectId, currentProject } = useProject();const { subscription } = useSubscription();const { filteredRoles, isRolesLoading, assignableRoleSlugs, getRolesForSelect, isEditDisabled } =@@ -360,7 +361,7 @@ export const IdentityRoleModify = ({ identityProjectMembership, onClose }: Props</Button><Buttontype="submit"- variant="project"+ variant={scopeVariant}isDisabled={!roleForm.formState.isDirty || isEditDisabled}isPending={roleForm.formState.isSubmitting}>diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentitySingleRoleModify.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentitySingleRoleModify.tsxindex 7d6f54a2c2..c8e840fd3c 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentitySingleRoleModify.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityRoleDetailsSection/IdentitySingleRoleModify.tsx@@ -6,7 +6,7 @@ import { createNotification } from "@app/components/notifications";import { Button, PageLoader } from "@app/components/v3";import { useProject, useSubscription } from "@app/context";import { isCustomProjectRole } from "@app/helpers/roles";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useUpdateProjectIdentityMembership } from "@app/hooks/api";import { IdentityProjectMembershipV1 } from "@app/hooks/api/identities/types";@@ -28,6 +28,7 @@ type Props = {};export const IdentitySingleRoleModify = ({ identityProjectMembership, role, onSuccess }: Props) => {+ const scopeVariant = useScopeVariant();const { projectId, currentProject } = useProject();const { subscription } = useSubscription();const { isRolesLoading, assignableRoleSlugs, getRolesForSelect, isEditDisabled } =@@ -93,7 +94,7 @@ export const IdentitySingleRoleModify = ({ identityProjectMembership, role, onSu<div className="mt-4 flex justify-end"><Buttontype="submit"- variant="project"+ variant={scopeVariant}isDisabled={!roleForm.formState.isDirty || isEditDisabled}isPending={roleForm.formState.isSubmitting}>diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityAuthSection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityAuthSection.tsxindex 49a3c7e389..cf12223394 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityAuthSection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityAuthSection.tsx@@ -17,6 +17,7 @@ import {EmptyTitle} from "@app/components/v3";import { ProjectPermissionIdentityActions, ProjectPermissionSub } from "@app/context";+import { useScopeVariant } from "@app/hooks";import { IdentityAuthMethod, TProjectIdentity } from "@app/hooks/api";import { usePopUp, UsePopUpState } from "@app/hooks/usePopUp";import { IdentityAuthMethodModal } from "@app/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal";@@ -28,6 +29,7 @@ type Props = {};export const ProjectIdentityAuthenticationSection = ({ identity, refetchIdentity }: Props) => {+ const scopeVariant = useScopeVariant();const { popUp, handlePopUpToggle, handlePopUpOpen } = usePopUp(["identityAuthMethod","upgradePlan"@@ -111,7 +113,7 @@ export const ProjectIdentityAuthenticationSection = ({ identity, refetchIdentity>{(isAllowed) => (<Button- variant="project"+ variant={scopeVariant}size="xs"isDisabled={!isAllowed}onClick={() => {diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsxindex f2d5c7f6aa..921ca25024 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx@@ -54,6 +54,7 @@ export const ProjectIdentityDetailsSection = ({const projectsHidden = hidesProjects(currentProject?.type);const isPam = currentProject?.type === ProjectType.PAM;const isAgentVault = currentProject?.type === ProjectType.AgentVault;+ const isSecretScanning = currentProject?.type === ProjectType.SecretScanning;let productLabel = "Project";if (projectsHidden) {@@ -150,7 +151,10 @@ export const ProjectIdentityDetailsSection = ({{isSubOrgIdentity ? "Sub-" : ""}Organization</Badge>) : (- <Badge variant={isAgentVault ? "av" : "project"}>+ <Badge+ // eslint-disable-next-line no-nested-ternary+ variant={isAgentVault ? "av" : isSecretScanning ? "ss" : "project"}+ >{isAgentVault ? <VaultIcon /> : <ProjectIcon />}{productLabel}</Badge>diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsxindex f07758db4b..eadca2657f 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsx@@ -63,7 +63,7 @@ import {useUser} from "@app/context";import { getProjectLabel } from "@app/helpers/project";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import {useDeleteProjectUserAdditionalPrivilege,useListProjectUserPrivileges,@@ -83,6 +83,7 @@ type Props = {};export const MemberProjectAdditionalPrivilegeSection = ({ membershipDetails }: Props) => {+ const scopeVariant = useScopeVariant();const sheetContainerRef = useRef<HTMLDivElement>(null);const queryClient = useQueryClient();const { user } = useUser();@@ -407,7 +408,7 @@ export const MemberProjectAdditionalPrivilegeSection = ({ membershipDetails }: Pconst isEditDisabled = !isAllowed || !canModifyMemberPrivileges;const button = (<Button- variant="project"+ variant={scopeVariant}size="xs"onClick={() => {handlePopUpOpen("modifyPrivilege");diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsxindex 58d9ed1955..c465c07e53 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsx@@ -35,6 +35,7 @@ import {useProject,useProjectPermission} from "@app/context";+import { useScopeVariant } from "@app/hooks";import {useCreateProjectUserAdditionalPrivilege,useGetProjectUserPrivilegeDetails,@@ -97,6 +98,7 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({menuPortalContainerRef,initialPermissions}: Props) => {+ const scopeVariant = useScopeVariant();const isCreate = !privilegeId;const [openPolicies, setOpenPolicies] = useState<string[]>(() =>initialPermissions@@ -518,7 +520,7 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({Cancel</Button><Button- variant="project"+ variant={scopeVariant}type="submit"isPending={isSubmitting}isDisabled={isSubmitting || !isDirty || isFormDisabled}diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsxindex 1d725d0ffd..02761994db 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberMultiRoleModify.tsx@@ -20,6 +20,7 @@ import {useProject,useSubscription} from "@app/context";+import { useScopeVariant } from "@app/hooks";import { useUpdateUserWorkspaceRole } from "@app/hooks/api";import { ProjectType } from "@app/hooks/api/projects/types";import { ProjectMembershipRole } from "@app/hooks/api/roles/types";@@ -39,6 +40,7 @@ type Props = {};export const MemberMultiRoleModify = ({ projectMember, onOpenUpgradeModal, onClose }: Props) => {+ const scopeVariant = useScopeVariant();const { subscription } = useSubscription();const { projectId, currentProject } = useProject();const {@@ -174,7 +176,7 @@ export const MemberMultiRoleModify = ({ projectMember, onOpenUpgradeModal, onClo</Button><Buttontype="submit"- variant="project"+ variant={scopeVariant}isDisabled={!roleForm.formState.isDirty || isEditDisabled}isPending={roleForm.formState.isSubmitting}>diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsxindex 3c00962cbb..b054bb794f 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx@@ -67,7 +67,7 @@ import {} from "@app/context";import { getProjectBaseURL, hidesProjects } from "@app/helpers/project";import { formatProjectRoleName } from "@app/helpers/roles";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useUpdateUserWorkspaceRole } from "@app/hooks/api";import { ProjectType } from "@app/hooks/api/projects/types";import { TProjectRole } from "@app/hooks/api/roles/types";@@ -88,6 +88,7 @@ export const MemberRoleDetailsSection = ({isMembershipDetailsLoading,onOpenUpgradeModal}: Props) => {+ const scopeVariant = useScopeVariant();const { user } = useUser();const userId = user?.id;const { projectId, currentProject } = useProject();@@ -368,7 +369,7 @@ export const MemberRoleDetailsSection = ({!isAllowed || isOwnProjectMembershipDetails || !canModifyMemberRoles;const button = (<Button- variant="project"+ variant={scopeVariant}size="xs"onClick={() => {handlePopUpOpen("modifyManyRoles");diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberSingleRoleModify.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberSingleRoleModify.tsxindex e261a72fc5..669e9e13b8 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberSingleRoleModify.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberSingleRoleModify.tsx@@ -5,6 +5,7 @@ import { CircleAlertIcon, RefreshCwIcon } from "lucide-react";import { createNotification } from "@app/components/notifications";import { Alert, AlertDescription, AlertTitle, Button, PageLoader } from "@app/components/v3";import { useProject, useSubscription } from "@app/context";+import { useScopeVariant } from "@app/hooks";import { useUpdateUserWorkspaceRole } from "@app/hooks/api";import { ProjectType } from "@app/hooks/api/projects/types";import { ProjectMembershipRole } from "@app/hooks/api/roles/types";@@ -34,6 +35,7 @@ export const MemberSingleRoleModify = ({onOpenUpgradeModal,onSuccess}: Props) => {+ const scopeVariant = useScopeVariant();const { subscription } = useSubscription();const { projectId, currentProject } = useProject();const {@@ -120,7 +122,7 @@ export const MemberSingleRoleModify = ({<div className="mt-4 flex justify-end"><Buttontype="submit"- variant="project"+ variant={scopeVariant}isDisabled={!roleForm.formState.isDirty || isEditDisabled}isPending={roleForm.formState.isSubmitting}>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsxindex 034a7224ae..03abc65c6e 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx@@ -24,6 +24,7 @@ import {} from "@app/components/v3";import { useOrganization, useProject, useSubscription } from "@app/context";import { getProjectBaseURL } from "@app/helpers/project";+import { useScopeVariant } from "@app/hooks";import { useCreateProjectRole, useGetProjectRoleBySlug } from "@app/hooks/api";import { TProjectRole } from "@app/hooks/api/roles/types";import { usePopUp } from "@app/hooks/usePopUp";@@ -53,6 +54,7 @@ type ContentProps = {};const Content = ({ role, onClose }: ContentProps) => {+ const scopeVariant = useScopeVariant();const {control,handleSubmit,@@ -194,7 +196,7 @@ const Content = ({ role, onClose }: ContentProps) => {Cancel</Button></SheetClose>- <Button type="submit" variant="project" isPending={isSubmitting}>+ <Button type="submit" variant={scopeVariant} isPending={isSubmitting}>Duplicate Role</Button></SheetFooter>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsxindex 39cc1d41b9..de2253fbe9 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/EditProjectRoleDialog.tsx@@ -23,7 +23,7 @@ import {} from "@app/components/v3";import { useOrganization, useProject, useSubscription } from "@app/context";import { getProjectBaseURL } from "@app/helpers/project";-import { usePopUp } from "@app/hooks";+import { usePopUp, useScopeVariant } from "@app/hooks";import { useUpdateProjectRole } from "@app/hooks/api";import { ProjectType } from "@app/hooks/api/projects/types";import { TProjectRole } from "@app/hooks/api/roles/types";@@ -46,6 +46,7 @@ type Props = {};export const EditProjectRoleDialog = ({ isOpen, role, onOpenChange }: Props) => {+ const scopeVariant = useScopeVariant();const navigate = useNavigate();const { currentOrg } = useOrganization();const { currentProject } = useProject();@@ -202,7 +203,7 @@ export const EditProjectRoleDialog = ({ isOpen, role, onOpenChange }: Props) =>Cancel</Button></SheetClose>- <Button type="submit" variant="project" isPending={isSubmitting}>+ <Button type="submit" variant={scopeVariant} isPending={isSubmitting}>Save Changes</Button></SheetFooter>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal.tsxindex 161d327518..ab8c5a0197 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal.tsx@@ -45,6 +45,7 @@ import {} from "@app/components/v3";import { cn } from "@app/components/v3/utils";import { ProjectPermissionSub } from "@app/context";+import { useScopeVariant } from "@app/hooks";import { ProjectType } from "@app/hooks/api/projects/types";import {@@ -183,6 +184,7 @@ const PolicyGroupsDetailedView = ({ groups }: { groups: TemplatePolicyGroup[] }));const Content = ({ onClose, type: projectType }: ContentProps) => {+ const scopeVariant = useScopeVariant();const rootForm = useFormContext<TFormSchema>();const templates = RoleTemplates[projectType ?? ProjectType.SecretManager];@@ -353,7 +355,7 @@ const Content = ({ onClose, type: projectType }: ContentProps) => {<TooltipTrigger asChild><IconButtonsize="sm"- variant={policyLayout === POLICY_LAYOUT.Compact ? "project" : "outline"}+ variant={policyLayout === POLICY_LAYOUT.Compact ? scopeVariant : "outline"}aria-label="List view"aria-pressed={policyLayout === POLICY_LAYOUT.Compact}className={policyLayout === POLICY_LAYOUT.Compact ? "z-10" : ""}@@ -369,7 +371,7 @@ const Content = ({ onClose, type: projectType }: ContentProps) => {<IconButtonsize="sm"variant={- policyLayout === POLICY_LAYOUT.Detailed ? "project" : "outline"+ policyLayout === POLICY_LAYOUT.Detailed ? scopeVariant : "outline"}aria-label="Card view"aria-pressed={policyLayout === POLICY_LAYOUT.Detailed}@@ -398,7 +400,7 @@ const Content = ({ onClose, type: projectType }: ContentProps) => {<SheetClose asChild><Button variant="ghost">Cancel</Button></SheetClose>- <Button variant="project" isDisabled={!selectedTemplate} onClick={onApply}>+ <Button variant={scopeVariant} isDisabled={!selectedTemplate} onClick={onApply}>Apply Template</Button></SheetFooter>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsxindex 7d1818aff0..19efed7780 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx@@ -23,6 +23,7 @@ import {} from "@app/components/v3";import { useOrganization, useProject, useSubscription } from "@app/context";import { getProjectBaseURL } from "@app/helpers/project";+import { useScopeVariant } from "@app/hooks";import { useCreateProjectRole } from "@app/hooks/api";import { usePopUp, UsePopUpState } from "@app/hooks/usePopUp";import { slugSchema } from "@app/lib/schemas";@@ -43,6 +44,7 @@ type Props = {};export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {+ const scopeVariant = useScopeVariant();const navigate = useNavigate();const { currentOrg } = useOrganization();const { currentProject } = useProject();@@ -193,7 +195,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {Cancel</Button></SheetClose>- <Button type="submit" variant="project" isPending={isSubmitting}>+ <Button type="submit" variant={scopeVariant} isPending={isSubmitting}>Create Role</Button></SheetFooter>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsxindex f5ad3cc0f7..c20b631a5b 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx@@ -20,6 +20,7 @@ import {import { ProjectPermissionSub, useProject } from "@app/context";import { ProjectPermissionSet } from "@app/context/ProjectPermissionContext";import { evaluatePermissionsAbility } from "@app/helpers/permissions";+import { useScopeVariant } from "@app/hooks";import { useGetProjectRoleBySlug, useUpdateProjectRole } from "@app/hooks/api";import { ProjectType } from "@app/hooks/api/projects/types";import { ProjectMembershipRole } from "@app/hooks/api/roles/types";@@ -147,6 +148,7 @@ export const renderConditionalComponents = (};export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {+ const scopeVariant = useScopeVariant();const { currentProject, projectId } = useProject();const isSecretManagerProject = currentProject.type === ProjectType.SecretManager;@@ -260,7 +262,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {</Button>)}<Button- variant="project"+ variant={scopeVariant}type="submit"isDisabled={isDisabled || isSubmitting || !isDirty}isPending={isSubmitting}diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/VaultPolicyImportModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/VaultPolicyImportModal.tsxindex 9a1b43d379..dc2cc5d577 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/VaultPolicyImportModal.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/VaultPolicyImportModal.tsx@@ -26,6 +26,7 @@ import {TextArea} from "@app/components/v3";import { ProjectPermissionSub, useOrganization } from "@app/context";+import { useScopeVariant } from "@app/hooks";import { TAvailableAppConnection } from "@app/hooks/api/appConnections/types";import {useGetVaultMounts,@@ -53,6 +54,7 @@ const defaultVaultConnectionId = (appConnections: TAvailableAppConnection[]) =>appConnections.length === 1 ? appConnections[0].id : null;const Content = ({ onClose, appConnections }: ContentProps) => {+ const scopeVariant = useScopeVariant();const rootForm = useFormContext<TFormSchema>();const hasAppConnections = appConnections.length > 0;const { isSubOrganization } = useOrganization();@@ -374,7 +376,7 @@ path "secret/metadata/prod/*" {<Button variant="ghost">Cancel</Button></SheetClose><Button- variant="project"+ variant={scopeVariant}onClick={handleTranslateAndApply}isDisabled={!hclPolicy.trim() || isLoadingMounts || !mounts}>diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourceSheet.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourceSheet.tsxindex 4b029d1977..95277e2e4f 100644--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourceSheet.tsx+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/AddSecretScanningResourceSheet.tsx@@ -162,9 +162,11 @@ export const AddSecretScanningResourceSheet = ({ dataSource, isOpen, onOpenChang{availableResources.map(({ externalId, name }) => (<Item key={externalId} variant="outline" size="sm"><ItemContent className="min-w-0">- <ItemTitle className="truncate">{name}</ItemTitle>+ <ItemTitle className="block w-full truncate" title={name}>+ {name}+ </ItemTitle></ItemContent>- <ItemActions>+ <ItemActions className="shrink-0"><Buttonvariant="outline"size="xs"