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
improvement(frontend): test secrets activation modal versus card (#8060)
claude[bot]d4732fdc0abb
diff --git a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsxindex 5571b33afb..cf595dbc10 100644--- a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx@@ -231,7 +231,7 @@ import { AddResourceButtons } from "./components/AddResourceButtons/AddResourceBimport { CreateDynamicSecretForm } from "./components/CreateDynamicSecretForm";import { CreateSecretForm } from "./components/CreateSecretForm";import { EditDynamicSecretForm } from "./components/EditDynamicSecretForm";-import { InviteMembersModal } from "./components/InviteMembersModal";+import { SecretsActivationNudge } from "./components/InviteMembersNudge/SecretsActivationNudge";import { ImportSecretsModal, SecretDropzone } from "./components/SecretDropzone";import { SecretV2MigrationSection } from "./components/SecretV2MigrationSection";import { MoveSecretsModal } from "./components/SelectionPanel/components";@@ -773,7 +773,7 @@ const OverviewPageContent = () => {} = overview ?? {};// Growth nudge: when the user creates a secret, ask the backend whether to surface the- // "Invite your team" modal. The check runs at most once per session, opens the modal only if+ // "Invite your team" card. The check runs at most once per session, opens the card only if// the backend says so, and is a no-op on failure.const {popUp: invitePopUp,@@ -903,6 +903,10 @@ const OverviewPageContent = () => {const isBatchModeActive = isOverviewBatchMode && isSingleEnvView;const hasPendingBatchChanges =isBatchModeActive && (pendingChanges.secrets.length > 0 || pendingChanges.folders.length > 0);+ // Mirrors SelectionPanel's selectedCount > 0, which is when its SelectedActionBar is visible.+ const hasSelectedEntries = Object.values(selectedEntries).some(+ (entries) => Object.keys(entries).length > 0+ );useEffect(() => {if (hasPendingBatchChanges) {@@ -4144,9 +4148,11 @@ const OverviewPageContent = () => {environment={singleEnvSlug}/>)}- {invitePopUp.inviteMembers.isOpen && (- <InviteMembersModal popUp={invitePopUp} handlePopUpToggle={handleInvitePopUpToggle} />- )}+ <SecretsActivationNudge+ popUp={invitePopUp}+ handlePopUpToggle={handleInvitePopUpToggle}+ isLifted={hasPendingBatchChanges || hasSelectedEntries}+ />{isBatchModeActive && singleVisibleEnv && (<CommitFormonCommit={handleCreateCommit}diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/InviteMembersModal.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/InviteMembersModal.tsxindex 4b08d80f89..bda49395d0 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/InviteMembersModal.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/InviteMembersModal.tsx@@ -1,4 +1,4 @@-import { useEffect, useMemo } from "react";+import { useEffect, useMemo, useRef } from "react";import { Controller, useForm } from "react-hook-form";import { zodResolver } from "@hookform/resolvers/zod";import { InfoIcon, SendHorizontalIcon } from "lucide-react";@@ -31,8 +31,6 @@ import { ProjectVersion } from "@app/hooks/api/projects/types";import { UsePopUpState } from "@app/hooks/usePopUp";import { filterByGrantConditions, getMemberAssignRoleConditions } from "@app/lib/fn/permission";-// PostHog event names for the secrets activation nudge, so we can measure the-// shown -> invited/dismissed conversion funnel of this modal.const ACTIVATION_EVENTS = {Viewed: "Secrets Activation Modal Viewed",Invited: "Secrets Activation Modal Members Invited",@@ -54,11 +52,12 @@ const inviteMembersFormSchema = z.object({type TInviteMembersForm = z.infer<typeof inviteMembersFormSchema>;type Props = {+ experimentVariant: "control" | null;popUp: UsePopUpState<["inviteMembers"]>;handlePopUpToggle: (popUpName: keyof UsePopUpState<["inviteMembers"]>, state?: boolean) => void;};-export const InviteMembersModal = ({ popUp, handlePopUpToggle }: Props) => {+export const InviteMembersModal = ({ popUp, handlePopUpToggle, experimentVariant }: Props) => {const { currentOrg } = useOrganization();const { currentProject } = useProject();const { permission: projectPermission } = useProjectPermission();@@ -99,13 +98,22 @@ export const InviteMembersModal = ({ popUp, handlePopUpToggle }: Props) => {const { mutateAsync: addUserToProject } = useAddUserToWsNonE2EE();const telemetry = new Telemetry().getInstance();- const baseEventProps = { orgId, projectId, projectType: currentProject?.type };+ const baseEventProps = {+ orgId,+ projectId,+ projectType: currentProject?.type,+ presentation: "modal",+ experiment_variant: experimentVariant,+ "$feature/secrets-activation-presentation": experimentVariant+ };+ const hasViewedRef = useRef(false);const isOpen = popUp?.inviteMembers?.isOpen;- // Fire once each time the nudge surfaces. The modal opens at most once per session- // (see useSecretsActivationNudge), so guarding on the open state is sufficient.useEffect(() => {- if (isOpen) telemetry.capture(ACTIVATION_EVENTS.Viewed, baseEventProps);+ if (isOpen && !hasViewedRef.current) {+ hasViewedRef.current = true;+ telemetry.capture(ACTIVATION_EVENTS.Viewed, baseEventProps);+ }// eslint-disable-next-line react-hooks/exhaustive-deps}, [isOpen]);@@ -121,7 +129,6 @@ export const InviteMembersModal = ({ popUp, handlePopUpToggle }: Props) => {return;}- // emails is already trimmed + lowercased by the schema; parseEmailList splits the entries.const usernames = parseEmailList(emails);if (usernames.length) {await addUserToProject({diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/index.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/index.tsxdeleted file mode 100644index 66b3c35aaa..0000000000--- a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersModal/index.tsx+++ /dev/null@@ -1 +0,0 @@-export { InviteMembersModal } from "./InviteMembersModal";diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/InviteMembersNudge.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/InviteMembersNudge.tsxnew file mode 100644index 0000000000..ee2b478e77--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/InviteMembersNudge.tsx@@ -0,0 +1,300 @@+import { useEffect, useMemo, useRef, useState } from "react";+import { Controller, useForm } from "react-hook-form";+import { zodResolver } from "@hookform/resolvers/zod";+import { CircleCheckIcon, SendHorizontalIcon, XIcon } from "lucide-react";+import { AnimatePresence, motion, useReducedMotion } from "motion/react";+import { z } from "zod";++import { createNotification } from "@app/components/notifications";+import Telemetry from "@app/components/utilities/telemetry/Telemetry";+import {+ Button,+ Card,+ CardDescription,+ CardTitle,+ Field,+ FieldDescription,+ FieldError,+ FieldLabel,+ IconButton,+ Input+} from "@app/components/v3";+import { useOrganization, useProject, useProjectPermission } from "@app/context";+import { emailListSchema, parseEmailList } from "@app/helpers/email";+import { useAddUserToWsNonE2EE, useGetProjectRoles } from "@app/hooks/api";+import { ProjectVersion } from "@app/hooks/api/projects/types";+import { UsePopUpState } from "@app/hooks/usePopUp";+import { filterByGrantConditions, getMemberAssignRoleConditions } from "@app/lib/fn/permission";++import { useFloatingBarClearance } from "./useFloatingBarClearance";++const ACTIVATION_EVENTS = {+ Viewed: "Secrets Activation Modal Viewed",+ Invited: "Secrets Activation Modal Members Invited",+ Dismissed: "Secrets Activation Modal Dismissed"+} as const;++const SUCCESS_AUTO_DISMISS_MS = 3000;++const inviteMembersNudgeFormSchema = z.object({+ emails: emailListSchema+});++export const InviteMembersNudge = ({ popUp, handlePopUpToggle, isLifted = false }: Props) => {+ const { currentOrg } = useOrganization();+ const { currentProject } = useProject();+ const { permission: projectPermission } = useProjectPermission();++ const orgId = currentOrg?.id || "";+ const projectId = currentProject?.id || "";++ const [isSuccess, setIsSuccess] = useState(false);+ const autoDismissTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);+ const isMountedRef = useRef(true);+ const hasViewedRef = useRef(false);++ const isOpen = Boolean(popUp?.inviteMembers?.isOpen);+ const bottomOffset = useFloatingBarClearance(isOpen && isLifted);++ const { data: roles, isPending: isRolesPending } = useGetProjectRoles(+ isOpen ? projectId : "",+ currentProject?.type+ );++ const defaultRole = useMemo(() => {+ const assignRoleConditions = getMemberAssignRoleConditions(projectPermission);+ const assignableRoles = filterByGrantConditions(roles ?? [], {+ getKey: (role) => role.slug,+ allowed: assignRoleConditions?.roles,+ forbidden: assignRoleConditions?.forbiddenRoles+ });+ return assignableRoles.find((role) => role.slug === "member") ?? assignableRoles[0];+ }, [roles, projectPermission]);++ const {+ control,+ handleSubmit,+ reset,+ formState: { isSubmitting }+ } = useForm<TInviteMembersNudgeForm>({+ resolver: zodResolver(inviteMembersNudgeFormSchema),+ defaultValues: { emails: "" }+ });++ const { mutateAsync: addUserToProject } = useAddUserToWsNonE2EE();++ const telemetry = new Telemetry().getInstance();+ const baseEventProps = {+ orgId,+ projectId,+ projectType: currentProject?.type,+ presentation: "card",+ experiment_variant: "card",+ "$feature/secrets-activation-presentation": "card"+ };++ useEffect(() => {+ if (isOpen && !hasViewedRef.current) {+ hasViewedRef.current = true;+ telemetry.capture(ACTIVATION_EVENTS.Viewed, baseEventProps);+ }+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [isOpen]);++ useEffect(() => {+ isMountedRef.current = true;+ return () => {+ isMountedRef.current = false;+ if (autoDismissTimeoutRef.current) clearTimeout(autoDismissTimeoutRef.current);+ };+ }, []);++ const close = () => {+ if (autoDismissTimeoutRef.current) clearTimeout(autoDismissTimeoutRef.current);+ handlePopUpToggle("inviteMembers", false);+ if (!isMountedRef.current) return;+ reset();+ setIsSuccess(false);+ };++ const onDismiss = () => {+ if (isSubmitting) return;+ telemetry.capture(ACTIVATION_EVENTS.Dismissed, baseEventProps);+ close();+ };++ const onInvite = async ({ emails }: TInviteMembersNudgeForm) => {+ if (!currentProject) return;+ if (!currentOrg?.id) return;+ if (!defaultRole) return;++ if (currentProject.version === ProjectVersion.V1) {+ createNotification({+ type: "error",+ text: "Please upgrade your project to invite new members to the project."+ });+ return;+ }++ const usernames = parseEmailList(emails);+ if (usernames.length) {+ await addUserToProject({+ usernames,+ orgId: currentOrg.id,+ projectId: currentProject.id,+ projectType: currentProject.type,+ roleSlugs: [defaultRole.slug]+ });+ }++ telemetry.capture(ACTIVATION_EVENTS.Invited, {+ ...baseEventProps,+ invitedCount: usernames.length+ });++ createNotification({+ type: "success",+ text: "Invites sent. Your teammates will get an email to join."+ });++ if (!isMountedRef.current) return;+ setIsSuccess(true);+ autoDismissTimeoutRef.current = setTimeout(close, SUCCESS_AUTO_DISMISS_MS);+ };++ const canSubmit = !isRolesPending && Boolean(defaultRole);+ const roleName = defaultRole?.name;+ const prefersReducedMotion = useReducedMotion();++ const transition = { duration: prefersReducedMotion ? 0 : 0.2, ease: "easeInOut" as const };+ const hidden = prefersReducedMotion+ ? { opacity: 0, bottom: bottomOffset }+ : { opacity: 0, y: 12, bottom: bottomOffset };+ const shown = { opacity: 1, y: 0, bottom: bottomOffset };++ let roleDescription: string | undefined;+ if (isRolesPending) {+ roleDescription = "Loading project roles...";+ } else if (roleName) {+ roleDescription = `Invited teammates join this project as ${roleName}.`;+ } else if (!canSubmit) {+ roleDescription =+ "You cannot assign a project role here, so invites must be sent from Access Control.";+ }++ return (+ <AnimatePresence>+ {isOpen && (+ <motion.div+ key="invite-members-nudge"+ role="region"+ aria-label="Invite your team"+ data-slot="invite-members-nudge"+ data-state={isSuccess ? "success" : "idle"}+ className="fixed right-4 left-4 z-40 md:left-auto md:w-[24rem]"+ initial={hidden}+ animate={shown}+ exit={hidden}+ transition={transition}+ onKeyDown={(e) => {+ if (e.key !== "Escape" || isSubmitting) return;+ e.stopPropagation();+ if (isSuccess) close();+ else onDismiss();+ }}+ >+ <Card>+ <div data-slot="invite-members-nudge-header" className="flex items-start gap-2">+ <div className="flex min-w-0 flex-1 flex-col gap-1.5">+ <CardTitle>{isSuccess ? "Invites Sent" : "Invite Your Team"}</CardTitle>+ <CardDescription>+ {isSuccess+ ? "Your teammates will get an email to join this project."+ : "Bring teammates in to review, rotate, and manage secrets together."}+ </CardDescription>+ </div>+ <IconButton+ type="button"+ variant="ghost-muted"+ size="xs"+ aria-label="Dismiss"+ isDisabled={isSubmitting}+ onClick={isSuccess ? close : onDismiss}+ >+ <XIcon />+ </IconButton>+ </div>+ {isSuccess ? (+ <div+ data-slot="invite-members-nudge-success"+ className="flex items-center gap-2 text-sm text-success"+ >+ <CircleCheckIcon className="size-4 shrink-0" />+ Invites are on their way.+ </div>+ ) : (+ <form+ data-slot="invite-members-nudge-form"+ onSubmit={handleSubmit(onInvite)}+ className="flex flex-col gap-3"+ >+ <Controller+ control={control}+ name="emails"+ render={({ field, fieldState: { error } }) => (+ <Field>+ <FieldLabel htmlFor="invite-members-nudge-emails">Emails</FieldLabel>+ <Input+ id="invite-members-nudge-emails"+ type="text"+ autoComplete="off"+ isError={Boolean(error)}+ disabled={!canSubmit}+ placeholder="[email protected], [email protected]"+ {...field}+ />+ <FieldDescription>{roleDescription}</FieldDescription>+ <FieldError>{error?.message}</FieldError>+ </Field>+ )}+ />+ <div+ data-slot="invite-members-nudge-actions"+ className="flex items-center justify-end gap-2"+ >+ <Button+ variant="ghost"+ size="sm"+ type="button"+ isDisabled={isSubmitting}+ onClick={onDismiss}+ >+ Not Now+ </Button>+ <Button+ type="submit"+ variant="project"+ size="sm"+ isPending={isSubmitting}+ isDisabled={isSubmitting || !canSubmit}+ >+ <SendHorizontalIcon />+ Send Invites+ </Button>+ </div>+ </form>+ )}+ </Card>+ </motion.div>+ )}+ </AnimatePresence>+ );+};++type TInviteMembersNudgeForm = z.infer<typeof inviteMembersNudgeFormSchema>;++type Props = {+ popUp: UsePopUpState<["inviteMembers"]>;+ handlePopUpToggle: (popUpName: keyof UsePopUpState<["inviteMembers"]>, state?: boolean) => void;+ isLifted?: boolean;+};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/SecretsActivationNudge.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/SecretsActivationNudge.tsxnew file mode 100644index 0000000000..63ce8ffe48--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/SecretsActivationNudge.tsx@@ -0,0 +1,49 @@+import { useEffect, useState } from "react";++import Telemetry from "@app/components/utilities/telemetry/Telemetry";+import { envConfig } from "@app/config/env";+import { UsePopUpState } from "@app/hooks/usePopUp";++import { InviteMembersModal } from "../InviteMembersModal/InviteMembersModal";+import { InviteMembersNudge } from "./InviteMembersNudge";+import { ActivationVariant, resolveActivationVariant } from "./resolveActivationVariant";++type Props = {+ popUp: UsePopUpState<["inviteMembers"]>;+ handlePopUpToggle: (popUpName: "inviteMembers", state?: boolean) => void;+ isLifted: boolean;+};++export const SecretsActivationNudge = ({ popUp, handlePopUpToggle, isLifted }: Props) => {+ const [variant, setVariant] = useState<ActivationVariant | undefined>();+ const { isOpen } = popUp.inviteMembers;++ useEffect(() => {+ if (!isOpen || variant !== undefined) return undefined;++ const posthog =+ envConfig.ENV === "production" &&+ envConfig.TELEMETRY_CAPTURING_ENABLED === true &&+ envConfig.POSTHOG_API_KEY+ ? new Telemetry().getInstance().api+ : undefined;++ return resolveActivationVariant(posthog, setVariant);+ }, [isOpen, variant]);++ if (variant === undefined) return null;++ if (variant === "card") {+ return (+ <InviteMembersNudge popUp={popUp} handlePopUpToggle={handlePopUpToggle} isLifted={isLifted} />+ );+ }++ return (+ <InviteMembersModal+ popUp={popUp}+ handlePopUpToggle={handlePopUpToggle}+ experimentVariant={variant}+ />+ );+};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/resolveActivationVariant.test.ts b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/resolveActivationVariant.test.tsnew file mode 100644index 0000000000..afef08af93--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/resolveActivationVariant.test.ts@@ -0,0 +1,101 @@+import assert from "node:assert/strict";+import { describe, it, mock } from "node:test";+import type { PostHog } from "posthog-js";++import { ACTIVATION_PRESENTATION_FLAG, resolveActivationVariant } from "./resolveActivationVariant";++const createClient = (value?: string | boolean, immediate = false) => {+ let listener: Parameters<PostHog["onFeatureFlags"]>[0] = () => {};+ const emit = (errorsLoading = false) => listener([], {}, { errorsLoading });+ const unsubscribe = mock.fn();+ const client = {+ getFeatureFlag: mock.fn(() => value),+ onFeatureFlags: (callback: typeof listener) => {+ listener = callback;+ if (immediate) emit();+ return unsubscribe;+ }+ };+ return { client, emit, unsubscribe };+};++describe("resolveActivationVariant", () => {+ it("uses the original modal without enrolling when telemetry is unavailable", () => {+ const resolved = mock.fn();+ resolveActivationVariant(undefined, resolved)();+ assert.deepEqual(+ resolved.mock.calls.map(({ arguments: args }) => args),+ [[null]]+ );+ });++ ["control", "card", false, true, undefined, "unknown"].forEach((value) => {+ it(`resolves ${String(value)} without emitting an early exposure`, () => {+ const resolved = mock.fn();+ const { client, unsubscribe } = createClient(value, true);+ const cancel = resolveActivationVariant(client, resolved);+ assert.equal(+ resolved.mock.calls[0].arguments[0],+ value === "control" || value === "card" ? value : null+ );+ assert.deepEqual(client.getFeatureFlag.mock.calls[0].arguments, [+ ACTIVATION_PRESENTATION_FLAG,+ { send_event: false, fresh: true }+ ]);+ assert.equal(unsubscribe.mock.callCount(), 1);+ cancel();+ });+ });++ it("waits for flags, freezes the assignment, and unsubscribes", () => {+ const { client, emit, unsubscribe } = createClient("card");+ const resolved = mock.fn();+ const cancel = resolveActivationVariant(client, resolved);+ assert.equal(resolved.mock.callCount(), 0);+ emit();+ client.getFeatureFlag.mock.mockImplementation(() => "control");+ emit();+ assert.equal(resolved.mock.callCount(), 1);+ assert.equal(resolved.mock.calls[0].arguments[0], "card");+ assert.equal(unsubscribe.mock.callCount(), 1);+ cancel();+ });++ it("falls back after a loading error without using cached flags", () => {+ const resolved = mock.fn();+ const { client, emit } = createClient("card");+ const cancel = resolveActivationVariant(client, resolved);+ emit(true);+ assert.equal(resolved.mock.calls[0].arguments[0], null);+ assert.equal(client.getFeatureFlag.mock.callCount(), 0);+ cancel();+ });++ it("times out after three seconds and ignores late flags", (context) => {+ context.mock.timers.enable({ apis: ["setTimeout"] });+ const { client, emit } = createClient("card");+ const resolved = mock.fn();+ const cancel = resolveActivationVariant(client, resolved);+ context.mock.timers.tick(2999);+ assert.equal(resolved.mock.callCount(), 0);+ context.mock.timers.tick(1);+ emit();+ assert.deepEqual(+ resolved.mock.calls.map(({ arguments: args }) => args),+ [[null]]+ );+ cancel();+ });++ it("cancels pending resolution when the nudge unmounts", (context) => {+ context.mock.timers.enable({ apis: ["setTimeout"] });+ const { client, emit, unsubscribe } = createClient("card");+ const resolved = mock.fn();+ const cancel = resolveActivationVariant(client, resolved);+ cancel();+ emit();+ context.mock.timers.tick(3000);+ assert.equal(resolved.mock.callCount(), 0);+ assert.equal(unsubscribe.mock.callCount(), 1);+ });+});diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/resolveActivationVariant.ts b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/resolveActivationVariant.tsnew file mode 100644index 0000000000..cc337da789--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/resolveActivationVariant.ts@@ -0,0 +1,52 @@+import type { PostHog } from "posthog-js";++export const ACTIVATION_PRESENTATION_FLAG = "secrets-activation-presentation";+export type ActivationVariant = "control" | "card" | null;++export const resolveActivationVariant = (+ posthog: Pick<PostHog, "getFeatureFlag" | "onFeatureFlags"> | undefined,+ onResolved: (variant: ActivationVariant) => void+) => {+ let settled = false;+ let unsubscribe: (() => void) | undefined;+ let timeout: ReturnType<typeof setTimeout> | undefined;++ const finish = (value: unknown) => {+ if (settled) return;+ settled = true;+ clearTimeout(timeout);+ unsubscribe?.();+ onResolved(value === "control" || value === "card" ? value : null);+ };++ if (!posthog) {+ finish(null);+ } else {+ timeout = setTimeout(() => finish(null), 3000);+ try {+ unsubscribe = posthog.onFeatureFlags((_flags, _variants, context) => {+ try {+ finish(+ context?.errorsLoading+ ? null+ : posthog.getFeatureFlag(ACTIVATION_PRESENTATION_FLAG, {+ send_event: false,+ fresh: true+ })+ );+ } catch {+ finish(null);+ }+ });+ if (settled) unsubscribe();+ } catch {+ finish(null);+ }+ }++ return () => {+ settled = true;+ clearTimeout(timeout);+ unsubscribe?.();+ };+};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/useFloatingBarClearance.ts b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/useFloatingBarClearance.tsnew file mode 100644index 0000000000..6d38aa1f8a--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/InviteMembersNudge/useFloatingBarClearance.ts@@ -0,0 +1,55 @@+import { useLayoutEffect, useState } from "react";++// Floating bars that share the bottom edge of the secret overview page. The selection action bar+// portals to document.body and the batch commit bar is a fixed sibling, so neither can be wrapped+// by a container ref; they are measured through their data-slot instead.+const FLOATING_BAR_SELECTOR = [+ '[data-slot="selected-action-bar"][data-state="open"]',+ '[data-slot="batch-commit-bar"]'+].join(", ");++const DEFAULT_BOTTOM_PX = 16;+const GAP_PX = 16;++// The selection bar animates in over 200ms with a translate, so a measurement taken on the same+// frame it opens is a few pixels low; re-measure once the transition has settled.+const SETTLE_DELAY_MS = 250;++const measureClearance = () => {+ let highestTop = Infinity;+ document.querySelectorAll<HTMLElement>(FLOATING_BAR_SELECTOR).forEach((bar) => {+ const { top, height } = bar.getBoundingClientRect();+ if (height > 0) highestTop = Math.min(highestTop, top);+ });+ if (highestTop === Infinity) return DEFAULT_BOTTOM_PX;+ return Math.round(window.innerHeight - highestTop + GAP_PX);+};++// Distance in px from the viewport bottom that clears whichever floating bar is visible, or the+// default margin when `isActive` is false.+export const useFloatingBarClearance = (isActive: boolean) => {+ const [bottom, setBottom] = useState(DEFAULT_BOTTOM_PX);++ useLayoutEffect(() => {+ if (!isActive) {+ setBottom(DEFAULT_BOTTOM_PX);+ return undefined;+ }++ const update = () => setBottom(measureClearance());+ update();++ const resizeObserver = new ResizeObserver(update);+ document.querySelectorAll(FLOATING_BAR_SELECTOR).forEach((bar) => resizeObserver.observe(bar));+ window.addEventListener("resize", update);+ const settleTimeout = setTimeout(update, SETTLE_DELAY_MS);++ return () => {+ resizeObserver.disconnect();+ window.removeEventListener("resize", update);+ clearTimeout(settleTimeout);+ };+ }, [isActive]);++ return bottom;+};diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsxindex ff81d2b6a3..3ecadc3a48 100644--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx@@ -559,7 +559,10 @@ export const CommitForm: React.FC<CommitFormProps> = ({<>{/* Floating Bottom Banner */}{!isModalOpen && (- <div className="fixed bottom-4 left-1/2 z-40 w-[calc(100%-2rem)] max-w-5xl -translate-x-1/2">+ <div+ data-slot="batch-commit-bar"+ className="fixed bottom-4 left-1/2 z-40 w-[calc(100%-2rem)] max-w-5xl -translate-x-1/2"+ ><AnimatePresence mode="wait"><motion.divkey="commit-panel"