Skip to content

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

fix(frontend): preserve CEL constraints and keep drawer open after role deletion (#19858)

Danny Xu1a30be3bdec5
diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsx
index 5c8b225506..65b1de855e 100644
--- a/frontend/src/react/pages/settings/MembersPage.tsx
+++ b/frontend/src/react/pages/settings/MembersPage.tsx
@@ -78,7 +78,11 @@ import {
hasWorkspacePermissionV2,
sortRoles,
} from "@/utils";
-import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";
+import {
+ buildConditionExpr,
+ convertFromExpr,
+ stringifyConditionExpression,
+} from "@/utils/issue/cel";
import { AccountMultiSelect } from "./shared/AccountMultiSelect";
import { RoleMultiSelect } from "./shared/RoleMultiSelect";
import { UserAvatar } from "./shared/UserAvatar";
@@ -1201,7 +1205,13 @@ function EditMemberRoleDrawer({
style: "SUCCESS",
title: t("common.deleted"),
});
- onClose();
+ // Close the drawer only when the member has no remaining roles.
+ const remaining = policy.bindings.some((b) =>
+ b.members.includes(member.binding)
+ );
+ if (!remaining) {
+ onClose();
+ }
} catch {
// error shown by store
} finally {
@@ -1264,8 +1274,15 @@ function EditMemberRoleDrawer({
environments !== undefined ||
(form.databaseMode === "EXPRESSION" && form.celExpression !== "");
if (form.databaseMode === "EXPRESSION" && form.celExpression) {
+ const extraParts = stringifyConditionExpression({
+ expirationTimestampInMS: form.expirationTimestampInMS,
+ environments,
+ });
+ const fullExpression = extraParts
+ ? `(${form.celExpression}) && ${extraParts}`
+ : form.celExpression;
const condition = create(ConditionExprSchema, {
- expression: form.celExpression,
+ expression: fullExpression,
description: form.reason,
});
const existingConditioned = policy.bindings.find(