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): preserve distinct project role bindings (#20021)
p0ny60f1a3b92ce8
diff --git a/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vue b/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vueindex a5fac682cc..c933b270af 100644--- a/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vue+++ b/frontend/src/components/Member/MemberDataTable/cells/UserRolesCell.vue@@ -10,8 +10,8 @@:scope="'workspace'"/><RoleCell- v-for="binding in projectRoleBindings"- :key="binding.role"+ v-for="(binding, index) in projectRoleBindings"+ :key="getProjectRoleBindingKey(binding, index)":bordered="true":binding="binding" :scope="'project'"/>@@ -20,10 +20,10 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { orderBy } from "lodash-es";import { computed } from "vue";-import { type Binding, BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";-import { isBindingPolicyExpired, sortRoles } from "@/utils";+import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";+import { sortRoles } from "@/utils";+import { getProjectRoleBindingKey } from "../../projectRoleBindings";import type { MemberRole } from "../../types";import RoleCell from "./RoleCell.vue";@@ -35,24 +35,5 @@ const workspaceLevelRoles = computed(() => {return sortRoles([...props.role.workspaceLevelRoles]);});-const projectRoleBindings = computed(() => {- const roleMap = new Map<string, { expired: boolean; binding: Binding }>();- for (const binding of props.role.projectRoleBindings) {- const isExpired = isBindingPolicyExpired(binding);- if (- !roleMap.has(binding.role) ||- (roleMap.get(binding.role)?.expired && !isExpired)- ) {- roleMap.set(binding.role, {- expired: isExpired,- binding,- });- }- }-- return orderBy(- [...roleMap.values()].map((item) => item.binding),- ["role"]- );-});+const projectRoleBindings = computed(() => props.role.projectRoleBindings);</script>diff --git a/frontend/src/components/Member/projectRoleBindings.ts b/frontend/src/components/Member/projectRoleBindings.tsnew file mode 100644index 0000000000..e5f15bae23--- /dev/null+++ b/frontend/src/components/Member/projectRoleBindings.ts@@ -0,0 +1,48 @@+import { PRESET_ROLES } from "@/types/iam/role";+import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";++export interface ProjectRoleBindingGroup {+ role: string;+ bindings: Binding[];+}++export const getProjectRoleBindingKey = (+ binding: Binding,+ index: number+): string => {+ return [+ binding.role,+ binding.condition?.expression ?? "",+ binding.condition?.description ?? "",+ index,+ ].join("::");+};++export const groupProjectRoleBindings = (+ bindings: Binding[]+): ProjectRoleBindingGroup[] => {+ const roleMap = new Map<string, Binding[]>();++ for (const binding of bindings) {+ if (!roleMap.has(binding.role)) {+ roleMap.set(binding.role, []);+ }+ roleMap.get(binding.role)?.push(binding);+ }++ return [...roleMap.keys()]+ .sort((a, b) => {+ const priority = (role: string) => {+ const presetRoleIndex = PRESET_ROLES.indexOf(role);+ if (presetRoleIndex !== -1) {+ return presetRoleIndex;+ }+ return PRESET_ROLES.length;+ };+ return priority(a) - priority(b);+ })+ .map((role) => ({+ role,+ bindings: roleMap.get(role) ?? [],+ }));+};diff --git a/frontend/src/components/Member/utils.test.ts b/frontend/src/components/Member/utils.test.tsnew file mode 100644index 0000000000..efc821320b--- /dev/null+++ b/frontend/src/components/Member/utils.test.ts@@ -0,0 +1,56 @@+import { create } from "@bufbuild/protobuf";+import { describe, expect, test } from "vitest";+import { ExprSchema as ConditionExprSchema } from "@/types/proto-es/google/type/expr_pb";+import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";+import {+ getProjectRoleBindingKey,+ groupProjectRoleBindings,+} from "./projectRoleBindings";++describe("groupProjectRoleBindings", () => {+ test("groups repeated roles without dropping distinct bindings", () => {+ const activeProjectDeveloper = create(BindingSchema, {+ role: "roles/projectDeveloper",+ members: ["user:[email protected]"],+ });+ const expiredProjectDeveloper = create(BindingSchema, {+ role: "roles/projectDeveloper",+ members: ["user:[email protected]"],+ condition: create(ConditionExprSchema, {+ expression: 'request.time < timestamp("2000-01-01T00:00:00Z")',+ }),+ });+ const sqlEditorUser = create(BindingSchema, {+ role: "roles/sqlEditorUser",+ members: ["user:[email protected]"],+ });++ const result = groupProjectRoleBindings([+ expiredProjectDeveloper,+ activeProjectDeveloper,+ sqlEditorUser,+ ]);++ expect(result.map((group) => group.role)).toEqual([+ "roles/projectDeveloper",+ "roles/sqlEditorUser",+ ]);+ expect(result[0].bindings).toEqual([+ expiredProjectDeveloper,+ activeProjectDeveloper,+ ]);+ });+});++describe("getProjectRoleBindingKey", () => {+ test("keeps repeated same-role bindings unique", () => {+ const binding = create(BindingSchema, {+ role: "roles/projectDeveloper",+ members: ["user:[email protected]"],+ });++ expect(getProjectRoleBindingKey(binding, 0)).not.toEqual(+ getProjectRoleBindingKey(binding, 1)+ );+ });+});diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsxindex 00ca2c18a3..2452b02b3f 100644--- a/frontend/src/react/pages/settings/MembersPage.tsx+++ b/frontend/src/react/pages/settings/MembersPage.tsx@@ -22,6 +22,7 @@ import React, {useState,} from "react";import { useTranslation } from "react-i18next";+import { groupProjectRoleBindings } from "@/components/Member/projectRoleBindings";import type { MemberBinding } from "@/components/Member/types";import { getMemberBindings } from "@/components/Member/utils";import {@@ -145,6 +146,10 @@ const assertNever = (value: never): never => {throw new Error(`Unexpected value: ${String(value)}`);};+const getProjectRoleSet = (bindings: Binding[]): string[] => {+ return [...new Set(bindings.map((binding) => binding.role))];+};+// ============================================================// MemberTable (view by members)// ============================================================@@ -207,6 +212,21 @@ function MemberTable({return scope === "project" && mb.projectRoleBindings.length === 0;};+ const renderProjectRoleSummary = (bindings: Binding[]) => {+ return groupProjectRoleBindings(bindings).map((group) => {+ return (+ <Badge key={group.role} className="text-xs gap-x-1">+ {displayRoleTitle(group.role)}+ {group.bindings.length > 1 && (+ <span className="text-control-light">+ ({group.bindings.length})+ </span>+ )}+ </Badge>+ );+ });+ };+return (<div className="border rounded-sm overflow-hidden"><table className="w-full text-sm">@@ -308,13 +328,7 @@ function MemberTable({<td className="px-4 py-2"><div className="flex flex-wrap gap-1">{scope === "project"- ? sortRoles(mb.projectRoleBindings.map((b) => b.role)).map(- (role) => (- <Badge key={role} className="text-xs gap-x-1">- {displayRoleTitle(role)}- </Badge>- )- )+ ? renderProjectRoleSummary(mb.projectRoleBindings): sortRoles([...mb.workspaceLevelRoles]).map((role) => (<Badge key={role} className="text-xs gap-x-1"><Building2 className="h-3 w-3" />@@ -398,7 +412,7 @@ function MemberTableByRole({for (const mb of bindings) {const roles =scope === "project"- ? mb.projectRoleBindings.map((b) => b.role)+ ? getProjectRoleSet(mb.projectRoleBindings): [...mb.workspaceLevelRoles];for (const role of roles) {if (!map.has(role)) map.set(role, []);