Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

feat(frontend): Sheet primitive, migrate legacy drawers, standardize resource-list UX (#19962)

Danny Xuba5b541352d9
diff --git a/frontend/AGENTS.md b/frontend/AGENTS.md
index 122d4e2209..80d4374b54 100644
--- a/frontend/AGENTS.md
+++ b/frontend/AGENTS.md
@@ -33,6 +33,47 @@ React UI components live in `src/react/components/ui/` and follow shadcn-style p
- **Use `cn()` for conditional classes** — import from `@/react/lib/utils`, don't write manual template literal ternaries
- **No manual `dark:` overrides** — use semantic tokens that handle theming
- **No manual `z-index` on overlay *consumers*** — callers of `Dialog`, `Sheet`, `Popover`, `Select`, `Tooltip` must not set their own `z-index`. The primitives in `src/react/components/ui/` already coordinate stacking (all overlays use `z-50`; within that layer, later-mounted portals win by DOM order). Do **not** strip `z-50` from `select.tsx`, `tooltip.tsx`, `dialog.tsx`, or `alert-dialog.tsx` — removing it makes Select/Tooltip render behind Dialog (BYT-9226, PR #19824)
+- **Dialog vs Sheet** — use `<Sheet>` (right-side drawer, in `src/react/components/ui/sheet.tsx`) for **creating or editing a resource**. Use `<Dialog>` for **confirmations, single-field prompts, critical interrupts, and read-only result displays**. The dividing line is whether the user is filling out a form with multiple fields — drawers keep the parent list/table visible behind a scrim and scale to multi-section forms, while dialogs are for short blocking interactions. `AlertDialog` is the right pick for destructive confirms that need an explicit acknowledgment.
+- **Sheet width tiers** — `<SheetContent>` accepts a `width` variant. Pick the tier that matches the form complexity; don't inline ad-hoc widths. Add a new tier to `sheet.tsx` only if a genuinely new size is needed.
+ - `narrow` (384px) — single-field pickers, short 2–3 field forms, environment/project selection, read-only display sheets
+ - `standard` (704px, default) — 3–6 field forms, permission transfer lists, typical create/edit resources (role, user, group, service account, workload identity, request role)
+ - `wide` (832px) — forms with CEL expression builders, nested tables, multi-tab layouts, multi-step wizards (custom approval rule, data export wizard)
+- **Edit sheets must populate from props reliably** — when a Sheet is always-mounted via `<Sheet open={open}>` (the standard pattern), `useState` initializers only run on first mount, which means switching the entity being edited (e.g. clicking Edit on a different row) won't repopulate fields. Use the **outer wrapper + inner form + stable-entity ref + key** pattern. The ref freezes the last-open entity so the inner form stays visually stable through the Sheet's close animation (which is ~200ms), while the `key` forces a fresh mount when a new entity is opened. Example from `CreateUserSheet`:
+ ```tsx
+ function CreateUserSheet(props: Props) {
+ const { open, user, onClose } = props;
+ // Freeze the entity while open=false so the inner form stays visually
+ // stable during the Sheet's close animation. Base UI's Dialog.Portal
+ // unmounts after the animation, at which point the form unmounts with it.
+ const openEntityRef = useRef(user);
+ if (open) {
+ openEntityRef.current = user;
+ }
+ const stableUser = openEntityRef.current;
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <UserForm
+ key={stableUser?.name ?? "new"}
+ user={stableUser}
+ onClose={props.onClose}
+ onCreated={props.onCreated}
+ onUpdated={props.onUpdated}
+ />
+ </SheetContent>
+ </Sheet>
+ );
+ }
+ function UserForm({ user, ... }: InnerProps) {
+ // useState initializers read directly from `user` — always fresh
+ // because the inner component mounts fresh on every open.
+ const [title, setTitle] = useState(user?.title ?? "");
+ // ...
+ }
+ ```
+ Do **not** guard the inner form with `{open && ...}` — that would unmount it at the start of the close animation, leaving a blank sheet sliding off-screen for ~200ms. Base UI's Dialog.Portal already handles the mount/unmount lifecycle around the animation.
+- **Edit sheets must disable Update until dirty** — capture initial values at mount (inside the inner form component, so they reflect the just-mounted entity prop) and compute `isDirty` via `useMemo` comparing current state to captured initials. Gate the Update button on `isFormValid && isDirty`. Create mode is always "dirty" so Create is enabled as soon as required fields are valid.
+- **Fetch the full entity before opening an edit sheet** — list APIs often return partial objects. Synchronous cache lookups like `store.getX(id)` can return a stub with only name/email/title fields, leaving nested fields (e.g. `workloadIdentityConfig.subjectPattern`) undefined. Use the async `getOrFetchX` form in row-click handlers so the Sheet receives a fully-hydrated entity — otherwise parsed/derived fields will be empty on first edit.
### Component Patterns
diff --git a/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsx b/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsx
deleted file mode 100644
index 1e6d9f2cda..0000000000
--- a/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsx
+++ /dev/null
@@ -1,621 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
-import { ChevronDown, ChevronUp, X } from "lucide-react";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { RoleSelect } from "@/react/components/RoleSelect";
-import { Button } from "@/react/components/ui/button";
-import { Input } from "@/react/components/ui/input";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
-import { useVueState } from "@/react/hooks/useVueState";
-import {
- ensureWorkloadIdentityFullName,
- pushNotification,
- useActuatorV1Store,
- useProjectV1Store,
- useWorkspaceV1Store,
-} from "@/store";
-import { useProjectIamPolicyStore } from "@/store/modules/v1/projectIamPolicy";
-import { useWorkloadIdentityStore } from "@/store/modules/workloadIdentity";
-import {
- getWorkloadIdentityNameInBinding,
- getWorkloadIdentitySuffix,
-} from "@/types";
-import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";
-import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
-import {
- WorkloadIdentityConfig_ProviderType,
- WorkloadIdentityConfigSchema,
- WorkloadIdentitySchema,
-} from "@/types/proto-es/v1/workload_identity_service_pb";
-import {
- getWorkloadIdentityProviderText,
- hasProjectPermissionV2,
- hasWorkspacePermissionV2,
- parseWorkloadIdentitySubjectPattern,
-} from "@/utils";
-
-type RefType = "branch" | "tag" | "all";
-
-const PLATFORM_PRESETS: Partial<
- Record<
- WorkloadIdentityConfig_ProviderType,
- { issuerUrl: string; audience: string }
- >
-> = {
- [WorkloadIdentityConfig_ProviderType.GITHUB]: {
- issuerUrl: "https://token.actions.githubusercontent.com",
- audience: "",
- },
- [WorkloadIdentityConfig_ProviderType.GITLAB]: {
- issuerUrl: "https://gitlab.com",
- audience: "",
- },
-};
-
-function computeSubjectPattern(
- providerType: WorkloadIdentityConfig_ProviderType,
- owner: string,
- repo: string,
- branch: string,
- refType: RefType
-): string {
- if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {
- if (!repo) return `repo:${owner}/*`;
- if (!branch) return `repo:${owner}/${repo}:*`;
- return `repo:${owner}/${repo}:ref:refs/heads/${branch}`;
- }
- if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {
- if (!repo) return `project_path:${owner}/*`;
- if (refType === "all" || !branch) return `project_path:${owner}/${repo}:*`;
- return `project_path:${owner}/${repo}:ref_type:${refType}:ref:${branch}`;
- }
- return "";
-}
-
-export function CreateWorkloadIdentityDrawer({
- workloadIdentity,
- project,
- onClose,
- onCreated,
- onUpdated,
-}: {
- workloadIdentity?: WorkloadIdentity;
- project?: string;
- onClose: () => void;
- onCreated: (wi: WorkloadIdentity) => void;
- onUpdated?: (wi: WorkloadIdentity) => void;
-}) {
- const { t } = useTranslation();
- const workloadIdentityStore = useWorkloadIdentityStore();
- const workspaceStore = useWorkspaceV1Store();
- const actuatorStore = useActuatorV1Store();
- const projectStore = useProjectV1Store();
- const projectIamPolicyStore = useProjectIamPolicyStore();
-
- const projectEntity = useVueState(() =>
- project ? projectStore.getProjectByName(project) : undefined
- );
-
- const isEditMode = !!workloadIdentity && !!workloadIdentity.email;
-
- const [title, setTitle] = useState(workloadIdentity?.title ?? "");
- const [emailPrefix, setEmailPrefix] = useState(() => {
- if (workloadIdentity?.email) {
- return workloadIdentity.email.split("@")[0];
- }
- return "";
- });
-
- const emailSuffix = useMemo(() => {
- const projectId = project ? project.replace(/^projects\//, "") : "";
- return getWorkloadIdentitySuffix(projectId || undefined);
- }, [project]);
-
- const parent = useMemo(
- () => project ?? actuatorStore.workspaceResourceName,
- [project, actuatorStore]
- );
-
- const [providerType, setProviderType] =
- useState<WorkloadIdentityConfig_ProviderType>(
- workloadIdentity?.workloadIdentityConfig?.providerType ??
- WorkloadIdentityConfig_ProviderType.GITHUB
- );
- const [owner, setOwner] = useState("");
- const [repo, setRepo] = useState("");
- const [branch, setBranch] = useState("");
- const [refType, setRefType] = useState<RefType>("all");
- const [issuerUrl, setIssuerUrl] = useState(
- PLATFORM_PRESETS[WorkloadIdentityConfig_ProviderType.GITHUB]!.issuerUrl
- );
- const [audience, setAudience] = useState("");
- const [subjectPattern, setSubjectPattern] = useState("");
- const [showAdvanced, setShowAdvanced] = useState(false);
- const [roles, setRoles] = useState<string[]>([]);
- const [isRequesting, setIsRequesting] = useState(false);
-
- const isUpdatingFromPatternRef = useRef(false);
- const isUpdatingFromFieldsRef = useRef(false);
-
- useEffect(() => {
- if (!workloadIdentity) return;
- setTitle(workloadIdentity.title);
- setEmailPrefix(workloadIdentity.email.split("@")[0]);
-
- const config = workloadIdentity.workloadIdentityConfig;
- if (config) {
- setProviderType(config.providerType);
- setIssuerUrl(config.issuerUrl);
- setAudience(config.allowedAudiences[0] ?? "");
- setSubjectPattern(config.subjectPattern);
-
- const parsed = parseWorkloadIdentitySubjectPattern(workloadIdentity);
- if (parsed) {
- setOwner(parsed.owner);
- setRepo(parsed.repo);
- setBranch(parsed.branch);
- if ("refType" in parsed && parsed.refType) {
- setRefType(parsed.refType);
- }
- }
- }
- }, []);
-
- useEffect(() => {
- if (isUpdatingFromPatternRef.current) return;
- isUpdatingFromFieldsRef.current = true;
- setSubjectPattern(
- computeSubjectPattern(providerType, owner, repo, branch, refType)
- );
- isUpdatingFromFieldsRef.current = false;
- }, [owner, repo, branch, providerType, refType]);
-
- useEffect(() => {
- if (isUpdatingFromFieldsRef.current) return;
- const parsed = parseWorkloadIdentitySubjectPattern({
- workloadIdentityConfig: {
- subjectPattern,
- providerType,
- },
- });
- if (parsed) {
- isUpdatingFromPatternRef.current = true;
- setOwner(parsed.owner);
- setRepo(parsed.repo);
- setBranch(parsed.branch);
- if ("refType" in parsed && parsed.refType) {
- setRefType(parsed.refType);
- }
- isUpdatingFromPatternRef.current = false;
- }
- }, [subjectPattern]);
-
- useEscapeKey(true, onClose);
-
- const handlePlatformChange = (value: WorkloadIdentityConfig_ProviderType) => {
- setProviderType(value);
- const preset = PLATFORM_PRESETS[value];
- if (preset) {
- setIssuerUrl(preset.issuerUrl);
- setAudience(preset.audience);
- }
- setRefType("all");
- setBranch("");
- };
-
- const allowConfirm = useMemo(() => {
- if (!emailPrefix && !workloadIdentity?.email) return false;
- if (!owner) return false;
- if (!issuerUrl) return false;
- return true;
- }, [emailPrefix, workloadIdentity?.email, owner, issuerUrl]);
-
- const requiredPermission = isEditMode
- ? "bb.workloadIdentities.update"
- : "bb.workloadIdentities.create";
- const hasPermission = projectEntity
- ? hasProjectPermissionV2(projectEntity, requiredPermission)
- : hasWorkspacePermissionV2(requiredPermission);
-
- const handleSubmit = async () => {
- if (!allowConfirm || !hasPermission) return;
- setIsRequesting(true);
- try {
- if (isEditMode) {
- await handleUpdate();
- } else {
- await handleCreate();
- }
- } catch {
- // error shown by store
- } finally {
- setIsRequesting(false);
- }
- };
-
- const updateProjectIamPolicyForMember = async (
- projectName: string,
- member: string,
- newRoles: string[]
- ) => {
- const policy = structuredClone(
- projectIamPolicyStore.getProjectIamPolicy(projectName)
- );
- for (const binding of policy.bindings) {
- binding.members = binding.members.filter((m) => m !== member);
- }
- policy.bindings = policy.bindings.filter(
- (binding) => binding.members.length > 0
- );
- for (const role of newRoles) {
- const existing = policy.bindings.find((b) => b.role === role);
- if (existing) {
- if (!existing.members.includes(member)) {
- existing.members.push(member);
- }
- } else {
- policy.bindings.push(
- create(BindingSchema, { role, members: [member] })
- );
- }
- }
- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);
- };
-
- const handleCreate = async () => {
- const wi = await workloadIdentityStore.createWorkloadIdentity(
- emailPrefix,
- {
- title: title || emailPrefix,
- workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
- providerType,
- issuerUrl,
- allowedAudiences: audience ? [audience] : [],
- subjectPattern,
- }),
- },
- parent
- );
-
- if (roles.length > 0) {
- const member = getWorkloadIdentityNameInBinding(wi.email);
- if (projectEntity) {
- await updateProjectIamPolicyForMember(
- projectEntity.name,
- member,
- roles
- );
- } else {
- await workspaceStore.patchIamPolicy([{ member, roles }]);
- }
- }
-
- onCreated(wi);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.created"),
- });
- onClose();
- };
-
- const handleUpdate = async () => {
- if (!workloadIdentity) return;
-
- const updateMask: string[] = [];
- if (title !== workloadIdentity.title) {
- updateMask.push("title");
- }
-
- const updated = await workloadIdentityStore.updateWorkloadIdentity(
- create(WorkloadIdentitySchema, {
- name: ensureWorkloadIdentityFullName(workloadIdentity.email),
- title,
- workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
- providerType,
- issuerUrl,
- allowedAudiences: audience ? [audience] : [],
- subjectPattern,
- }),
- }),
- create(FieldMaskSchema, {
- paths: [...updateMask, "workload_identity_config"],
- })
- );
-
- onUpdated?.(updated);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.updated"),
- });
- onClose();
- };
-
- const isGitLab = providerType === WorkloadIdentityConfig_ProviderType.GITLAB;
- const showBranchField =
- providerType === WorkloadIdentityConfig_ProviderType.GITHUB ||
- refType !== "all";
- const isTagRefType = isGitLab && refType === "tag";
-
- return (
- <>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-overlay/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-background shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">
- {t("settings.members.workload-identity")}
- </h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="size-5" />
- </Button>
- </div>
-
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {/* Title */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("common.name")}
- </label>
- <Input
- value={title}
- onChange={(e) => setTitle(e.target.value)}
- placeholder="GitHub Deploy"
- maxLength={200}
- autoComplete="off"
- />
- </div>
-
- {/* Email */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("common.email")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- {isEditMode ? (
- <Input value={workloadIdentity!.email} disabled />
- ) : (
- <div className="flex items-center">
- <Input
- value={emailPrefix}
- onChange={(e) => setEmailPrefix(e.target.value)}
- placeholder="my-workflow"
- autoComplete="off"
- className="rounded-r-none"
- />
- <span className="inline-flex items-center px-3 h-9 border border-l-0 border-control-border bg-control-bg text-sm text-control rounded-r-xs whitespace-nowrap">
- @{emailSuffix}
- </span>
- </div>
- )}
- </div>
-
- {/* Platform */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.workload-identity-platform")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <select
- value={providerType}
- onChange={(e) =>
- handlePlatformChange(
- Number(
- e.target.value
- ) as WorkloadIdentityConfig_ProviderType
- )
- }
- className="border border-control-border rounded-xs text-sm px-2 py-2 bg-background"
- >
- {[
- WorkloadIdentityConfig_ProviderType.GITHUB,
- WorkloadIdentityConfig_ProviderType.GITLAB,
- ].map((pt) => (
- <option key={pt} value={pt}>
- {getWorkloadIdentityProviderText(pt)}
- </option>
- ))}
- </select>
- </div>
-
- {/* Owner / Group */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {isGitLab
- ? t("settings.members.workload-identity-group")
- : t("settings.members.workload-identity-owner")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <Input
- value={owner}
- onChange={(e) => setOwner(e.target.value)}
- placeholder={isGitLab ? "my-group" : "my-org"}
- maxLength={200}
- autoComplete="off"
- />
- </div>
-
- {/* Repository / Project */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {isGitLab
- ? t("settings.members.workload-identity-project")
- : t("settings.members.workload-identity-repo")}
- </label>
- <Input
- value={repo}
- onChange={(e) => setRepo(e.target.value)}
- placeholder={isGitLab ? "my-project" : "my-repo"}
- maxLength={200}
- autoComplete="off"
- />
- <span className="text-xs text-control-light">
- {isGitLab
- ? t("settings.members.workload-identity-project-hint")
- : t("settings.members.workload-identity-repo-hint")}
- </span>
- </div>
-
- {/* Allowed Branches/Tags (GitLab only) */}
- {isGitLab && (
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t(
- "settings.members.workload-identity-allowed-branches-tags"
- )}
- </label>
- <select
- value={refType}
- onChange={(e) => setRefType(e.target.value as RefType)}
- className="border border-control-border rounded-xs text-sm px-2 py-2 bg-background"
- >
- <option value="all">
- {t("settings.members.workload-identity-all-branches-tags")}
- </option>
- <option value="branch">
- {t("settings.members.workload-identity-specific-branch")}
- </option>
- <option value="tag">
- {t("settings.members.workload-identity-specific-tag")}
- </option>
- </select>
- </div>
- )}
-
- {/* Branch / Tag */}
- {showBranchField && (
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {isTagRefType
- ? t("settings.members.workload-identity-tag")
- : t("settings.members.workload-identity-branch")}
- </label>
- <Input
- value={branch}
- onChange={(e) => setBranch(e.target.value)}
- placeholder={isTagRefType ? "v1.0.0" : "main"}
- maxLength={200}
- autoComplete="off"
- />
- <span className="text-xs text-control-light">
- {isTagRefType
- ? t("settings.members.workload-identity-tag-hint")
- : t("settings.members.workload-identity-branch-hint")}
- </span>
- </div>
- )}
-
- {/* Advanced Settings */}
- {showAdvanced && (
- <div className="flex flex-col gap-y-6 pt-6 border-t">
- {/* Issuer URL / GitLab URL */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {isGitLab
- ? t("settings.members.workload-identity-gitlab-url")
- : t("settings.members.workload-identity-issuer")}
- </label>
- <Input
- value={issuerUrl}
- onChange={(e) => setIssuerUrl(e.target.value)}
- maxLength={500}
- autoComplete="off"
- />
- {isGitLab && (
- <span className="text-xs text-control-light">
- {t("settings.members.workload-identity-gitlab-url-hint")}
- </span>
- )}
- </div>
-
- {/* Audience */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.workload-identity-audience")}
- </label>
- <Input
- value={audience}
- onChange={(e) => setAudience(e.target.value)}
- maxLength={500}
- autoComplete="off"
- />
- </div>
-
- {/* Subject Pattern */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.workload-identity-subject")}
- </label>
- <Input
- value={subjectPattern}
- onChange={(e) => setSubjectPattern(e.target.value)}
- maxLength={500}
- autoComplete="off"
- />
- </div>
- </div>
- )}
-
- {/* Advanced Settings Toggle */}
- <button
- type="button"
- className="flex items-center gap-x-1 text-sm text-accent hover:underline w-fit"
- onClick={() => setShowAdvanced(!showAdvanced)}
- >
- {t("settings.members.workload-identity-advanced")}
- {showAdvanced ? (
- <ChevronUp className="size-4" />
- ) : (
- <ChevronDown className="size-4" />
- )}
- </button>
-
- {/* Roles (create mode only) */}
- {!isEditMode &&
- (projectEntity
- ? hasProjectPermissionV2(
- projectEntity,
- "bb.projects.setIamPolicy"
- )
- : hasWorkspacePermissionV2("bb.workspaces.setIamPolicy")) && (
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.table.roles")}
- </label>
- <RoleSelect
- value={roles}
- onChange={setRoles}
- disabled={false}
- />
- </div>
- )}
- </div>
- </div>
-
- {/* Footer */}
- <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!allowConfirm || !hasPermission || isRequesting}
- onClick={handleSubmit}
- >
- {isEditMode ? t("common.update") : t("common.create")}
- </Button>
- </div>
- </div>
- </>
- );
-}
diff --git a/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx b/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx
new file mode 100644
index 0000000000..52a04ea56e
--- /dev/null
+++ b/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx
@@ -0,0 +1,682 @@
+import { create } from "@bufbuild/protobuf";
+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
+import { ChevronDown, ChevronUp } from "lucide-react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { RoleSelect } from "@/react/components/RoleSelect";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
+import { useVueState } from "@/react/hooks/useVueState";
+import {
+ ensureWorkloadIdentityFullName,
+ pushNotification,
+ useActuatorV1Store,
+ useProjectV1Store,
+ useWorkspaceV1Store,
+} from "@/store";
+import { useProjectIamPolicyStore } from "@/store/modules/v1/projectIamPolicy";
+import { useWorkloadIdentityStore } from "@/store/modules/workloadIdentity";
+import {
+ getWorkloadIdentityNameInBinding,
+ getWorkloadIdentitySuffix,
+} from "@/types";
+import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";
+import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
+import {
+ WorkloadIdentityConfig_ProviderType,
+ WorkloadIdentityConfigSchema,
+ WorkloadIdentitySchema,
+} from "@/types/proto-es/v1/workload_identity_service_pb";
+import {
+ getWorkloadIdentityProviderText,
+ hasProjectPermissionV2,
+ hasWorkspacePermissionV2,
+ parseWorkloadIdentitySubjectPattern,
+} from "@/utils";
+
+type RefType = "branch" | "tag" | "all";
+
+const PLATFORM_PRESETS: Partial<
+ Record<
+ WorkloadIdentityConfig_ProviderType,
+ { issuerUrl: string; audience: string }
+ >
+> = {
+ [WorkloadIdentityConfig_ProviderType.GITHUB]: {
+ issuerUrl: "https://token.actions.githubusercontent.com",
+ audience: "",
+ },
+ [WorkloadIdentityConfig_ProviderType.GITLAB]: {
+ issuerUrl: "https://gitlab.com",
+ audience: "",
+ },
+};
+
+function computeSubjectPattern(
+ providerType: WorkloadIdentityConfig_ProviderType,
+ owner: string,
+ repo: string,
+ branch: string,
+ refType: RefType
+): string {
+ if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {
+ if (!repo) return `repo:${owner}/*`;
+ if (!branch) return `repo:${owner}/${repo}:*`;
+ return `repo:${owner}/${repo}:ref:refs/heads/${branch}`;
+ }
+ if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {
+ if (!repo) return `project_path:${owner}/*`;
+ if (refType === "all" || !branch) return `project_path:${owner}/${repo}:*`;
+ return `project_path:${owner}/${repo}:ref_type:${refType}:ref:${branch}`;
+ }
+ return "";
+}
+
+interface CreateWorkloadIdentitySheetProps {
+ open: boolean;
+ workloadIdentity?: WorkloadIdentity;
+ project?: string;
+ onClose: () => void;
+ onCreated: (wi: WorkloadIdentity) => void;
+ onUpdated?: (wi: WorkloadIdentity) => void;
+}
+
+// Outer wrapper — thin shell that provides the Sheet container. The actual
+// form lives in `WorkloadIdentityForm` below.
+//
+// Stable-entity trick: `openEntityRef` holds the last entity the Sheet was
+// *opened* with. When the parent closes the Sheet it typically nulls out the
+// entity at the same time — but we need the form to continue rendering the
+// previous entity's data for the 200ms close animation. The ref is frozen
+// while `open === false`, so the inner form stays visually stable through
+// the slide-out transition. Base UI's Dialog.Portal unmounts the Popup after
+// the animation completes, at which point the form unmounts cleanly and a
+// subsequent open will mount it fresh (useState initializers re-run from
+// the ref'd entity).
+export function CreateWorkloadIdentitySheet(
+ props: CreateWorkloadIdentitySheetProps
+) {
+ const { open, workloadIdentity, onClose } = props;
+ const openEntityRef = useRef(workloadIdentity);
+ if (open) {
+ openEntityRef.current = workloadIdentity;
+ }
+ const stableEntity = openEntityRef.current;
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <WorkloadIdentityForm
+ key={stableEntity?.name ?? "new"}
+ workloadIdentity={stableEntity}
+ project={props.project}
+ onClose={props.onClose}
+ onCreated={props.onCreated}
+ onUpdated={props.onUpdated}
+ />
+ </SheetContent>
+ </Sheet>
+ );
+}
+
+function WorkloadIdentityForm({
+ workloadIdentity,
+ project,
+ onClose,
+ onCreated,
+ onUpdated,
+}: Omit<CreateWorkloadIdentitySheetProps, "open">) {
+ const { t } = useTranslation();
+ const workloadIdentityStore = useWorkloadIdentityStore();
+ const workspaceStore = useWorkspaceV1Store();
+ const actuatorStore = useActuatorV1Store();
+ const projectStore = useProjectV1Store();
+ const projectIamPolicyStore = useProjectIamPolicyStore();
+
+ const projectEntity = useVueState(() =>
+ project ? projectStore.getProjectByName(project) : undefined
+ );
+
+ const isEditMode = !!workloadIdentity && !!workloadIdentity.email;
+
+ // Initial values derived from the workloadIdentity prop. Because this
+ // component is keyed by entity+open in the parent, it remounts fresh on
+ // every Sheet open — so these useState initializers always see the latest
+ // prop values. No reset useEffect needed.
+ const initialParsed = useMemo(
+ () =>
+ workloadIdentity
+ ? parseWorkloadIdentitySubjectPattern(workloadIdentity)
+ : undefined,
+ []
+ );
+ const initialProviderType =
+ workloadIdentity?.workloadIdentityConfig?.providerType ??
+ WorkloadIdentityConfig_ProviderType.GITHUB;
+ const initialIssuerUrl =
+ workloadIdentity?.workloadIdentityConfig?.issuerUrl ??
+ PLATFORM_PRESETS[initialProviderType]?.issuerUrl ??
+ "";
+ const initialAudience =
+ workloadIdentity?.workloadIdentityConfig?.allowedAudiences[0] ?? "";
+ const initialSubjectPattern =
+ workloadIdentity?.workloadIdentityConfig?.subjectPattern ?? "";
+ const initialTitle = workloadIdentity?.title ?? "";
+ const initialEmailPrefix = workloadIdentity?.email
+ ? workloadIdentity.email.split("@")[0]
+ : "";
+ const initialOwner = initialParsed?.owner ?? "";
+ const initialRepo = initialParsed?.repo ?? "";
+ const initialBranch = initialParsed?.branch ?? "";
+ const initialRefType: RefType =
+ (initialParsed && "refType" in initialParsed && initialParsed.refType) ||
+ "all";
+
+ const [title, setTitle] = useState(initialTitle);
+ const [emailPrefix, setEmailPrefix] = useState(initialEmailPrefix);
+
+ const emailSuffix = useMemo(() => {
+ const projectId = project ? project.replace(/^projects\//, "") : "";
+ return getWorkloadIdentitySuffix(projectId || undefined);
+ }, [project]);
+
+ const parent = useMemo(
+ () => project ?? actuatorStore.workspaceResourceName,
+ [project, actuatorStore]
+ );
+
+ const [providerType, setProviderType] =
+ useState<WorkloadIdentityConfig_ProviderType>(initialProviderType);
+ const [owner, setOwner] = useState(initialOwner);
+ const [repo, setRepo] = useState(initialRepo);
+ const [branch, setBranch] = useState(initialBranch);
+ const [refType, setRefType] = useState<RefType>(initialRefType);
+ const [issuerUrl, setIssuerUrl] = useState(initialIssuerUrl);
+ const [audience, setAudience] = useState(initialAudience);
+ const [subjectPattern, setSubjectPattern] = useState(initialSubjectPattern);
+ const [showAdvanced, setShowAdvanced] = useState(false);
+ const [roles, setRoles] = useState<string[]>([]);
+ const [isRequesting, setIsRequesting] = useState(false);
+
+ const isUpdatingFromPatternRef = useRef(false);
+ const isUpdatingFromFieldsRef = useRef(false);
+
+ useEffect(() => {
+ if (isUpdatingFromPatternRef.current) return;
+ isUpdatingFromFieldsRef.current = true;
+ setSubjectPattern(
+ computeSubjectPattern(providerType, owner, repo, branch, refType)
+ );
+ isUpdatingFromFieldsRef.current = false;
+ }, [owner, repo, branch, providerType, refType]);
+
+ useEffect(() => {
+ if (isUpdatingFromFieldsRef.current) return;
+ const parsed = parseWorkloadIdentitySubjectPattern({
+ workloadIdentityConfig: {
+ subjectPattern,
+ providerType,
+ },
+ });
+ if (parsed) {
+ isUpdatingFromPatternRef.current = true;
+ setOwner(parsed.owner);
+ setRepo(parsed.repo);
+ setBranch(parsed.branch);
+ if ("refType" in parsed && parsed.refType) {
+ setRefType(parsed.refType);
+ }
+ isUpdatingFromPatternRef.current = false;
+ }
+ }, [subjectPattern]);
+
+ const handlePlatformChange = (value: WorkloadIdentityConfig_ProviderType) => {
+ setProviderType(value);
+ const preset = PLATFORM_PRESETS[value];
+ if (preset) {
+ setIssuerUrl(preset.issuerUrl);
+ setAudience(preset.audience);
+ }
+ setRefType("all");
+ setBranch("");
+ };
+
+ const isFormValid = useMemo(() => {
+ if (!emailPrefix && !workloadIdentity?.email) return false;
+ if (!owner) return false;
+ if (!issuerUrl) return false;
+ return true;
+ }, [emailPrefix, workloadIdentity?.email, owner, issuerUrl]);
+
+ // Dirty tracking — compare current state to the initial values captured
+ // at mount. In edit mode the Update button is disabled unless something
+ // actually changed. In create mode we treat any filled-in form as dirty.
+ const isDirty = useMemo(() => {
+ if (!isEditMode) return true;
+ if (title !== initialTitle) return true;
+ if (providerType !== initialProviderType) return true;
+ if (owner !== initialOwner) return true;
+ if (repo !== initialRepo) return true;
+ if (branch !== initialBranch) return true;
+ if (refType !== initialRefType) return true;
+ if (issuerUrl !== initialIssuerUrl) return true;
+ if (audience !== initialAudience) return true;
+ if (subjectPattern !== initialSubjectPattern) return true;
+ return false;
+ }, [
+ isEditMode,
+ title,
+ providerType,
+ owner,
+ repo,
+ branch,
+ refType,
+ issuerUrl,
+ audience,
+ subjectPattern,
+ initialTitle,
+ initialProviderType,
+ initialOwner,
+ initialRepo,
+ initialBranch,
+ initialRefType,
+ initialIssuerUrl,
+ initialAudience,
+ initialSubjectPattern,
+ ]);
+
+ const allowConfirm = isFormValid && isDirty;
+
+ const requiredPermission = isEditMode
+ ? "bb.workloadIdentities.update"
+ : "bb.workloadIdentities.create";
+ const hasPermission = projectEntity
+ ? hasProjectPermissionV2(projectEntity, requiredPermission)
+ : hasWorkspacePermissionV2(requiredPermission);
+
+ const handleSubmit = async () => {
+ if (!allowConfirm || !hasPermission) return;
+ setIsRequesting(true);
+ try {
+ if (isEditMode) {
+ await handleUpdate();
+ } else {
+ await handleCreate();
+ }
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ }
+ };
+
+ const updateProjectIamPolicyForMember = async (
+ projectName: string,
+ member: string,
+ newRoles: string[]
+ ) => {
+ const policy = structuredClone(
+ projectIamPolicyStore.getProjectIamPolicy(projectName)
+ );
+ for (const binding of policy.bindings) {
+ binding.members = binding.members.filter((m) => m !== member);
+ }
+ policy.bindings = policy.bindings.filter(
+ (binding) => binding.members.length > 0
+ );
+ for (const role of newRoles) {
+ const existing = policy.bindings.find((b) => b.role === role);
+ if (existing) {
+ if (!existing.members.includes(member)) {
+ existing.members.push(member);
+ }
+ } else {
+ policy.bindings.push(
+ create(BindingSchema, { role, members: [member] })
+ );
+ }
+ }
+ await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);
+ };
+
+ const handleCreate = async () => {
+ const wi = await workloadIdentityStore.createWorkloadIdentity(
+ emailPrefix,
+ {
+ title: title || emailPrefix,
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType,
+ issuerUrl,
+ allowedAudiences: audience ? [audience] : [],
+ subjectPattern,
+ }),
+ },
+ parent
+ );
+
+ if (roles.length > 0) {
+ const member = getWorkloadIdentityNameInBinding(wi.email);
+ if (projectEntity) {
+ await updateProjectIamPolicyForMember(
+ projectEntity.name,
+ member,
+ roles
+ );
+ } else {
+ await workspaceStore.patchIamPolicy([{ member, roles }]);
+ }
+ }
+
+ onCreated(wi);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.created"),
+ });
+ onClose();
+ };
+
+ const handleUpdate = async () => {
+ if (!workloadIdentity) return;
+
+ const updateMask: string[] = [];
+ if (title !== workloadIdentity.title) {
+ updateMask.push("title");
+ }
+
+ const updated = await workloadIdentityStore.updateWorkloadIdentity(
+ create(WorkloadIdentitySchema, {
+ name: ensureWorkloadIdentityFullName(workloadIdentity.email),
+ title,
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType,
+ issuerUrl,
+ allowedAudiences: audience ? [audience] : [],
+ subjectPattern,
+ }),
+ }),
+ create(FieldMaskSchema, {
+ paths: [...updateMask, "workload_identity_config"],
+ })
+ );
+
+ onUpdated?.(updated);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ onClose();
+ };
+
+ const isGitLab = providerType === WorkloadIdentityConfig_ProviderType.GITLAB;
+ const showBranchField =
+ providerType === WorkloadIdentityConfig_ProviderType.GITHUB ||
+ refType !== "all";
+ const isTagRefType = isGitLab && refType === "tag";
+
+ return (
+ <>
+ <SheetHeader>
+ <SheetTitle>{t("settings.members.workload-identity")}</SheetTitle>
+ </SheetHeader>
+
+ <SheetBody>
+ <div className="flex flex-col gap-y-6">
+ {/* Title */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.name")}
+ </label>
+ <Input
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ placeholder="GitHub Deploy"
+ maxLength={200}
+ autoComplete="off"
+ />
+ </div>
+
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ {isEditMode ? (
+ <Input value={workloadIdentity!.email} disabled />
+ ) : (
+ <div className="flex items-center">
+ <Input
+ value={emailPrefix}
+ onChange={(e) => setEmailPrefix(e.target.value)}
+ placeholder="my-workflow"
+ autoComplete="off"
+ className="rounded-r-none"
+ />
+ <span className="inline-flex items-center px-3 h-9 border border-l-0 border-control-border bg-control-bg text-sm text-control rounded-r-xs whitespace-nowrap">
+ @{emailSuffix}
+ </span>
+ </div>
+ )}
+ </div>
+
+ {/* Platform */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-platform")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <select
+ value={providerType}
+ onChange={(e) =>
+ handlePlatformChange(
+ Number(e.target.value) as WorkloadIdentityConfig_ProviderType
+ )
+ }
+ className="border border-control-border rounded-xs text-sm px-2 py-2 bg-background"
+ >
+ {[
+ WorkloadIdentityConfig_ProviderType.GITHUB,
+ WorkloadIdentityConfig_ProviderType.GITLAB,
+ ].map((pt) => (
+ <option key={pt} value={pt}>
+ {getWorkloadIdentityProviderText(pt)}
+ </option>
+ ))}
+ </select>
+ </div>
+
+ {/* Owner / Group */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isGitLab
+ ? t("settings.members.workload-identity-group")
+ : t("settings.members.workload-identity-owner")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <Input
+ value={owner}
+ onChange={(e) => setOwner(e.target.value)}
+ placeholder={isGitLab ? "my-group" : "my-org"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ </div>
+
+ {/* Repository / Project */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isGitLab
+ ? t("settings.members.workload-identity-project")
+ : t("settings.members.workload-identity-repo")}
+ </label>
+ <Input
+ value={repo}
+ onChange={(e) => setRepo(e.target.value)}
+ placeholder={isGitLab ? "my-project" : "my-repo"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ <span className="text-xs text-control-light">
+ {isGitLab
+ ? t("settings.members.workload-identity-project-hint")
+ : t("settings.members.workload-identity-repo-hint")}
+ </span>
+ </div>
+
+ {/* Allowed Branches/Tags (GitLab only) */}
+ {isGitLab && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-allowed-branches-tags")}
+ </label>
+ <select
+ value={refType}
+ onChange={(e) => setRefType(e.target.value as RefType)}
+ className="border border-control-border rounded-xs text-sm px-2 py-2 bg-background"
+ >
+ <option value="all">
+ {t("settings.members.workload-identity-all-branches-tags")}
+ </option>
+ <option value="branch">
+ {t("settings.members.workload-identity-specific-branch")}
+ </option>
+ <option value="tag">
+ {t("settings.members.workload-identity-specific-tag")}
+ </option>
+ </select>
+ </div>
+ )}
+
+ {/* Branch / Tag */}
+ {showBranchField && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isTagRefType
+ ? t("settings.members.workload-identity-tag")
+ : t("settings.members.workload-identity-branch")}
+ </label>
+ <Input
+ value={branch}
+ onChange={(e) => setBranch(e.target.value)}
+ placeholder={isTagRefType ? "v1.0.0" : "main"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ <span className="text-xs text-control-light">
+ {isTagRefType
+ ? t("settings.members.workload-identity-tag-hint")
+ : t("settings.members.workload-identity-branch-hint")}
+ </span>
+ </div>
+ )}
+
+ {/* Advanced Settings */}
+ {showAdvanced && (
+ <div className="flex flex-col gap-y-6 pt-6 border-t">
+ {/* Issuer URL / GitLab URL */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isGitLab
+ ? t("settings.members.workload-identity-gitlab-url")
+ : t("settings.members.workload-identity-issuer")}
+ </label>
+ <Input
+ value={issuerUrl}
+ onChange={(e) => setIssuerUrl(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ {isGitLab && (
+ <span className="text-xs text-control-light">
+ {t("settings.members.workload-identity-gitlab-url-hint")}
+ </span>
+ )}
+ </div>
+
+ {/* Audience */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-audience")}
+ </label>
+ <Input
+ value={audience}
+ onChange={(e) => setAudience(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </div>
+
+ {/* Subject Pattern */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-subject")}
+ </label>
+ <Input
+ value={subjectPattern}
+ onChange={(e) => setSubjectPattern(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </div>
+ </div>
+ )}
+
+ {/* Advanced Settings Toggle */}
+ <button
+ type="button"
+ className="flex items-center gap-x-1 text-sm text-accent hover:underline w-fit"
+ onClick={() => setShowAdvanced(!showAdvanced)}
+ >
+ {t("settings.members.workload-identity-advanced")}
+ {showAdvanced ? (
+ <ChevronUp className="size-4" />
+ ) : (
+ <ChevronDown className="size-4" />
+ )}
+ </button>
+
+ {/* Roles (create mode only) */}
+ {!isEditMode &&
+ (projectEntity
+ ? hasProjectPermissionV2(
+ projectEntity,
+ "bb.projects.setIamPolicy"
+ )
+ : hasWorkspacePermissionV2("bb.workspaces.setIamPolicy")) && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.table.roles")}
+ </label>
+ <RoleSelect
+ value={roles}
+ onChange={setRoles}
+ disabled={false}
+ />
+ </div>
+ )}
+ </div>
+ </SheetBody>
+
+ <SheetFooter>
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowConfirm || !hasPermission || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.create")}
+ </Button>
+ </SheetFooter>
+ </>
+ );
+}
diff --git a/frontend/src/react/components/CustomApproval/RuleEditDialog.tsx b/frontend/src/react/components/CustomApproval/RuleEditSheet.tsx
similarity index 91%
rename from frontend/src/react/components/CustomApproval/RuleEditDialog.tsx
rename to frontend/src/react/components/CustomApproval/RuleEditSheet.tsx
index 05687287e5..cd5b311120 100644
--- a/frontend/src/react/components/CustomApproval/RuleEditDialog.tsx
+++ b/frontend/src/react/components/CustomApproval/RuleEditSheet.tsx
@@ -13,12 +13,15 @@ import {
import { ExprEditor } from "@/react/components/ExprEditor";
import { Alert } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
-import {
- Dialog,
- DialogContent,
- DialogTitle,
-} from "@/react/components/ui/dialog";
import { Input } from "@/react/components/ui/input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { Switch } from "@/react/components/ui/switch";
import { Textarea } from "@/react/components/ui/textarea";
import type { LocalApprovalRule } from "@/types";
@@ -37,7 +40,7 @@ import {
getApprovalOptionConfigMap,
} from "./utils";
-interface RuleEditDialogProps {
+interface RuleEditSheetProps {
open: boolean;
onOpenChange: (open: boolean) => void;
mode: "create" | "edit";
@@ -50,7 +53,7 @@ interface RuleEditDialogProps {
onSave: (rule: Omit<LocalApprovalRule, "uid"> & { uid?: string }) => void;
}
-export function RuleEditDialog({
+export function RuleEditSheet({
open,
onOpenChange,
mode,
@@ -61,7 +64,7 @@ export function RuleEditDialog({
hasFeature,
onShowFeatureModal,
onSave,
-}: RuleEditDialogProps) {
+}: RuleEditSheetProps) {
const { t } = useTranslation();
const [title, setTitle] = useState("");
const [description, setDescription] = useState("");
@@ -163,17 +166,13 @@ export function RuleEditDialog({
};
return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="flex flex-col overflow-hidden lg:max-w-[75vw] 2xl:max-w-[55vw]">
- {/* Header */}
- <div className="border-b px-6 py-4">
- <DialogTitle className="text-lg font-medium text-control">
- {t("custom-approval.rule.self")}
- </DialogTitle>
- </div>
+ <Sheet open={open} onOpenChange={onOpenChange}>
+ <SheetContent width="wide">
+ <SheetHeader>
+ <SheetTitle>{t("custom-approval.rule.self")}</SheetTitle>
+ </SheetHeader>
- {/* Body */}
- <div className="flex flex-1 flex-col gap-y-4 overflow-y-auto px-6 py-4">
+ <SheetBody className="gap-y-4">
{/* Fallback hint */}
{isFallback && (
<Alert variant="warning">
@@ -281,18 +280,17 @@ export function RuleEditDialog({
</>
)}
</div>
- </div>
+ </SheetBody>
- {/* Footer */}
- <footer className="flex items-center justify-end gap-x-2 border-t px-6 py-4">
+ <SheetFooter>
<Button variant="outline" onClick={() => onOpenChange(false)}>
{t("common.cancel")}
</Button>
<Button disabled={!allowSave || !allowAdmin} onClick={handleSave}>
{mode === "create" ? t("common.create") : t("common.update")}
</Button>
- </footer>
- </DialogContent>
- </Dialog>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
diff --git a/frontend/src/react/components/CustomApproval/RulesSection.tsx b/frontend/src/react/components/CustomApproval/RulesSection.tsx
index 39e49843a4..f6991b075e 100644
--- a/frontend/src/react/components/CustomApproval/RulesSection.tsx
+++ b/frontend/src/react/components/CustomApproval/RulesSection.tsx
@@ -28,7 +28,7 @@ import { pushNotification, useWorkspaceApprovalSettingStore } from "@/store";
import type { LocalApprovalRule } from "@/types";
import type { WorkspaceApprovalSetting_Rule_Source } from "@/types/proto-es/v1/setting_service_pb";
import { WorkspaceApprovalSetting_Rule_Source as RuleSource } from "@/types/proto-es/v1/setting_service_pb";
-import { RuleEditDialog } from "./RuleEditDialog";
+import { RuleEditSheet } from "./RuleEditSheet";
import { approvalSourceText, formatApprovalFlow } from "./utils";
interface RulesSectionProps {
@@ -365,7 +365,7 @@ export function RulesSection({
)}
</div>
- <RuleEditDialog
+ <RuleEditSheet
open={dialogOpen}
onOpenChange={setDialogOpen}
mode={dialogMode}
diff --git a/frontend/src/react/components/EditEnvironmentDrawer.tsx b/frontend/src/react/components/EditEnvironmentSheet.tsx
similarity index 68%
rename from frontend/src/react/components/EditEnvironmentDrawer.tsx
rename to frontend/src/react/components/EditEnvironmentSheet.tsx
index 7d7600e8cc..dbf26026ab 100644
--- a/frontend/src/react/components/EditEnvironmentDrawer.tsx
+++ b/frontend/src/react/components/EditEnvironmentSheet.tsx
@@ -1,14 +1,20 @@
-import { X } from "lucide-react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { Button } from "@/react/components/ui/button";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useEnvironmentV1Store } from "@/store";
-export function EditEnvironmentDrawer({
+export function EditEnvironmentSheet({
open,
onClose,
onUpdate,
@@ -24,7 +30,7 @@ export function EditEnvironmentDrawer({
);
const [selected, setSelected] = useState("");
const [updating, setUpdating] = useState(false);
- useEscapeKey(open, onClose);
+
useEffect(() => {
if (open) {
setSelected("");
@@ -32,24 +38,13 @@ export function EditEnvironmentDrawer({
}
}, [open]);
- if (!open) return null;
-
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={onClose} />
- <div className="ml-auto relative bg-background w-[24rem] max-w-[100vw] h-full shadow-lg flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b border-control-border">
- <h2 className="text-lg font-semibold">
- {t("database.edit-environment")}
- </h2>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={onClose}
- >
- <X className="size-4" />
- </button>
- </div>
- <div className="flex-1 overflow-y-auto p-6">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="narrow">
+ <SheetHeader>
+ <SheetTitle>{t("database.edit-environment")}</SheetTitle>
+ </SheetHeader>
+ <SheetBody>
<div className="flex flex-col gap-y-1">
{environments.map((env) => (
<label
@@ -72,8 +67,8 @@ export function EditEnvironmentDrawer({
</label>
))}
</div>
- </div>
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t border-control-border">
+ </SheetBody>
+ <SheetFooter>
<Button variant="ghost" onClick={onClose}>
{t("common.cancel")}
</Button>
@@ -91,8 +86,8 @@ export function EditEnvironmentDrawer({
>
{t("common.update")}
</Button>
- </div>
- </div>
- </div>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
diff --git a/frontend/src/react/components/database/CreateDatabaseDrawer.tsx b/frontend/src/react/components/database/CreateDatabaseSheet.tsx
similarity index 94%
rename from frontend/src/react/components/database/CreateDatabaseDrawer.tsx
rename to frontend/src/react/components/database/CreateDatabaseSheet.tsx
index b35da153c8..f42553a8ee 100644
--- a/frontend/src/react/components/database/CreateDatabaseDrawer.tsx
+++ b/frontend/src/react/components/database/CreateDatabaseSheet.tsx
@@ -8,8 +8,15 @@ import { InstanceSelect } from "@/react/components/InstanceSelect";
import { Button } from "@/react/components/ui/button";
import { Combobox } from "@/react/components/ui/combobox";
import { Input } from "@/react/components/ui/input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { useClickOutside } from "@/react/hooks/useClickOutside";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { router } from "@/router";
@@ -162,18 +169,18 @@ function IssueLabelSelect({
);
}
-export interface CreateDatabaseDrawerProps {
+export interface CreateDatabaseSheetProps {
open: boolean;
onClose: () => void;
// If provided, lock project selection to this project
projectName?: string;
}
-export function CreateDatabaseDrawer({
+export function CreateDatabaseSheet({
open,
onClose,
projectName: fixedProjectName,
-}: CreateDatabaseDrawerProps) {
+}: CreateDatabaseSheetProps) {
const { t } = useTranslation();
const projectStore = useProjectV1Store();
const instanceStore = useInstanceV1Store();
@@ -250,8 +257,6 @@ export function CreateDatabaseDrawer({
(!requireOwner || !!ownerName) &&
(!forceIssueLabels || issueLabels.length > 0);
- useEscapeKey(open, onClose);
-
const searchProjects = useCallback(
(query: string) => {
projectStore
@@ -372,22 +377,13 @@ export function CreateDatabaseDrawer({
selectedInstance && instanceV1HasCollationAndCharacterSet(selectedInstance);
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={onClose} />
- <div className="ml-auto relative bg-background w-[40rem] max-w-[100vw] h-full shadow-lg flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b border-control-border">
- <h2 className="text-lg font-semibold">
- {t("quick-action.create-db")}
- </h2>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={onClose}
- >
- <X className="size-4" />
- </button>
- </div>
-
- <div className="flex-1 overflow-y-auto p-6 flex flex-col gap-y-4">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <SheetHeader>
+ <SheetTitle>{t("quick-action.create-db")}</SheetTitle>
+ </SheetHeader>
+
+ <SheetBody className="gap-y-4">
{!fixedProjectName && (
<div>
<label className="block text-sm font-medium mb-1">
@@ -541,23 +537,23 @@ export function CreateDatabaseDrawer({
</div>
</>
)}
- </div>
+ </SheetBody>
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t border-control-border">
+ <SheetFooter>
<Button variant="ghost" onClick={onClose}>
{t("common.cancel")}
</Button>
<Button disabled={!allowCreate || creating} onClick={handleCreate}>
{t("common.create")}
</Button>
- </div>
+ </SheetFooter>
{creating && (
<div className="absolute inset-0 bg-background/60 flex items-center justify-center z-10">
<div className="animate-spin size-6 border-2 border-accent border-t-transparent rounded-full" />
</div>
)}
- </div>
- </div>
+ </SheetContent>
+ </Sheet>
);
}
diff --git a/frontend/src/react/components/database/LabelEditorDrawer.tsx b/frontend/src/react/components/database/LabelEditorSheet.tsx
similarity index 83%
rename from frontend/src/react/components/database/LabelEditorDrawer.tsx
rename to frontend/src/react/components/database/LabelEditorSheet.tsx
index 58d8d92ce8..477ca9608e 100644
--- a/frontend/src/react/components/database/LabelEditorDrawer.tsx
+++ b/frontend/src/react/components/database/LabelEditorSheet.tsx
@@ -4,10 +4,17 @@ import { useTranslation } from "react-i18next";
import { Alert } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
-export function LabelEditorDrawer({
+export function LabelEditorSheet({
open,
databases,
onClose,
@@ -24,7 +31,6 @@ export function LabelEditorDrawer({
const [newKey, setNewKey] = useState("");
const [newValue, setNewValue] = useState("");
- useEscapeKey(open, onClose);
useEffect(() => {
if (open) {
setLabelsList(databases.map((db) => ({ ...db.labels })));
@@ -34,8 +40,6 @@ export function LabelEditorDrawer({
}
}, [open, databases]);
- if (!open) return null;
-
const addLabelToAll = () => {
if (!newKey.trim()) return;
setLabelsList((prev) =>
@@ -71,19 +75,12 @@ export function LabelEditorDrawer({
const hasMixedValues = allKeys.some((key) => getDisplayValue(key).mixed);
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={onClose} />
- <div className="ml-auto relative bg-background w-[28rem] max-w-[100vw] h-full shadow-lg flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b border-control-border">
- <h2 className="text-lg font-semibold">{t("database.edit-labels")}</h2>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={onClose}
- >
- <X className="size-4" />
- </button>
- </div>
- <div className="flex-1 overflow-y-auto p-6">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="narrow">
+ <SheetHeader>
+ <SheetTitle>{t("database.edit-labels")}</SheetTitle>
+ </SheetHeader>
+ <SheetBody>
{hasMixedValues && (
<Alert variant="warning" className="mb-4">
{t("database.mixed-label-values-warning")}
@@ -144,8 +141,8 @@ export function LabelEditorDrawer({
{t("common.no-data")}
</p>
)}
- </div>
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t border-control-border">
+ </SheetBody>
+ <SheetFooter>
<Button variant="ghost" onClick={onClose}>
{t("common.cancel")}
</Button>
@@ -163,8 +160,8 @@ export function LabelEditorDrawer({
>
{t("common.update")}
</Button>
- </div>
- </div>
- </div>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
diff --git a/frontend/src/react/components/database/TransferProjectDrawer.tsx b/frontend/src/react/components/database/TransferProjectSheet.tsx
similarity index 86%
rename from frontend/src/react/components/database/TransferProjectDrawer.tsx
rename to frontend/src/react/components/database/TransferProjectSheet.tsx
index d126980f2f..9f3ff48a11 100644
--- a/frontend/src/react/components/database/TransferProjectDrawer.tsx
+++ b/frontend/src/react/components/database/TransferProjectSheet.tsx
@@ -1,10 +1,16 @@
-import { X } from "lucide-react";
import { useCallback, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { EngineIconPath } from "@/components/InstanceForm/constants";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useActuatorV1Store, useProjectV1Store } from "@/store";
@@ -16,7 +22,7 @@ import {
getInstanceResource,
} from "@/utils";
-export function TransferProjectDrawer({
+export function TransferProjectSheet({
open,
databases,
onClose,
@@ -43,8 +49,6 @@ export function TransferProjectDrawer({
const [transferring, setTransferring] = useState(false);
const searchTimerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
- useEscapeKey(open, onClose);
-
const fetchProjects = useCallback(
async (query: string) => {
setLoadingProjects(true);
@@ -80,24 +84,13 @@ export function TransferProjectDrawer({
};
}, [searchQuery, open, fetchProjects]);
- if (!open) return null;
-
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={onClose} />
- <div className="ml-auto relative bg-background w-[36rem] max-w-[100vw] h-full shadow-lg flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b border-control-border">
- <h2 className="text-lg font-semibold">
- {t("database.transfer-project")}
- </h2>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={onClose}
- >
- <X className="size-4" />
- </button>
- </div>
- <div className="flex-1 overflow-y-auto p-6 flex flex-col gap-y-4">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <SheetHeader>
+ <SheetTitle>{t("database.transfer-project")}</SheetTitle>
+ </SheetHeader>
+ <SheetBody className="gap-y-4">
<p className="text-sm text-control-light">
{t("database.selected-n-databases", { n: databases.length })}
</p>
@@ -188,8 +181,8 @@ export function TransferProjectDrawer({
</div>
</div>
)}
- </div>
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t border-control-border">
+ </SheetBody>
+ <SheetFooter>
<Button variant="ghost" onClick={onClose}>
{t("common.cancel")}
</Button>
@@ -209,8 +202,8 @@ export function TransferProjectDrawer({
>
{t("common.transfer")}
</Button>
- </div>
- </div>
- </div>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
diff --git a/frontend/src/react/components/database/index.tsx b/frontend/src/react/components/database/index.tsx
index 732de1b3d7..57cb4c58e6 100644
--- a/frontend/src/react/components/database/index.tsx
+++ b/frontend/src/react/components/database/index.tsx
@@ -1,8 +1,8 @@
-export type { CreateDatabaseDrawerProps } from "./CreateDatabaseDrawer";
-export { CreateDatabaseDrawer } from "./CreateDatabaseDrawer";
+export type { CreateDatabaseSheetProps } from "./CreateDatabaseSheet";
+export { CreateDatabaseSheet } from "./CreateDatabaseSheet";
export type { DatabaseBatchOperationsBarProps } from "./DatabaseBatchOperationsBar";
export { DatabaseBatchOperationsBar } from "./DatabaseBatchOperationsBar";
export type { DatabaseTableMode, DatabaseTableProps } from "./DatabaseTable";
export { DatabaseTable } from "./DatabaseTable";
-export { LabelEditorDrawer } from "./LabelEditorDrawer";
-export { TransferProjectDrawer } from "./TransferProjectDrawer";
+export { LabelEditorSheet } from "./LabelEditorSheet";
+export { TransferProjectSheet } from "./TransferProjectSheet";
diff --git a/frontend/src/react/components/ui/sheet.tsx b/frontend/src/react/components/ui/sheet.tsx
new file mode 100644
index 0000000000..646733a65d
--- /dev/null
+++ b/frontend/src/react/components/ui/sheet.tsx
@@ -0,0 +1,196 @@
+import { Dialog as BaseDialog } from "@base-ui/react/dialog";
+import { cva, type VariantProps } from "class-variance-authority";
+import { X } from "lucide-react";
+import type { ComponentProps } from "react";
+import { cn } from "@/react/lib/utils";
+
+// ---- Root ----
+// A side sheet is a Dialog whose Popup is pinned to the right edge of the
+// viewport. We reuse Base UI's Dialog primitive for focus trap, Escape key,
+// outside-click dismissal, and ARIA wiring — a sheet is semantically a dialog,
+// just with a different layout.
+const Sheet = BaseDialog.Root;
+
+// ---- Trigger ----
+const SheetTrigger = BaseDialog.Trigger;
+
+// ---- Close ----
+const SheetClose = BaseDialog.Close;
+
+// ---- Backdrop ----
+// Dialog, Select, Tooltip, AlertDialog, DropdownMenu all share `z-50`. Within
+// that layer, stacking falls back to DOM portal mount order — later mounts
+// win — which correctly places a Select/Tooltip opened *inside* a Sheet on
+// top of the sheet backdrop. Do not bump Sheet above z-50 (or other overlays
+// below) without updating all siblings together. See BYT-9226 / PR #19824.
+function SheetOverlay({
+ className,
+ ref,
+ ...props
+}: ComponentProps<typeof BaseDialog.Backdrop>) {
+ return (
+ <BaseDialog.Backdrop
+ ref={ref}
+ className={cn(
+ "fixed inset-0 z-50 bg-overlay/50",
+ "data-[starting-style]:opacity-0 data-[ending-style]:opacity-0",
+ "transition-opacity duration-200",
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+// ---- Content (Portal + Overlay + Popup) ----
+// Width tiers codify our resource-edit drawer conventions:
+// narrow (384px) — single-field pickers, short forms
+// standard (704px) — 3-6 field forms, permission transfer lists
+// wide (832px) — forms with CEL builders, nested tables, multi-tab layouts
+// Do not inline ad-hoc widths on SheetContent — add a tier here if a new
+// legitimate size is needed so all consumers stay aligned.
+const sheetContentVariants = cva(
+ cn(
+ "fixed inset-y-0 right-0 z-50 flex h-full flex-col bg-background shadow-lg",
+ "max-w-[100vw] outline-hidden",
+ "data-[starting-style]:translate-x-full data-[ending-style]:translate-x-full",
+ "transition-transform duration-200 ease-out"
+ ),
+ {
+ variants: {
+ width: {
+ narrow: "w-[24rem]",
+ standard: "w-[44rem]",
+ wide: "w-[52rem]",
+ },
+ },
+ defaultVariants: {
+ width: "standard",
+ },
+ }
+);
+
+interface SheetContentProps
+ extends ComponentProps<typeof BaseDialog.Popup>,
+ VariantProps<typeof sheetContentVariants> {}
+
+function SheetContent({
+ className,
+ children,
+ width,
+ ref,
+ ...props
+}: SheetContentProps) {
+ return (
+ <BaseDialog.Portal>
+ <SheetOverlay />
+ <BaseDialog.Popup
+ ref={ref}
+ className={cn(sheetContentVariants({ width }), className)}
+ {...props}
+ >
+ {children}
+ </BaseDialog.Popup>
+ </BaseDialog.Portal>
+ );
+}
+
+// ---- Header ----
+// Sticky top region with a bottom border, laid out as a row so the built-in
+// close button sits on the right. Typically contains a `SheetTitle` and an
+// optional `SheetDescription` — both are wrapped in a flex-col for the
+// vertical stack layout while the close button remains flush right.
+function SheetHeader({ className, children, ...props }: ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex items-start justify-between gap-x-4 border-b border-control-border px-6 py-4",
+ className
+ )}
+ {...props}
+ >
+ <div className="flex flex-col gap-y-1 min-w-0 flex-1">{children}</div>
+ {/* Built-in close affordance. Callers should not render their own close
+ button — Base UI's Close dismisses the Sheet via Root's onOpenChange. */}
+ <BaseDialog.Close
+ aria-label="Close"
+ className="shrink-0 rounded-xs p-1 text-control hover:bg-control-bg focus:outline-hidden focus-visible:ring-2 focus-visible:ring-accent cursor-pointer"
+ >
+ <X className="size-4" />
+ </BaseDialog.Close>
+ </div>
+ );
+}
+
+// ---- Body ----
+// Scrollable middle region between header and footer. Uses flex-1 so it
+// absorbs remaining vertical space.
+function SheetBody({ className, ...props }: ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex flex-1 flex-col overflow-y-auto px-6 py-4",
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+// ---- Footer ----
+// Sticky bottom region with a top border. Use `gap-x-2` for button groups,
+// matching the BUTTON_SPACING_STANDARDIZATION convention.
+function SheetFooter({ className, ...props }: ComponentProps<"div">) {
+ return (
+ <div
+ className={cn(
+ "flex items-center justify-end gap-x-2 border-t border-control-border px-6 py-4",
+ className
+ )}
+ {...props}
+ />
+ );
+}
+
+// ---- Title ----
+function SheetTitle({
+ className,
+ ref,
+ ...props
+}: ComponentProps<typeof BaseDialog.Title>) {
+ return (
+ <BaseDialog.Title
+ ref={ref}
+ className={cn("text-lg font-semibold text-control", className)}
+ {...props}
+ />
+ );
+}
+
+// ---- Description ----
+function SheetDescription({
+ className,
+ ref,
+ ...props
+}: ComponentProps<typeof BaseDialog.Description>) {
+ return (
+ <BaseDialog.Description
+ ref={ref}
+ className={cn("text-sm text-control-light", className)}
+ {...props}
+ />
+ );
+}
+
+export {
+ Sheet,
+ SheetBody,
+ SheetClose,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetOverlay,
+ SheetTitle,
+ SheetTrigger,
+};
diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.json
index a07dbcd17e..098c89f0a6 100644
--- a/frontend/src/react/locales/en-US.json
+++ b/frontend/src/react/locales/en-US.json
@@ -586,12 +586,7 @@
"database.filter-database": "Filter database",
"database.labels": "Database Labels",
"database.revision.delete-confirm-dialog": "This will delete these applied revisions and the database schema will not be changed. This action cannot be undone.",
- "database.revision.import-revision": "Import Revision",
- "database.revision.invalid-version-format": "Version must be numeric parts separated by dots (e.g., 1.0.0)",
"database.revision.self": "Revision",
- "database.revision.type-declarative": "Declarative",
- "database.revision.type-versioned": "Versioned",
- "database.revision.version-already-exists": "This version already exists in the database",
"database.successfully-exported-schema": "Successfully exported schema",
"database.sync-complete-for-instance": "Sync complete for instance '{{0}}'",
"database.sync-database": "Sync Database",
diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.json
index f5565e4869..6cfeaf3269 100644
--- a/frontend/src/react/locales/es-ES.json
+++ b/frontend/src/react/locales/es-ES.json
@@ -586,12 +586,7 @@
"database.filter-database": "Filtrar base de datos",
"database.labels": "Etiquetas de base de datos",
"database.revision.delete-confirm-dialog": "Esto eliminará las revisiones aplicadas y el esquema de la base de datos no se modificará. Esta acción no se puede deshacer.",
- "database.revision.import-revision": "Revisión de importación",
- "database.revision.invalid-version-format": "La versión debe tener partes numéricas separadas por puntos (por ejemplo, 1.0.0)",
"database.revision.self": "Revisión",
- "database.revision.type-declarative": "Declarativo",
- "database.revision.type-versioned": "Versionado",
- "database.revision.version-already-exists": "Esta versión ya existe en la base de datos",
"database.successfully-exported-schema": "Esquema exportado correctamente",
"database.sync-complete-for-instance": "Sincronización completada para la instancia '{{0}}'",
"database.sync-database": "Sincronizar base de datos",
diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.json
index b13f281571..d1a5442b3c 100644
--- a/frontend/src/react/locales/ja-JP.json
+++ b/frontend/src/react/locales/ja-JP.json
@@ -586,12 +586,7 @@
"database.filter-database": "フィルターデータベース",
"database.labels": "データベースラベル",
"database.revision.delete-confirm-dialog": "これにより、適用されたリビジョンが削除され、データベース スキーマは変更されません。このアクションは元に戻せません。",
- "database.revision.import-revision": "インポートリビジョン",
- "database.revision.invalid-version-format": "バージョンはドットで区切られた数字部分でなければなりません(例:1.0.0)",
"database.revision.self": "リビジョン",
- "database.revision.type-declarative": "宣言的",
- "database.revision.type-versioned": "バージョン管理",
- "database.revision.version-already-exists": "このバージョンは既にデータベースに存在します",
"database.successfully-exported-schema": "スキーマのエクスポートに成功しました",
"database.sync-complete-for-instance": "インスタンス '{{0}}' の同期が完了しました",
"database.sync-database": "データベースを同期",
diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.json
index 176de1dd11..0d76f700ac 100644
--- a/frontend/src/react/locales/vi-VN.json
+++ b/frontend/src/react/locales/vi-VN.json
@@ -586,12 +586,7 @@
"database.filter-database": "Lọc cơ sở dữ liệu",
"database.labels": "Nhãn cơ sở dữ liệu",
"database.revision.delete-confirm-dialog": "Thao tác này sẽ xóa các bản sửa đổi đã áp dụng này và lược đồ cơ sở dữ liệu sẽ không bị thay đổi. Hành động này không thể hoàn tác.",
- "database.revision.import-revision": "Nhập bản sửa đổi",
- "database.revision.invalid-version-format": "Phiên bản phải là các phần số được phân tách bằng dấu chấm (ví dụ: 1.0.0)",
"database.revision.self": "Phiên bản",
- "database.revision.type-declarative": "Khai báo",
- "database.revision.type-versioned": "Phiên bản",
- "database.revision.version-already-exists": "Phiên bản này đã tồn tại trong cơ sở dữ liệu",
"database.successfully-exported-schema": "Đã xuất schema thành công",
"database.sync-complete-for-instance": "Đồng bộ hoàn tất cho instance '{{0}}'",
"database.sync-database": "Đồng bộ cơ sở dữ liệu",
diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.json
index 10a3e32138..846bef932d 100644
--- a/frontend/src/react/locales/zh-CN.json
+++ b/frontend/src/react/locales/zh-CN.json
@@ -586,12 +586,7 @@
"database.filter-database": "过滤数据库",
"database.labels": "数据库标签",
"database.revision.delete-confirm-dialog": "这将删除这些已应用的修改,但不会影响数据库 Schema。此操作无法撤消。",
- "database.revision.import-revision": "导入版本",
- "database.revision.invalid-version-format": "版本必须是用点分隔的数字部分(例如,1.0.0)",
"database.revision.self": "版本",
- "database.revision.type-declarative": "声明式",
- "database.revision.type-versioned": "版本化",
- "database.revision.version-already-exists": "此版本已存在于数据库中",
"database.successfully-exported-schema": "成功导出 Schema",
"database.sync-complete-for-instance": "实例 '{{0}}' 同步完成",
"database.sync-database": "同步数据库",
diff --git a/frontend/src/react/pages/project/ProjectDataExportPage.tsx b/frontend/src/react/pages/project/ProjectDataExportPage.tsx
index 70526a40a1..58b3fa70c4 100644
--- a/frontend/src/react/pages/project/ProjectDataExportPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDataExportPage.tsx
@@ -36,7 +36,7 @@ import {
PERMISSIONS_FOR_DATABASE_EXPORT_ISSUE,
type SearchParams as VueSearchParams,
} from "@/utils";
-import { DataExportPrepDrawer } from "./export-center/DataExportPrepDrawer";
+import { DataExportPrepSheet } from "./export-center/DataExportPrepSheet";
export function ProjectDataExportPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
@@ -224,7 +224,7 @@ export function ProjectDataExportPage({ projectId }: { projectId: string }) {
)}
</div>
- <DataExportPrepDrawer
+ <DataExportPrepSheet
open={showDrawer}
onClose={() => setShowDrawer(false)}
projectName={project?.name ?? projectName}
diff --git a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx
index bee37b2546..3936b3616f 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx
@@ -62,7 +62,7 @@ const mocks = vi.hoisted(() => {
t: (key: string) => key,
})),
pushNotification: vi.fn(),
- transferProjectDrawer: vi.fn(
+ transferProjectSheet: vi.fn(
({
open,
onTransfer,
@@ -71,7 +71,7 @@ const mocks = vi.hoisted(() => {
onTransfer: (projectName: string) => Promise<void>;
}) => (
<div
- data-testid="transfer-project-drawer"
+ data-testid="transfer-project-sheet"
data-open={open ? "true" : "false"}
>
{open && (
@@ -284,7 +284,7 @@ vi.mock("@/store", () => ({
}));
vi.mock("@/react/components/database", () => ({
- TransferProjectDrawer: mocks.transferProjectDrawer,
+ TransferProjectSheet: mocks.transferProjectSheet,
}));
vi.mock("@/connect", () => ({
@@ -452,7 +452,7 @@ beforeEach(() => {
t: (key: string) => key,
});
mocks.pushNotification.mockReset();
- mocks.transferProjectDrawer.mockClear();
+ mocks.transferProjectSheet.mockClear();
mocks.DatabaseChangelogPanel.mockClear();
mocks.DatabaseOverviewPanel.mockClear();
mocks.DatabaseRevisionPanel.mockClear();
diff --git a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx
index d7d225441c..2065b5444a 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx
@@ -5,7 +5,7 @@ import { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import type { LocationQueryRaw } from "vue-router";
import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";
-import { TransferProjectDrawer } from "@/react/components/database";
+import { TransferProjectSheet } from "@/react/components/database";
import { Alert } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
import {
@@ -294,7 +294,7 @@ export function ProjectDatabaseDetailPage({
</DialogContent>
</Dialog>
- <TransferProjectDrawer
+ <TransferProjectSheet
open={showTransferDrawer}
databases={[detail.database]}
onClose={() => setShowTransferDrawer(false)}
diff --git a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
index 073b88c3bd..cf2d3d82e8 100644
--- a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
@@ -11,12 +11,12 @@ import {
type SearchParams,
} from "@/react/components/AdvancedSearch";
import {
- CreateDatabaseDrawer,
+ CreateDatabaseSheet,
DatabaseBatchOperationsBar,
DatabaseTable,
- LabelEditorDrawer,
+ LabelEditorSheet,
} from "@/react/components/database";
-import { EditEnvironmentDrawer } from "@/react/components/EditEnvironmentDrawer";
+import { EditEnvironmentSheet } from "@/react/components/EditEnvironmentSheet";
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { Button } from "@/react/components/ui/button";
import { useVueState } from "@/react/hooks/useVueState";
@@ -53,7 +53,7 @@ import {
PERMISSIONS_FOR_DATABASE_CREATE_ISSUE,
supportedEngineV1List,
} from "@/utils";
-import { DataExportPrepDrawer } from "./export-center/DataExportPrepDrawer";
+import { DataExportPrepSheet } from "./export-center/DataExportPrepSheet";
export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
@@ -394,12 +394,12 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
onExportData={isDefault ? undefined : handleExportData}
/>
- <EditEnvironmentDrawer
+ <EditEnvironmentSheet
open={showEditEnvDrawer}
onClose={() => setShowEditEnvDrawer(false)}
onUpdate={handleEnvironmentUpdate}
/>
- <LabelEditorDrawer
+ <LabelEditorSheet
open={showLabelEditor}
databases={selectedDatabases}
onClose={() => setShowLabelEditor(false)}
@@ -416,13 +416,13 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
/>
</div>
- <CreateDatabaseDrawer
+ <CreateDatabaseSheet
open={showCreateDrawer}
onClose={() => setShowCreateDrawer(false)}
projectName={projectName}
/>
- <DataExportPrepDrawer
+ <DataExportPrepSheet
open={showExportDrawer}
onClose={() => setShowExportDrawer(false)}
projectName={projectName}
diff --git a/frontend/src/react/pages/project/ProjectGitOpsPage.tsx b/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
index 30e089f2d9..a88ae93dd9 100644
--- a/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
@@ -2,7 +2,7 @@ import { Check, ChevronDown, ChevronRight, Copy, XCircle } from "lucide-react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import gitopsWorkflowImage from "@/assets/gitops-workflow.svg";
-import { CreateWorkloadIdentityDrawer } from "@/react/components/CreateWorkloadIdentityDrawer";
+import { CreateWorkloadIdentitySheet } from "@/react/components/CreateWorkloadIdentitySheet";
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { Alert } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
@@ -605,13 +605,12 @@ export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
</p>
</div>
- {showCreateDrawer && (
- <CreateWorkloadIdentityDrawer
- project={projectName}
- onClose={() => setShowCreateDrawer(false)}
- onCreated={handleWorkloadIdentityCreated}
- />
- )}
+ <CreateWorkloadIdentitySheet
+ open={showCreateDrawer}
+ project={projectName}
+ onClose={() => setShowCreateDrawer(false)}
+ onCreated={handleWorkloadIdentityCreated}
+ />
</div>
);
}
diff --git a/frontend/src/react/pages/project/database-detail/revision/CreateRevisionDialog.tsx b/frontend/src/react/pages/project/database-detail/revision/CreateRevisionDialog.tsx
deleted file mode 100644
index ba37b88e9b..0000000000
--- a/frontend/src/react/pages/project/database-detail/revision/CreateRevisionDialog.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { revisionServiceClientConnect } from "@/connect";
-import { Button } from "@/react/components/ui/button";
-import {
- Dialog,
- DialogContent,
- DialogTitle,
-} from "@/react/components/ui/dialog";
-import { pushNotification, useSheetV1Store } from "@/store";
-import {
- BatchCreateRevisionsRequestSchema,
- CreateRevisionRequestSchema,
- type Revision,
- Revision_Type,
-} from "@/types/proto-es/v1/revision_service_pb";
-
-export function CreateRevisionDialog({
- databaseName,
- existingVersions,
- isCheckingExistingVersions,
- open,
- projectName,
- onCreated,
- onOpenChange,
-}: {
- databaseName: string;
- existingVersions: string[];
- isCheckingExistingVersions: boolean;
- open: boolean;
- projectName: string;
- onCreated: (revisions: Revision[]) => void;
- onOpenChange: (open: boolean) => void;
-}) {
- const { t } = useTranslation();
- const sheetStore = useSheetV1Store();
- const [version, setVersion] = useState("");
- const [statement, setStatement] = useState("");
- const [type, setType] = useState(Revision_Type.VERSIONED);
- const [isCreating, setIsCreating] = useState(false);
- const normalizedVersion = version.trim();
- const isDuplicateVersion = existingVersions.includes(normalizedVersion);
- const isValidVersion = /^(\d+)(\.(\d+))*$/.test(normalizedVersion);
-
- const reset = () => {
- setVersion("");
- setStatement("");
- setType(Revision_Type.VERSIONED);
- };
-
- const handleOpenChange = (nextOpen: boolean) => {
- if (!nextOpen) {
- reset();
- }
- onOpenChange(nextOpen);
- };
-
- const canCreate =
- normalizedVersion.length > 0 &&
- statement.trim().length > 0 &&
- !isCheckingExistingVersions &&
- isValidVersion &&
- !isDuplicateVersion;
-
- const handleCreate = async () => {
- if (!canCreate || isCreating) {
- return;
- }
-
- setIsCreating(true);
- try {
- const sheet = await sheetStore.createSheet(projectName, {
- content: new TextEncoder().encode(statement),
- });
- const response = await revisionServiceClientConnect.batchCreateRevisions(
- create(BatchCreateRevisionsRequestSchema, {
- parent: databaseName,
- requests: [
- create(CreateRevisionRequestSchema, {
- parent: databaseName,
- revision: {
- sheet: sheet.name,
- type,
- version: normalizedVersion,
- },
- }),
- ],
- })
- );
- onCreated(response.revisions);
- handleOpenChange(false);
- } catch (error) {
- pushNotification({
- module: "bytebase",
- style: "CRITICAL",
- title: t("common.error"),
- description: error instanceof Error ? error.message : String(error),
- });
- } finally {
- setIsCreating(false);
- }
- };
-
- return (
- <Dialog open={open} onOpenChange={handleOpenChange}>
- <DialogContent className="max-w-3xl p-6">
- <DialogTitle>{t("database.revision.import-revision")}</DialogTitle>
- <div className="mt-4 flex flex-col gap-4">
- <div className="flex flex-col gap-2">
- <label
- className="block text-sm font-medium text-control"
- htmlFor="revision-version"
- >
- {t("common.version")}
- </label>
- <input
- id="revision-version"
- className="w-full rounded-xs border border-control-border px-3 py-2 text-sm text-main"
- name="version"
- value={version}
- onChange={(event) => setVersion(event.target.value)}
- />
- {normalizedVersion.length > 0 && !isValidVersion && (
- <p className="text-sm text-error">
- {t("database.revision.invalid-version-format")}
- </p>
- )}
- {isDuplicateVersion && (
- <p className="text-sm text-error">
- {t("database.revision.version-already-exists")}
- </p>
- )}
- {isCheckingExistingVersions && (
- <p className="text-sm text-control-light">
- {t("common.loading")}...
- </p>
- )}
- </div>
- <div className="flex flex-col gap-2">
- <label
- className="block text-sm font-medium text-control"
- htmlFor="revision-type"
- >
- {t("common.type")}
- </label>
- <select
- id="revision-type"
- className="w-full rounded-xs border border-control-border px-3 py-2 text-sm text-main"
- value={String(type)}
- onChange={(event) =>
- setType(Number(event.target.value) as Revision_Type)
- }
- >
- <option value={String(Revision_Type.VERSIONED)}>
- {t("database.revision.type-versioned")}
- </option>
- <option value={String(Revision_Type.DECLARATIVE)}>
- {t("database.revision.type-declarative")}
- </option>
- </select>
- </div>
- <div className="flex flex-col gap-2">
- <label
- className="block text-sm font-medium text-control"
- htmlFor="revision-statement"
- >
- {t("common.statement")}
- </label>
- <textarea
- id="revision-statement"
- className="min-h-48 w-full rounded-xs border border-control-border px-3 py-2 text-sm text-main"
- name="statement"
- value={statement}
- onChange={(event) => setStatement(event.target.value)}
- />
- </div>
- <div className="flex items-center justify-end gap-x-2">
- <Button
- type="button"
- variant="ghost"
- onClick={() => handleOpenChange(false)}
- >
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!canCreate || isCreating}
- type="button"
- onClick={() => void handleCreate()}
- >
- {isCreating ? t("common.loading") : t("common.create")}
- </Button>
- </div>
- </div>
- </DialogContent>
- </Dialog>
- );
-}
diff --git a/frontend/src/react/pages/project/export-center/DataExportPrepDrawer.tsx b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
similarity index 95%
rename from frontend/src/react/pages/project/export-center/DataExportPrepDrawer.tsx
rename to frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
index 77c908c348..94d6924a66 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepDrawer.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
@@ -1,5 +1,5 @@
import { create } from "@bufbuild/protobuf";
-import { Database as DatabaseIcon, FolderTree, Loader2, X } from "lucide-react";
+import { Database as DatabaseIcon, FolderTree, Loader2 } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { v4 as uuidv4 } from "uuid";
@@ -9,8 +9,15 @@ import { IssueLabelSelect } from "@/react/components/IssueLabelSelect";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { Switch } from "@/react/components/ui/switch";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { useSessionPageSize } from "@/react/hooks/useSessionPageSize";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
@@ -51,7 +58,7 @@ import {
} from "@/utils";
// ---------------------------------------------------------------------------
-// Main Drawer
+// Main Sheet
// ---------------------------------------------------------------------------
export interface DataExportPrepSeed {
@@ -61,7 +68,7 @@ export interface DataExportPrepSeed {
step?: 1 | 2;
}
-export interface DataExportPrepDrawerProps {
+export interface DataExportPrepSheetProps {
open: boolean;
onClose: () => void;
projectName: string;
@@ -77,12 +84,12 @@ const EXPORT_FORMATS = [
{ value: ExportFormat.XLSX, label: "XLSX" },
] as const;
-export function DataExportPrepDrawer({
+export function DataExportPrepSheet({
open,
onClose,
projectName,
seed,
-}: DataExportPrepDrawerProps) {
+}: DataExportPrepSheetProps) {
const { t } = useTranslation();
const currentUser = useCurrentUserV1();
const sheetStore = useSheetV1Store();
@@ -197,15 +204,13 @@ export function DataExportPrepDrawer({
}
}, [open, seedKey, seedStep]);
- // Close the drawer if the project context changes while open
+ // Close the sheet if the project context changes while open
useEffect(() => {
if (open) {
onClose();
}
}, [projectName]);
- useEscapeKey(open, onClose);
-
// Limits
const maximumResultSize = useVueState(() => {
let size = settingStore.workspaceProfile.sqlResultSize;
@@ -289,26 +294,14 @@ export function DataExportPrepDrawer({
}
};
- if (!open) return null;
-
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={onClose} />
- <div className="ml-auto relative bg-background w-[calc(100vw-8rem)] lg:w-240 max-w-[calc(100vw-8rem)] h-full shadow-lg flex flex-col">
- {/* Header */}
- <div className="px-6 py-4 border-b border-control-border">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="wide">
+ <SheetHeader>
<div className="flex flex-col gap-y-3">
- <div className="flex items-center justify-between">
- <span className="text-lg font-semibold">
- {t("custom-approval.risk-rule.risk.namespace.data_export")}
- </span>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={onClose}
- >
- <X className="size-4" />
- </button>
- </div>
+ <SheetTitle>
+ {t("custom-approval.risk-rule.risk.namespace.data_export")}
+ </SheetTitle>
{/* Steps indicator */}
<div className="flex items-center gap-x-4 text-sm">
<StepIndicator
@@ -326,10 +319,9 @@ export function DataExportPrepDrawer({
/>
</div>
</div>
- </div>
+ </SheetHeader>
- {/* Content */}
- <div className="flex-1 overflow-y-auto p-6">
+ <SheetBody>
{step === 1 ? (
<DatabaseAndGroupSelector
projectName={projectName}
@@ -481,10 +473,9 @@ export function DataExportPrepDrawer({
</div>
</div>
)}
- </div>
+ </SheetBody>
- {/* Footer */}
- <div className="px-6 py-4 border-t border-control-border flex items-center justify-end gap-x-2">
+ <SheetFooter>
<Button variant="outline" onClick={handleCancel}>
{step === 1 ? t("common.cancel") : t("common.back")}
</Button>
@@ -498,9 +489,9 @@ export function DataExportPrepDrawer({
{t("common.create")}
</Button>
)}
- </div>
- </div>
- </div>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
diff --git a/frontend/src/react/pages/settings/DatabasesPage.tsx b/frontend/src/react/pages/settings/DatabasesPage.tsx
index 4328b82894..e016c0c8f9 100644
--- a/frontend/src/react/pages/settings/DatabasesPage.tsx
+++ b/frontend/src/react/pages/settings/DatabasesPage.tsx
@@ -11,13 +11,13 @@ import {
type SearchParams,
} from "@/react/components/AdvancedSearch";
import {
- CreateDatabaseDrawer,
+ CreateDatabaseSheet,
DatabaseBatchOperationsBar,
DatabaseTable,
- LabelEditorDrawer,
- TransferProjectDrawer,
+ LabelEditorSheet,
+ TransferProjectSheet,
} from "@/react/components/database";
-import { EditEnvironmentDrawer } from "@/react/components/EditEnvironmentDrawer";
+import { EditEnvironmentSheet } from "@/react/components/EditEnvironmentSheet";
import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { Button } from "@/react/components/ui/button";
@@ -438,18 +438,18 @@ export function DatabasesPage() {
onEditEnvironment={() => setShowEditEnvDrawer(true)}
onTransferProject={() => setShowTransferDrawer(true)}
/>
- <EditEnvironmentDrawer
+ <EditEnvironmentSheet
open={showEditEnvDrawer}
onClose={() => setShowEditEnvDrawer(false)}
onUpdate={handleEnvironmentUpdate}
/>
- <LabelEditorDrawer
+ <LabelEditorSheet
open={showLabelEditor}
databases={selectedDatabases}
onClose={() => setShowLabelEditor(false)}
onApply={handleLabelsApply}
/>
- <TransferProjectDrawer
+ <TransferProjectSheet
open={showTransferDrawer}
databases={selectedDatabases}
onClose={() => setShowTransferDrawer(false)}
@@ -465,7 +465,7 @@ export function DatabasesPage() {
/>
</div>
- <CreateDatabaseDrawer
+ <CreateDatabaseSheet
open={showCreateDrawer}
onClose={() => setShowCreateDrawer(false)}
/>
diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
index 5fbe5e6ef0..1ff516d78e 100644
--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx
+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
@@ -1,4 +1,21 @@
import { create } from "@bufbuild/protobuf";
+import {
+ closestCenter,
+ DndContext,
+ type DragEndEvent,
+ KeyboardSensor,
+ PointerSensor,
+ useSensor,
+ useSensors,
+} from "@dnd-kit/core";
+import {
+ arrayMove,
+ SortableContext,
+ sortableKeyboardCoordinates,
+ useSortable,
+ verticalListSortingStrategy,
+} from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
import { cloneDeep, isEqual } from "lodash-es";
import { GripVertical, ListOrdered, Plus, ShieldAlert, X } from "lucide-react";
import {
@@ -17,6 +34,14 @@ import { PermissionGuard } from "@/react/components/PermissionGuard";
import { ResourceIdField } from "@/react/components/ResourceIdField";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import {
Tabs,
TabsList,
@@ -24,6 +49,7 @@ import {
TabsTrigger,
} from "@/react/components/ui/tabs";
import { useVueState } from "@/react/hooks/useVueState";
+import { cn } from "@/react/lib/utils";
import { router } from "@/router";
import {
WORKSPACE_ROUTE_SQL_REVIEW_CREATE,
@@ -71,31 +97,6 @@ import {
sqlReviewPolicySlug,
} from "@/utils";
-// ============================================================
-// Escape key stack
-// ============================================================
-const escapeStack: (() => void)[] = [];
-
-function useEscapeKey(onEscape: () => void) {
- useEffect(() => {
- escapeStack.push(onEscape);
- const handler = (e: KeyboardEvent) => {
- if (
- e.key === "Escape" &&
- escapeStack[escapeStack.length - 1] === onEscape
- ) {
- onEscape();
- }
- };
- document.addEventListener("keydown", handler);
- return () => {
- document.removeEventListener("keydown", handler);
- const idx = escapeStack.lastIndexOf(onEscape);
- if (idx >= 0) escapeStack.splice(idx, 1);
- };
- }, [onEscape]);
-}
-
// ============================================================
// EnvironmentName - displays env name with color badge
// ============================================================
@@ -1014,10 +1015,12 @@ function EnvironmentDetail({
// ============================================================
// CreateDrawer
// ============================================================
-function CreateDrawer({
+function CreateSheet({
+ open,
onClose,
onCreate,
}: {
+ open: boolean;
onClose: () => void;
onCreate: (params: {
environment: Partial<Environment>;
@@ -1025,7 +1028,6 @@ function CreateDrawer({
}) => void;
}) {
const { t } = useTranslation();
- useEscapeKey(onClose);
const subscriptionStore = useSubscriptionV1Store();
const environmentStore = useEnvironmentV1Store();
@@ -1042,6 +1044,18 @@ function CreateDrawer({
const [resourceId, setResourceId] = useState("");
const [resourceIdValid, setResourceIdValid] = useState(false);
+ // Reset form state whenever the Sheet is (re)opened. Sheet is always mounted
+ // so useState initializers only run on first mount.
+ useEffect(() => {
+ if (!open) return;
+ setTitle("");
+ setColor("#4f46e5");
+ setIsProtected(false);
+ setRolloutPolicy(getEmptyRolloutPolicy("", PolicyResourceType.ENVIRONMENT));
+ setResourceId("");
+ setResourceIdValid(false);
+ }, [open]);
+
const canCreate = useMemo(() => {
return title.trim().length > 0 && resourceId.length > 0 && resourceIdValid;
}, [title, resourceId, resourceIdValid]);
@@ -1101,17 +1115,13 @@ function CreateDrawer({
};
return (
- <>
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
- <div className="fixed inset-y-0 right-0 z-50 w-xl max-w-[100vw] bg-white shadow-xl flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">{t("common.environment")}</h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <SheetHeader>
+ <SheetTitle>{t("common.environment")}</SheetTitle>
+ </SheetHeader>
- <div className="flex-1 overflow-auto px-6 py-6">
+ <SheetBody>
<div className="flex flex-col gap-y-6">
{/* Name */}
<div className="flex flex-col gap-y-2">
@@ -1187,25 +1197,129 @@ function CreateDrawer({
/>
</div>
</div>
- </div>
+ </SheetBody>
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t">
+ <SheetFooter>
<Button variant="outline" onClick={onClose}>
{t("common.cancel")}
</Button>
<Button disabled={!canCreate} onClick={handleCreate}>
{t("common.create")}
</Button>
- </div>
- </div>
- </>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
// ============================================================
-// ReorderDrawer
+// ReorderSheet
// ============================================================
-function ReorderDrawer({
+function SortableEnvironmentRow({
+ env,
+ index,
+}: {
+ env: Environment;
+ index: number;
+}) {
+ const {
+ attributes,
+ listeners,
+ setNodeRef,
+ transform,
+ transition,
+ isDragging,
+ } = useSortable({ id: env.id });
+
+ const style = {
+ transform: CSS.Transform.toString(transform),
+ transition,
+ opacity: isDragging ? 0.5 : undefined,
+ };
+
+ return (
+ <div
+ ref={setNodeRef}
+ style={style}
+ className={cn(
+ "flex items-center justify-between p-2 rounded-xs border border-transparent",
+ !isDragging && "hover:bg-control-bg"
+ )}
+ >
+ <div className="flex items-center gap-x-2">
+ <span className="textinfo">{index + 1}.</span>
+ <EnvironmentName environment={env} />
+ </div>
+ <button
+ type="button"
+ className="cursor-grab active:cursor-grabbing touch-none p-1 text-control-light hover:text-control"
+ aria-label="Drag to reorder"
+ {...attributes}
+ {...listeners}
+ >
+ <GripVertical className="size-5" />
+ </button>
+ </div>
+ );
+}
+
+// Outer wrapper — captures a snapshot of `environments` at open time and
+// keeps it stable for the lifetime of the opened sheet. The inner
+// `ReorderSheetInner` is keyed by an open counter so it remounts fresh
+// every time the Sheet opens (re-initializing its `list` state from the
+// snapshot), but does NOT reset mid-session when the parent's
+// `environments` prop gets a new reference on every render (which
+// `useVueState` does — it spreads the store's array). A naive
+// `useEffect([open, environments])` reset would clobber the user's drag
+// reorder the instant the parent re-renders, which was the previous bug.
+function ReorderSheet({
+ open,
+ environments,
+ onClose,
+ onConfirm,
+}: {
+ open: boolean;
+ environments: Environment[];
+ onClose: () => void;
+ onConfirm: (reordered: Environment[]) => void;
+}) {
+ // Counter bumps each time the Sheet transitions from closed → open,
+ // forcing the inner component to remount with a fresh list snapshot.
+ const [openCount, setOpenCount] = useState(0);
+ const prevOpenRef = useRef(false);
+ useEffect(() => {
+ if (open && !prevOpenRef.current) {
+ setOpenCount((c) => c + 1);
+ }
+ prevOpenRef.current = open;
+ }, [open]);
+
+ // Snapshot the environments at the moment we decided to open. This
+ // closes over a stable array reference for the session.
+ const snapshotRef = useRef(environments);
+ if (open && !prevOpenRef.current) {
+ snapshotRef.current = environments;
+ }
+ // After the initial open transition we keep refreshing the snapshot
+ // while open remains true so list-item metadata (titles, colors) stays
+ // current. But we never mutate the *order* mid-session.
+ const snapshot = open ? environments : snapshotRef.current;
+
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="narrow">
+ <ReorderSheetInner
+ key={openCount}
+ environments={snapshot}
+ onClose={onClose}
+ onConfirm={onConfirm}
+ />
+ </SheetContent>
+ </Sheet>
+ );
+}
+
+function ReorderSheetInner({
environments,
onClose,
onConfirm,
@@ -1215,72 +1329,80 @@ function ReorderDrawer({
onConfirm: (reordered: Environment[]) => void;
}) {
const { t } = useTranslation();
- useEscapeKey(onClose);
- const [list, setList] = useState(() => [...environments]);
- const [dragIndex, setDragIndex] = useState<number | null>(null);
+ // Initialize once at mount from the snapshot passed in. The outer
+ // wrapper remounts this component on each open, so this initializer
+ // always sees the correct starting order.
+ const [list, setList] = useState<Environment[]>(() => [...environments]);
+
+ // dnd-kit sensors — Pointer handles mouse/touch, Keyboard enables
+ // Tab+Space/Arrow accessible reordering.
+ const sensors = useSensors(
+ useSensor(PointerSensor, {
+ // Small activation distance prevents click-vs-drag ambiguity on
+ // the grip handle while still feeling responsive.
+ activationConstraint: { distance: 4 },
+ }),
+ useSensor(KeyboardSensor, {
+ coordinateGetter: sortableKeyboardCoordinates,
+ })
+ );
+ // Compare against the initial order captured at mount, not against the
+ // live `environments` prop (which may change reference on every parent
+ // render thanks to useVueState spreading the store array).
+ const initialOrderRef = useRef(environments.map((e) => e.id));
const orderChanged = useMemo(() => {
+ if (list.length !== initialOrderRef.current.length) return true;
for (let i = 0; i < list.length; i++) {
- if (list[i].id !== environments[i].id) return true;
+ if (list[i].id !== initialOrderRef.current[i]) return true;
}
return false;
- }, [list, environments]);
-
- const onDragStart = (index: number) => {
- setDragIndex(index);
- };
-
- const onDragOver = (e: React.DragEvent, index: number) => {
- e.preventDefault();
- if (dragIndex === null || dragIndex === index) return;
- const newList = [...list];
- const [item] = newList.splice(dragIndex, 1);
- newList.splice(index, 0, item);
- setList(newList);
- setDragIndex(index);
+ }, [list]);
+
+ const handleDragEnd = (event: DragEndEvent) => {
+ const { active, over } = event;
+ if (!over || active.id === over.id) return;
+ setList((prev) => {
+ const oldIndex = prev.findIndex((e) => e.id === active.id);
+ const newIndex = prev.findIndex((e) => e.id === over.id);
+ if (oldIndex < 0 || newIndex < 0) return prev;
+ return arrayMove(prev, oldIndex, newIndex);
+ });
};
return (
<>
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
- <div className="fixed inset-y-0 right-0 z-50 w-120 max-w-[90vw] bg-white shadow-xl flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">{t("environment.reorder")}</h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
-
- <div className="flex-1 overflow-auto px-6 py-4">
- {list.map((env, index) => (
- <div
- key={env.id}
- draggable
- onDragStart={() => onDragStart(index)}
- onDragOver={(e) => onDragOver(e, index)}
- onDragEnd={() => setDragIndex(null)}
- className={`flex items-center justify-between p-2 hover:bg-gray-100 rounded-xs cursor-grab ${
- dragIndex === index ? "opacity-50" : ""
- }`}
- >
- <div className="flex items-center gap-x-2">
- <span className="textinfo">{index + 1}.</span>
- <EnvironmentName environment={env} />
- </div>
- <GripVertical className="w-5 h-5 text-gray-500" />
+ <SheetHeader>
+ <SheetTitle>{t("environment.reorder")}</SheetTitle>
+ </SheetHeader>
+
+ <SheetBody>
+ <DndContext
+ sensors={sensors}
+ collisionDetection={closestCenter}
+ onDragEnd={handleDragEnd}
+ >
+ <SortableContext
+ items={list.map((e) => e.id)}
+ strategy={verticalListSortingStrategy}
+ >
+ <div className="flex flex-col gap-y-1">
+ {list.map((env, index) => (
+ <SortableEnvironmentRow key={env.id} env={env} index={index} />
+ ))}
</div>
- ))}
- </div>
-
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button disabled={!orderChanged} onClick={() => onConfirm(list)}>
- {t("common.update")}
- </Button>
- </div>
- </div>
+ </SortableContext>
+ </DndContext>
+ </SheetBody>
+
+ <SheetFooter>
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button disabled={!orderChanged} onClick={() => onConfirm(list)}>
+ {t("common.update")}
+ </Button>
+ </SheetFooter>
</>
);
}
@@ -1500,22 +1622,20 @@ export function EnvironmentsPage() {
))}
</Tabs>
- {/* Create drawer */}
- {showCreate && (
- <CreateDrawer
- onClose={() => setShowCreate(false)}
- onCreate={handleCreate}
- />
- )}
+ {/* Create sheet */}
+ <CreateSheet
+ open={showCreate}
+ onClose={() => setShowCreate(false)}
+ onCreate={handleCreate}
+ />
- {/* Reorder drawer */}
- {showReorder && (
- <ReorderDrawer
- environments={environmentList}
- onClose={() => setShowReorder(false)}
- onConfirm={handleReorder}
- />
- )}
+ {/* Reorder sheet */}
+ <ReorderSheet
+ open={showReorder}
+ environments={environmentList}
+ onClose={() => setShowReorder(false)}
+ onConfirm={handleReorder}
+ />
</div>
);
}
diff --git a/frontend/src/react/pages/settings/GroupsPage.tsx b/frontend/src/react/pages/settings/GroupsPage.tsx
index ef37b2fe6a..793c033fa5 100644
--- a/frontend/src/react/pages/settings/GroupsPage.tsx
+++ b/frontend/src/react/pages/settings/GroupsPage.tsx
@@ -3,12 +3,10 @@ import { isEqual } from "lodash-es";
import {
ChevronDown,
ChevronRight,
- Pencil,
Plus,
Settings,
Trash2,
Users,
- X,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -19,6 +17,14 @@ import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import {
Table,
TableBody,
@@ -28,9 +34,9 @@ import {
TableRow,
} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
+import { cn } from "@/react/lib/utils";
import { router } from "@/router";
import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";
import {
@@ -53,7 +59,7 @@ import {
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import { hasWorkspacePermissionV2, isValidEmail } from "@/utils";
-import { AADSyncDrawer } from "./shared/AADSyncDrawer";
+import { AADSyncSheet } from "./shared/AADSyncSheet";
// ============================================================
// Helpers
@@ -272,8 +278,8 @@ function GroupTable({
isExpanded={isExpanded}
members={members}
searchText={searchText}
- canEdit={canEdit}
canDelete={canDelete}
+ canOpen={canEdit || hasWorkspacePermissionV2("bb.groups.get")}
onToggle={() => toggleExpand(group)}
onEdit={() => onGroupSelected(group)}
onDelete={() => handleDelete(group)}
@@ -292,8 +298,8 @@ function GroupRow({
isExpanded,
members,
searchText,
- canEdit,
canDelete,
+ canOpen,
onToggle,
onEdit,
onDelete,
@@ -303,23 +309,46 @@ function GroupRow({
isExpanded: boolean;
members: User[] | undefined;
searchText: string;
- canEdit: boolean;
canDelete: boolean;
+ canOpen: boolean;
onToggle: () => void;
onEdit: () => void;
onDelete: () => void;
}) {
const { t } = useTranslation();
- const stripeBg = index % 2 === 1 ? "bg-gray-50" : "";
+ const stripeBg = index % 2 === 1 ? "bg-control-bg/50" : "";
return (
<>
- <TableRow className={stripeBg}>
+ <TableRow
+ className={cn(
+ stripeBg,
+ canOpen &&
+ "cursor-pointer hover:bg-control-bg focus-visible:outline-none focus-visible:bg-control-bg"
+ )}
+ tabIndex={canOpen ? 0 : undefined}
+ role={canOpen ? "button" : undefined}
+ aria-label={canOpen ? group.title : undefined}
+ onClick={canOpen ? onEdit : undefined}
+ onKeyDown={
+ canOpen
+ ? (e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ onEdit();
+ }
+ }
+ : undefined
+ }
+ >
<TableCell className="py-2">
<div className="flex items-center gap-x-2">
<button
className="shrink-0 p-0.5 rounded-xs hover:bg-gray-200"
- onClick={onToggle}
+ onClick={(e) => {
+ e.stopPropagation();
+ onToggle();
+ }}
>
{isExpanded ? (
<ChevronDown className="h-4 w-4" />
@@ -352,25 +381,16 @@ function GroupRow({
</TableCell>
<TableCell className="py-2">
<div className="flex justify-end gap-x-1">
- {canEdit && (
- <Tooltip content={t("common.edit")}>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7"
- onClick={onEdit}
- >
- <Pencil className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
{canDelete && (
<Tooltip content={t("common.delete")}>
<Button
variant="ghost"
size="icon"
className="h-7 w-7 text-error hover:text-error"
- onClick={onDelete}
+ onClick={(e) => {
+ e.stopPropagation();
+ onDelete();
+ }}
>
<Trash2 className="h-4 w-4" />
</Button>
@@ -426,17 +446,44 @@ function GroupRow({
// CreateGroupDrawer
// ============================================================
-function CreateGroupDrawer({
- group,
- onClose,
- onUpdated,
- onRemoved,
-}: {
+interface CreateGroupSheetProps {
+ open: boolean;
group: Group | undefined;
onClose: () => void;
onUpdated: (group: Group) => void;
onRemoved: (group: Group) => void;
-}) {
+}
+
+function CreateGroupSheet(props: CreateGroupSheetProps) {
+ const { open, group, onClose } = props;
+ // Freeze the entity while open=false so the inner form stays visually
+ // stable during the Sheet's close animation.
+ const openEntityRef = useRef(group);
+ if (open) {
+ openEntityRef.current = group;
+ }
+ const stableGroup = openEntityRef.current;
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <GroupForm
+ key={stableGroup?.name ?? "new"}
+ group={stableGroup}
+ onClose={props.onClose}
+ onUpdated={props.onUpdated}
+ onRemoved={props.onRemoved}
+ />
+ </SheetContent>
+ </Sheet>
+ );
+}
+
+function GroupForm({
+ group,
+ onClose,
+ onUpdated,
+ onRemoved,
+}: Omit<CreateGroupSheetProps, "open">) {
const { t } = useTranslation();
const groupStore = useGroupStore();
const settingV1Store = useSettingV1Store();
@@ -451,11 +498,11 @@ function CreateGroupDrawer({
);
const domainOptions = workspaceDomains.filter((d) => d.trim());
- const [email, setEmail] = useState(() => {
- if (!group) return "";
- return group.email ?? "";
- });
- const [selectedDomain, setSelectedDomain] = useState(() => {
+ // Initial values derived from the group prop. The parent keys this
+ // component by group, so it remounts fresh on each open — these initial
+ // values always reflect the latest prop.
+ const initialEmail = group?.email ?? "";
+ const initialSelectedDomain = (() => {
if (group?.email) {
const atIdx = group.email.indexOf("@");
if (atIdx >= 0) {
@@ -464,27 +511,28 @@ function CreateGroupDrawer({
}
}
return domainOptions[0] ?? "";
- });
- const [title, setTitle] = useState(group?.title ?? "");
- const [description, setDescription] = useState(group?.description ?? "");
- const [members, setMembers] = useState<GroupMember[]>(() => {
- if (group) {
- return group.members.map((m) =>
+ })();
+ const initialTitle = group?.title ?? "";
+ const initialDescription = group?.description ?? "";
+ const initialMembers: GroupMember[] = group
+ ? group.members.map((m) =>
create(GroupMemberSchema, { member: m.member, role: m.role })
- );
- }
- return [
- create(GroupMemberSchema, {
- role: GroupMember_Role.OWNER,
- member: currentUser.name,
- }),
- ];
- });
+ )
+ : [
+ create(GroupMemberSchema, {
+ role: GroupMember_Role.OWNER,
+ member: currentUser.name,
+ }),
+ ];
+
+ const [email, setEmail] = useState(initialEmail);
+ const [selectedDomain, setSelectedDomain] = useState(initialSelectedDomain);
+ const [title, setTitle] = useState(initialTitle);
+ const [description, setDescription] = useState(initialDescription);
+ const [members, setMembers] = useState<GroupMember[]>(initialMembers);
const [isRequesting, setIsRequesting] = useState(false);
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
- useEscapeKey(true, onClose);
-
const isExternalGroup = !!group?.source;
const allowEdit = isExternalGroup
@@ -672,221 +720,203 @@ function CreateGroupDrawer({
return (
<>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">{t("common.group")}</h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
-
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {isExternalGroup && (
- <Alert variant="info">
- <AlertDescription>
- {t("settings.members.groups.external-readonly")}
- </AlertDescription>
- </Alert>
- )}
-
- {/* Email */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.groups.form.email")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <span className="textinfolabel text-sm">
- {t("settings.members.groups.form.email-tips")}
- </span>
- <div className="flex items-center gap-x-1">
- <Input
- value={isEditMode ? email : email.split("@")[0]}
- onChange={(e) => setEmail(e.target.value)}
- disabled={isEditMode || !allowEdit}
- />
- {!isEditMode && domainOptions.length > 0 && (
- <>
- <span className="text-sm text-control-light">@</span>
- {domainOptions.length === 1 ? (
- <span className="text-sm text-control-light whitespace-nowrap">
- {domainOptions[0]}
- </span>
- ) : (
- <select
- value={selectedDomain}
- onChange={(e) => setSelectedDomain(e.target.value)}
- className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1"
- disabled={!allowEdit}
- >
- {domainOptions.map((d) => (
- <option key={d} value={d}>
- {d}
- </option>
- ))}
- </select>
- )}
- </>
- )}
- </div>
- </div>
+ <SheetHeader>
+ <SheetTitle>{t("common.group")}</SheetTitle>
+ </SheetHeader>
- {/* Title */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.groups.form.title")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <Input
- value={title}
- onChange={(e) => setTitle(e.target.value)}
- maxLength={200}
- disabled={!allowEdit}
- />
- </div>
+ <SheetBody>
+ <div className="flex flex-col gap-y-6">
+ {isExternalGroup && (
+ <Alert variant="info">
+ <AlertDescription>
+ {t("settings.members.groups.external-readonly")}
+ </AlertDescription>
+ </Alert>
+ )}
- {/* Description */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.groups.form.description")}
- </label>
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.groups.form.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <span className="textinfolabel text-sm">
+ {t("settings.members.groups.form.email-tips")}
+ </span>
+ <div className="flex items-center gap-x-1">
<Input
- value={description}
- onChange={(e) => setDescription(e.target.value)}
- maxLength={1000}
- disabled={!allowEdit}
+ value={isEditMode ? email : email.split("@")[0]}
+ onChange={(e) => setEmail(e.target.value)}
+ disabled={isEditMode || !allowEdit}
/>
- </div>
-
- {/* Members */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("common.members", { count: 2 })}
- </label>
- <div className="flex flex-col gap-y-2">
- {members.map((member, index) => (
- <div key={index} className="flex items-center gap-x-2">
- <Input
- className="flex-1"
- value={member.member}
- onChange={(e) =>
- handleMemberChange(index, "member", e.target.value)
- }
- placeholder="users/[email protected]"
- disabled={!allowEdit}
- />
+ {!isEditMode && domainOptions.length > 0 && (
+ <>
+ <span className="text-sm text-control-light">@</span>
+ {domainOptions.length === 1 ? (
+ <span className="text-sm text-control-light whitespace-nowrap">
+ {domainOptions[0]}
+ </span>
+ ) : (
<select
- value={member.role}
- onChange={(e) =>
- handleMemberChange(
- index,
- "role",
- Number(e.target.value) as GroupMember_Role
- )
- }
- className="h-9 rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm"
+ value={selectedDomain}
+ onChange={(e) => setSelectedDomain(e.target.value)}
+ className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1"
disabled={!allowEdit}
>
- <option value={GroupMember_Role.OWNER}>
- {t("settings.members.groups.form.role.owner")}
- </option>
- <option value={GroupMember_Role.MEMBER}>
- {t("settings.members.groups.form.role.member")}
- </option>
+ {domainOptions.map((d) => (
+ <option key={d} value={d}>
+ {d}
+ </option>
+ ))}
</select>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7 shrink-0 text-error hover:text-error"
- onClick={() => handleRemoveMember(index)}
- disabled={!allowEdit}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </div>
- ))}
- {allowEdit && (
+ )}
+ </>
+ )}
+ </div>
+ </div>
+
+ {/* Title */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.groups.form.title")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <Input
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ maxLength={200}
+ disabled={!allowEdit}
+ />
+ </div>
+
+ {/* Description */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.groups.form.description")}
+ </label>
+ <Input
+ value={description}
+ onChange={(e) => setDescription(e.target.value)}
+ maxLength={1000}
+ disabled={!allowEdit}
+ />
+ </div>
+
+ {/* Members */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.members", { count: 2 })}
+ </label>
+ <div className="flex flex-col gap-y-2">
+ {members.map((member, index) => (
+ <div key={index} className="flex items-center gap-x-2">
+ <Input
+ className="flex-1"
+ value={member.member}
+ onChange={(e) =>
+ handleMemberChange(index, "member", e.target.value)
+ }
+ placeholder="users/[email protected]"
+ disabled={!allowEdit}
+ />
+ <select
+ value={member.role}
+ onChange={(e) =>
+ handleMemberChange(
+ index,
+ "role",
+ Number(e.target.value) as GroupMember_Role
+ )
+ }
+ className="h-9 rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm"
+ disabled={!allowEdit}
+ >
+ <option value={GroupMember_Role.OWNER}>
+ {t("settings.members.groups.form.role.owner")}
+ </option>
+ <option value={GroupMember_Role.MEMBER}>
+ {t("settings.members.groups.form.role.member")}
+ </option>
+ </select>
<Button
- variant="outline"
- size="sm"
- className="self-start"
- onClick={handleAddMember}
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 shrink-0 text-error hover:text-error"
+ onClick={() => handleRemoveMember(index)}
+ disabled={!allowEdit}
>
- <Plus className="h-4 w-4 mr-1" />
- {t("settings.members.add-member")}
+ <Trash2 className="h-4 w-4" />
</Button>
- )}
- </div>
+ </div>
+ ))}
+ {allowEdit && (
+ <Button
+ variant="outline"
+ size="sm"
+ className="self-start"
+ onClick={handleAddMember}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ {t("settings.members.add-member")}
+ </Button>
+ )}
</div>
-
- {errorMessage && (
- <p className="text-error text-sm">{errorMessage}</p>
- )}
</div>
+
+ {errorMessage && <p className="text-error text-sm">{errorMessage}</p>}
</div>
+ </SheetBody>
- {/* Footer */}
- <div className="flex items-center justify-between px-6 py-4 border-t">
- <div>
- {canDelete && (
- <>
- {showDeleteConfirm ? (
- <div className="flex items-center gap-x-2">
- <span className="text-sm text-error">
- {t("settings.members.action.deactivate-confirm-title")}
- </span>
- <Button
- variant="destructive"
- size="sm"
- onClick={handleDelete}
- disabled={isRequesting}
- >
- {t("common.deactivate")}
- </Button>
- <Button
- variant="outline"
- size="sm"
- onClick={() => setShowDeleteConfirm(false)}
- >
- {t("common.cancel")}
- </Button>
- </div>
- ) : (
+ <SheetFooter className="justify-between">
+ <div>
+ {canDelete && (
+ <>
+ {showDeleteConfirm ? (
+ <div className="flex items-center gap-x-2">
+ <span className="text-sm text-error">
+ {t("settings.members.action.deactivate-confirm-title")}
+ </span>
<Button
- variant="ghost"
- className="text-error hover:text-error"
- onClick={() => setShowDeleteConfirm(true)}
+ variant="destructive"
+ size="sm"
+ onClick={handleDelete}
+ disabled={isRequesting}
>
- <Trash2 className="h-4 w-4 mr-1" />
- {t("common.delete")}
+ {t("common.deactivate")}
</Button>
- )}
- </>
- )}
- </div>
- <div className="flex items-center gap-x-2">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!allowEdit || !allowConfirm || isRequesting}
- onClick={handleSubmit}
- >
- {isEditMode ? t("common.update") : t("common.create")}
- </Button>
- </div>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => setShowDeleteConfirm(false)}
+ >
+ {t("common.cancel")}
+ </Button>
+ </div>
+ ) : (
+ <Button
+ variant="ghost"
+ className="text-error hover:text-error"
+ onClick={() => setShowDeleteConfirm(true)}
+ >
+ <Trash2 className="h-4 w-4 mr-1" />
+ {t("common.delete")}
+ </Button>
+ )}
+ </>
+ )}
</div>
- </div>
+ <div className="flex items-center gap-x-2">
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowEdit || !allowConfirm || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.create")}
+ </Button>
+ </div>
+ </SheetFooter>
</>
);
}
@@ -1081,27 +1111,27 @@ export function GroupsPage() {
)}
</ComponentPermissionGuard>
- {showCreateGroupDrawer && (
- <CreateGroupDrawer
- group={editingGroup}
- onClose={() => {
- setShowCreateGroupDrawer(false);
- setEditingGroup(undefined);
- }}
- onUpdated={(group) => {
- groupPaged.updateCache([group]);
- }}
- onRemoved={(group) => {
- groupPaged.removeCache(group);
- setShowCreateGroupDrawer(false);
- setEditingGroup(undefined);
- }}
- />
- )}
+ <CreateGroupSheet
+ open={showCreateGroupDrawer}
+ group={editingGroup}
+ onClose={() => {
+ setShowCreateGroupDrawer(false);
+ setEditingGroup(undefined);
+ }}
+ onUpdated={(group) => {
+ groupPaged.updateCache([group]);
+ }}
+ onRemoved={(group) => {
+ groupPaged.removeCache(group);
+ setShowCreateGroupDrawer(false);
+ setEditingGroup(undefined);
+ }}
+ />
- {showAadSyncDrawer && (
- <AADSyncDrawer onClose={() => setShowAadSyncDrawer(false)} />
- )}
+ <AADSyncSheet
+ open={showAadSyncDrawer}
+ onClose={() => setShowAadSyncDrawer(false)}
+ />
</div>
);
}
diff --git a/frontend/src/react/pages/settings/InstancesPage.tsx b/frontend/src/react/pages/settings/InstancesPage.tsx
index 27b29a8919..dd92e2a015 100644
--- a/frontend/src/react/pages/settings/InstancesPage.tsx
+++ b/frontend/src/react/pages/settings/InstancesPage.tsx
@@ -35,6 +35,14 @@ import {
DropdownMenuTrigger,
} from "@/react/components/ui/dropdown-menu";
import { EllipsisText } from "@/react/components/ui/ellipsis-text";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { PagedTableFooter } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
@@ -489,10 +497,10 @@ function LabelsDisplay({ labels }: { labels: { [key: string]: string } }) {
}
// ============================================================
-// EditEnvironmentDrawer
+// EditEnvironmentSheet
// ============================================================
-function EditEnvironmentDrawer({
+function EditEnvironmentSheet({
open,
onClose,
onUpdate,
@@ -507,27 +515,17 @@ function EditEnvironmentDrawer({
() => environmentStore.environmentList ?? []
);
const [selected, setSelected] = useState("");
- useEscapeKey(open, onClose);
useEffect(() => {
if (open) setSelected("");
}, [open]);
- if (!open) return null;
-
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={onClose} />
- <div className="ml-auto relative bg-background w-[24rem] max-w-[100vw] h-full shadow-lg flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b border-control-border">
- <h2 className="text-lg font-semibold">{t("common.environment")}</h2>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={onClose}
- >
- &times;
- </button>
- </div>
- <div className="flex-1 overflow-y-auto p-6">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="narrow">
+ <SheetHeader>
+ <SheetTitle>{t("common.environment")}</SheetTitle>
+ </SheetHeader>
+ <SheetBody>
<div className="flex flex-col gap-y-2">
{environments.map((env) => (
<label
@@ -558,8 +556,8 @@ function EditEnvironmentDrawer({
</label>
))}
</div>
- </div>
- <div className="flex justify-end items-center gap-x-2 px-6 py-4 border-t border-control-border">
+ </SheetBody>
+ <SheetFooter>
<Button variant="ghost" onClick={onClose}>
{t("common.cancel")}
</Button>
@@ -572,9 +570,9 @@ function EditEnvironmentDrawer({
>
{t("common.update")}
</Button>
- </div>
- </div>
- </div>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
@@ -1179,7 +1177,7 @@ export function InstancesPage() {
showAssignLicense={subscriptionStore.currentPlan !== PlanType.FREE}
/>
- <EditEnvironmentDrawer
+ <EditEnvironmentSheet
open={showEditEnvDrawer}
onClose={() => setShowEditEnvDrawer(false)}
onUpdate={handleEnvironmentUpdate}
diff --git a/frontend/src/react/pages/settings/LandingPage.tsx b/frontend/src/react/pages/settings/LandingPage.tsx
index f9069dbb7d..2a5ecbe4f5 100644
--- a/frontend/src/react/pages/settings/LandingPage.tsx
+++ b/frontend/src/react/pages/settings/LandingPage.tsx
@@ -22,6 +22,13 @@ import {
useState,
} from "react";
import { useTranslation } from "react-i18next";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
import { router } from "@/router";
import {
@@ -310,7 +317,7 @@ function useLastVisitedProject() {
// Config Drawer
// ---------------------------------------------------------------------------
-function ConfigDrawer({
+function ConfigSheet({
open,
onClose,
fullList,
@@ -325,15 +332,6 @@ function ConfigDrawer({
}) {
const { t } = useTranslation();
- useEffect(() => {
- if (!open) return;
- const handleKeyDown = (e: KeyboardEvent) => {
- if (e.key === "Escape") onClose();
- };
- document.addEventListener("keydown", handleKeyDown);
- return () => document.removeEventListener("keydown", handleKeyDown);
- }, [open, onClose]);
-
const dragItem = useRef<number | null>(null);
const dragOver = useRef<number | null>(null);
@@ -378,24 +376,13 @@ function ConfigDrawer({
setConfig([...config, id]);
};
- if (!open) return null;
-
return (
- <div className="fixed inset-0 z-50 flex justify-end">
- <div className="absolute inset-0 bg-black/30" onClick={onClose} />
- <div className="relative w-96 max-w-[calc(100vw-8rem)] bg-white shadow-xl flex flex-col">
- <div className="flex items-center justify-between px-4 py-3 border-b">
- <h3 className="font-medium text-base">
- {t("landing.quick-link.manage")}
- </h3>
- <button
- onClick={onClose}
- className="text-gray-400 hover:text-gray-600"
- >
- ✕
- </button>
- </div>
- <div className="flex-1 overflow-y-auto px-2 py-2">
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="narrow">
+ <SheetHeader>
+ <SheetTitle>{t("landing.quick-link.manage")}</SheetTitle>
+ </SheetHeader>
+ <SheetBody className="px-2 py-2">
{selected.map((item, i) => (
<div
key={item.id}
@@ -433,9 +420,9 @@ function ConfigDrawer({
{item.title}
</div>
))}
- </div>
- </div>
- </div>
+ </SheetBody>
+ </SheetContent>
+ </Sheet>
);
}
@@ -578,7 +565,7 @@ export function LandingPage({
</div>
</div>
- <ConfigDrawer
+ <ConfigSheet
open={showConfigDrawer}
onClose={() => setShowConfigDrawer(false)}
fullList={fullList}
diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsx
index 296d47220e..3053f57bdd 100644
--- a/frontend/src/react/pages/settings/MembersPage.tsx
+++ b/frontend/src/react/pages/settings/MembersPage.tsx
@@ -54,14 +54,17 @@ import {
} from "@/react/components/ui/alert";
import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
-import {
- Dialog,
- DialogContent,
- DialogTitle,
-} from "@/react/components/ui/dialog";
import { ExpirationPicker } from "@/react/components/ui/expiration-picker";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import {
Tabs,
TabsList,
@@ -1652,13 +1655,31 @@ function EditMemberRoleDrawer({
// members page before the React migration.
// ============================================================
-function RequestRoleDialog({
- project,
- onClose,
-}: {
+interface RequestRoleSheetProps {
+ open: boolean;
project: Project;
onClose: () => void;
-}) {
+}
+
+function RequestRoleSheet(props: RequestRoleSheetProps) {
+ const { open, project, onClose } = props;
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ {/* Base UI's Dialog.Portal unmounts after the close animation,
+ so the inner form mounts/unmounts with the Sheet's lifecycle
+ without needing an explicit {open && ...} guard. The `key`
+ forces a fresh mount if the project switches while open. */}
+ <RequestRoleForm key={project.name} {...props} />
+ </SheetContent>
+ </Sheet>
+ );
+}
+
+function RequestRoleForm({
+ project,
+ onClose,
+}: Omit<RequestRoleSheetProps, "open">) {
const { t } = useTranslation();
const currentUser = useVueState(() => useCurrentUserV1().value);
const [role, setRole] = useState("");
@@ -1929,15 +1950,12 @@ function RequestRoleDialog({
project.issueLabels.length > 0 || project.forceIssueLabels;
return (
- <Dialog
- open
- onOpenChange={(open) => {
- if (!open) onClose();
- }}
- >
- <DialogContent className="max-w-lg p-6">
- <DialogTitle>{t("issue.title.request-role")}</DialogTitle>
- <div className="flex flex-col gap-y-4 mt-4">
+ <>
+ <SheetHeader>
+ <SheetTitle>{t("issue.title.request-role")}</SheetTitle>
+ </SheetHeader>
+ <SheetBody>
+ <div className="flex flex-col gap-y-4">
{labelsMisconfigured && (
<Alert variant="warning">
<AlertTitle>
@@ -2085,16 +2103,16 @@ function RequestRoleDialog({
/>
)}
</div>
- <div className="flex items-center justify-end gap-x-2 mt-6">
- <Button variant="outline" onClick={onClose} disabled={submitting}>
- {t("common.cancel")}
- </Button>
- <Button disabled={!canSubmit} onClick={handleSubmit}>
- {t("common.submit")}
- </Button>
- </div>
- </DialogContent>
- </Dialog>
+ </SheetBody>
+ <SheetFooter>
+ <Button variant="outline" onClick={onClose} disabled={submitting}>
+ {t("common.cancel")}
+ </Button>
+ <Button disabled={!canSubmit} onClick={handleSubmit}>
+ {t("common.submit")}
+ </Button>
+ </SheetFooter>
+ </>
);
}
@@ -2380,8 +2398,9 @@ export function MembersPage({ projectId }: { projectId?: string }) {
</TabsPanel>
</Tabs>
- {showRequestRoleDialog && project && (
- <RequestRoleDialog
+ {project && (
+ <RequestRoleSheet
+ open={showRequestRoleDialog}
project={project}
onClose={() => setShowRequestRoleDialog(false)}
/>
diff --git a/frontend/src/react/pages/settings/ProjectsPage.tsx b/frontend/src/react/pages/settings/ProjectsPage.tsx
index d0cc5ebbce..fd124aebdf 100644
--- a/frontend/src/react/pages/settings/ProjectsPage.tsx
+++ b/frontend/src/react/pages/settings/ProjectsPage.tsx
@@ -7,7 +7,6 @@ import {
EllipsisVertical,
Plus,
Trash2,
- X,
} from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
@@ -31,6 +30,14 @@ import {
DropdownMenuTrigger,
} from "@/react/components/ui/dropdown-menu";
import { Input } from "@/react/components/ui/input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { PagedTableFooter } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
@@ -205,10 +212,10 @@ function ConfirmDialog({
}
// ============================================================
-// CreateProjectDrawer
+// CreateProjectSheet
// ============================================================
-function CreateProjectDrawer({
+function CreateProjectSheet({
open,
onClose,
onCreated,
@@ -225,14 +232,14 @@ function CreateProjectDrawer({
const [isResourceIdValid, setIsResourceIdValid] = useState(false);
const resourceIdFieldRef = useRef<ResourceIdFieldRef>(null);
- const closeDrawer = useCallback(() => {
- onClose();
+ // Reset form state whenever the Sheet is (re)opened. Sheet is always
+ // mounted so useState initializers only run on first mount.
+ useEffect(() => {
+ if (!open) return;
setTitle("");
setResourceId("");
setIsCreating(false);
- }, [onClose]);
-
- useEscapeKey(closeDrawer, open);
+ }, [open]);
const allowCreate = useMemo(() => {
if (!title.trim()) return false;
@@ -257,7 +264,7 @@ function CreateProjectDrawer({
});
onCreated(created);
- closeDrawer();
+ onClose();
} catch (error) {
if (error instanceof ConnectError && error.code === Code.AlreadyExists) {
resourceIdFieldRef.current?.addValidationError(
@@ -277,7 +284,7 @@ function CreateProjectDrawer({
projectStore,
t,
onCreated,
- closeDrawer,
+ onClose,
]);
const validate = useCallback(
@@ -302,23 +309,14 @@ function CreateProjectDrawer({
[projectStore, t]
);
- if (!open) return null;
-
return (
- <div className="fixed inset-0 z-50 flex">
- <div className="fixed inset-0 bg-overlay/50" onClick={closeDrawer} />
- <div className="ml-auto relative bg-background w-[40rem] max-w-[100vw] h-full shadow-lg flex flex-col">
- <div className="flex items-center justify-between px-6 py-4 border-b border-control-border">
- <h2 className="text-lg font-semibold">{t("common.project")}</h2>
- <button
- className="p-1 hover:bg-control-bg rounded-xs"
- onClick={closeDrawer}
- >
- <X className="h-5 w-5" />
- </button>
- </div>
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <SheetHeader>
+ <SheetTitle>{t("common.project")}</SheetTitle>
+ </SheetHeader>
- <div className="flex-1 overflow-y-auto p-6">
+ <SheetBody>
<div className="flex flex-col gap-y-6">
<div>
<label className="text-base leading-6 font-medium text-control">
@@ -350,18 +348,18 @@ function CreateProjectDrawer({
<div className="animate-spin size-6 border-2 border-accent border-t-transparent rounded-full" />
</div>
)}
- </div>
+ </SheetBody>
- <div className="flex justify-end items-center gap-x-3 px-6 py-4 border-t border-control-border">
- <Button variant="ghost" onClick={closeDrawer}>
+ <SheetFooter>
+ <Button variant="ghost" onClick={onClose}>
{t("common.cancel")}
</Button>
<Button disabled={!allowCreate} onClick={handleCreate}>
{t("common.create")}
</Button>
- </div>
- </div>
- </div>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}
@@ -1196,7 +1194,7 @@ export function ProjectsPage() {
</div>
{/* Create drawer */}
- <CreateProjectDrawer
+ <CreateProjectSheet
open={showCreateDrawer}
onClose={() => setShowCreateDrawer(false)}
onCreated={handleCreated}
diff --git a/frontend/src/react/pages/settings/RolesPage.tsx b/frontend/src/react/pages/settings/RolesPage.tsx
index 004a18e7d9..e84c2ff80f 100644
--- a/frontend/src/react/pages/settings/RolesPage.tsx
+++ b/frontend/src/react/pages/settings/RolesPage.tsx
@@ -22,6 +22,14 @@ import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import {
Table,
TableBody,
@@ -371,13 +379,15 @@ function DeleteConfirmModal({
// RoleDrawer
// ============================================================
-function RoleDrawer({
+function RoleSheet({
+ open,
role,
mode,
hasCustomRoleFeature,
onClose,
onShowFeatureModal,
}: {
+ open: boolean;
role: Role | undefined;
mode: "ADD" | "EDIT";
hasCustomRoleFeature: boolean;
@@ -386,7 +396,6 @@ function RoleDrawer({
}) {
const { t } = useTranslation();
const roleStore = useRoleStore();
- useEscapeKey(onClose);
const [editRole, setEditRole] = useState<Role>(
create(RoleSchema, { permissions: [...BASIC_WORKSPACE_PERMISSIONS] })
@@ -542,25 +551,14 @@ function RoleDrawer({
}
};
- if (!role) return null;
-
return (
- <>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
-
- {/* Drawer */}
- <div className="fixed inset-y-0 right-0 z-50 w-[44rem] max-w-[100vw] bg-white shadow-xl flex flex-col">
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">{t("common.role.self")}</h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <SheetHeader>
+ <SheetTitle>{t("common.role.self")}</SheetTitle>
+ </SheetHeader>
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
+ <SheetBody>
<div className="flex flex-col gap-y-5">
{/* Title */}
<div className="flex flex-col gap-y-1.5">
@@ -665,11 +663,10 @@ function RoleDrawer({
/>
</div>
</div>
- </div>
+ </SheetBody>
- {/* Footer */}
{!isBuiltin && (
- <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
+ <SheetFooter>
<Button variant="outline" onClick={onClose}>
{t("common.cancel")}
</Button>
@@ -681,25 +678,24 @@ function RoleDrawer({
>
{mode === "ADD" ? t("common.create") : t("common.update")}
</Button>
- </div>
+ </SheetFooter>
)}
- {/* Loading overlay */}
{loading && (
- <div className="absolute inset-0 z-10 bg-white/50 flex items-center justify-center">
+ <div className="absolute inset-0 z-10 bg-background/50 flex items-center justify-center">
<div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
</div>
)}
- </div>
- {/* Import modal */}
- {showImportModal && (
- <ImportPermissionModal
- onCancel={() => setShowImportModal(false)}
- onImport={handleImportPermissions}
- />
- )}
- </>
+ {/* Import modal */}
+ {showImportModal && (
+ <ImportPermissionModal
+ onCancel={() => setShowImportModal(false)}
+ onImport={handleImportPermissions}
+ />
+ )}
+ </SheetContent>
+ </Sheet>
);
}
@@ -903,8 +899,9 @@ export function RolesPage() {
</div>
)}
- {/* Role Drawer */}
- <RoleDrawer
+ {/* Role Sheet */}
+ <RoleSheet
+ open={detailRole !== undefined}
role={detailRole}
mode={detailMode}
hasCustomRoleFeature={hasCustomRoleFeature}
diff --git a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
index b3da894d1f..cdbb531081 100644
--- a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
+++ b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
@@ -1,7 +1,7 @@
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
-import { Copy, KeyRound, Pencil, Plus, Trash2, Undo2, X } from "lucide-react";
-import { useCallback, useState } from "react";
+import { Copy, KeyRound, Plus, Trash2, Undo2 } from "lucide-react";
+import { useCallback, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { RoleSelect } from "@/react/components/RoleSelect";
@@ -9,10 +9,18 @@ import { UserAvatar } from "@/react/components/UserAvatar";
import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { Tooltip } from "@/react/components/ui/tooltip";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
+import { cn } from "@/react/lib/utils";
import {
ensureServiceAccountFullName,
pushNotification,
@@ -162,11 +170,39 @@ function ServiceAccountTable({
) : (
users.map((user, i) => {
const isDeleted = user.state === State.DELETED;
+ const canOpenDetail =
+ !!onUserSelected &&
+ (project
+ ? hasProjectPermissionV2(project, "bb.serviceAccounts.get")
+ : hasWorkspacePermissionV2("bb.serviceAccounts.get"));
return (
<tr
key={user.name}
- className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-control-bg" : ""}`}
+ className={cn(
+ "border-b last:border-b-0",
+ i % 2 === 1 && "bg-control-bg/50",
+ canOpenDetail &&
+ "cursor-pointer hover:bg-control-bg focus-visible:outline-none focus-visible:bg-control-bg"
+ )}
+ tabIndex={canOpenDetail ? 0 : undefined}
+ role={canOpenDetail ? "button" : undefined}
+ aria-label={
+ canOpenDetail ? user.title || user.email : undefined
+ }
+ onClick={
+ canOpenDetail ? () => onUserSelected(user) : undefined
+ }
+ onKeyDown={
+ canOpenDetail
+ ? (e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ onUserSelected(user);
+ }
+ }
+ : undefined
+ }
>
{/* Account column */}
<td className="px-4 py-2">
@@ -178,7 +214,7 @@ function ServiceAccountTable({
className={
isDeleted
? "line-through text-control-light"
- : "font-medium text-accent"
+ : "font-medium text-main"
}
>
{user.title}
@@ -253,55 +289,37 @@ function ServiceAccountTable({
</div>
</td>
- {/* Operations column */}
+ {/* Operations column — destructive/secondary actions only.
+ The row itself is clickable to open the detail sheet. */}
<td className="px-4 py-2">
<div className="flex justify-end gap-x-1">
- {!isDeleted && (
- <>
- {(project
- ? hasProjectPermissionV2(
- project,
- "bb.serviceAccounts.delete"
- )
- : hasWorkspacePermissionV2(
- "bb.serviceAccounts.delete"
- )) && (
- <Tooltip
- content={t(
- "settings.members.action.deactivate-confirm-title"
- )}
+ {!isDeleted &&
+ (project
+ ? hasProjectPermissionV2(
+ project,
+ "bb.serviceAccounts.delete"
+ )
+ : hasWorkspacePermissionV2(
+ "bb.serviceAccounts.delete"
+ )) && (
+ <Tooltip
+ content={t(
+ "settings.members.action.deactivate-confirm-title"
+ )}
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 text-error hover:text-error"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleDeactivate(user);
+ }}
>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7 text-error hover:text-error"
- onClick={() => handleDeactivate(user)}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
- {(project
- ? hasProjectPermissionV2(
- project,
- "bb.serviceAccounts.get"
- )
- : hasWorkspacePermissionV2(
- "bb.serviceAccounts.get"
- )) && (
- <Tooltip content={t("common.edit")}>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7"
- onClick={() => onUserSelected?.(user)}
- >
- <Pencil className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
- </>
- )}
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
{isDeleted &&
(project
? hasProjectPermissionV2(
@@ -320,7 +338,10 @@ function ServiceAccountTable({
variant="ghost"
size="icon"
className="h-7 w-7"
- onClick={() => handleRestore(user)}
+ onClick={(e) => {
+ e.stopPropagation();
+ handleRestore(user);
+ }}
>
<Undo2 className="h-4 w-4" />
</Button>
@@ -342,19 +363,47 @@ function ServiceAccountTable({
// CreateServiceAccountDrawer
// ============================================================
-function CreateServiceAccountDrawer({
- serviceAccount,
- project,
- onClose,
- onCreated,
- onUpdated,
-}: {
+interface CreateServiceAccountSheetProps {
+ open: boolean;
serviceAccount: ServiceAccount | undefined;
project?: string;
onClose: () => void;
onCreated: (sa: ServiceAccount) => void;
onUpdated: (sa: ServiceAccount) => void;
-}) {
+}
+
+function CreateServiceAccountSheet(props: CreateServiceAccountSheetProps) {
+ const { open, serviceAccount, onClose } = props;
+ // Freeze the entity while open=false so the inner form stays visually
+ // stable during the Sheet's close animation.
+ const openEntityRef = useRef(serviceAccount);
+ if (open) {
+ openEntityRef.current = serviceAccount;
+ }
+ const stableServiceAccount = openEntityRef.current;
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <ServiceAccountForm
+ key={stableServiceAccount?.name ?? "new"}
+ serviceAccount={stableServiceAccount}
+ project={props.project}
+ onClose={props.onClose}
+ onCreated={props.onCreated}
+ onUpdated={props.onUpdated}
+ />
+ </SheetContent>
+ </Sheet>
+ );
+}
+
+function ServiceAccountForm({
+ serviceAccount,
+ project,
+ onClose,
+ onCreated,
+ onUpdated,
+}: Omit<CreateServiceAccountSheetProps, "open">) {
const { t } = useTranslation();
const serviceAccountStore = useServiceAccountStore();
const workspaceStore = useWorkspaceV1Store();
@@ -373,16 +422,29 @@ function CreateServiceAccountDrawer({
const isEditMode = !!serviceAccount && !!serviceAccount.email;
const emailSuffix = getServiceAccountSuffix();
- const [title, setTitle] = useState(serviceAccount?.title ?? "");
- const [emailPrefix, setEmailPrefix] = useState(
- serviceAccount?.email ? serviceAccount.email.split("@")[0] : ""
- );
+ // Capture initial values on mount — parent keys by serviceAccount so
+ // these reflect the latest props.
+ const initialTitle = serviceAccount?.title ?? "";
+ const initialEmailPrefix = serviceAccount?.email
+ ? serviceAccount.email.split("@")[0]
+ : "";
+
+ const [title, setTitle] = useState(initialTitle);
+ const [emailPrefix, setEmailPrefix] = useState(initialEmailPrefix);
const [roles, setRoles] = useState<string[]>([]);
const [isRequesting, setIsRequesting] = useState(false);
- useEscapeKey(true, onClose);
+ const isFormValid = isEditMode ? true : emailPrefix.trim().length > 0;
- const allowConfirm = isEditMode ? true : emailPrefix.trim().length > 0;
+ // Dirty tracking — Update button disabled unless something changed.
+ const isDirty = useMemo(() => {
+ if (!isEditMode) return true;
+ if (title !== initialTitle) return true;
+ // Roles are not part of edit mode for service accounts (create-only).
+ return false;
+ }, [isEditMode, title, initialTitle]);
+
+ const allowConfirm = isFormValid && isDirty;
const requiredPermission = isEditMode
? "bb.serviceAccounts.update"
@@ -495,102 +557,84 @@ function CreateServiceAccountDrawer({
return (
<>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-overlay/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-background shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">
- {t("settings.members.service-account")}
- </h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
+ <SheetHeader>
+ <SheetTitle>{t("settings.members.service-account")}</SheetTitle>
+ </SheetHeader>
+
+ <SheetBody>
+ <div className="flex flex-col gap-y-6">
+ {/* Name */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.name")}
+ </label>
+ <Input
+ autoComplete="off"
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ placeholder="Foo"
+ maxLength={200}
+ />
+ </div>
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {/* Name */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("common.name")}
- </label>
- <Input
- autoComplete="off"
- value={title}
- onChange={(e) => setTitle(e.target.value)}
- placeholder="Foo"
- maxLength={200}
- />
- </div>
-
- {/* Email */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("common.email")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- {isEditMode ? (
- <Input value={serviceAccount?.email ?? ""} disabled />
- ) : (
- <div className="px-1 flex items-center border border-control-border rounded-xs overflow-hidden focus-within:border-accent">
- <input
- type="text"
- autoComplete="off"
- value={emailPrefix}
- onChange={(e) => setEmailPrefix(e.target.value)}
- className="flex-1 h-9 px-3 py-1 text-sm bg-transparent border-none outline-none ring-0 shadow-none focus:border-none focus:outline-none focus:ring-0 focus:shadow-none"
- />
- <span className="px-2 py-1 text-sm text-control-light bg-control-bg whitespace-nowrap">
- @{emailSuffix}
- </span>
- </div>
- )}
- </div>
-
- {/* Roles (create mode only) */}
- {!isEditMode &&
- (projectEntity
- ? hasProjectPermissionV2(
- projectEntity,
- "bb.projects.setIamPolicy"
- )
- : hasWorkspacePermissionV2("bb.workspaces.setIamPolicy")) && (
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.table.roles")}
- </label>
- <RoleSelect
- value={roles}
- onChange={setRoles}
- disabled={false}
- scope={project ? "project" : undefined}
- />
- </div>
- )}
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ {isEditMode ? (
+ <Input value={serviceAccount?.email ?? ""} disabled />
+ ) : (
+ <div className="px-1 flex items-center border border-control-border rounded-xs overflow-hidden focus-within:border-accent">
+ <input
+ type="text"
+ autoComplete="off"
+ value={emailPrefix}
+ onChange={(e) => setEmailPrefix(e.target.value)}
+ className="flex-1 h-9 px-3 py-1 text-sm bg-transparent border-none outline-none ring-0 shadow-none focus:border-none focus:outline-none focus:ring-0 focus:shadow-none"
+ />
+ <span className="px-2 py-1 text-sm text-control-light bg-control-bg whitespace-nowrap">
+ @{emailSuffix}
+ </span>
+ </div>
+ )}
</div>
- </div>
- {/* Footer */}
- <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!allowConfirm || !hasPermission || isRequesting}
- onClick={handleSubmit}
- >
- {isEditMode ? t("common.update") : t("common.create")}
- </Button>
+ {/* Roles (create mode only) */}
+ {!isEditMode &&
+ (projectEntity
+ ? hasProjectPermissionV2(
+ projectEntity,
+ "bb.projects.setIamPolicy"
+ )
+ : hasWorkspacePermissionV2("bb.workspaces.setIamPolicy")) && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.table.roles")}
+ </label>
+ <RoleSelect
+ value={roles}
+ onChange={setRoles}
+ disabled={false}
+ scope={project ? "project" : undefined}
+ />
+ </div>
+ )}
</div>
- </div>
+ </SheetBody>
+
+ <SheetFooter>
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowConfirm || !hasPermission || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.create")}
+ </Button>
+ </SheetFooter>
</>
);
}
@@ -794,18 +838,17 @@ export function ServiceAccountsPage({ projectId }: { projectId?: string }) {
)}
</div>
- {showDrawer && (
- <CreateServiceAccountDrawer
- serviceAccount={editingSa}
- project={projectName}
- onClose={() => {
- setShowDrawer(false);
- setEditingSa(undefined);
- }}
- onCreated={handleCreated}
- onUpdated={handleUpdated}
- />
- )}
+ <CreateServiceAccountSheet
+ open={showDrawer}
+ serviceAccount={editingSa}
+ project={projectName}
+ onClose={() => {
+ setShowDrawer(false);
+ setEditingSa(undefined);
+ }}
+ onCreated={handleCreated}
+ onUpdated={handleUpdated}
+ />
</div>
);
}
diff --git a/frontend/src/react/pages/settings/UsersPage.tsx b/frontend/src/react/pages/settings/UsersPage.tsx
index 79d8d4fdf2..a07fad3439 100644
--- a/frontend/src/react/pages/settings/UsersPage.tsx
+++ b/frontend/src/react/pages/settings/UsersPage.tsx
@@ -6,14 +6,12 @@ import {
CircleCheck,
Eye,
EyeOff,
- Pencil,
Plus,
Settings,
Trash2,
Undo2,
- X,
} from "lucide-react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";
import { FeatureBadge } from "@/react/components/FeatureBadge";
@@ -23,6 +21,14 @@ import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import {
Table,
TableBody,
@@ -32,9 +38,9 @@ import {
TableRow,
} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
+import { cn } from "@/react/lib/utils";
import { router } from "@/router";
import {
WORKSPACE_ROUTE_GROUPS,
@@ -68,7 +74,7 @@ import {
UserSchema,
} from "@/types/proto-es/v1/user_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
-import { AADSyncDrawer } from "./shared/AADSyncDrawer";
+import { AADSyncSheet } from "./shared/AADSyncSheet";
// ============================================================
// UserTable
@@ -246,7 +252,41 @@ function UserTable({
return (
<TableRow
key={user.name}
- className={i % 2 === 1 ? "bg-gray-50" : ""}
+ className={cn(
+ i % 2 === 1 && "bg-control-bg/50",
+ hasWorkspacePermissionV2(getViewPermission(accountType)) &&
+ "cursor-pointer hover:bg-control-bg focus-visible:outline-none focus-visible:bg-control-bg"
+ )}
+ tabIndex={
+ hasWorkspacePermissionV2(getViewPermission(accountType))
+ ? 0
+ : undefined
+ }
+ role={
+ hasWorkspacePermissionV2(getViewPermission(accountType))
+ ? "button"
+ : undefined
+ }
+ aria-label={
+ hasWorkspacePermissionV2(getViewPermission(accountType))
+ ? user.title || user.email
+ : undefined
+ }
+ onClick={
+ hasWorkspacePermissionV2(getViewPermission(accountType))
+ ? () => handleView(user)
+ : undefined
+ }
+ onKeyDown={
+ hasWorkspacePermissionV2(getViewPermission(accountType))
+ ? (e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ handleView(user);
+ }
+ }
+ : undefined
+ }
>
{/* Account column */}
<TableCell className="py-2">
@@ -258,7 +298,7 @@ function UserTable({
className={
isDeleted
? "line-through text-control-light"
- : "font-medium text-accent"
+ : "font-medium text-main"
}
>
{user.title}
@@ -305,56 +345,33 @@ function UserTable({
/>
</TableCell>
- {/* Operations column */}
+ {/* Operations column — destructive/secondary actions only.
+ The row itself is clickable to open the detail sheet. */}
<TableCell className="py-2">
<div className="flex justify-end gap-x-1">
- {!isDeleted && (
- <>
- {hasWorkspacePermissionV2(
- getDeletePermission(accountType)
- ) &&
- !isSelf && (
- <Tooltip
- content={t(
- "settings.members.action.deactivate-confirm-title"
- )}
- >
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7 text-error hover:text-error"
- onClick={() => handleDeactivate(user)}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </Tooltip>
+ {!isDeleted &&
+ hasWorkspacePermissionV2(
+ getDeletePermission(accountType)
+ ) &&
+ !isSelf && (
+ <Tooltip
+ content={t(
+ "settings.members.action.deactivate-confirm-title"
)}
- {hasWorkspacePermissionV2(
- getViewPermission(accountType)
- ) && (
- <Tooltip
- content={
- accountType === AccountType.USER
- ? t("common.view")
- : t("common.edit")
- }
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 text-error hover:text-error"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleDeactivate(user);
+ }}
>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7"
- onClick={() => handleView(user)}
- >
- {accountType === AccountType.USER ? (
- <Eye className="h-4 w-4" />
- ) : (
- <Pencil className="h-4 w-4" />
- )}
- </Button>
- </Tooltip>
- )}
- </>
- )}
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
{isDeleted &&
hasWorkspacePermissionV2(
getUndeletePermission(accountType)
@@ -368,7 +385,10 @@ function UserTable({
variant="ghost"
size="icon"
className="h-7 w-7"
- onClick={() => handleRestore(user)}
+ onClick={(e) => {
+ e.stopPropagation();
+ handleRestore(user);
+ }}
>
<Undo2 className="h-4 w-4" />
</Button>
@@ -411,7 +431,11 @@ function UserGroupsCell({
key={groupName}
variant="secondary"
className="text-xs px-1.5 py-0 cursor-pointer"
- onClick={() => {
+ // The parent TableRow is a row-click button — stop propagation so
+ // clicking a group badge navigates to the group without also
+ // opening the user detail sheet.
+ onClick={(e) => {
+ e.stopPropagation();
if (group && onGroupSelected) {
onGroupSelected(group);
}
@@ -434,17 +458,50 @@ function extractUserTitle(email: string): string {
return atIndex !== -1 ? email.substring(0, atIndex) : email;
}
-function CreateUserDrawer({
- user,
- onClose,
- onCreated,
- onUpdated,
-}: {
+interface CreateUserSheetProps {
+ open: boolean;
user: User | undefined;
onClose: () => void;
onCreated: (user: User) => void;
onUpdated: (user: User) => void;
-}) {
+}
+
+// Outer wrapper — renders the Sheet container. The actual form lives in
+// `UserForm` below, keyed by entity so it remounts cleanly every time a
+// different entity is selected, and gated by `open` so it unmounts on close.
+// This guarantees that useState initializers always see the latest `user`
+// prop and that there's no stale state between opens.
+function CreateUserSheet(props: CreateUserSheetProps) {
+ const { open, user, onClose } = props;
+ // Freeze the entity while open=false so the inner form stays visually
+ // stable during the Sheet's close animation; see the long comment on
+ // CreateWorkloadIdentitySheet for the full rationale.
+ const openEntityRef = useRef(user);
+ if (open) {
+ openEntityRef.current = user;
+ }
+ const stableUser = openEntityRef.current;
+ return (
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <UserForm
+ key={stableUser?.name ?? "new"}
+ user={stableUser}
+ onClose={props.onClose}
+ onCreated={props.onCreated}
+ onUpdated={props.onUpdated}
+ />
+ </SheetContent>
+ </Sheet>
+ );
+}
+
+function UserForm({
+ user,
+ onClose,
+ onCreated,
+ onUpdated,
+}: Omit<CreateUserSheetProps, "open">) {
const { t } = useTranslation();
const userStore = useUserStore();
const workspaceStore = useWorkspaceV1Store();
@@ -467,25 +524,37 @@ function CreateUserDrawer({
const allowUpdate =
!isEditMode || hasWorkspacePermissionV2("bb.users.update");
+ // Capture initial values on mount. Because the parent keys this component
+ // by user, it remounts fresh every time a different user is edited, so
+ // these initial values always reflect the latest `user` prop.
+ //
+ // The empty deps array is intentional: we want the initial baseline
+ // frozen at mount so dirty tracking compares against it. If we added
+ // `userMapToRoles` to deps, a Pinia store refresh mid-edit would move
+ // the baseline and incorrectly classify untouched fields as dirty
+ // (or vice versa). Since the outer CreateUserSheet wrapper remounts
+ // this component whenever the edited user changes, "mount-only" is the
+ // right scope for the baseline.
const initialRoles = useMemo(() => {
if (!user || !isEditMode) {
return [PresetRoleType.WORKSPACE_MEMBER];
}
const roles = userMapToRoles.get(getUserFullNameByType(user));
return roles ? [...roles] : [];
- }, [user, isEditMode, userMapToRoles]);
-
- const [title, setTitle] = useState(user?.title ?? "");
- const [email, setEmail] = useState(user?.email ?? "");
- const [phone, setPhone] = useState(user?.phone ?? "");
+ }, []);
+ const initialTitle = user?.title ?? "";
+ const initialEmail = user?.email ?? "";
+ const initialPhone = user?.phone ?? "";
+
+ const [title, setTitle] = useState(initialTitle);
+ const [email, setEmail] = useState(initialEmail);
+ const [phone, setPhone] = useState(initialPhone);
const [password, setPassword] = useState("");
const [passwordConfirm, setPasswordConfirm] = useState("");
const [roles, setRoles] = useState<string[]>(initialRoles);
const [isRequesting, setIsRequesting] = useState(false);
const [showPassword, setShowPassword] = useState(false);
- useEscapeKey(true, onClose);
-
// Password validation
const passwordChecks = useMemo(() => {
const minLength = passwordRestriction?.minLength ?? 8;
@@ -544,13 +613,35 @@ function CreateUserDrawer({
return workspaceDomains.includes(domain);
}, [email, isEditMode, enforceIdentityDomain, workspaceDomains]);
- const allowConfirm =
+ const isFormValid =
email.length > 0 &&
emailDomainValid &&
!passwordHint &&
!passwordMismatch &&
(isEditMode || password.length > 0);
+ // Dirty tracking — in edit mode the Update button is disabled unless
+ // something actually changed. Create mode is always "dirty".
+ const isDirty = useMemo(() => {
+ if (!isEditMode) return true;
+ if (title !== initialTitle) return true;
+ if (phone !== initialPhone) return true;
+ if (password.length > 0) return true;
+ if (!isEqual([...initialRoles].sort(), [...roles].sort())) return true;
+ return false;
+ }, [
+ isEditMode,
+ title,
+ phone,
+ password,
+ roles,
+ initialTitle,
+ initialPhone,
+ initialRoles,
+ ]);
+
+ const allowConfirm = isFormValid && isDirty;
+
const hasPermission = hasWorkspacePermissionV2(
isEditMode ? "bb.users.update" : "bb.users.create"
);
@@ -645,193 +736,173 @@ function CreateUserDrawer({
return (
<>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">{t("common.user")}</h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
+ <SheetHeader>
+ <SheetTitle>{t("common.user")}</SheetTitle>
+ </SheetHeader>
+
+ <SheetBody>
+ <div className="flex flex-col gap-y-6">
+ {/* Name */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.name")}
+ </label>
+ <Input
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ placeholder={t("common.name")}
+ maxLength={200}
+ disabled={!allowUpdate}
+ />
+ </div>
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {/* Name */}
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <Input
+ type="email"
+ value={email}
+ onChange={(e) => setEmail(e.target.value)}
+ disabled={isEditMode}
+ />
+ </div>
+
+ {/* Roles */}
+ {hasWorkspacePermissionV2("bb.workspaces.setIamPolicy") && (
<div className="flex flex-col gap-y-2">
<label className="block text-sm font-medium text-control">
- {t("common.name")}
+ {t("settings.members.table.roles")}
</label>
- <Input
- value={title}
- onChange={(e) => setTitle(e.target.value)}
- placeholder={t("common.name")}
- maxLength={200}
- disabled={!allowUpdate}
- />
+ <RoleSelect value={roles} onChange={setRoles} disabled={false} />
</div>
+ )}
- {/* Email */}
- <div className="flex flex-col gap-y-2">
+ {/* Phone */}
+ <div className="flex flex-col gap-y-2">
+ <div>
<label className="block text-sm font-medium text-control">
- {t("common.email")}
- <span className="ml-0.5 text-error">*</span>
+ {t("settings.profile.phone")}
</label>
- <Input
- type="email"
- value={email}
- onChange={(e) => setEmail(e.target.value)}
- disabled={isEditMode}
- />
+ <span className="textinfolabel text-sm">
+ {t("settings.profile.phone-tips")}
+ </span>
</div>
+ <Input
+ type="tel"
+ value={phone}
+ onChange={(e) => setPhone(e.target.value)}
+ autoComplete="new-password"
+ disabled={!allowUpdate}
+ />
+ </div>
- {/* Roles */}
- {hasWorkspacePermissionV2("bb.workspaces.setIamPolicy") && (
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.table.roles")}
- </label>
- <RoleSelect
- value={roles}
- onChange={setRoles}
- disabled={false}
+ {/* Password */}
+ <div className="flex flex-col gap-y-6">
+ <div>
+ <label className="block text-sm font-medium text-control">
+ {t("settings.profile.password")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <span
+ className={`flex items-center gap-x-1 textinfolabel text-sm ${passwordHint ? "text-error" : ""}`}
+ >
+ {t("settings.profile.password-hint")}
+ <Tooltip
+ content={
+ <ul className="list-none text-sm">
+ {passwordChecks.map((check, i) => (
+ <li key={i} className="flex gap-x-1 items-center">
+ {check.matched ? (
+ <CircleCheck className="w-4 text-green-400" />
+ ) : (
+ <CircleAlert className="w-4 text-red-400" />
+ )}
+ {check.text}
+ </li>
+ ))}
+ </ul>
+ }
+ >
+ <CircleAlert className="w-4 cursor-help" />
+ </Tooltip>
+ </span>
+ <div className="mt-1 relative flex items-center">
+ <Input
+ type={showPassword ? "text" : "password"}
+ value={password}
+ onChange={(e) => setPassword(e.target.value)}
+ autoComplete="new-password"
+ placeholder={t("common.sensitive-placeholder")}
+ disabled={!allowUpdate}
+ className={passwordHint ? "border-error" : ""}
/>
+ <button
+ type="button"
+ className="absolute right-3 cursor-pointer"
+ onClick={() => setShowPassword(!showPassword)}
+ >
+ {showPassword ? (
+ <Eye className="w-4 h-4" />
+ ) : (
+ <EyeOff className="w-4 h-4" />
+ )}
+ </button>
</div>
- )}
-
- {/* Phone */}
- <div className="flex flex-col gap-y-2">
- <div>
- <label className="block text-sm font-medium text-control">
- {t("settings.profile.phone")}
- </label>
- <span className="textinfolabel text-sm">
- {t("settings.profile.phone-tips")}
- </span>
- </div>
- <Input
- type="tel"
- value={phone}
- onChange={(e) => setPhone(e.target.value)}
- autoComplete="new-password"
- disabled={!allowUpdate}
- />
</div>
- {/* Password */}
- <div className="flex flex-col gap-y-6">
- <div>
- <label className="block text-sm font-medium text-control">
- {t("settings.profile.password")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <span
- className={`flex items-center gap-x-1 textinfolabel text-sm ${passwordHint ? "text-error" : ""}`}
+ <div>
+ <label className="block text-sm font-medium text-control">
+ {t("settings.profile.password-confirm")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <div className="mt-1 relative flex items-center">
+ <Input
+ type={showPassword ? "text" : "password"}
+ value={passwordConfirm}
+ onChange={(e) => setPasswordConfirm(e.target.value)}
+ autoComplete="new-password"
+ placeholder={t(
+ "settings.profile.password-confirm-placeholder"
+ )}
+ disabled={!allowUpdate}
+ className={passwordMismatch ? "border-error" : ""}
+ />
+ <button
+ type="button"
+ className="absolute right-3 cursor-pointer"
+ onClick={() => setShowPassword(!showPassword)}
>
- {t("settings.profile.password-hint")}
- <Tooltip
- content={
- <ul className="list-none text-sm">
- {passwordChecks.map((check, i) => (
- <li key={i} className="flex gap-x-1 items-center">
- {check.matched ? (
- <CircleCheck className="w-4 text-green-400" />
- ) : (
- <CircleAlert className="w-4 text-red-400" />
- )}
- {check.text}
- </li>
- ))}
- </ul>
- }
- >
- <CircleAlert className="w-4 cursor-help" />
- </Tooltip>
- </span>
- <div className="mt-1 relative flex items-center">
- <Input
- type={showPassword ? "text" : "password"}
- value={password}
- onChange={(e) => setPassword(e.target.value)}
- autoComplete="new-password"
- placeholder={t("common.sensitive-placeholder")}
- disabled={!allowUpdate}
- className={passwordHint ? "border-error" : ""}
- />
- <button
- type="button"
- className="absolute right-3 cursor-pointer"
- onClick={() => setShowPassword(!showPassword)}
- >
- {showPassword ? (
- <Eye className="w-4 h-4" />
- ) : (
- <EyeOff className="w-4 h-4" />
- )}
- </button>
- </div>
- </div>
-
- <div>
- <label className="block text-sm font-medium text-control">
- {t("settings.profile.password-confirm")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <div className="mt-1 relative flex items-center">
- <Input
- type={showPassword ? "text" : "password"}
- value={passwordConfirm}
- onChange={(e) => setPasswordConfirm(e.target.value)}
- autoComplete="new-password"
- placeholder={t(
- "settings.profile.password-confirm-placeholder"
- )}
- disabled={!allowUpdate}
- className={passwordMismatch ? "border-error" : ""}
- />
- <button
- type="button"
- className="absolute right-3 cursor-pointer"
- onClick={() => setShowPassword(!showPassword)}
- >
- {showPassword ? (
- <Eye className="w-4 h-4" />
- ) : (
- <EyeOff className="w-4 h-4" />
- )}
- </button>
- </div>
- {passwordMismatch && (
- <span className="text-error text-sm mt-1 pl-1">
- {t("settings.profile.password-mismatch")}
- </span>
- )}
+ {showPassword ? (
+ <Eye className="w-4 h-4" />
+ ) : (
+ <EyeOff className="w-4 h-4" />
+ )}
+ </button>
</div>
+ {passwordMismatch && (
+ <span className="text-error text-sm mt-1 pl-1">
+ {t("settings.profile.password-mismatch")}
+ </span>
+ )}
</div>
</div>
</div>
-
- {/* Footer */}
- <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!allowConfirm || !hasPermission || isRequesting}
- onClick={handleSubmit}
- >
- {isEditMode ? t("common.update") : t("common.create")}
- </Button>
- </div>
- </div>
+ </SheetBody>
+
+ <SheetFooter>
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowConfirm || !hasPermission || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.create")}
+ </Button>
+ </SheetFooter>
</>
);
}
@@ -1044,29 +1115,29 @@ export function UsersPage() {
)}
</div>
- {showCreateUserDrawer && (
- <CreateUserDrawer
- user={editingUser}
- onClose={() => {
- setShowCreateUserDrawer(false);
- setEditingUser(undefined);
- }}
- onCreated={(user) => {
- activeUsers.updateCache([user]);
- }}
- onUpdated={(user) => {
- activeUsers.updateCache([user]);
- if (user.state === State.DELETED) {
- activeUsers.removeCache(user);
- inactiveUsers.updateCache([user]);
- }
- }}
- />
- )}
-
- {showAadSyncDrawer && (
- <AADSyncDrawer onClose={() => setShowAadSyncDrawer(false)} />
- )}
+ <CreateUserSheet
+ open={showCreateUserDrawer}
+ user={editingUser}
+ onClose={() => {
+ setShowCreateUserDrawer(false);
+ setEditingUser(undefined);
+ }}
+ onCreated={(user) => {
+ activeUsers.updateCache([user]);
+ }}
+ onUpdated={(user) => {
+ activeUsers.updateCache([user]);
+ if (user.state === State.DELETED) {
+ activeUsers.removeCache(user);
+ inactiveUsers.updateCache([user]);
+ }
+ }}
+ />
+
+ <AADSyncSheet
+ open={showAadSyncDrawer}
+ onClose={() => setShowAadSyncDrawer(false)}
+ />
</div>
);
}
diff --git a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
index 0a5c93d4a9..af24071911 100644
--- a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
+++ b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
@@ -1,7 +1,7 @@
-import { Pencil, Plus, Trash2, Undo2 } from "lucide-react";
-import { useCallback, useState } from "react";
+import { Plus, Trash2, Undo2 } from "lucide-react";
+import { useCallback, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { CreateWorkloadIdentityDrawer } from "@/react/components/CreateWorkloadIdentityDrawer";
+import { CreateWorkloadIdentitySheet } from "@/react/components/CreateWorkloadIdentitySheet";
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { UserAvatar } from "@/react/components/UserAvatar";
import { Button } from "@/react/components/ui/button";
@@ -114,9 +114,51 @@ function WorkloadIdentityTable({
) : (
users.map((user) => {
const isDeleted = user.state === State.DELETED;
+ const canOpenDetail =
+ !!onUserSelected &&
+ (project
+ ? hasProjectPermissionV2(project, "bb.workloadIdentities.get")
+ : hasWorkspacePermissionV2("bb.workloadIdentities.get"));
+ const canDelete = project
+ ? hasProjectPermissionV2(
+ project,
+ "bb.workloadIdentities.delete"
+ )
+ : hasWorkspacePermissionV2("bb.workloadIdentities.delete");
+ const canRestore = project
+ ? hasProjectPermissionV2(
+ project,
+ "bb.workloadIdentities.undelete"
+ )
+ : hasWorkspacePermissionV2("bb.workloadIdentities.undelete");
return (
- <TableRow key={user.name}>
+ <TableRow
+ key={user.name}
+ className={
+ canOpenDetail
+ ? "cursor-pointer hover:bg-control-bg focus-visible:outline-none focus-visible:bg-control-bg"
+ : undefined
+ }
+ tabIndex={canOpenDetail ? 0 : undefined}
+ role={canOpenDetail ? "button" : undefined}
+ aria-label={
+ canOpenDetail ? user.title || user.email : undefined
+ }
+ onClick={
+ canOpenDetail ? () => onUserSelected(user) : undefined
+ }
+ onKeyDown={
+ canOpenDetail
+ ? (e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ onUserSelected(user);
+ }
+ }
+ : undefined
+ }
+ >
{/* Account column */}
<TableCell>
<div className="flex items-center gap-x-3">
@@ -126,7 +168,7 @@ function WorkloadIdentityTable({
className={
isDeleted
? "line-through text-control-light font-medium"
- : "font-medium text-accent"
+ : "font-medium text-main"
}
>
{user.title || user.email}
@@ -138,80 +180,48 @@ function WorkloadIdentityTable({
</div>
</TableCell>
- {/* Operations column */}
+ {/* Operations column — destructive/secondary actions only.
+ The row itself is clickable to open the detail sheet. */}
<TableCell>
<div className="flex justify-end gap-x-1">
- {!isDeleted && (
- <>
- {(project
- ? hasProjectPermissionV2(
- project,
- "bb.workloadIdentities.delete"
- )
- : hasWorkspacePermissionV2(
- "bb.workloadIdentities.delete"
- )) && (
- <Tooltip
- content={t(
- "settings.members.action.deactivate-confirm-title"
- )}
- >
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7 text-error hover:text-error"
- onClick={() => handleDeactivate(user)}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </Tooltip>
+ {!isDeleted && canDelete && (
+ <Tooltip
+ content={t(
+ "settings.members.action.deactivate-confirm-title"
)}
- {(project
- ? hasProjectPermissionV2(
- project,
- "bb.workloadIdentities.get"
- )
- : hasWorkspacePermissionV2(
- "bb.workloadIdentities.get"
- )) &&
- onUserSelected && (
- <Tooltip content={t("common.edit")}>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7"
- onClick={() => onUserSelected(user)}
- >
- <Pencil className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
- </>
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 text-error hover:text-error"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleDeactivate(user);
+ }}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
)}
- {isDeleted &&
- (project
- ? hasProjectPermissionV2(
- project,
- "bb.workloadIdentities.undelete"
- )
- : hasWorkspacePermissionV2(
- "bb.workloadIdentities.undelete"
- )) && (
- <Tooltip
- content={t(
- "settings.members.action.reactivate-confirm-title"
- )}
+ {isDeleted && canRestore && (
+ <Tooltip
+ content={t(
+ "settings.members.action.reactivate-confirm-title"
+ )}
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleRestore(user);
+ }}
>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7"
- onClick={() => handleRestore(user)}
- >
- <Undo2 className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
+ <Undo2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
</div>
</TableCell>
</TableRow>
@@ -313,8 +323,26 @@ export function WorkloadIdentitiesPage({ projectId }: { projectId?: string }) {
}
};
- const handleUserSelected = (user: User) => {
- const wi = workloadIdentityStore.getWorkloadIdentity(user.email);
+ // Sequence guard for async row-selection. Each click increments the
+ // counter; only the response from the latest click is allowed to update
+ // `editingWI`. Without this, fast double-clicks on different rows can
+ // resolve out of order and open the sheet with the wrong identity.
+ const selectSeqRef = useRef(0);
+ const handleUserSelected = async (user: User) => {
+ // Use getOrFetch so the full WorkloadIdentity (including
+ // workloadIdentityConfig with subjectPattern) is loaded before we open
+ // the edit Sheet. `getWorkloadIdentity` returns a stub with only
+ // name/email/title if the cache is empty — which it is on first click
+ // of a row, since listWorkloadIdentities doesn't populate the cache.
+ // Without this, the edit Sheet would see no config and leave
+ // Organization/Repository/Branch fields blank.
+ const seq = ++selectSeqRef.current;
+ const wi = await workloadIdentityStore.getOrFetchWorkloadIdentity(
+ user.email,
+ true
+ );
+ // Drop stale response — a later click superseded this request.
+ if (seq !== selectSeqRef.current) return;
setEditingWI(wi);
setShowDrawer(true);
};
@@ -418,22 +446,21 @@ export function WorkloadIdentitiesPage({ projectId }: { projectId?: string }) {
)}
</div>
- {showDrawer && (
- <CreateWorkloadIdentityDrawer
- workloadIdentity={editingWI}
- project={projectName}
- onClose={() => {
- setShowDrawer(false);
- setEditingWI(undefined);
- }}
- onCreated={(wi) => {
- activeData.updateCache([workloadIdentityToUser(wi)]);
- }}
- onUpdated={(wi) => {
- activeData.updateCache([workloadIdentityToUser(wi)]);
- }}
- />
- )}
+ <CreateWorkloadIdentitySheet
+ open={showDrawer}
+ workloadIdentity={editingWI}
+ project={projectName}
+ onClose={() => {
+ setShowDrawer(false);
+ setEditingWI(undefined);
+ }}
+ onCreated={(wi) => {
+ activeData.updateCache([workloadIdentityToUser(wi)]);
+ }}
+ onUpdated={(wi) => {
+ activeData.updateCache([workloadIdentityToUser(wi)]);
+ }}
+ />
</div>
);
}
diff --git a/frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx b/frontend/src/react/pages/settings/shared/AADSyncSheet.tsx
similarity index 83%
rename from frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx
rename to frontend/src/react/pages/settings/shared/AADSyncSheet.tsx
index 8e61b989ba..fa6c26cb35 100644
--- a/frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx
+++ b/frontend/src/react/pages/settings/shared/AADSyncSheet.tsx
@@ -1,12 +1,19 @@
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
-import { Copy, X } from "lucide-react";
+import { Copy } from "lucide-react";
import { useTranslation } from "react-i18next";
import { LearnMoreLink } from "@/react/components/LearnMoreLink";
import { Alert, AlertDescription } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
-import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import {
+ Sheet,
+ SheetBody,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
import {
pushNotification,
@@ -16,10 +23,16 @@ import {
import { hasWorkspacePermissionV2 } from "@/utils";
// ============================================================
-// AADSyncDrawer
+// AADSyncSheet
// ============================================================
-export function AADSyncDrawer({ onClose }: { onClose: () => void }) {
+export function AADSyncSheet({
+ open,
+ onClose,
+}: {
+ open: boolean;
+ onClose: () => void;
+}) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
const settingV1Store = useSettingV1Store();
@@ -34,8 +47,6 @@ export function AADSyncDrawer({ onClose }: { onClose: () => void }) {
() => settingV1Store.workspaceProfile.directorySyncToken
);
- useEscapeKey(true, onClose);
-
const scimUrl =
externalUrl && workspaceResourceName
? `${externalUrl}/hook/scim/${workspaceResourceName}`
@@ -94,28 +105,13 @@ export function AADSyncDrawer({ onClose }: { onClose: () => void }) {
};
return (
- <>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">
- {t("settings.members.entra-sync.self")}
- </h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>
+ <SheetContent width="standard">
+ <SheetHeader>
+ <SheetTitle>{t("settings.members.entra-sync.self")}</SheetTitle>
+ </SheetHeader>
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
+ <SheetBody>
<div className="flex flex-col gap-y-6">
{/* Description */}
<p className="text-sm text-control-light">
@@ -190,15 +186,14 @@ export function AADSyncDrawer({ onClose }: { onClose: () => void }) {
)}
</div>
</div>
- </div>
+ </SheetBody>
- {/* Footer */}
- <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
+ <SheetFooter>
<Button variant="outline" onClick={onClose}>
{t("common.cancel")}
</Button>
- </div>
- </div>
- </>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
);
}