Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(frontend): show unrestricted project member environments (#20142)
p0ny9d597f81a50e
diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.jsonindex 8d4be8deb9..6779b8c100 100644--- a/frontend/src/react/locales/en-US.json+++ b/frontend/src/react/locales/en-US.json@@ -1696,6 +1696,7 @@},"members": {"allow-ddl": "Allow running DDL/DML statements in the selected environments.",+ "allow-ddl-all-environments": "No environment restrictions. Allow running DDL/DML statements in all environments.","description": "Project members determine the permission to operate database and issues inside the project. Project Owner, Workspace Admin and Workspace DBA all have full project permissions.","disallow-ddl-all-environments": "Disallow running DDL/DML statements for all environments.","edit-member": "Edit member - {{member}}",diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.jsonindex c5e3808485..8e4f924493 100644--- a/frontend/src/react/locales/es-ES.json+++ b/frontend/src/react/locales/es-ES.json@@ -1688,6 +1688,7 @@},"members": {"allow-ddl": "Permitir ejecutar sentencias DDL/DML en los entornos seleccionados.",+ "allow-ddl-all-environments": "Sin restricciones de entorno. Permitir ejecutar sentencias DDL/DML en todos los entornos.","description": "Los miembros del proyecto determinan el permiso para operar la base de datos y los problemas dentro del proyecto. El propietario del proyecto, el administrador del espacio de trabajo y el DBA del espacio de trabajo tienen permisos completos para el proyecto.","disallow-ddl-all-environments": "No permitir ejecutar sentencias DDL/DML en ningún entorno.","edit-member": "Editar miembro - {{member}}",diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.jsonindex 40d53d2dc6..532a35bb21 100644--- a/frontend/src/react/locales/ja-JP.json+++ b/frontend/src/react/locales/ja-JP.json@@ -1688,6 +1688,7 @@},"members": {"allow-ddl": "選択した環境で DDL/DML ステートメントの実行を許可する。",+ "allow-ddl-all-environments": "環境制限はありません。すべての環境で DDL/DML ステートメントの実行を許可する。","description": "プロジェクトメンバーのロールにより、プロジェクト内のデータベースとイシューを操作するための権限が決まります。プロジェクト所有者、ワークスペース管理者、および DBA はすべて、プロジェクトに対する完全な権限を持っています。","disallow-ddl-all-environments": "すべての環境で DDL/DML ステートメントの実行を禁止する。","edit-member": "メンバー編集 - {{member}}",diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.jsonindex 406efa1ed1..1fbf691a13 100644--- a/frontend/src/react/locales/vi-VN.json+++ b/frontend/src/react/locales/vi-VN.json@@ -1688,6 +1688,7 @@},"members": {"allow-ddl": "Cho phép chạy câu lệnh DDL/DML trong các môi trường đã chọn.",+ "allow-ddl-all-environments": "Không có giới hạn môi trường. Cho phép chạy câu lệnh DDL/DML trong tất cả môi trường.","description": "Thành viên dự án xác định quyền để vận hành cơ sở dữ liệu và các vấn đề bên trong dự án. Chủ sở hữu dự án, Quản trị viên không gian làm việc và DBA không gian làm việc đều có toàn quyền dự án.","disallow-ddl-all-environments": "Không cho phép chạy câu lệnh DDL/DML cho tất cả các môi trường.","edit-member": "Chỉnh sửa thành viên - {{member}}",diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.jsonindex 0808dbbbee..356b07fe32 100644--- a/frontend/src/react/locales/zh-CN.json+++ b/frontend/src/react/locales/zh-CN.json@@ -1688,6 +1688,7 @@},"members": {"allow-ddl": "允许在所选环境中执行 DDL/DML 语句。",+ "allow-ddl-all-environments": "无环境限制。允许在所有环境中执行 DDL/DML 语句。","description": "项目成员角色决定了操作项目中的数据库和工单的权限。项目的所有者,工作空间管理员和 DBA 都具有项目所有的权限。","disallow-ddl-all-environments": "禁止在所有环境中执行 DDL/DML 语句。","edit-member": "编辑成员 - {{member}}",diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsxindex 8b73ac856f..f02c859012 100644--- a/frontend/src/react/pages/settings/MembersPage.tsx+++ b/frontend/src/react/pages/settings/MembersPage.tsx@@ -99,6 +99,7 @@ import {stringifyConditionExpression,} from "@/utils/issue/cel";import { getSetIamPolicyPermissionGuardConfig } from "./membersPageActions";+import { getProjectRoleBindingEnvironmentLimitationState } from "./membersPageEnvironment";import { RequestRoleSheet } from "./RequestRoleSheet";import {getRequestRoleButtonState,@@ -999,11 +1000,6 @@ function EditMemberRoleDrawer({[]);- const getEnvironmentLimitation = useCallback((binding: Binding): string[] => {- if (!binding.parsedExpr) return [];- return convertFromExpr(binding.parsedExpr).environments ?? [];- }, []);-const handleDeleteRole = async (roleBinding: Binding) => {if (!member || !projectName) return;const roleName = displayRoleTitle(roleBinding.role);@@ -1302,12 +1298,8 @@ function EditMemberRoleDrawer({)}{liveProjectRoleBindings.map((binding, idx) => {const rows = getSingleBindingRows(binding);- const envs = roleHasEnvironmentLimitation(binding.role)- ? getEnvironmentLimitation(binding)- : [];- const showEnvBanner = roleHasEnvironmentLimitation(- binding.role- );+ const envLimitation =+ getProjectRoleBindingEnvironmentLimitationState(binding);return (<divkey={`${binding.role}-${idx}`}@@ -1340,15 +1332,21 @@ function EditMemberRoleDrawer({</div>{/* Environment info banner */}- {showEnvBanner && (+ {envLimitation && (<div className="mx-4 mt-3 flex items-start gap-x-2 rounded-sm bg-blue-50 border border-blue-200 px-3 py-2 text-xs text-blue-700"><Info className="h-4 w-4 shrink-0 mt-0.5" /><div>- {envs.length > 0 ? (+ {envLimitation.type === "unrestricted" ? (+ <span>+ {t(+ "project.members.allow-ddl-all-environments"+ )}+ </span>+ ) : envLimitation.environments.length > 0 ? (<><span>{t("project.members.allow-ddl")}</span><div className="flex flex-wrap gap-1 mt-1">- {envs.map((env) => (+ {envLimitation.environments.map((env) => (<Badgekey={env}variant="secondary"diff --git a/frontend/src/react/pages/settings/membersPageEnvironment.test.ts b/frontend/src/react/pages/settings/membersPageEnvironment.test.tsnew file mode 100644index 0000000000..6a9effc0a6--- /dev/null+++ b/frontend/src/react/pages/settings/membersPageEnvironment.test.ts@@ -0,0 +1,66 @@+import { describe, expect, test, vi } from "vitest";+import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";+import { getProjectRoleBindingEnvironmentLimitationState } from "./membersPageEnvironment";++vi.mock("@/components/ProjectMember/utils", () => ({+ roleHasEnvironmentLimitation: (role: string) =>+ role === "roles/sqlEditorUser",+}));++vi.mock("@/utils/issue/cel", () => ({+ convertFromExpr: (expr: { environments?: string[] }) => ({+ environments: expr.environments,+ }),+}));++const binding = (role: string, environments?: string[]): Binding =>+ ({+ role,+ parsedExpr: environments === undefined ? {} : { environments },+ }) as Binding;++const bindingWithoutParsedExpr = (role: string): Binding =>+ ({+ role,+ }) as Binding;++describe("getProjectRoleBindingEnvironmentLimitation", () => {+ test("returns undefined for roles without DDL or DML environment restrictions", () => {+ expect(+ getProjectRoleBindingEnvironmentLimitationState(+ binding("roles/viewer", [])+ )+ ).toBeUndefined();+ });++ test("returns unrestricted when a DDL/DML role has no environment condition", () => {+ expect(+ getProjectRoleBindingEnvironmentLimitationState(+ binding("roles/sqlEditorUser")+ )+ ).toEqual({+ type: "unrestricted",+ });+ });++ test("returns unrestricted when a DDL/DML role has no parsed condition", () => {+ expect(+ getProjectRoleBindingEnvironmentLimitationState(+ bindingWithoutParsedExpr("roles/sqlEditorUser")+ )+ ).toEqual({+ type: "unrestricted",+ });+ });++ test("preserves explicit empty environment restrictions", () => {+ expect(+ getProjectRoleBindingEnvironmentLimitationState(+ binding("roles/sqlEditorUser", [])+ )+ ).toEqual({+ environments: [],+ type: "restricted",+ });+ });+});diff --git a/frontend/src/react/pages/settings/membersPageEnvironment.ts b/frontend/src/react/pages/settings/membersPageEnvironment.tsnew file mode 100644index 0000000000..7e1e4858d2--- /dev/null+++ b/frontend/src/react/pages/settings/membersPageEnvironment.ts@@ -0,0 +1,38 @@+import { roleHasEnvironmentLimitation } from "@/components/ProjectMember/utils";+import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";+import { convertFromExpr } from "@/utils/issue/cel";++export type ProjectRoleBindingEnvironmentLimitationState =+ | {+ type: "unrestricted";+ }+ | {+ environments: string[];+ type: "restricted";+ };++export const getProjectRoleBindingEnvironmentLimitationState = (+ binding: Binding+): ProjectRoleBindingEnvironmentLimitationState | undefined => {+ if (!roleHasEnvironmentLimitation(binding.role)) {+ return undefined;+ }++ if (!binding.parsedExpr) {+ return {+ type: "unrestricted",+ };+ }++ const environments = convertFromExpr(binding.parsedExpr).environments;+ if (environments === undefined) {+ return {+ type: "unrestricted",+ };+ }++ return {+ environments,+ type: "restricted",+ };+};