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): surface missing-license paywall in instance form (#20589)
boojack2d86863cc796
diff --git a/frontend/src/react/components/instance/InstanceFormButtons.tsx b/frontend/src/react/components/instance/InstanceFormButtons.tsxindex e683bb6726..b6ceaacaaa 100644--- a/frontend/src/react/components/instance/InstanceFormButtons.tsx+++ b/frontend/src/react/components/instance/InstanceFormButtons.tsx@@ -70,7 +70,6 @@ export function InstanceFormButtons({readonlyDataSourceList,setDataSourceEditState,hasReadonlyReplicaFeature,- missingFeature: _missingFeature,setMissingFeature,testConnection,checkDataSource,diff --git a/frontend/src/react/components/instance/InstanceFormContext.test.tsx b/frontend/src/react/components/instance/InstanceFormContext.test.tsxindex e7e1738fc7..429ae2f21d 100644--- a/frontend/src/react/components/instance/InstanceFormContext.test.tsx+++ b/frontend/src/react/components/instance/InstanceFormContext.test.tsx@@ -9,6 +9,7 @@ import {DataSourceType,InstanceSchema,} from "@/types/proto-es/v1/instance_service_pb";+import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { unknownInstance } from "@/types/v1/instance";import {InstanceFormProvider,@@ -91,6 +92,33 @@ vi.mock("@/utils/connect", () => ({error instanceof Error ? error.message : String(error),}));+vi.mock("@/react/components/ui/feature-modal", () => ({+ FeatureModal: ({+ open,+ feature,+ instance,+ onOpenChange,+ }: {+ open: boolean;+ feature: number | undefined;+ instance?: { name: string };+ onOpenChange: (open: boolean) => void;+ }) =>+ open ? (+ <div+ data-testid="feature-modal"+ data-feature={String(feature)}+ data-instance={instance?.name}+ >+ <button+ data-testid="feature-modal-close"+ type="button"+ onClick={() => onOpenChange(false)}+ />+ </div>+ ) : null,+}));+(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;@@ -159,4 +187,78 @@ describe("InstanceFormProvider", () => {harness.unmount();});++ // Regression test for BYT-9696: setting missingFeature (e.g. saving a+ // read-only connection on an unlicensed instance) must surface the+ // FeatureModal paywall instead of failing silently.+ test("renders the FeatureModal when missingFeature is set", async () => {+ const instance = create(InstanceSchema, {+ name: "instances/prod",+ title: "Production",+ engine: Engine.POSTGRES,+ environment: "environments/prod",+ dataSources: [+ create(DataSourceSchema, {+ id: "admin",+ type: DataSourceType.ADMIN,+ host: "prod.example.com",+ port: "5432",+ }),+ ],+ });++ const MissingFeatureProbe = () => {+ const ctx = useInstanceFormContext();+ return (+ <button+ data-testid="set-missing-feature"+ type="button"+ onClick={() =>+ ctx.setMissingFeature(+ PlanFeature.FEATURE_INSTANCE_READ_ONLY_CONNECTION+ )+ }+ />+ );+ };++ const harness = renderIntoContainer();+ await harness.render(+ <InstanceFormProvider instance={instance}>+ <MissingFeatureProbe />+ </InstanceFormProvider>+ );++ expect(+ harness.container.querySelector("[data-testid='feature-modal']")+ ).toBeNull();++ const trigger = harness.container.querySelector(+ "[data-testid='set-missing-feature']"+ ) as HTMLButtonElement;+ await act(async () => {+ trigger.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ const modal = harness.container.querySelector(+ "[data-testid='feature-modal']"+ ) as HTMLElement;+ expect(modal).not.toBeNull();+ expect(modal.dataset.feature).toBe(+ String(PlanFeature.FEATURE_INSTANCE_READ_ONLY_CONNECTION)+ );+ expect(modal.dataset.instance).toBe("instances/prod");++ const close = harness.container.querySelector(+ "[data-testid='feature-modal-close']"+ ) as HTMLButtonElement;+ await act(async () => {+ close.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });+ expect(+ harness.container.querySelector("[data-testid='feature-modal']")+ ).toBeNull();++ harness.unmount();+ });});diff --git a/frontend/src/react/components/instance/InstanceFormContext.tsx b/frontend/src/react/components/instance/InstanceFormContext.tsxindex 474a773f5d..7a68525fb6 100644--- a/frontend/src/react/components/instance/InstanceFormContext.tsx+++ b/frontend/src/react/components/instance/InstanceFormContext.tsx@@ -34,6 +34,7 @@ import {isValidSpannerHost,} from "@/utils";import { extractGrpcErrorMessage } from "@/utils/connect";+import { FeatureModal } from "../ui/feature-modal";import type { BasicInfo, DataSourceEditState, EditDataSource } from "./common";import {calcDataSourceUpdateMask,@@ -613,6 +614,14 @@ export function InstanceFormProvider({return (<InstanceFormCtx.Provider value={value}>{children}+ <FeatureModal+ open={!!missingFeature}+ feature={missingFeature}+ instance={instance}+ onOpenChange={(open) => {+ if (!open) setMissingFeature(undefined);+ }}+ /></InstanceFormCtx.Provider>);}