Skip to content

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

fix: restore CEL editor for member role grants (#20408)

rebelicee9445fd7f135
diff --git a/frontend/src/react/components/ExprEditor.test.tsx b/frontend/src/react/components/ExprEditor.test.tsx
index cc8f78d673..7e8936c6a2 100644
--- a/frontend/src/react/components/ExprEditor.test.tsx
+++ b/frontend/src/react/components/ExprEditor.test.tsx
@@ -4,6 +4,8 @@ import { afterEach, describe, expect, test, vi } from "vitest";
import type { Factor } from "@/plugins/cel/types/factor";
import { type ConditionGroupExpr, ExprType } from "@/plugins/cel/types/simple";
import {
+ CEL_ATTRIBUTE_RESOURCE_DATABASE,
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,
CEL_ATTRIBUTE_RISK_LEVEL,
CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,
} from "@/utils/cel-attributes";
@@ -98,6 +100,29 @@ const optionConfigMap = new Map<Factor, OptionConfig>([
],
]);
+const searchableOptionConfigMap = new Map<Factor, OptionConfig>([
+ [
+ CEL_ATTRIBUTE_RESOURCE_DATABASE,
+ {
+ options: [],
+ search: async () => ({
+ options: [],
+ nextPageToken: "",
+ }),
+ },
+ ],
+ [
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,
+ {
+ options: [],
+ search: async () => ({
+ options: [],
+ nextPageToken: "",
+ }),
+ },
+ ],
+]);
+
const renderIntoContainer = (element: ReactElement) => {
const container = document.createElement("div");
document.body.appendChild(container);
@@ -234,4 +259,262 @@ describe("ExprEditor", () => {
unmount();
});
+
+ test("tag input uses only the outer field border", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "@in",
+ args: [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, []],
+ },
+ ],
+ };
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_RESOURCE_TABLE_NAME]}
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ const input = container.querySelector(
+ 'input[placeholder="cel.condition.input-value-press-enter"]'
+ );
+
+ expect(input).toBeInstanceOf(HTMLInputElement);
+ expect(input?.className).toContain("border-0");
+ expect(input?.className).toContain("focus:ring-0");
+ expect(input?.className).toContain("focus:border-0");
+ expect(input?.className).toContain("placeholder:text-control-placeholder");
+
+ unmount();
+ });
+
+ test("plain value input aligns with select trigger sizing", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "_==_",
+ args: [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, ""],
+ },
+ ],
+ };
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_RESOURCE_TABLE_NAME]}
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ const input = container.querySelector(
+ 'input[placeholder="cel.condition.input-value"]'
+ );
+
+ expect(input).toBeInstanceOf(HTMLInputElement);
+ expect(input?.className).toContain("h-9");
+ expect(input?.className).not.toContain("h-7");
+
+ unmount();
+ });
+
+ test("multi value input aligns with select trigger sizing", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "@in",
+ args: [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, []],
+ },
+ ],
+ };
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_RESOURCE_TABLE_NAME]}
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ const input = container.querySelector(
+ 'input[placeholder="cel.condition.input-value-press-enter"]'
+ );
+ const field = input?.parentElement;
+
+ expect(field).toBeInstanceOf(HTMLDivElement);
+ expect(field?.className).toContain("min-h-9");
+ expect(field?.className).not.toContain("min-h-8");
+ expect(field?.className).toContain("w-full");
+ expect(field?.className).toContain("min-w-0");
+ expect(field?.className).not.toContain("min-w-64");
+
+ unmount();
+ });
+
+ test("static multi-select value aligns with select trigger sizing", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "@in",
+ args: [CEL_ATTRIBUTE_STATEMENT_SQL_TYPE, []],
+ },
+ ],
+ };
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_STATEMENT_SQL_TYPE]}
+ optionConfigMap={optionConfigMap}
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ const trigger = Array.from(container.querySelectorAll("button")).find(
+ (button) => button.textContent?.includes("cel.condition.select-value")
+ );
+
+ expect(trigger).toBeInstanceOf(HTMLButtonElement);
+ expect(trigger?.className).toContain("min-h-9");
+ expect(trigger?.className).not.toContain("min-h-8");
+
+ unmount();
+ });
+
+ test("searchable multi-select value aligns with select trigger sizing", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "@in",
+ args: [CEL_ATTRIBUTE_RESOURCE_DATABASE, []],
+ },
+ ],
+ };
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_RESOURCE_DATABASE]}
+ optionConfigMap={searchableOptionConfigMap}
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ const placeholder = Array.from(container.querySelectorAll("span")).find(
+ (span) => span.textContent?.includes("cel.condition.select-value")
+ );
+ const trigger = placeholder?.parentElement;
+
+ expect(trigger).toBeInstanceOf(HTMLDivElement);
+ expect(trigger?.className).toContain("min-h-9");
+ expect(trigger?.className).not.toContain("min-h-8");
+
+ unmount();
+ });
+
+ test("collection operator uses tag input when option config disables multi-select", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "@in",
+ args: [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, []],
+ },
+ ],
+ };
+ const optionConfig = searchableOptionConfigMap.get(
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME
+ ) as OptionConfig;
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_RESOURCE_TABLE_NAME]}
+ optionConfigMap={
+ new Map([
+ [
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,
+ {
+ ...optionConfig,
+ supportMultiple: false,
+ },
+ ],
+ ])
+ }
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ expect(
+ container.querySelector(
+ 'input[placeholder="cel.condition.input-value-press-enter"]'
+ )
+ ).toBeInstanceOf(HTMLInputElement);
+ expect(container.textContent?.includes("cel.condition.select-value")).toBe(
+ false
+ );
+
+ unmount();
+ });
+
+ test("searchable value trigger aligns with select trigger sizing", async () => {
+ const initialExpr: ConditionGroupExpr = {
+ type: ExprType.ConditionGroup,
+ operator: "_&&_",
+ args: [
+ {
+ type: ExprType.Condition,
+ operator: "_==_",
+ args: [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, ""],
+ },
+ ],
+ };
+
+ const { container, unmount } = renderIntoContainer(
+ <ExprEditor
+ expr={initialExpr}
+ factorList={[CEL_ATTRIBUTE_RESOURCE_TABLE_NAME]}
+ optionConfigMap={searchableOptionConfigMap}
+ onUpdate={() => {}}
+ />
+ );
+ await flushEffects();
+
+ const trigger = Array.from(container.querySelectorAll("button")).find(
+ (button) => button.textContent?.includes("cel.condition.select-value")
+ );
+
+ expect(trigger).toBeInstanceOf(HTMLButtonElement);
+ expect(trigger?.className).toContain("h-9");
+ expect(trigger?.className).not.toContain("h-8");
+ expect(trigger?.querySelector("span")?.className).toContain("flex-1");
+ expect(trigger?.querySelector("span")?.className).toContain("truncate");
+
+ unmount();
+ });
});
diff --git a/frontend/src/react/components/ExprEditor.tsx b/frontend/src/react/components/ExprEditor.tsx
index d951931c71..fc76aba82c 100644
--- a/frontend/src/react/components/ExprEditor.tsx
+++ b/frontend/src/react/components/ExprEditor.tsx
@@ -87,6 +87,9 @@ function getDefaultValue(
return "";
}
+const VALUE_MULTI_FIELD_CLASS =
+ "min-h-9 px-3 py-1 text-sm leading-5 rounded-xs border border-control-border bg-background";
+
// Clone root, apply a mutation to the clone, return the clone.
function updateExpr(
root: ConditionGroupExpr,
@@ -369,13 +372,17 @@ function SearchableSelect({
<button
ref={triggerRef}
type="button"
- className="h-8 px-2 text-sm rounded-xs border border-control-border bg-background w-full text-left disabled:opacity-50 truncate"
+ className="inline-flex h-9 w-full items-center rounded-xs border border-control-border bg-background px-3 text-left text-sm leading-5 text-control disabled:opacity-50"
disabled={disabled}
onClick={handleOpen}
>
- {selectedLabel || (
- <span className="text-control-placeholder">{placeholder ?? ""}</span>
- )}
+ <span className="min-w-0 flex-1 truncate">
+ {selectedLabel || (
+ <span className="text-control-placeholder">
+ {placeholder ?? ""}
+ </span>
+ )}
+ </span>
</button>
{open && (
<PortaledDropdown
@@ -547,13 +554,14 @@ function MultiSearchableSelect({
<div className="min-w-32 max-w-xs">
<div
ref={triggerRef}
- className="min-h-8 px-2 py-0.5 text-sm rounded-xs border border-control-border bg-background flex flex-wrap gap-1 cursor-pointer"
+ className={cn(
+ VALUE_MULTI_FIELD_CLASS,
+ "flex flex-wrap items-center gap-1 cursor-pointer"
+ )}
onClick={disabled ? undefined : handleOpen}
>
{value.length === 0 && (
- <span className="text-control-placeholder text-sm leading-6">
- {placeholder ?? ""}
- </span>
+ <span className="text-control-placeholder">{placeholder ?? ""}</span>
)}
{value.map((v) => (
<span
@@ -668,7 +676,12 @@ function TagInput({
};
return (
- <div className="flex flex-wrap items-center gap-1 min-h-8 px-2 py-0.5 rounded-xs border border-control-border bg-background min-w-64 max-w-xs">
+ <div
+ className={cn(
+ VALUE_MULTI_FIELD_CLASS,
+ "flex w-full min-w-0 flex-wrap items-center gap-1"
+ )}
+ >
{value.map((tag) => (
<span
key={tag}
@@ -688,7 +701,7 @@ function TagInput({
))}
{!disabled && (
<input
- className="flex-1 min-w-16 h-6 text-sm outline-none bg-transparent"
+ className="flex-1 min-w-16 h-5 border-0 bg-transparent p-0 text-sm leading-5 shadow-none outline-none placeholder:text-control-placeholder focus:border-0 focus:ring-0"
placeholder={value.length === 0 ? (placeholder ?? "") : ""}
value={inputValue}
disabled={disabled}
@@ -751,7 +764,10 @@ function MultiCheckSelect({
<button
ref={triggerRef}
type="button"
- className="inline-flex items-center gap-1 min-h-8 w-full px-2 py-0.5 text-sm rounded-xs border border-control-border bg-background text-left hover:bg-control-bg disabled:pointer-events-none disabled:opacity-50 flex-wrap"
+ className={cn(
+ VALUE_MULTI_FIELD_CLASS,
+ "inline-flex w-full flex-wrap items-center gap-1 text-left hover:bg-control-bg disabled:pointer-events-none disabled:opacity-50"
+ )}
disabled={disabled}
onClick={() => setOpen(!open)}
>
@@ -1006,6 +1022,7 @@ function ValueInput({
};
const hasOption = optionConfig.options.length > 0 || !!optionConfig.search;
+ const hasMultiOption = hasOption && optionConfig.supportMultiple !== false;
type InputType = "INPUT" | "SINGLE-SELECT" | "MULTI-SELECT" | "MULTI-INPUT";
@@ -1013,7 +1030,7 @@ function ValueInput({
let inputType: InputType;
if (isArrayValue) {
- inputType = hasOption ? "MULTI-SELECT" : "MULTI-INPUT";
+ inputType = hasMultiOption ? "MULTI-SELECT" : "MULTI-INPUT";
} else if (isStringOperator(operator)) {
inputType = "INPUT";
} else if (hasOption) {
@@ -1077,7 +1094,6 @@ function ValueInput({
return (
<Input
type="number"
- size="sm"
className="max-w-20"
value={getNumberValue()}
disabled={readonly}
@@ -1111,7 +1127,6 @@ function ValueInput({
}
return (
<Input
- size="sm"
className="min-w-28"
value={getStringValue()}
disabled={readonly}
diff --git a/frontend/src/react/pages/settings/MembersPage.test.tsx b/frontend/src/react/pages/settings/MembersPage.test.tsx
new file mode 100644
index 0000000000..5f371f3931
--- /dev/null
+++ b/frontend/src/react/pages/settings/MembersPage.test.tsx
@@ -0,0 +1,467 @@
+import type {
+ ButtonHTMLAttributes,
+ InputHTMLAttributes,
+ ReactNode,
+} from "react";
+import { act, createElement } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+(
+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+const { mockPushNotification, mockUpdateProjectIamPolicy } = vi.hoisted(() => ({
+ mockPushNotification: vi.fn(),
+ mockUpdateProjectIamPolicy: vi.fn(),
+}));
+
+vi.mock("@/react/components/AccountMultiSelect", () => ({
+ AccountMultiSelect: ({
+ onChange,
+ }: {
+ onChange: (members: string[]) => void;
+ }) =>
+ createElement(
+ "button",
+ {
+ "data-testid": "account-select",
+ onClick: () => onChange(["user:[email protected]"]),
+ },
+ "select account"
+ ),
+}));
+
+vi.mock("@/react/components/DatabaseResourceSelector", () => ({
+ DatabaseResourceSelector: () =>
+ createElement("div", { "data-testid": "database-resource-selector" }),
+}));
+
+vi.mock("@/react/components/EnvironmentSelect", () => ({
+ EnvironmentSelect: () =>
+ createElement("div", { "data-testid": "environment-multi-select" }),
+}));
+
+vi.mock("@/react/components/ExprEditor", () => ({
+ ExprEditor: () => createElement("div", { "data-testid": "expr-editor" }),
+}));
+
+vi.mock("@/react/components/FeatureBadge", () => ({
+ FeatureBadge: () => createElement("span", {}),
+}));
+
+vi.mock("@/react/components/LearnMoreLink", () => ({
+ LearnMoreLink: () => createElement("a", {}),
+}));
+
+vi.mock("@/react/components/PermissionGuard", () => ({
+ PermissionGuard: ({
+ children,
+ }: {
+ children: (args: { disabled: boolean }) => ReactNode;
+ }) => createElement("div", {}, children({ disabled: false })),
+}));
+
+vi.mock("@/react/components/RoleSelect", () => ({
+ RoleSelect: ({
+ value,
+ onChange,
+ }: {
+ value: string[];
+ onChange: (roles: string[]) => void;
+ }) =>
+ createElement("input", {
+ "data-testid": "role-select",
+ value: value[0] ?? "",
+ onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+ onChange(e.target.value ? [e.target.value] : []),
+ }),
+}));
+
+vi.mock("@/react/components/role-grant/DDLWarningCallout", () => ({
+ DDLWarningCallout: () => null,
+}));
+
+vi.mock("@/react/components/UserCell", () => ({
+ UserCell: () => createElement("span", {}),
+}));
+
+vi.mock("@/react/components/ui/alert", () => ({
+ Alert: ({
+ children,
+ description,
+ title,
+ }: {
+ children?: ReactNode;
+ description?: ReactNode;
+ title?: ReactNode;
+ }) => createElement("div", {}, title, description, children),
+}));
+
+vi.mock("@/react/components/ui/badge", () => ({
+ Badge: ({ children }: { children?: ReactNode }) =>
+ createElement("span", {}, children),
+}));
+
+vi.mock("@/react/components/ui/button", () => ({
+ Button: ({
+ children,
+ disabled,
+ onClick,
+ variant: _variant,
+ size: _size,
+ }: ButtonHTMLAttributes<HTMLButtonElement> & {
+ size?: string;
+ variant?: string;
+ }) => createElement("button", { disabled, onClick }, children),
+}));
+
+vi.mock("@/react/components/ui/checkbox", () => ({
+ Checkbox: () => createElement("input", { type: "checkbox" }),
+}));
+
+vi.mock("@/react/components/ui/input", () => ({
+ Input: (props: InputHTMLAttributes<HTMLInputElement>) =>
+ createElement("input", props),
+}));
+
+vi.mock("@/react/components/ui/search-input", () => ({
+ SearchInput: (props: InputHTMLAttributes<HTMLInputElement>) =>
+ createElement("input", props),
+}));
+
+vi.mock("@/react/components/ui/sheet", () => ({
+ Sheet: ({ children, open }: { children: ReactNode; open: boolean }) =>
+ open ? createElement("div", { "data-testid": "sheet" }, children) : null,
+ SheetBody: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ SheetContent: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ SheetFooter: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ SheetHeader: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ SheetTitle: ({ children }: { children: ReactNode }) =>
+ createElement("h2", {}, children),
+}));
+
+vi.mock("@/react/components/ui/table", () => ({
+ Table: ({ children }: { children: ReactNode }) =>
+ createElement("table", {}, children),
+ TableBody: ({ children }: { children: ReactNode }) =>
+ createElement("tbody", {}, children),
+ TableCell: ({ children }: { children: ReactNode }) =>
+ createElement("td", {}, children),
+ TableHead: ({ children }: { children: ReactNode }) =>
+ createElement("th", {}, children),
+ TableHeader: ({ children }: { children: ReactNode }) =>
+ createElement("thead", {}, children),
+ TableRow: ({ children }: { children: ReactNode }) =>
+ createElement("tr", {}, children),
+}));
+
+vi.mock("@/react/components/ui/tabs", () => ({
+ Tabs: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ TabsList: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ TabsPanel: ({ children }: { children: ReactNode }) =>
+ createElement("div", {}, children),
+ TabsTrigger: ({ children }: { children: ReactNode }) =>
+ createElement("button", {}, children),
+}));
+
+vi.mock("@/react/components/ui/tooltip", () => ({
+ Tooltip: ({ children }: { children: ReactNode }) =>
+ createElement("span", {}, children),
+}));
+
+vi.mock("@/react/hooks/useEscapeKey", () => ({
+ useEscapeKey: () => {},
+}));
+
+vi.mock("@/react/hooks/useVueState", () => ({
+ useVueState: (getter: () => unknown) => getter(),
+}));
+
+vi.mock("@/react/lib/project-member/utils", () => ({
+ getRoleEnvironmentLimitationKind: vi.fn(() => undefined),
+ roleHasDatabaseLimitation: vi.fn((role: string) =>
+ role.includes("sqlEditor")
+ ),
+}));
+
+vi.mock("@/react/router", () => ({
+ useNavigate: () => vi.fn(),
+ WORKSPACE_ROUTE_GROUPS: "groups",
+ WORKSPACE_ROUTE_USER_PROFILE: "user-profile",
+}));
+
+vi.mock("@/plugins/cel", () => ({
+ buildCELExpr: vi.fn(),
+ emptySimpleExpr: () => ({}),
+ validateSimpleExpr: () => true,
+ wrapAsGroup: (expr: unknown) => expr,
+}));
+
+vi.mock("@/types", () => ({
+ ALL_USERS_USER_EMAIL: "allUsers",
+ isDefaultProject: () => false,
+ userBindingPrefix: "user:",
+}));
+
+vi.mock("@/types/proto-es/google/type/expr_pb", () => ({
+ ExprSchema: {},
+}));
+
+vi.mock("@/types/proto-es/v1/common_pb", () => ({
+ State: { ACTIVE: 1, DELETED: 2 },
+}));
+
+vi.mock("@/types/proto-es/v1/iam_policy_pb", () => ({
+ BindingSchema: {},
+}));
+
+vi.mock("@/types/proto-es/v1/setting_service_pb", () => ({
+ Setting_SettingName: { EMAIL: 1 },
+}));
+
+vi.mock("@/types/proto-es/v1/subscription_service_pb", () => ({
+ PlanFeature: { FEATURE_REQUEST_ROLE_WORKFLOW: 1 },
+}));
+
+vi.mock("@/types/v1/user", () => ({
+ AccountType: { USER: "USER" },
+ getAccountTypeByEmail: () => "USER",
+}));
+
+vi.mock("@/utils", () => ({
+ batchConvertParsedExprToCELString: vi.fn(),
+ displayRoleTitle: (role: string) => role,
+ formatAbsoluteDateTime: () => "",
+ getDatabaseNameOptionConfig: () => ({ options: [] }),
+ hasProjectPermissionV2: () => true,
+ hasWorkspacePermissionV2: () => true,
+ isBindingPolicyExpired: () => false,
+ sortRoles: (roles: string[]) => roles,
+}));
+
+vi.mock("@/utils/cel-attributes", () => ({
+ CEL_ATTRIBUTE_RESOURCE_DATABASE: "resource.database",
+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME: "resource.schema_name",
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME: "resource.table_name",
+}));
+
+vi.mock("@/utils/issue/cel", () => ({
+ buildConditionExpr: (args: Record<string, unknown>) => ({ ...args }),
+ convertFromExpr: () => ({}),
+ stringifyConditionExpression: () => "",
+}));
+
+vi.mock("@/utils/v1/member", () => ({
+ getMemberBindings: () => [],
+ groupProjectRoleBindings: () => [],
+}));
+
+vi.mock("@bufbuild/protobuf", () => ({
+ create: (_schema: unknown, init?: Record<string, unknown>) => ({ ...init }),
+}));
+
+vi.mock("react-i18next", () => ({
+ useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+const projectIamPolicy = { bindings: [] };
+
+vi.mock("@/store", () => ({
+ pushNotification: mockPushNotification,
+ useActuatorV1Store: () => ({
+ isSaaSMode: false,
+ userCountInIam: 1,
+ }),
+ useCurrentUserV1: () => ({
+ value: { email: "[email protected]", name: "users/[email protected]" },
+ }),
+ useProjectIamPolicyStore: () => ({
+ getOrFetchProjectIamPolicy: vi.fn(),
+ getProjectIamPolicy: () => projectIamPolicy,
+ updateProjectIamPolicy: mockUpdateProjectIamPolicy,
+ }),
+ useProjectV1Store: () => ({
+ getProjectByName: (name: string) => ({
+ allowRequestRole: true,
+ name,
+ permissions: ["bb.projects.setIamPolicy"],
+ state: 1,
+ }),
+ }),
+ useRoleStore: () => ({
+ roleList: [{ name: "roles/sqlEditorUser", permissions: [] }],
+ }),
+ useSettingV1Store: () => ({
+ getOrFetchSettingByName: vi.fn(),
+ getSettingByName: () => undefined,
+ }),
+ useSubscriptionV1Store: () => ({
+ hasFeature: () => true,
+ userCountLimit: 10,
+ }),
+ useUserStore: () => ({}),
+ useWorkspaceV1Store: () => ({
+ findRolesByMember: () => [],
+ patchIamPolicy: vi.fn(),
+ workspaceIamPolicy: { bindings: [] },
+ }),
+}));
+
+vi.mock("./MemberBindingEnvironmentBanner", () => ({
+ MemberBindingEnvironmentBanner: () => null,
+}));
+
+vi.mock("./MemberDatabaseResourceName", () => ({
+ MemberDatabaseResourceName: () => null,
+}));
+
+vi.mock("./RequestRoleSheet", () => ({
+ RequestRoleSheet: () => null,
+}));
+
+import { buildCELExpr } from "@/plugins/cel";
+import { nativeChange } from "@/react/test-utils/nativeChange";
+import { MembersPage } from "./MembersPage";
+
+let container: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+
+beforeEach(() => {
+ vi.clearAllMocks();
+ projectIamPolicy.bindings = [];
+ container = document.createElement("div");
+ document.body.appendChild(container);
+ root = createRoot(container);
+});
+
+afterEach(() => {
+ act(() => {
+ root.unmount();
+ });
+ document.body.removeChild(container);
+});
+
+async function renderPage(): Promise<void> {
+ await act(async () => {
+ root.render(createElement(MembersPage, { projectId: "sample-project" }));
+ await Promise.resolve();
+ });
+}
+
+async function flush(): Promise<void> {
+ await act(async () => {
+ await Promise.resolve();
+ await Promise.resolve();
+ });
+}
+
+describe("MembersPage project role grant drawer", () => {
+ it("uses the graphical expression editor for database CEL scope", async () => {
+ await renderPage();
+
+ const grantButton = [...container.querySelectorAll("button")].find(
+ (button) => button.textContent === "settings.members.grant-access"
+ ) as HTMLButtonElement;
+ await act(async () => {
+ grantButton.click();
+ });
+ await flush();
+
+ const accountButton = container.querySelector(
+ "[data-testid='account-select']"
+ ) as HTMLButtonElement;
+ await act(async () => {
+ accountButton.click();
+ });
+
+ const roleInput = container.querySelector(
+ "[data-testid='role-select']"
+ ) as HTMLInputElement;
+ await act(async () => {
+ nativeChange(roleInput, "roles/sqlEditorUser");
+ });
+ await flush();
+
+ const expressionRadio = [...container.querySelectorAll("input")].find(
+ (input) =>
+ input instanceof HTMLInputElement &&
+ input.type === "radio" &&
+ input.parentElement?.textContent === "CEL Expression"
+ ) as HTMLInputElement;
+ await act(async () => {
+ expressionRadio.click();
+ });
+ await flush();
+
+ expect(
+ container.querySelector("[data-testid='expr-editor']")
+ ).not.toBeNull();
+ expect(
+ container.querySelector(
+ "textarea[placeholder='e.g. resource.database_name.startsWith(\"employee_\")']"
+ )
+ ).toBeNull();
+ });
+
+ it("shows an error when CEL expression parsing fails", async () => {
+ vi.mocked(buildCELExpr).mockRejectedValueOnce(new Error("parse failed"));
+
+ await renderPage();
+
+ const grantButton = [...container.querySelectorAll("button")].find(
+ (button) => button.textContent === "settings.members.grant-access"
+ ) as HTMLButtonElement;
+ await act(async () => {
+ grantButton.click();
+ });
+ await flush();
+
+ const accountButton = container.querySelector(
+ "[data-testid='account-select']"
+ ) as HTMLButtonElement;
+ await act(async () => {
+ accountButton.click();
+ });
+
+ const roleInput = container.querySelector(
+ "[data-testid='role-select']"
+ ) as HTMLInputElement;
+ await act(async () => {
+ nativeChange(roleInput, "roles/sqlEditorUser");
+ });
+ await flush();
+
+ const expressionRadio = [...container.querySelectorAll("input")].find(
+ (input) =>
+ input instanceof HTMLInputElement &&
+ input.type === "radio" &&
+ input.parentElement?.textContent === "CEL Expression"
+ ) as HTMLInputElement;
+ await act(async () => {
+ expressionRadio.click();
+ });
+ await flush();
+
+ const createButton = [...container.querySelectorAll("button")].find(
+ (button) => button.textContent === "common.create"
+ ) as HTMLButtonElement;
+ await act(async () => {
+ createButton.click();
+ });
+ await flush();
+
+ expect(mockPushNotification).toHaveBeenCalledWith({
+ module: "bytebase",
+ style: "CRITICAL",
+ title: "project.members.request-role.failed-to-build-expression",
+ });
+ expect(mockUpdateProjectIamPolicy).not.toHaveBeenCalled();
+ });
+});
diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsx
index a2b2dfa4c3..93a6400f0b 100644
--- a/frontend/src/react/pages/settings/MembersPage.tsx
+++ b/frontend/src/react/pages/settings/MembersPage.tsx
@@ -19,9 +19,17 @@ import React, {
} from "react";
import { useTranslation } from "react-i18next";
import { v4 as uuidv4 } from "uuid";
+import type { ConditionGroupExpr, Factor, Operator } from "@/plugins/cel";
+import {
+ buildCELExpr,
+ emptySimpleExpr,
+ validateSimpleExpr,
+ wrapAsGroup,
+} from "@/plugins/cel";
import { AccountMultiSelect } from "@/react/components/AccountMultiSelect";
import { DatabaseResourceSelector as DatabaseResourceSelectorComponent } from "@/react/components/DatabaseResourceSelector";
import { EnvironmentSelect } from "@/react/components/EnvironmentSelect";
+import { ExprEditor, type OptionConfig } from "@/react/components/ExprEditor";
import { FeatureBadge } from "@/react/components/FeatureBadge";
import { LearnMoreLink } from "@/react/components/LearnMoreLink";
import { PermissionGuard } from "@/react/components/PermissionGuard";
@@ -97,13 +105,20 @@ import type { User } from "@/types/proto-es/v1/user_service_pb";
import type { GroupBinding, MemberBinding } from "@/types/v1/member";
import { AccountType, getAccountTypeByEmail } from "@/types/v1/user";
import {
+ batchConvertParsedExprToCELString,
displayRoleTitle,
formatAbsoluteDateTime,
+ getDatabaseNameOptionConfig,
hasProjectPermissionV2,
hasWorkspacePermissionV2,
isBindingPolicyExpired,
sortRoles,
} from "@/utils";
+import {
+ CEL_ATTRIBUTE_RESOURCE_DATABASE,
+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,
+} from "@/utils/cel-attributes";
import {
buildConditionExpr,
convertFromExpr,
@@ -890,7 +905,7 @@ interface RoleBindingFormState {
expirationTimestampInMS: number | undefined;
databaseMode: DatabaseMode;
databaseResources: DatabaseResource[];
- celExpression: string;
+ exprGroup: ConditionGroupExpr;
environments: string[];
}
@@ -904,8 +919,11 @@ function DatabaseResourceSection({
onModeChange,
databaseResources,
onDatabaseResourcesChange,
- celExpression,
- onCelExpressionChange,
+ exprGroup,
+ onExprGroupChange,
+ factorList,
+ factorOptionConfigMap,
+ factorOperatorOverrideMap,
formId,
}: {
projectName: string;
@@ -913,8 +931,11 @@ function DatabaseResourceSection({
onModeChange: (mode: DatabaseMode) => void;
databaseResources: DatabaseResource[];
onDatabaseResourcesChange: (resources: DatabaseResource[]) => void;
- celExpression: string;
- onCelExpressionChange: (expr: string) => void;
+ exprGroup: ConditionGroupExpr;
+ onExprGroupChange: (expr: ConditionGroupExpr) => void;
+ factorList: Factor[];
+ factorOptionConfigMap: Map<Factor, OptionConfig>;
+ factorOperatorOverrideMap: Map<Factor, Operator[]>;
formId: string;
}) {
const { t } = useTranslation();
@@ -949,12 +970,12 @@ function DatabaseResourceSection({
</div>
{mode === "EXPRESSION" && (
- <textarea
- className="w-full rounded-xs border border-control-border bg-transparent px-3 py-2 text-sm font-mono resize-none"
- rows={3}
- placeholder='e.g. resource.database_name.startsWith("employee_")'
- value={celExpression}
- onChange={(e) => onCelExpressionChange(e.target.value)}
+ <ExprEditor
+ expr={exprGroup}
+ factorList={factorList}
+ optionConfigMap={factorOptionConfigMap}
+ factorOperatorOverrideMap={factorOperatorOverrideMap}
+ onUpdate={onExprGroupChange}
/>
)}
@@ -987,6 +1008,38 @@ function ProjectRoleBindingForm({
const roleList = useVueState(() => [...roleStore.roleList]);
const expirationPresets = useMemo(() => getExpirationPresets(t), [t]);
+ const factorList = useMemo<Factor[]>(
+ () => [
+ CEL_ATTRIBUTE_RESOURCE_DATABASE,
+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,
+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,
+ ],
+ []
+ );
+ const factorOperatorOverrideMap = useMemo(
+ () =>
+ new Map<Factor, Operator[]>([
+ [CEL_ATTRIBUTE_RESOURCE_DATABASE, ["_==_", "@in"]],
+ [CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME, ["_==_"]],
+ [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME, ["_==_", "@in"]],
+ ]),
+ []
+ );
+ const factorOptionConfigMap = useMemo(
+ () =>
+ factorList.reduce((map, factor) => {
+ if (factor === CEL_ATTRIBUTE_RESOURCE_DATABASE) {
+ map.set(factor, {
+ ...getDatabaseNameOptionConfig(projectName),
+ supportMultiple: false,
+ });
+ } else {
+ map.set(factor, { options: [] });
+ }
+ return map;
+ }, new Map<Factor, OptionConfig>()),
+ [factorList, projectName]
+ );
const permissions = useMemo(() => {
if (!form.role) return [];
@@ -1009,7 +1062,7 @@ function ProjectRoleBindingForm({
role,
databaseMode: "ALL",
databaseResources: [],
- celExpression: "",
+ exprGroup: wrapAsGroup(emptySimpleExpr()),
environments: [],
});
};
@@ -1098,17 +1151,20 @@ function ProjectRoleBindingForm({
...form,
databaseMode: mode,
databaseResources: [],
- celExpression: "",
+ exprGroup: wrapAsGroup(emptySimpleExpr()),
})
}
databaseResources={form.databaseResources}
onDatabaseResourcesChange={(resources: DatabaseResource[]) =>
onChange({ ...form, databaseResources: resources })
}
- celExpression={form.celExpression}
- onCelExpressionChange={(expr: string) =>
- onChange({ ...form, celExpression: expr })
+ exprGroup={form.exprGroup}
+ onExprGroupChange={(expr: ConditionGroupExpr) =>
+ onChange({ ...form, exprGroup: expr })
}
+ factorList={factorList}
+ factorOptionConfigMap={factorOptionConfigMap}
+ factorOperatorOverrideMap={factorOperatorOverrideMap}
formId={form.id}
/>
)}
@@ -1230,7 +1286,7 @@ function EditMemberRoleDrawer({
expirationTimestampInMS: computeExpirationTimestamp(7),
databaseMode: "ALL",
databaseResources: [],
- celExpression: "",
+ exprGroup: wrapAsGroup(emptySimpleExpr()),
environments: [],
}));
@@ -1365,15 +1421,48 @@ function EditMemberRoleDrawer({
form.reason !== "" ||
databaseResources !== undefined ||
environments !== undefined ||
- (form.databaseMode === "EXPRESSION" && form.celExpression !== "");
- if (form.databaseMode === "EXPRESSION" && form.celExpression) {
+ (form.databaseMode === "EXPRESSION" &&
+ validateSimpleExpr(form.exprGroup));
+ if (
+ form.databaseMode === "EXPRESSION" &&
+ validateSimpleExpr(form.exprGroup)
+ ) {
+ let parsedExpr;
+ try {
+ parsedExpr = await buildCELExpr(form.exprGroup);
+ } catch {
+ parsedExpr = undefined;
+ }
+ if (!parsedExpr) {
+ pushNotification({
+ module: "bytebase",
+ style: "CRITICAL",
+ title: t(
+ "project.members.request-role.failed-to-build-expression"
+ ),
+ });
+ return;
+ }
+ const [exprString] = await batchConvertParsedExprToCELString([
+ parsedExpr,
+ ]);
+ if (!exprString?.trim()) {
+ pushNotification({
+ module: "bytebase",
+ style: "CRITICAL",
+ title: t(
+ "project.members.request-role.failed-to-build-expression"
+ ),
+ });
+ return;
+ }
const extraParts = stringifyConditionExpression({
expirationTimestampInMS: form.expirationTimestampInMS,
environments,
});
const fullExpression = extraParts
- ? `(${form.celExpression}) && ${extraParts}`
- : form.celExpression;
+ ? `(${exprString}) && ${extraParts}`
+ : exprString;
const condition = create(ConditionExprSchema, {
expression: fullExpression,
description: form.reason,
@@ -1524,6 +1613,11 @@ function EditMemberRoleDrawer({
roleHasDatabaseLimitation(form.role) &&
form.databaseMode === "SELECT" &&
form.databaseResources.length === 0
+ ) &&
+ !(
+ roleHasDatabaseLimitation(form.role) &&
+ form.databaseMode === "EXPRESSION" &&
+ !validateSimpleExpr(form.exprGroup)
)
: isEditMode
? selectedRoles.length > 0
diff --git a/frontend/src/utils/expr.ts b/frontend/src/utils/expr.ts
index edcc710c90..257ad64519 100644
--- a/frontend/src/utils/expr.ts
+++ b/frontend/src/utils/expr.ts
@@ -29,6 +29,7 @@ export type OptionConfig = {
}>;
fetch?: (names: string[]) => Promise<LabeledOption[]>;
fallback?: (value: string) => LabeledOption;
+ supportMultiple?: boolean;
options: LabeledOption[];
};