Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: improve the access filter (#20914)
ecmadao6c16fb3bc2e9
diff --git a/backend/store/access_grant.go b/backend/store/access_grant.goindex 71d6836291..d6a1dc99f4 100644--- a/backend/store/access_grant.go+++ b/backend/store/access_grant.go@@ -360,7 +360,7 @@ func GetListAccessGrantFilter(filter string) (*qb.Query, error) {if !ok {return nil, errors.Errorf("status value must be a string")}- return qb.Q().Space("access_grant.status = ?", statusStr), nil+ return getAccessGrantStatusFilter(statusStr)case "query":queryStr, ok := value.(string)if !ok {@@ -450,15 +450,19 @@ func GetListAccessGrantFilter(filter string) (*qb.Query, error) {if len(rawList) == 0 {return nil, errors.Errorf("empty list value for filter %v", variable)}- var statuses []string+ q := qb.Q()for _, raw := range rawList {s, ok := raw.(string)if !ok {return nil, errors.Errorf("status value must be a string")}- statuses = append(statuses, s)+ qq, err := getAccessGrantStatusFilter(s)+ if err != nil {+ return nil, err+ }+ q.Or("?", qq)}- return qb.Q().Space("access_grant.status = ANY(?)", statuses), nil+ return qb.Q().Space("(?)", q), nilcase celoperators.GreaterEquals, celoperators.LessEquals, celoperators.Greater, celoperators.Less:variable, rawValue := getVariableAndValueFromExpr(expr)value, ok := rawValue.(string)@@ -502,3 +506,25 @@ func GetListAccessGrantFilter(filter string) (*qb.Query, error) {}return qb.Q().Space("(?)", q), nil}++func getAccessGrantStatusFilter(status string) (*qb.Query, error) {+ rejectedIssueQ := qb.Q().Space("EXISTS (SELECT 1 FROM issue, jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND COALESCE((issue.payload->'approval'->>'approvalFindingDone')::boolean, false) AND issue.payload->'approval'->'approvalTemplate' IS NOT NULL AND approver->>'status' = ?)", storepb.IssuePayloadApproval_Approver_REJECTED.String())+ canceledIssueQ := qb.Q().Space("EXISTS (SELECT 1 FROM issue WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND issue.status = ?)", storepb.Issue_CANCELED.String())++ switch status {+ case "ACTIVE":+ return qb.Q().Space("(access_grant.status = ? AND access_grant.expire_time > now())", storepb.AccessGrant_ACTIVE.String()), nil+ case "EXPIRED":+ return qb.Q().Space("(access_grant.status = ? AND access_grant.expire_time <= now())", storepb.AccessGrant_ACTIVE.String()), nil+ case "REVOKED":+ return qb.Q().Space("access_grant.status = ?", storepb.AccessGrant_REVOKED.String()), nil+ case "PENDING":+ return qb.Q().Space("(access_grant.status = ? AND NOT ? AND NOT ?)", storepb.AccessGrant_PENDING.String(), canceledIssueQ, rejectedIssueQ), nil+ case "CANCELED":+ return qb.Q().Space("(access_grant.status = ? AND ? AND NOT ?)", storepb.AccessGrant_PENDING.String(), canceledIssueQ, rejectedIssueQ), nil+ case "REJECTED":+ return qb.Q().Space("(access_grant.status = ? AND ?)", storepb.AccessGrant_PENDING.String(), rejectedIssueQ), nil+ default:+ return nil, errors.Errorf("unsupported status %q", status)+ }+}diff --git a/backend/store/access_grant_filter_test.go b/backend/store/access_grant_filter_test.goindex fecf451727..b11382f795 100644--- a/backend/store/access_grant_filter_test.go+++ b/backend/store/access_grant_filter_test.go@@ -149,6 +149,40 @@ func TestGetListAccessGrantFilter(t *testing.T) {wantErr: true,errContains: "export value must be a boolean",},+ {+ name: "pending status excludes canceled and rejected pending grants",+ filter: `status == "PENDING"`,+ wantSQL: "((access_grant.status = $1 AND NOT EXISTS (SELECT 1 FROM issue WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND issue.status = $2) AND NOT EXISTS (SELECT 1 FROM issue, jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND COALESCE((issue.payload->'approval'->>'approvalFindingDone')::boolean, false) AND issue.payload->'approval'->'approvalTemplate' IS NOT NULL AND approver->>'status' = $3)))",+ wantArgs: []any{"PENDING", "CANCELED", "REJECTED"},+ wantErr: false,+ },+ {+ name: "canceled status excludes rejected pending grants",+ filter: `status == "CANCELED"`,+ wantSQL: "((access_grant.status = $1 AND EXISTS (SELECT 1 FROM issue WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND issue.status = $2) AND NOT EXISTS (SELECT 1 FROM issue, jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND COALESCE((issue.payload->'approval'->>'approvalFindingDone')::boolean, false) AND issue.payload->'approval'->'approvalTemplate' IS NOT NULL AND approver->>'status' = $3)))",+ wantArgs: []any{"PENDING", "CANCELED", "REJECTED"},+ wantErr: false,+ },+ {+ name: "rejected status matches rejected pending grants",+ filter: `status == "REJECTED"`,+ wantSQL: "((access_grant.status = $1 AND EXISTS (SELECT 1 FROM issue, jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND COALESCE((issue.payload->'approval'->>'approvalFindingDone')::boolean, false) AND issue.payload->'approval'->'approvalTemplate' IS NOT NULL AND approver->>'status' = $2)))",+ wantArgs: []any{"PENDING", "REJECTED"},+ wantErr: false,+ },+ {+ name: "status rejects unknown status",+ filter: `status == "DONE"`,+ wantErr: true,+ errContains: `unsupported status "DONE"`,+ },+ {+ name: "status in combines display-status filters",+ filter: `status in ["PENDING", "REJECTED"]`,+ wantSQL: "(((access_grant.status = $1 AND NOT EXISTS (SELECT 1 FROM issue WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND issue.status = $2) AND NOT EXISTS (SELECT 1 FROM issue, jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND COALESCE((issue.payload->'approval'->>'approvalFindingDone')::boolean, false) AND issue.payload->'approval'->'approvalTemplate' IS NOT NULL AND approver->>'status' = $3)) OR (access_grant.status = $4 AND EXISTS (SELECT 1 FROM issue, jsonb_array_elements(issue.payload->'approval'->'approvers') AS approver WHERE issue.project = access_grant.project AND issue.id = (access_grant.payload->>'issueId')::bigint AND COALESCE((issue.payload->'approval'->>'approvalFindingDone')::boolean, false) AND issue.payload->'approval'->'approvalTemplate' IS NOT NULL AND approver->>'status' = $5))))",+ wantArgs: []any{"PENDING", "CANCELED", "REJECTED", "PENDING", "REJECTED"},+ wantErr: false,+ },}for _, tt := range tests {diff --git a/frontend/src/react/components/sql-editor/AccessPane.test.tsx b/frontend/src/react/components/sql-editor/AccessPane.test.tsxindex e3cd27a1e4..7e0dfa8d5c 100644--- a/frontend/src/react/components/sql-editor/AccessPane.test.tsx+++ b/frontend/src/react/components/sql-editor/AccessPane.test.tsx@@ -30,6 +30,12 @@ const mocks = vi.hoisted(() => ({hasFeature: vi.fn(() => true),sqlEditorEventsEmit: vi.fn().mockResolvedValue(undefined),getDefaultPagination: vi.fn(() => 20),+ advancedSearchScopeOptions: undefined as+ | Array<{+ id: string;+ options?: Array<{ value: string; keywords?: string[] }>;+ }>+ | undefined,}));vi.mock("react-i18next", () => ({@@ -111,17 +117,25 @@ vi.mock("@/react/hooks/useSQLEditorBridge", () => ({vi.mock("@/react/components/AdvancedSearch", () => ({AdvancedSearch: ({placeholder,+ scopeOptions,onParamsChange,}: {placeholder?: string;+ scopeOptions?: Array<{+ id: string;+ options?: Array<{ value: string; keywords?: string[] }>;+ }>;onParamsChange: (p: unknown) => void;- }) => (- <input- data-testid="advanced-search"- placeholder={placeholder}- onChange={() => onParamsChange({ query: "", scopes: [] })}- />- ),+ }) => {+ mocks.advancedSearchScopeOptions = scopeOptions;+ return (+ <input+ data-testid="advanced-search"+ placeholder={placeholder}+ onChange={() => onParamsChange({ query: "", scopes: [] })}+ />+ );+ },}));vi.mock("@/react/components/FeatureBadge", () => ({@@ -243,6 +257,7 @@ const setupDefaultMocks = () => {mocks.project = "projects/proj1";mocks.state.highlightAccessGrantName = undefined;+ mocks.advancedSearchScopeOptions = undefined;mocks.searchMyAccessGrants.mockResolvedValue({accessGrants: [],@@ -283,6 +298,46 @@ describe("AccessPane", () => {unmount();});+ test("initial status filter uses display-status semantics", async () => {+ const { render, unmount } = renderIntoContainer(<AccessPane />);+ render();++ await act(async () => {+ await new Promise((r) => setTimeout(r, 0));+ });++ expect(mocks.searchMyAccessGrants).toHaveBeenCalledWith(+ expect.objectContaining({+ filter: {+ status: ["ACTIVE", "PENDING"],+ },+ })+ );+ unmount();+ });++ test("status search options include rejected and canceled display statuses", async () => {+ const { render, unmount } = renderIntoContainer(<AccessPane />);+ render();++ await act(async () => {+ await new Promise((r) => setTimeout(r, 0));+ });++ const statusOption = mocks.advancedSearchScopeOptions?.find(+ (option) => option.id === "status"+ );+ expect(statusOption?.options?.map((option) => option.value)).toEqual([+ "ACTIVE",+ "PENDING",+ "EXPIRED",+ "REVOKED",+ "REJECTED",+ "CANCELED",+ ]);+ unmount();+ });+test("loading state — shows spinner while loading", async () => {let resolveSearch: (val: unknown) => void = () => {};mocks.searchMyAccessGrants.mockImplementation(diff --git a/frontend/src/react/components/sql-editor/AccessPane.tsx b/frontend/src/react/components/sql-editor/AccessPane.tsxindex a44ea7b304..1836314694 100644--- a/frontend/src/react/components/sql-editor/AccessPane.tsx+++ b/frontend/src/react/components/sql-editor/AccessPane.tsx@@ -26,7 +26,7 @@ import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";import { AccessGrant_Status } from "@/types/proto-es/v1/access_grant_service_pb";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import type { AccessGrantFilterStatus } from "@/utils";+import type { AccessGrantDisplayStatus } from "@/utils";import { getDefaultPagination } from "@/utils";import { sqlEditorEvents } from "@/views/sql-editor/events";import { AccessGrantItem } from "./AccessGrantItem";@@ -114,6 +114,16 @@ export function AccessPane() {keywords: ["revoked"],render: () => t("common.revoked"),},+ {+ value: "REJECTED",+ keywords: ["rejected"],+ render: () => t("common.rejected"),+ },+ {+ value: "CANCELED",+ keywords: ["canceled", "cancelled"],+ render: () => t("common.canceled"),+ },],},{@@ -176,7 +186,7 @@ export function AccessPane() {const filter = useMemo((): AccessFilter => {const selectedStatuses = searchParams.scopes.filter((s) => s.id === "status")- .map((s) => s.value) as AccessGrantFilterStatus[];+ .map((s) => s.value) as Exclude<AccessGrantDisplayStatus, "UNKNOWN">[];const databaseScope = searchParams.scopes.find((s) => s.id === "database");const unmaskScope = searchParams.scopes.find((s) => s.id === "unmask");diff --git a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsxindex 0ecb67b26e..2d528ae725 100644--- a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx+++ b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx@@ -52,10 +52,10 @@ import { getTimeForPbTimestampProtoEs } from "@/types";import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";import { AccessGrant_Status } from "@/types/proto-es/v1/access_grant_service_pb";import type { Database } from "@/types/proto-es/v1/database_service_pb";+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {type AccessGrantDisplayStatus,- type AccessGrantFilterStatus,formatAbsoluteDateTime,getAccessGrantDisplayStatus,getAccessGrantDisplayStatusText,@@ -144,6 +144,7 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {void projectsByName;const listUsers = useAppStore((state) => state.listUsers);const listAccessGrants = useAppStore((state) => state.listAccessGrants);+ const fetchIssueByName = useAppStore((state) => state.fetchIssueByName);const activateAccessGrant = useAppStore((state) => state.activateAccessGrant);const revokeAccessGrant = useAppStore((state) => state.revokeAccessGrant);const currentUser = useCurrentUser();@@ -186,6 +187,9 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {type: "activate" | "revoke";grant: AccessGrant;} | null>(null);+ const [issueByGrantName, setIssueByGrantName] = useState<Map<string, Issue>>(+ new Map()+ );// Server-side search for database filter optionsconst searchDatabases = useCallback(@@ -292,6 +296,16 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {keywords: ["revoked"],render: () => <span>{t("common.revoked")}</span>,},+ {+ value: "REJECTED",+ keywords: ["rejected"],+ render: () => <span>{t("common.rejected")}</span>,+ },+ {+ value: "CANCELED",+ keywords: ["canceled", "cancelled"],+ render: () => <span>{t("common.canceled")}</span>,+ },],},{@@ -373,10 +387,10 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {const fetchList = useCallback(async (params: { pageSize: number; pageToken: string }) => {const filter: AccessFilter = {};- const statuses = getValuesFromScopes(- searchParams,- "status"- ) as AccessGrantFilterStatus[];+ const statuses = getValuesFromScopes(searchParams, "status") as Exclude<+ AccessGrantDisplayStatus,+ "UNKNOWN"+ >[];if (statuses.length > 0) {filter.status = statuses;}@@ -429,6 +443,42 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {enabled: canList,});+ useEffect(() => {+ const pendingWithMissingIssue = paged.dataList.filter(+ (g) =>+ g.status === AccessGrant_Status.PENDING &&+ g.issue &&+ !issueByGrantName.has(g.name)+ );+ if (pendingWithMissingIssue.length === 0) {+ return;+ }++ void (async () => {+ const results = await Promise.all(+ pendingWithMissingIssue.map(async (g) => {+ try {+ const issue = await fetchIssueByName(g.issue, true);+ return { grantName: g.name, issue };+ } catch {+ return undefined;+ }+ })+ );+ setIssueByGrantName((prev) => {+ const next = new Map(prev);+ let changed = false;+ for (const r of results) {+ if (r) {+ next.set(r.grantName, r.issue);+ changed = true;+ }+ }+ return changed ? next : prev;+ });+ })();+ }, [fetchIssueByName, issueByGrantName, paged.dataList]);+// Translated column descriptors. Built inside the component (not at// module scope) so `title` strings resolve via `t()` and update// automatically on language switches. Memoized on `t` so the@@ -440,8 +490,8 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {{key: "status",title: t("common.status"),- defaultWidth: 112,- minWidth: 72,+ defaultWidth: 160,+ minWidth: 128,},{key: "creator",@@ -609,6 +659,7 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {<AccessGrantRowkey={grant.name}grant={grant}+ issue={issueByGrantName.get(grant.name)}canActivate={canActivate}canRevoke={canRevoke}onActivate={() =>@@ -683,19 +734,21 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {function AccessGrantRow({grant,+ issue,canActivate,canRevoke,onActivate,onRevoke,}: {grant: AccessGrant;+ issue?: Issue;canActivate: boolean;canRevoke: boolean;onActivate: () => void;onRevoke: () => void;}) {const { t } = useTranslation();- const status = getAccessGrantDisplayStatus(grant);+ const status = getAccessGrantDisplayStatus(grant, issue);const createdAt = grant.createTime? formatAbsoluteDateTime(getTimeForPbTimestampProtoEs(grant.createTime))@@ -709,7 +762,7 @@ function AccessGrantRow({<TableRow><TableCell><Badge variant={statusTagVariant(status)}>- {getAccessGrantDisplayStatusText(grant)}+ {getAccessGrantDisplayStatusText(grant, issue)}</Badge></TableCell><TableCell>diff --git a/frontend/src/react/pages/project/ProjectPageLayout.test.ts b/frontend/src/react/pages/project/ProjectPageLayout.test.tsindex 9a7468e462..e0545e5066 100644--- a/frontend/src/react/pages/project/ProjectPageLayout.test.ts+++ b/frontend/src/react/pages/project/ProjectPageLayout.test.ts@@ -100,6 +100,36 @@ describe("project page layout", () => {expect(source).not.toContain('<div className="mb-2">');});+ test("access grants search exposes display status filters", () => {+ const source = readProjectPage("ProjectAccessGrantsPage.tsx");++ expect(source).toContain('value: "REJECTED"');+ expect(source).toContain('value: "CANCELED"');+ expect(source).toContain(+ 'render: () => <span>{t("common.rejected")}</span>'+ );+ expect(source).toContain(+ 'render: () => <span>{t("common.canceled")}</span>'+ );+ });++ test("access grants render display status from linked issue state", () => {+ const source = readProjectPage("ProjectAccessGrantsPage.tsx");++ expect(source).toContain("issue={issueByGrantName.get(grant.name)}");+ expect(source).toContain("getAccessGrantDisplayStatus(grant, issue)");+ expect(source).toContain("getAccessGrantDisplayStatusText(grant, issue)");+ });++ test("access grants status column reserves space for display badges", () => {+ const source = readProjectPage("ProjectAccessGrantsPage.tsx");++ expect(source).toContain(`key: "status",+ title: t("common.status"),+ defaultWidth: 160,+ minWidth: 128,`);+ });+test("keeps database groups on the shared page vertical rhythm", () => {const source = readProjectPage("ProjectDatabaseGroupsPage.tsx");const databaseGroupTable = readFileSync(diff --git a/frontend/src/react/stores/app/accessGrant.test.ts b/frontend/src/react/stores/app/accessGrant.test.tsindex b39f6dea9b..87f5c9aebf 100644--- a/frontend/src/react/stores/app/accessGrant.test.ts+++ b/frontend/src/react/stores/app/accessGrant.test.ts@@ -1,8 +1,6 @@import { describe, expect, test } from "vitest";import { buildAccessGrantFilter } from "./accessGrant";-const FIXED_NOW = new Date("2026-06-01T00:00:00Z");-describe("buildAccessGrantFilter", () => {test("empty filter returns empty string", () => {expect(buildAccessGrantFilter(undefined)).toBe("");@@ -31,6 +29,14 @@ describe("buildAccessGrantFilter", () => {);});+ test("statuses emit display-status filter", () => {+ expect(+ buildAccessGrantFilter({+ status: ["ACTIVE", "PENDING"],+ })+ ).toBe('(status == "ACTIVE" || status == "PENDING")');+ });+test("unmask combines with other filters in order", () => {expect(buildAccessGrantFilter({@@ -55,9 +61,9 @@ describe("buildAccessGrantFilter", () => {test("absent unmask/export fields produce no emission", () => {// Only target, no unmask/export.- expect(- buildAccessGrantFilter({ target: "instances/i/databases/d" }, FIXED_NOW)- ).toBe('target == "instances/i/databases/d"');+ expect(buildAccessGrantFilter({ target: "instances/i/databases/d" })).toBe(+ 'target == "instances/i/databases/d"'+ );});// statementExact pins the distinction from `statement` (substring search)diff --git a/frontend/src/react/stores/app/accessGrant.ts b/frontend/src/react/stores/app/accessGrant.tsindex ba57a4bfae..572f2e3502 100644--- a/frontend/src/react/stores/app/accessGrant.ts+++ b/frontend/src/react/stores/app/accessGrant.ts@@ -2,7 +2,6 @@ import { create as createProto } from "@bufbuild/protobuf";import { accessGrantServiceClientConnect } from "@/connect";import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";import {- AccessGrant_Status,ActivateAccessGrantRequestSchema,CreateAccessGrantRequestSchema,GetAccessGrantRequestSchema,@@ -17,8 +16,7 @@ import type {} from "./types";export const buildAccessGrantFilter = (- filter: AccessGrantFilter | undefined,- now = new Date()+ filter: AccessGrantFilter | undefined): string => {if (!filter) return "";const parts: string[] = [];@@ -29,20 +27,7 @@ export const buildAccessGrantFilter = (if (filter.status !== undefined && filter.status.length > 0) {const statusFilter: string[] = [];for (const status of filter.status) {- switch (status) {- case "ACTIVE":- statusFilter.push(- `(status == "${AccessGrant_Status[AccessGrant_Status.ACTIVE]}" && expire_time > "${now.toISOString()}")`- );- break;- case "EXPIRED":- statusFilter.push(`expire_time <= "${now.toISOString()}"`);- break;- default:- statusFilter.push(- `status == "${status as keyof typeof AccessGrant_Status}"`- );- }+ statusFilter.push(`status == "${status}"`);}parts.push(`(${statusFilter.join(" || ")})`);}diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.tsindex 9e7e254366..672ecda78d 100644--- a/frontend/src/react/stores/app/types.ts+++ b/frontend/src/react/stores/app/types.ts@@ -95,7 +95,7 @@ import type { Workspace } from "@/types/proto-es/v1/workspace_service_pb";import type { Environment } from "@/types/v1/environment";import type { IssueFilter } from "@/types/v1/issue/issue";import type { SQLResultSetV1 } from "@/types/v1/sql";-import type { AccessGrantFilterStatus } from "@/utils";+import type { AccessGrantDisplayStatus } from "@/utils";export type ProjectListParams = {pageSize: number;@@ -155,7 +155,7 @@ export type AccessGrantFilter = {// byte-for-byte. PR #20491 bot review #3349385091.statementExact?: string;creator?: string;- status?: AccessGrantFilterStatus[];+ status?: Exclude<AccessGrantDisplayStatus, "UNKNOWN">[];issue?: string;target?: string;createdTsAfter?: number;