Skip to content

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

refactor: database name display (#21097)

ecmadao9bce8214dcf1
diff --git a/frontend/src/components/DatabaseResourceSelector.test.tsx b/frontend/src/components/DatabaseResourceSelector.test.tsx
index 31d3c93885..65a1375752 100644
--- a/frontend/src/components/DatabaseResourceSelector.test.tsx
+++ b/frontend/src/components/DatabaseResourceSelector.test.tsx
@@ -95,6 +95,19 @@ vi.mock("@/components/EnvironmentLabel", () => ({
),
}));
+vi.mock("@/components/DatabaseTargetDisplay", () => ({
+ DatabaseTargetDisplay: ({
+ database,
+ target,
+ }: {
+ database?: { name: string };
+ target?: string;
+ }) => {
+ const name = database?.name ?? target ?? "";
+ return <span>{name.split("/databases/").at(-1) ?? name}</span>;
+ },
+}));
+
vi.mock("@/utils", () => ({
engineNameV1: (engine: number) => `engine-${engine}`,
extractDatabaseResourceName: mocks.extractDatabaseResourceName,
@@ -137,10 +150,12 @@ function Harness({
includeColumns,
initialValue = [],
onValueChange,
+ readonly,
}: {
includeColumns?: boolean;
initialValue?: DatabaseResource[];
onValueChange?: (value: DatabaseResource[]) => void;
+ readonly?: boolean;
}) {
const [value, setValue] = useState<DatabaseResource[]>(initialValue);
@@ -149,6 +164,7 @@ function Harness({
projectName="projects/project"
value={value}
includeColumns={includeColumns}
+ readonly={readonly}
onChange={(next) => {
setValue(next);
onValueChange?.(next);
@@ -554,4 +570,42 @@ describe("DatabaseResourceSelector", () => {
unmount();
});
+
+ test("prevents resource changes when readonly", async () => {
+ const onValueChange = vi.fn();
+ const { container, unmount } = renderIntoContainer(
+ <Harness
+ includeColumns
+ readonly
+ initialValue={[
+ {
+ databaseFullName: databaseName,
+ schema: "public",
+ table: "employee",
+ columns: ["salary"],
+ },
+ ]}
+ onValueChange={onValueChange}
+ />
+ );
+ await flushPromises();
+ await expandDatabase(container);
+ clickFirstButtonInRow(container, "public");
+ clickFirstButtonInRow(container, "employee");
+
+ const salaryRow = rowForText(container, "salary");
+ const salaryCheckbox = salaryRow.querySelector('[role="checkbox"]');
+ expect(salaryCheckbox?.getAttribute("aria-disabled")).toBe("true");
+
+ clickCheckboxInRow(container, "id");
+
+ const selectedResource = rowForText(
+ container,
+ "hr.public.employee: salary"
+ );
+ expect(selectedResource.querySelector("button")).toBeNull();
+ expect(onValueChange).not.toHaveBeenCalled();
+
+ unmount();
+ });
});
diff --git a/frontend/src/components/DatabaseResourceSelector.tsx b/frontend/src/components/DatabaseResourceSelector.tsx
index 26a1ba4ac8..675f070a32 100644
--- a/frontend/src/components/DatabaseResourceSelector.tsx
+++ b/frontend/src/components/DatabaseResourceSelector.tsx
@@ -2,7 +2,6 @@ import {
ChevronDown,
ChevronRight,
Columns3,
- Database as DatabaseIcon,
Layers,
Table2,
X,
@@ -16,7 +15,7 @@ import {
type SearchParams,
type ValueOption,
} from "@/components/AdvancedSearch";
-import { EnvironmentLabel } from "@/components/EnvironmentLabel";
+import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { Checkbox } from "@/components/ui/checkbox";
import { useAppStore } from "@/stores/app";
import type { DatabaseResource } from "@/types";
@@ -93,11 +92,13 @@ export function DatabaseResourceSelector({
value,
onChange,
includeColumns = false,
+ readonly = false,
}: {
projectName: string;
value: DatabaseResource[];
onChange: (resources: DatabaseResource[]) => void;
includeColumns?: boolean;
+ readonly?: boolean;
}) {
const { t } = useTranslation();
const getOrFetchDatabaseMetadata = useAppStore(
@@ -837,6 +838,7 @@ export function DatabaseResourceSelector({
checked={isTableChecked(dbName, schemaName, table.name)}
indeterminate={isTableIndeterminate(dbName, schemaName, table.name)}
expanded={expandedTables.has(key)}
+ readonly={readonly}
onToggleExpand={() => toggleExpandTable(key)}
onChange={() => toggleTable(dbName, schemaName, table.name)}
isColumnChecked={(column) =>
@@ -864,8 +866,9 @@ export function DatabaseResourceSelector({
<div className="flex items-center justify-between px-3 py-1.5 bg-control-bg border-b border-control-border text-xs text-control-light">
<button
type="button"
- className="text-accent hover:underline cursor-pointer"
+ className="text-accent hover:underline cursor-pointer disabled:text-control-light disabled:no-underline disabled:cursor-not-allowed"
onClick={toggleSelectAll}
+ disabled={readonly}
>
{isAllSelected
? t("common.deselect-all")
@@ -880,9 +883,6 @@ export function DatabaseResourceSelector({
</div>
<div className="flex-1 overflow-y-auto">
{databases.map((db) => {
- const { databaseName } = extractDatabaseResourceName(db.name);
- const envName = db.effectiveEnvironment ?? db.environment;
- const instanceTitle = db.instanceResource?.title ?? "";
const isExpanded = expandedDatabases.has(db.name);
const metadata = metadataMap.get(db.name);
const isLoading = loadingMetadata.has(db.name);
@@ -906,6 +906,7 @@ export function DatabaseResourceSelector({
</button>
<Checkbox
className="shrink-0"
+ disabled={readonly}
checked={
dbChecked
? true
@@ -915,20 +916,12 @@ export function DatabaseResourceSelector({
}
onCheckedChange={() => toggleDatabase(db)}
/>
- {envName && (
- <EnvironmentLabel
- environmentName={envName}
- className="text-xs shrink-0"
- />
- )}
- <DatabaseIcon className="w-3.5 h-3.5 text-control-light shrink-0" />
- <span className="text-sm truncate">{databaseName}</span>
+ <DatabaseTargetDisplay
+ database={db}
+ showEnvironment
+ className="min-w-0"
+ />
</div>
- {instanceTitle && (
- <div className="pl-10 text-xs text-control-light pb-0.5">
- ({instanceTitle})
- </div>
- )}
{isExpanded && (
<div className="pl-6">
{isLoading && (
@@ -976,6 +969,7 @@ export function DatabaseResourceSelector({
</button>
<Checkbox
className="shrink-0"
+ disabled={readonly}
checked={
schemaChecked
? true
@@ -1043,13 +1037,15 @@ export function DatabaseResourceSelector({
className="flex items-center gap-x-1 px-2 py-1 text-sm hover:bg-control-bg group rounded-sm"
>
<span className="flex-1 truncate">{resourceLabel(r)}</span>
- <button
- type="button"
- className="shrink-0 w-4 h-4 text-control-light hover:text-control opacity-0 group-hover:opacity-100 cursor-pointer"
- onClick={() => removeResource(r)}
- >
- <X className="w-3.5 h-3.5" />
- </button>
+ {!readonly && (
+ <button
+ type="button"
+ className="shrink-0 w-4 h-4 text-control-light hover:text-control opacity-0 group-hover:opacity-100 cursor-pointer"
+ onClick={() => removeResource(r)}
+ >
+ <X className="w-3.5 h-3.5" />
+ </button>
+ )}
</div>
))}
</div>
@@ -1068,6 +1064,7 @@ function TableNode({
checked,
indeterminate,
expanded,
+ readonly,
onToggleExpand,
onChange,
isColumnChecked,
@@ -1079,6 +1076,7 @@ function TableNode({
checked: boolean;
indeterminate: boolean;
expanded: boolean;
+ readonly: boolean;
onToggleExpand: () => void;
onChange: () => void;
isColumnChecked: (column: string) => boolean;
@@ -1104,6 +1102,7 @@ function TableNode({
)}
<Checkbox
className="shrink-0"
+ disabled={readonly}
checked={checked ? true : indeterminate ? "indeterminate" : false}
onCheckedChange={() => onChange()}
/>
@@ -1120,6 +1119,7 @@ function TableNode({
<span className="shrink-0 w-4" />
<Checkbox
className="shrink-0"
+ disabled={readonly}
checked={isColumnChecked(column.name)}
onCheckedChange={() => onColumnChange(column.name)}
/>
diff --git a/frontend/src/components/DatabaseSelect.test.tsx b/frontend/src/components/DatabaseSelect.test.tsx
index 277b42f3dd..1cb29f0bc7 100644
--- a/frontend/src/components/DatabaseSelect.test.tsx
+++ b/frontend/src/components/DatabaseSelect.test.tsx
@@ -60,11 +60,21 @@ vi.mock("@/components/ui/combobox", () => ({
},
}));
-// EngineIcon / EnvironmentLabel are only used inside option.render — never
-// invoked by these tests — but stub them so the module imports cleanly.
-vi.mock("@/components/EngineIcon", () => ({ EngineIcon: () => null }));
-vi.mock("@/components/EnvironmentLabel", () => ({
- EnvironmentLabel: () => null,
+vi.mock("@/components/DatabaseTargetDisplay", () => ({
+ DatabaseTargetDisplay: ({
+ database,
+ target,
+ }: {
+ database?: { name: string };
+ target?: string;
+ }) => {
+ const name = database?.name ?? target ?? "";
+ const matches = name.match(
+ /(?:^|\/)instances\/(?<instanceName>[^/]+)\/databases\/(?<databaseName>[^/]+)(?:$|\/)/
+ );
+ const { instanceName = "", databaseName = name } = matches?.groups ?? {};
+ return <span>{`${instanceName} / ${databaseName}`}</span>;
+ },
}));
vi.mock("@/utils", () => ({
@@ -348,6 +358,31 @@ describe("DatabaseSelect — single mode (regression guard for Sync Schema)", ()
unmount();
});
+ test("selected value uses database target display when cache misses", async () => {
+ mocks.fetchDatabases.mockResolvedValue({
+ databases: [],
+ nextPageToken: "",
+ });
+ const { unmount } = render(
+ <DatabaseSelect
+ value="instances/bbdev/databases/employee"
+ onChange={vi.fn()}
+ projectName="projects/p"
+ />
+ );
+ await flush();
+
+ const renderedValue = combo.props?.renderValue?.({
+ value: "instances/bbdev/databases/employee",
+ label: "employee",
+ }) as ReactElement;
+ const valueView = render(renderedValue);
+
+ expect(valueView.container.textContent).toBe("bbdev / employee");
+ valueView.unmount();
+ unmount();
+ });
+
test("resolves a selected off-page value from the store cache (Sync Schema deep-link)", async () => {
const cached = db("instances/i/databases/deeplink", "environments/prod");
mocks.cache.set(cached.name, cached);
diff --git a/frontend/src/components/DatabaseSelect.tsx b/frontend/src/components/DatabaseSelect.tsx
index 5e20510743..3a52f1a9e7 100644
--- a/frontend/src/components/DatabaseSelect.tsx
+++ b/frontend/src/components/DatabaseSelect.tsx
@@ -1,17 +1,11 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { EngineIcon } from "@/components/EngineIcon";
-import { EnvironmentLabel } from "@/components/EnvironmentLabel";
+import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
import { useAppStore } from "@/stores/app";
import type { Engine } from "@/types/proto-es/v1/common_pb";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
-import {
- extractDatabaseResourceName,
- getDatabaseEnvironment,
- getDefaultPagination,
- getInstanceResource,
-} from "@/utils";
+import { extractDatabaseResourceName, getDefaultPagination } from "@/utils";
interface BaseProps {
placeholder?: string;
@@ -140,7 +134,6 @@ export function DatabaseSelect(props: DatabaseSelectProps) {
);
const buildOption = useCallback((database: Database): ComboboxOption => {
- const inst = getInstanceResource(database);
const { databaseName, instance } = extractDatabaseResourceName(
database.name
);
@@ -150,20 +143,7 @@ export function DatabaseSelect(props: DatabaseSelectProps) {
description: instance,
render: () => (
<div className="flex flex-col gap-0.5">
- <div className="flex items-center gap-1.5">
- {inst.title && (
- <>
- <EngineIcon engine={inst.engine} className="h-4 w-4" />
- <span>{inst.title}</span>
- <span className="text-control-placeholder">&gt;</span>
- </>
- )}
- <EnvironmentLabel
- environmentName={getDatabaseEnvironment(database).name}
- />
- <span className="text-control-placeholder">&gt;</span>
- <span>{databaseName}</span>
- </div>
+ <DatabaseTargetDisplay database={database} showEnvironment />
<span className="text-xs text-control-placeholder">
{database.name}
</span>
@@ -229,14 +209,8 @@ export function DatabaseSelect(props: DatabaseSelectProps) {
onChange={(name) => onChange(name, resolveDatabase(name))}
renderValue={(opt) => {
const database = resolveDatabase(opt.value);
- if (!database) return opt.label;
- const inst = getInstanceResource(database);
- return (
- <span className="flex items-center gap-1.5 truncate">
- <EngineIcon engine={inst.engine} className="h-4 w-4" />
- {extractDatabaseResourceName(database.name).databaseName}
- </span>
- );
+ if (!database) return <DatabaseTargetDisplay target={opt.value} />;
+ return <DatabaseTargetDisplay database={database} />;
}}
/>
);
diff --git a/frontend/src/components/DatabaseTargetDisplay.test.tsx b/frontend/src/components/DatabaseTargetDisplay.test.tsx
index d78ba9cdea..e26f0151ca 100644
--- a/frontend/src/components/DatabaseTargetDisplay.test.tsx
+++ b/frontend/src/components/DatabaseTargetDisplay.test.tsx
@@ -1,7 +1,8 @@
-import { act } from "react";
+import { act, type ReactNode } from "react";
import { createRoot } from "react-dom/client";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { Engine } from "@/types/proto-es/v1/common_pb";
+import type { Database } from "@/types/proto-es/v1/database_service_pb";
import { DatabaseTargetDisplay } from "./DatabaseTargetDisplay";
(
@@ -28,6 +29,36 @@ vi.mock("@/components/EngineIcon", () => ({
),
}));
+vi.mock("@/components/EnvironmentLabel", () => ({
+ EnvironmentLabel: ({
+ className,
+ environment,
+ }: {
+ className?: string;
+ environment: { title: string };
+ }) => (
+ <span className={className} data-testid="environment-label">
+ {environment.title}
+ </span>
+ ),
+}));
+
+vi.mock("@/components/ui/ellipsis-text", () => ({
+ EllipsisText: ({
+ children,
+ className,
+ text,
+ }: {
+ children?: ReactNode;
+ className?: string;
+ text: string;
+ }) => (
+ <span className={className} data-testid={`ellipsis-${text}`}>
+ {children ?? text}
+ </span>
+ ),
+}));
+
vi.mock("@/lib/utils", () => ({
cn: (...classes: Array<string | false | null | undefined>) =>
classes.filter(Boolean).join(" "),
@@ -50,17 +81,16 @@ vi.mock("@/types", () => ({
isValidDatabaseName: (name: string) => name.includes("/databases/"),
}));
-vi.mock("@/types/v1/database", () => ({
- unknownDatabase: () => ({ name: "", instanceResource: { title: "" } }),
-}));
-
vi.mock("@/utils", () => ({
- extractDatabaseResourceName: (name: string) => ({
- databaseName: name.split("/databases/")[1] ?? name,
- }),
- getInstanceResource: (database: {
- instanceResource?: { engine: Engine; title: string };
- }) => database.instanceResource,
+ extractDatabaseResourceName: (name: string) => {
+ const [, instanceAndDatabase = ""] = name.split("/instances/");
+ const [instanceName = "", databaseName = name] =
+ instanceAndDatabase.split("/databases/");
+ return {
+ databaseName,
+ instanceName,
+ };
+ },
}));
describe("DatabaseTargetDisplay", () => {
@@ -107,8 +137,64 @@ describe("DatabaseTargetDisplay", () => {
expect(container.textContent).toContain("POSTGRES");
expect(container.textContent).toContain("Production");
+ expect(
+ container.querySelector('[data-testid="environment-label"]')
+ ).toBeTruthy();
expect(container.textContent).toContain("prod-instance");
expect(container.textContent).toContain("app");
+ expect(container.firstElementChild?.textContent).toBe(
+ "POSTGRESprod-instance / Productionapp"
+ );
+ });
+
+ it("renders a passed database even when it is not in the store cache", () => {
+ mocks.databasesByName = {};
+
+ act(() => {
+ root.render(
+ <DatabaseTargetDisplay
+ showEnvironment
+ database={{
+ name: "projects/p/instances/bbdev/databases/employee",
+ effectiveEnvironment: "environments/prod",
+ instanceResource: {
+ engine: Engine.POSTGRES,
+ title: "bbdev",
+ },
+ } as Database}
+ />
+ );
+ });
+
+ expect(container.textContent).toContain("POSTGRES");
+ expect(container.textContent).toContain("Production");
+ expect(container.textContent).toContain("bbdev");
+ expect(container.textContent).toContain("employee");
+ expect(
+ container.querySelector('[data-testid="ellipsis-employee"]')
+ ).toBeTruthy();
+ });
+
+ it("falls back to target path context while the database cache is missing", () => {
+ mocks.databasesByName = {};
+
+ act(() => {
+ root.render(
+ <DatabaseTargetDisplay
+ showEnvironment
+ target="projects/p/instances/bbdev/databases/employee"
+ />
+ );
+ });
+
+ expect(container.querySelector('[data-testid="engine-icon"]')).toBeNull();
+ expect(container.textContent).not.toContain("MYSQL");
+ expect(container.textContent).not.toContain("UNKNOWN");
+ expect(container.textContent).toContain("bbdev");
+ expect(container.textContent).toContain("employee");
+ expect(
+ container.querySelector('[data-testid="ellipsis-bbdev"]')
+ ).toBeTruthy();
});
it("applies stable truncation priority across environment, instance, and database name", () => {
@@ -134,15 +220,34 @@ describe("DatabaseTargetDisplay", () => {
expect(rootElement?.className).toContain("inline-flex");
expect(rootElement?.className).toContain("max-w-full");
- expect(rootElement?.getAttribute("title")).toBe(
- "Production / prod-instance / app"
- );
+ expect(rootElement?.getAttribute("title")).toBeNull();
expect(environment?.className).toContain("max-w-24");
expect(instance?.className).toContain("max-w-40");
expect(database?.className).toContain("flex-1");
expect(database?.className).toContain("min-w-12");
});
+ it("uses overflow-aware tooltips for truncated identity names", () => {
+ act(() => {
+ root.render(
+ <DatabaseTargetDisplay
+ showEnvironment
+ target="projects/p/instances/prod/databases/app"
+ />
+ );
+ });
+
+ expect(
+ container.querySelector('[data-testid="ellipsis-prod-instance"]')
+ ).toBeTruthy();
+ expect(
+ container.querySelector('[data-testid="ellipsis-Production"]')
+ ).toBeTruthy();
+ expect(
+ container.querySelector('[data-testid="ellipsis-app"]')
+ ).toBeTruthy();
+ });
+
it("can hide optional database metadata", () => {
act(() => {
root.render(
@@ -184,12 +289,15 @@ describe("DatabaseTargetDisplay", () => {
});
it("falls back to the raw target when the target is not a database", () => {
+ const target = "projects/p/databaseGroups/prod";
+
act(() => {
- root.render(
- <DatabaseTargetDisplay target="projects/p/databaseGroups/prod" />
- );
+ root.render(<DatabaseTargetDisplay target={target} />);
});
- expect(container.textContent).toContain("projects/p/databaseGroups/prod");
+ expect(container.textContent).toContain(target);
+ expect(
+ container.querySelector(`[data-testid="ellipsis-${target}"]`)
+ ).toBeTruthy();
});
});
diff --git a/frontend/src/components/DatabaseTargetDisplay.tsx b/frontend/src/components/DatabaseTargetDisplay.tsx
index 7700f7c512..a060b003fc 100644
--- a/frontend/src/components/DatabaseTargetDisplay.tsx
+++ b/frontend/src/components/DatabaseTargetDisplay.tsx
@@ -1,11 +1,12 @@
-import { ChevronRight } from "lucide-react";
import { useMemo } from "react";
import { EngineIcon } from "@/components/EngineIcon";
+import { EnvironmentLabel } from "@/components/EnvironmentLabel";
+import { EllipsisText } from "@/components/ui/ellipsis-text";
import { cn } from "@/lib/utils";
import { useAppStore } from "@/stores/app";
import { isValidDatabaseName } from "@/types";
-import { unknownDatabase } from "@/types/v1/database";
-import { extractDatabaseResourceName, getInstanceResource } from "@/utils";
+import type { Database } from "@/types/proto-es/v1/database_service_pb";
+import { extractDatabaseResourceName } from "@/utils";
type DatabaseTargetDisplaySize = "sm" | "md";
@@ -17,7 +18,6 @@ const sizeClasses: Record<
icon: string;
instance: string;
root: string;
- separator: string;
}
> = {
sm: {
@@ -26,7 +26,6 @@ const sizeClasses: Record<
icon: "h-4 w-4",
instance: "max-w-40",
root: "text-sm",
- separator: "h-4 w-4",
},
md: {
database: "min-w-16",
@@ -34,34 +33,44 @@ const sizeClasses: Record<
icon: "h-5 w-5",
instance: "max-w-48",
root: "text-base",
- separator: "h-5 w-5",
},
};
+type DatabaseTargetDisplayProps = {
+ className?: string;
+ showEngine?: boolean;
+ showEnvironment?: boolean;
+ showInstance?: boolean;
+ size?: DatabaseTargetDisplaySize;
+} & (
+ | {
+ database?: Database;
+ target: string;
+ }
+ | {
+ database: Database;
+ target?: string;
+ }
+);
+
export function DatabaseTargetDisplay({
className,
+ database: databaseProp,
showEngine = true,
showEnvironment = false,
showInstance = true,
size = "sm",
target,
-}: {
- className?: string;
- showEngine?: boolean;
- showEnvironment?: boolean;
- showInstance?: boolean;
- size?: DatabaseTargetDisplaySize;
- target: string;
-}) {
+}: DatabaseTargetDisplayProps) {
const databasesByName = useAppStore((s) => s.databasesByName);
const environmentList = useAppStore((s) => s.environmentList);
const classes = sizeClasses[size];
- const database = databasesByName[target] ?? unknownDatabase();
+ const targetName = target ?? databaseProp?.name ?? "";
+ const database = databaseProp ?? databasesByName[targetName];
+ const instance = database?.instanceResource;
const environmentName =
- database.effectiveEnvironment ??
- database.instanceResource?.environment ??
- "";
+ database?.effectiveEnvironment ?? instance?.environment ?? "";
const environment = useMemo(
() =>
environmentName
@@ -70,30 +79,24 @@ export function DatabaseTargetDisplay({
[environmentList, environmentName]
);
- if (!isValidDatabaseName(target)) {
+ if (!isValidDatabaseName(targetName)) {
return (
- <span
+ <EllipsisText
+ text={targetName}
className={cn(
"truncate text-control-placeholder",
classes.root,
className
)}
- >
- {target}
- </span>
+ />
);
}
- const instance = getInstanceResource(database);
- const { databaseName } = extractDatabaseResourceName(target);
- const shouldShowSeparator = showInstance && Boolean(instance.title);
- const title = [
- showEnvironment ? environment?.title : undefined,
- showInstance ? instance.title : undefined,
- databaseName,
- ]
- .filter(Boolean)
- .join(" / ");
+ const { databaseName, instanceName } =
+ extractDatabaseResourceName(targetName);
+ const instanceTitle = instance?.title || instanceName;
+ const shouldShowInstance = showInstance && Boolean(instanceTitle);
+ const shouldShowSeparator = shouldShowInstance && Boolean(databaseName);
return (
<div
@@ -102,42 +105,39 @@ export function DatabaseTargetDisplay({
classes.root,
className
)}
- title={title}
>
- {showEngine && (
+ {showEngine && instance && (
<EngineIcon
engine={instance.engine}
className={cn("mr-1 shrink-0", classes.icon)}
/>
)}
- {showEnvironment && environment?.title && (
- <span
- className={cn(
- "mr-1 min-w-0 shrink truncate text-control-placeholder",
- classes.environment
- )}
- >
- {environment.title}
- </span>
- )}
- {showInstance && instance.title && (
- <span
+ {shouldShowInstance && (
+ <EllipsisText
+ text={instanceTitle}
className={cn(
"min-w-0 shrink-[2] truncate text-control-light",
classes.instance
)}
- >
- {instance.title}
- </span>
+ />
)}
{shouldShowSeparator && (
- <ChevronRight
- className={cn("shrink-0 text-control-light/80", classes.separator)}
- />
+ <span className="shrink-0 whitespace-pre text-control-light/80">
+ {" / "}
+ </span>
+ )}
+ {showEnvironment && environment?.title && (
+ <EllipsisText
+ text={environment.title}
+ className={cn("mr-1 min-w-0 shrink", classes.environment)}
+ >
+ <EnvironmentLabel environment={environment} />
+ </EllipsisText>
)}
- <span className={cn("flex-1 truncate text-control", classes.database)}>
- {databaseName}
- </span>
+ <EllipsisText
+ text={databaseName}
+ className={cn("flex-1 truncate text-control", classes.database)}
+ />
</div>
);
}
diff --git a/frontend/src/components/MatchedDatabaseView.test.tsx b/frontend/src/components/MatchedDatabaseView.test.tsx
index 498fa090e3..5f7b267984 100644
--- a/frontend/src/components/MatchedDatabaseView.test.tsx
+++ b/frontend/src/components/MatchedDatabaseView.test.tsx
@@ -41,6 +41,14 @@ vi.mock("@/components/EngineIcon", () => ({
),
}));
+vi.mock("@/components/EnvironmentLabel", () => ({
+ EnvironmentLabel: ({
+ environment,
+ }: {
+ environment: { title: string };
+ }) => <span>{environment.title}</span>,
+}));
+
vi.mock("@/lib/utils", () => ({
cn: (...classes: Array<string | false | null | undefined>) =>
classes.filter(Boolean).join(" "),
diff --git a/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.test.tsx b/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.test.tsx
index 7a2d29cdaa..2e3428ce25 100644
--- a/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.test.tsx
+++ b/frontend/src/modules/sql-editor/components/AccessGrantRequestDrawer.test.tsx
@@ -236,14 +236,10 @@ vi.mock("@/components/ui/button", () => ({
),
}));
-// The drawer now renders the real DatabaseSelect, which imports EngineIcon and
-// EnvironmentLabel. Stub them so their transitive proto-es imports don't load
-// (they conflict with this file's minimal @bufbuild/protobuf(/wkt) mocks). They
-// are only referenced inside the picker's option.render, never invoked here
-// because the Combobox mock below renders plain <option> labels.
-vi.mock("@/components/EngineIcon", () => ({ EngineIcon: () => null }));
-vi.mock("@/components/EnvironmentLabel", () => ({
- EnvironmentLabel: () => null,
+// Keep the real DatabaseSelect behavior under test without loading the shared
+// display's transitive proto-es dependencies into this minimal protobuf mock.
+vi.mock("@/components/DatabaseTargetDisplay", () => ({
+ DatabaseTargetDisplay: () => null,
}));
vi.mock("@/components/ui/combobox", () => ({
diff --git a/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.test.tsx b/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.test.tsx
index a0be5087c0..0b209d6a91 100644
--- a/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.test.tsx
+++ b/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.test.tsx
@@ -101,13 +101,16 @@ vi.mock("@/components/DatabaseResourceSelector", () => ({
value,
includeColumns,
onChange,
+ readonly,
}: {
value: unknown;
includeColumns?: boolean;
onChange?: (resources: unknown[]) => void;
+ readonly?: boolean;
}) => (
<div
data-include-columns={String(includeColumns)}
+ data-readonly={String(readonly)}
data-testid="database-resource-selector"
>
{JSON.stringify(value)}
@@ -137,12 +140,16 @@ vi.mock("@/components/ExprEditor", () => ({
ExprEditor: ({
expr,
onUpdate,
+ readonly,
}: {
expr: unknown;
onUpdate: (expr: unknown) => void;
+ readonly?: boolean;
}) => (
<div>
- <div data-testid="expr-editor">{JSON.stringify(expr)}</div>
+ <div data-readonly={String(readonly)} data-testid="expr-editor">
+ {JSON.stringify(expr)}
+ </div>
<button
data-testid="expr-editor-set-column-scope"
onClick={() =>
@@ -403,6 +410,33 @@ describe("GrantAccessDialog", () => {
unmount();
});
+ test("keeps catalog resources readonly while allowing scoped mode changes", async () => {
+ const { container, unmount } = renderGrantAccessDialog();
+ await flush();
+
+ let radioList = getRadios(container);
+ expect(isDisabled(radioList[0])).toBe(true);
+ expect(isDisabled(radioList[1])).toBe(false);
+ expect(isDisabled(radioList[2])).toBe(false);
+ expect(
+ container
+ .querySelector('[data-testid="database-resource-selector"]')
+ ?.getAttribute("data-readonly")
+ ).toBe("true");
+
+ await click(radioList[1]!);
+
+ radioList = getRadios(container);
+ expect(isChecked(radioList[1])).toBe(true);
+ expect(
+ container
+ .querySelector('[data-testid="expr-editor"]')
+ ?.getAttribute("data-readonly")
+ ).toBe("true");
+
+ unmount();
+ });
+
test("falls back to a raw expression when initial CEL conversion fails", async () => {
mocks.batchConvertCELStringToParsedExpr.mockImplementationOnce(
async () => [undefined] as unknown as [{ parsed: true }]
diff --git a/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.tsx b/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.tsx
index d05ca5c169..c0be1315ed 100644
--- a/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.tsx
+++ b/frontend/src/routes/project/database-detail/catalog/GrantAccessDialog.tsx
@@ -419,7 +419,7 @@ export function GrantAccessDialog({
onValueChange={(value) => onRadioChange(value as RadioValue)}
>
<Tooltip content={t("issue.role-grant.all-databases-tip")}>
- <RadioGroupItem value="ALL" disabled={modeChangeProcessing}>
+ <RadioGroupItem value="ALL" disabled>
{t("issue.role-grant.all-databases")}
</RadioGroupItem>
</Tooltip>
@@ -457,6 +457,7 @@ export function GrantAccessDialog({
projectName={projectName}
value={databaseResources}
includeColumns
+ readonly
onChange={setDatabaseResources}
/>
)}
@@ -466,6 +467,7 @@ export function GrantAccessDialog({
factorList={factorList}
optionConfigMap={factorOptionConfigMap}
factorOperatorOverrideMap={factorOperatorOverrideMap}
+ readonly
onUpdate={setExpr}
/>
)}
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
index 047ebc3d54..cdd9cc6b19 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
@@ -1,16 +1,14 @@
import { Download, EyeOff, Loader2, Shield } from "lucide-react";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
-import { EngineIcon } from "@/components/EngineIcon";
+import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { useProjectByName } from "@/hooks/useProjectByName";
import { useAppStore } from "@/stores/app";
import { projectNamePrefix } from "@/stores/modules/v1/common";
import { isValidDatabaseName } from "@/types";
import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";
-import { unknownDatabase } from "@/types/v1/database";
import { extractProjectResourceName, hasProjectPermissionV2 } from "@/utils";
import { getAccessGrantExpirationText } from "@/utils/accessGrant";
-import { extractDatabaseResourceName } from "@/utils/v1/database";
import { useIssueDetailContext } from "../context/IssueDetailContext";
export function IssueDetailAccessGrantDetails() {
@@ -160,45 +158,13 @@ export function IssueDetailAccessGrantDetails() {
}
function IssueDetailAccessGrantTarget({ target }: { target: string }) {
- const databasesByName = useAppStore((s) => s.databasesByName);
- const database = useMemo(
- () => databasesByName[target] ?? unknownDatabase(),
- [databasesByName, target]
- );
- // Subscribe to the env cache so the row re-resolves once it loads; compute
- // via getState() in a memo because getEnvironmentByName returns a fresh
- // fallback object on a miss (unsafe as a raw selector — would loop).
- const environmentList = useAppStore((s) => s.environmentList);
- const environment = useMemo(
- () =>
- useAppStore
- .getState()
- .getEnvironmentByName(
- database.effectiveEnvironment ?? database.environment ?? ""
- ),
- [environmentList, database]
- );
- const instance = database.instanceResource;
- const { databaseName } = extractDatabaseResourceName(target);
-
return (
<div className="inline-flex min-w-0 items-center gap-2 rounded-sm border px-2 py-1.5">
- <div className="min-w-0 flex-1">
- <div className="flex min-w-0 items-center truncate text-sm">
- {instance && (
- <EngineIcon
- engine={instance.engine}
- className="mr-1 inline-block h-4 w-4"
- />
- )}
- <span className="mr-1 truncate text-gray-400">
- {environment.title}
- </span>
- <span className="truncate text-gray-600">{instance?.title}</span>
- <span className="mx-1 shrink-0 text-gray-500">&gt;</span>
- <span className="truncate text-gray-800">{databaseName}</span>
- </div>
- </div>
+ <DatabaseTargetDisplay
+ target={target}
+ showEnvironment
+ className="min-w-0 flex-1"
+ />
</div>
);
}
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
index 4d23531e07..1ed7ad5480 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
@@ -1,5 +1,5 @@
import { create } from "@bufbuild/protobuf";
-import { ChevronRight, ExternalLink, FolderTree } from "lucide-react";
+import { ExternalLink, FolderTree } from "lucide-react";
import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { instanceRoleServiceClientConnect } from "@/api";
@@ -9,7 +9,7 @@ import {
PROJECT_V1_ROUTE_PLAN_DETAIL_SPECS,
} from "@/app/router/handles";
import { buildPlanRolloutRouteFromPlanName } from "@/app/router/routeHelpers";
-import { EngineIcon } from "@/components/EngineIcon";
+import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { RouterLink } from "@/components/RouterLink";
import { SearchInput } from "@/components/ui/search-input";
import {
@@ -44,7 +44,6 @@ import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";
import { unknownDatabase } from "@/types/v1/database";
import {
extractDatabaseResourceName,
- extractInstanceResourceName,
extractPlanUID,
extractProjectResourceName,
getDefaultTransactionMode,
@@ -747,56 +746,12 @@ function IssueDetailDatabaseTarget({
showEnvironment?: boolean;
target: string;
}) {
- const { t } = useTranslation();
- const databasesByName = useAppStore((s) => s.databasesByName);
- const environmentList = useAppStore((s) => s.environmentList);
- const database = useMemo(
- () => databasesByName[target] ?? unknownDatabase(),
- [databasesByName, target]
- );
- const environmentName =
- database.effectiveEnvironment ??
- database.instanceResource?.environment ??
- "";
- const environment = useMemo(
- () => useAppStore.getState().getEnvironmentByName(environmentName),
- [environmentList, environmentName]
- );
- const instance = database.instanceResource;
- const { databaseName } = extractDatabaseResourceName(target);
- const instanceTitle =
- instance?.title ||
- extractInstanceResourceName(target) ||
- t("common.unknown");
- const title = [
- showEnvironment ? environment.title : undefined,
- instanceTitle,
- databaseName,
- ]
- .filter(Boolean)
- .join(" / ");
-
return (
- <div className="flex min-w-0 max-w-full items-center text-sm" title={title}>
- {instance && (
- <EngineIcon
- engine={instance.engine}
- className="mr-1 inline-block h-4 w-4 shrink-0"
- />
- )}
- {showEnvironment && (
- <span className="mr-1 max-w-24 shrink truncate text-control-placeholder">
- {environment.title}
- </span>
- )}
- <span className="min-w-0 shrink-[2] truncate text-control-light">
- {instanceTitle}
- </span>
- <ChevronRight className="h-4 w-4 shrink-0 text-control-light/80" />
- <span className="min-w-12 flex-1 truncate text-control">
- {databaseName}
- </span>
- </div>
+ <DatabaseTargetDisplay
+ target={target}
+ showEnvironment={showEnvironment}
+ className="flex min-w-0 max-w-full"
+ />
);
}
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
index 83f64d7611..7ab1a8724d 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
@@ -4,7 +4,7 @@ import { Loader2 } from "lucide-react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { rolloutServiceClientConnect } from "@/api";
-import { EngineIcon } from "@/components/EngineIcon";
+import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { TaskStatusIcon } from "@/components/TaskStatusIcon";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
@@ -37,12 +37,7 @@ import {
Task_Type,
TaskRun_Status,
} from "@/types/proto-es/v1/rollout_service_pb";
-import { unknownDatabase } from "@/types/v1/database";
-import {
- extractDatabaseResourceName,
- extractInstanceResourceName,
- extractStageUID,
-} from "@/utils";
+import { extractStageUID } from "@/utils";
import { useIssueDetailContext } from "../context/IssueDetailContext";
import {
CANCELABLE_TASK_STATUSES,
@@ -570,50 +565,11 @@ function groupTasksByStage(tasks: Task[]) {
function IssueDetailTaskDatabaseName({ task }: { task: Task }) {
if (task.target) {
- return <IssueDetailDatabaseTarget target={task.target} />;
+ return <DatabaseTargetDisplay target={task.target} showEnvironment />;
}
return <span className="truncate">{task.name.split("/").at(-1)}</span>;
}
-function IssueDetailDatabaseTarget({ target }: { target: string }) {
- const { t } = useTranslation();
- const databasesByName = useAppStore((s) => s.databasesByName);
- const environmentList = useAppStore((s) => s.environmentList);
- const database = useMemo(
- () => databasesByName[target] ?? unknownDatabase(),
- [databasesByName, target]
- );
- const environmentName =
- database.effectiveEnvironment ??
- database.instanceResource?.environment ??
- "";
- const environment = useMemo(
- () => useAppStore.getState().getEnvironmentByName(environmentName),
- [environmentList, environmentName]
- );
- const instance = database.instanceResource;
- const { databaseName } = extractDatabaseResourceName(target);
- const instanceTitle =
- instance?.title ||
- extractInstanceResourceName(target) ||
- t("common.unknown");
-
- return (
- <div className="flex min-w-0 items-center truncate text-sm">
- {instance && (
- <EngineIcon
- engine={instance.engine}
- className="mr-1 inline-block h-4 w-4"
- />
- )}
- <span className="mr-1 truncate text-gray-400">{environment.title}</span>
- <span className="truncate text-gray-600">{instanceTitle}</span>
- <span className="mx-1 shrink-0 text-gray-500 opacity-60">›</span>
- <span className="truncate text-gray-800">{databaseName}</span>
- </div>
- );
-}
-
function IssueDetailStageEnvironment({
environmentName,
}: {
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRunTable.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRunTable.tsx
index f79847907f..b355b2ffa7 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRunTable.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailTaskRunTable.tsx
@@ -1,6 +1,6 @@
import { useEffect, useMemo } from "react";
import { useTranslation } from "react-i18next";
-import { EngineIcon } from "@/components/EngineIcon";
+import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { HumanizeTs } from "@/components/HumanizeTs";
import { TaskRunStatusIcon } from "@/components/TaskRunStatusIcon";
import { EllipsisText } from "@/components/ui/ellipsis-text";
@@ -21,12 +21,9 @@ import {
import { useAppStore } from "@/stores/app";
import { projectNamePrefix } from "@/stores/modules/v1/common";
import { getDateForPbTimestampProtoEs } from "@/types";
-import type { Database } from "@/types/proto-es/v1/database_service_pb";
import type { Task, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";
import {
databaseForTask,
- extractDatabaseResourceName,
- extractInstanceResourceName,
extractTaskUID,
formatAbsoluteDateTime,
humanizeDurationV1,
@@ -137,7 +134,10 @@ export function IssueDetailTaskRunTable({
{showDatabaseColumn && (
<TableCell>
{database ? (
- <IssueDetailTaskRunDatabaseCell database={database} />
+ <DatabaseTargetDisplay
+ database={database}
+ showEnvironment
+ />
) : (
<span className="text-control-light">-</span>
)}
@@ -210,37 +210,3 @@ function IssueDetailTaskRunDateCell({
/>
);
}
-
-function IssueDetailTaskRunDatabaseCell({ database }: { database: Database }) {
- const { t } = useTranslation();
- const environmentList = useAppStore((s) => s.environmentList);
- const environmentName =
- database.effectiveEnvironment ??
- database.instanceResource?.environment ??
- "";
- const environment = useMemo(
- () => useAppStore.getState().getEnvironmentByName(environmentName),
- [environmentList, environmentName]
- );
- const instance = database.instanceResource;
- const { databaseName } = extractDatabaseResourceName(database.name);
- const instanceTitle =
- instance?.title ||
- extractInstanceResourceName(database.name) ||
- t("common.unknown");
-
- return (
- <div className="flex min-w-0 items-center truncate text-sm">
- {instance && (
- <EngineIcon
- engine={instance.engine}
- className="mr-1 inline-block h-4 w-4"
- />
- )}
- <span className="mr-1 truncate text-gray-400">{environment.title}</span>
- <span className="truncate text-gray-600">{instanceTitle}</span>
- <span className="mx-1 shrink-0 text-gray-500 opacity-60">/</span>
- <span className="truncate text-gray-800">{databaseName}</span>
- </div>
- );
-}
diff --git a/frontend/src/routes/project/plan-detail/components/PlanTargetDisplay.test.tsx b/frontend/src/routes/project/plan-detail/components/PlanTargetDisplay.test.tsx
index 3a35d06bb5..5f84f738d2 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanTargetDisplay.test.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanTargetDisplay.test.tsx
@@ -28,6 +28,14 @@ vi.mock("@/components/EngineIcon", () => ({
),
}));
+vi.mock("@/components/EnvironmentLabel", () => ({
+ EnvironmentLabel: ({
+ environment,
+ }: {
+ environment: { title: string };
+ }) => <span>{environment.title}</span>,
+}));
+
vi.mock("@/lib/utils", () => ({
cn: (...classes: Array<string | false | null | undefined>) =>
classes.filter(Boolean).join(" "),
@@ -130,9 +138,7 @@ describe("PlanTargetDisplay", () => {
expect(rootElement?.className).toContain("inline-flex");
expect(rootElement?.className).toContain("max-w-full");
- expect(rootElement?.getAttribute("title")).toBe(
- "Production / prod-instance / app"
- );
+ expect(rootElement?.getAttribute("title")).toBeNull();
expect(environment?.className).toContain("max-w-24");
expect(instance?.className).toContain("max-w-40");
expect(database?.className).toContain("flex-1");
diff --git a/frontend/src/routes/workspace/Page403.test.tsx b/frontend/src/routes/workspace/Page403.test.tsx
index 819d058208..24a2d025c2 100644
--- a/frontend/src/routes/workspace/Page403.test.tsx
+++ b/frontend/src/routes/workspace/Page403.test.tsx
@@ -49,6 +49,25 @@ afterEach(() => {
});
describe("Page403", () => {
+ test("allows long permission details to wrap within the alert", () => {
+ const from = `/403?from=${"segment".repeat(40)}`;
+ mocks.currentRoute.value = {
+ query: {
+ api: "/bytebase.v1.WorkspaceService/GetIamPolicy",
+ from,
+ },
+ };
+
+ act(() => {
+ root.render(<Page403 />);
+ });
+
+ const details = container.querySelector(".wrap-anywhere");
+ expect(details).toBeTruthy();
+ expect(details?.className ?? "").toContain("min-w-0");
+ expect(details?.textContent).toContain(from);
+ });
+
test("go back home navigates to the landing page", () => {
act(() => {
root.render(<Page403 />);
diff --git a/frontend/src/routes/workspace/Page403.tsx b/frontend/src/routes/workspace/Page403.tsx
index e5c71aea30..7da822e8c2 100644
--- a/frontend/src/routes/workspace/Page403.tsx
+++ b/frontend/src/routes/workspace/Page403.tsx
@@ -35,7 +35,7 @@ export function Page403() {
<div className="rounded-md border border-red-200 bg-red-50 p-4">
<div className="flex items-start gap-3">
<ShieldAlert className="h-5 w-5 text-red-600 mt-0.5 shrink-0" />
- <div className="flex flex-col gap-2">
+ <div className="flex min-w-0 flex-1 flex-col gap-2 wrap-anywhere">
<div className="font-medium text-red-800">
{t("common.missing-required-permission", { permissions: "" })}
</div>