Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: sql editor header (#20948)
ecmadaod345b02faa2e
diff --git a/frontend/src/assets/logo-full-dark.svg b/frontend/src/assets/logo-full-dark.svgnew file mode 100644index 0000000000..9eca80407f--- /dev/null+++ b/frontend/src/assets/logo-full-dark.svg@@ -0,0 +1,7 @@+<svg width="1024" height="220" viewBox="0 0 1024 220" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M267.945 167.731H314.905C342.254 167.731 359.527 154.103 359.527 133.123C359.527 117.522 352.69 106.404 332.178 101.563C347.652 95.8246 352.51 87.2173 352.51 75.203C352.51 55.6573 337.756 42.2085 310.407 42.2085H267.945V167.731ZM293.134 145.137V114.474H312.566C326.241 114.474 333.978 120.032 333.978 129.178C333.978 140.116 326.241 145.137 312.566 145.137H293.134ZM293.134 94.0314V64.6232H308.068C321.743 64.6232 326.96 70.5407 326.96 79.148C326.96 89.1898 321.743 94.0314 308.068 94.0314H293.134ZM378.999 205.208C400.95 205.208 412.645 192.477 420.562 173.649L461.945 74.4857H433.157L414.984 127.743C413.365 132.226 411.925 137.785 411.026 142.627C410.126 137.785 408.687 132.226 407.067 127.743L388.895 74.4857H359.567L396.632 163.427L395.372 167.372C392.673 175.621 386.736 181.539 377.38 181.539C373.421 181.539 370.003 181.18 366.404 180.283L362.806 203.415C367.664 204.85 374.141 205.208 378.999 205.208Z" fill="#F9FAFB"/>+<path d="M509.624 167.881H522.918V146.401H512.858C508.187 146.401 505.312 143.716 505.312 137.809V95.3848H525.074V74.7993H505.312V53.4979L481.059 56.0039V74.7993H467.945V95.3848H481.059V139.062C481.059 159.289 491.12 167.881 509.624 167.881ZM575.459 170.208C593.963 170.208 609.592 161.974 617.138 150.339L598.274 136.198C593.963 143.358 585.878 148.728 575.459 148.728C563.242 148.728 554.978 141.031 552.283 130.112H622.168C622.707 127.069 622.887 124.204 622.887 121.519C622.887 94.6688 603.484 72.4723 575.459 72.4723C547.433 72.4723 527.132 94.6688 527.132 121.519C527.132 148.37 546.535 170.208 575.459 170.208ZM552.283 112.032C554.978 100.934 563.602 93.2368 575.099 93.2368C586.956 93.2368 595.759 101.65 598.454 112.032H552.283ZM687.249 170.208C712.939 170.208 733.42 148.549 733.42 121.698C733.42 94.8478 712.939 72.8303 687.249 72.8303C671.26 72.8303 662.817 79.2744 657.786 89.1197V37.2085H633.533V167.881H657.068V152.666C662.098 163.227 670.542 170.208 687.249 170.208ZM657.068 121.698C657.068 107.199 667.308 94.6688 683.297 94.6688C698.747 94.6688 709.167 107.02 709.167 121.519C709.167 135.661 698.747 148.37 683.297 148.37C667.308 148.37 657.068 136.198 657.068 121.698ZM785.937 170.208C802.645 170.208 811.088 163.227 816.119 152.666V167.881H839.653V74.7993H815.58V89.4777C810.549 79.4534 802.106 72.8303 785.937 72.8303C760.247 72.8303 739.767 94.8478 739.767 121.698C739.767 148.549 760.247 170.208 785.937 170.208ZM764.02 121.519C764.02 107.02 774.439 94.6688 789.889 94.6688C805.878 94.6688 816.119 107.199 816.119 121.698C816.119 136.198 805.878 148.37 789.889 148.37C774.439 148.37 764.02 135.661 764.02 121.519ZM886.04 170.208C906.7 170.208 922.33 157.32 922.33 140.136C922.33 126.173 916.042 116.149 888.915 109.168C877.776 106.304 876.339 103.44 876.339 100.218C876.339 94.4898 881.369 91.9837 888.016 91.9837C894.304 91.9837 900.053 94.8478 904.544 102.008L922.15 88.5827C912.629 76.2314 902.568 72.4723 887.477 72.4723C865.56 72.4723 852.625 84.6446 852.625 100.934C852.625 112.748 856.398 124.025 881.369 129.933C896.101 133.334 898.436 136.019 898.436 140.852C898.436 146.401 893.765 150.518 885.501 150.518C877.597 150.518 870.411 146.759 863.584 139.062L847.235 153.919C857.476 164.838 870.231 170.208 886.04 170.208ZM976.517 170.208C995.021 170.208 1010.65 161.974 1018.2 150.339L999.332 136.198C995.021 143.358 986.936 148.728 976.517 148.728C964.3 148.728 956.036 141.031 953.342 130.112H1023.23C1023.77 127.069 1023.94 124.204 1023.94 121.519C1023.94 94.6688 1004.54 72.4723 976.517 72.4723C948.491 72.4723 928.19 94.6688 928.19 121.519C928.19 148.37 947.593 170.208 976.517 170.208ZM953.342 112.032C956.036 100.934 964.66 93.2368 976.157 93.2368C988.014 93.2368 996.817 101.65 999.512 112.032H953.342Z" fill="#F9FAFB"/>+<path d="M63.3182 209.286C40.9935 198.863 22.8237 181.221 11.7365 159.201C0.649395 137.179 -2.70929 112.063 2.20168 87.8978C7.11264 63.733 20.0073 41.927 38.8077 25.9936C57.6082 10.0604 81.2196 0.927572 105.837 0.0669197C130.455 -0.793732 154.645 6.66803 174.511 21.2495C194.375 35.8312 208.758 56.6835 215.339 80.4466C221.924 104.21 220.322 129.499 210.797 152.241C201.271 174.982 184.374 193.851 162.831 205.806L109.664 109.786L63.3182 209.286Z" fill="#111827"/>+<path d="M162.726 205.864C147.617 214.226 130.748 218.901 113.494 219.504C96.24 220.108 79.0873 216.625 63.4319 209.338L109.665 109.785L162.726 205.864Z" fill="white"/>+<path d="M47.9785 64.5504H172.557V117.247C172.557 130.949 169.34 141.254 162.907 148.162C156.59 155.19 148.402 158.703 138.342 158.703C131.908 158.703 126.293 157.123 121.497 153.961C116.818 150.915 113.251 146.7 110.794 141.314C108.572 147.167 105.062 151.793 100.266 155.19C95.4705 158.703 89.7972 160.46 83.2466 160.46C72.2509 160.46 63.5947 156.947 57.2781 149.92C51.0784 142.894 47.9785 132.764 47.9785 119.531V64.5504ZM149.572 89.4937H122.55V117.072C122.55 122.107 123.661 125.972 125.884 128.665C128.224 131.476 131.616 132.88 136.061 132.88C140.038 132.88 143.255 131.535 145.711 128.842C148.284 126.265 149.572 122.341 149.572 117.072V89.4937ZM99.3891 89.4937H70.9641V118.828C70.9641 124.098 72.1924 128.022 74.6489 130.598C77.1054 133.291 80.6146 134.637 85.1766 134.637C89.5047 134.637 92.9555 133.291 95.529 130.598C98.1024 128.022 99.3891 124.098 99.3891 118.828V89.4937Z" fill="white"/>+</svg>diff --git a/frontend/src/components/BytebaseLogo.test.tsx b/frontend/src/components/BytebaseLogo.test.tsxindex e5e5332cf6..e9a6da43e4 100644--- a/frontend/src/components/BytebaseLogo.test.tsx+++ b/frontend/src/components/BytebaseLogo.test.tsx@@ -47,6 +47,10 @@ vi.mock("@/assets/logo-full.svg", () => ({default: "/assets/logo-full.svg",}));+vi.mock("@/assets/logo-full-dark.svg", () => ({+ default: "/assets/logo-full-dark.svg",+}));+let BytebaseLogo: typeof import("./BytebaseLogo").BytebaseLogo;const renderIntoContainer = (element: ReactElement) => {@@ -98,6 +102,19 @@ describe("BytebaseLogo", () => {unmount();});+ test("renders dark fallback Bytebase SVG when requested", () => {+ mocks.workspaceLogo = "";+ const { container, render, unmount } = renderIntoContainer(+ <BytebaseLogo builtinTheme="dark" />+ );+ render();+ const img = container.querySelector("img");+ expect(img).not.toBeNull();+ expect(img?.getAttribute("src")).toBe("/assets/logo-full-dark.svg");+ expect(img?.getAttribute("alt")).toBe("Bytebase");+ unmount();+ });+test("records and navigates when a redirect is provided", () => {mocks.workspaceLogo = "";const { container, render, unmount } = renderIntoContainer(diff --git a/frontend/src/components/BytebaseLogo.tsx b/frontend/src/components/BytebaseLogo.tsxindex 8d14eaf3b8..54edf94246 100644--- a/frontend/src/components/BytebaseLogo.tsx+++ b/frontend/src/components/BytebaseLogo.tsx@@ -1,6 +1,7 @@import { useTranslation } from "react-i18next";import { useNavigate } from "@/app/router";import logoFull from "@/assets/logo-full.svg";+import logoFullDark from "@/assets/logo-full-dark.svg";import { RouterLink } from "@/components/RouterLink";import { useRecentVisit, useWorkspace } from "@/hooks/useAppState";import { cn } from "@/lib/utils";@@ -9,6 +10,7 @@ type Props = {/** Optional route name — when set, the logo is wrapped in a link that records the visit. */readonly redirect?: string;readonly className?: string;+ readonly builtinTheme?: "light" | "dark";};/**@@ -16,12 +18,17 @@ type Props = {* custom logo when set, otherwise the bundled Bytebase fallback SVG.**/-export function BytebaseLogo({ className, redirect }: Props) {+export function BytebaseLogo({+ builtinTheme = "light",+ className,+ redirect,+}: Props) {const { t } = useTranslation();const workspace = useWorkspace();const { record } = useRecentVisit();const navigate = useNavigate();const customLogo = workspace?.logo ?? "";+ const builtinLogo = builtinTheme === "dark" ? logoFullDark : logoFull;const content = (<span className="h-full w-full select-none flex flex-row justify-center items-center">@@ -33,7 +40,7 @@ export function BytebaseLogo({ className, redirect }: Props) {/>) : (<img- src={logoFull}+ src={builtinLogo}alt="Bytebase"className="h-8 md:h-10 w-auto object-contain"/>diff --git a/frontend/src/components/InstanceLabel.test.tsx b/frontend/src/components/InstanceLabel.test.tsxnew file mode 100644index 0000000000..875f2753d9--- /dev/null+++ b/frontend/src/components/InstanceLabel.test.tsx@@ -0,0 +1,178 @@+import type { MouseEventHandler, ReactElement, ReactNode } from "react";+import { act } from "react";+import { createRoot, type Root } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import { Engine } from "@/types/proto-es/v1/common_pb";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const mocks = vi.hoisted(() => ({+ instancesByName: {} as Record<string, { name: string; title: string }>,+ fetchInstance: vi.fn(),+ hasWorkspacePermissionV2: vi.fn((_permission: string) => true),+}));++vi.mock("react-i18next", () => ({+ initReactI18next: { type: "3rdParty", init: () => {} },+ useTranslation: () => ({ t: (key: string) => key }),+}));++vi.mock("@/components/EngineIcon", () => ({+ EngineIcon: ({ engine }: { engine: Engine }) => (+ <span data-engine={Engine[engine]} data-testid="engine-icon" />+ ),+}));++vi.mock("@/components/RouterLink", () => ({+ RouterLink: ({+ children,+ className,+ onClick,+ to,+ }: {+ children: ReactNode;+ className?: string;+ onClick?: MouseEventHandler<HTMLAnchorElement>;+ to: { name?: string; params?: Record<string, string> };+ }) => (+ <a+ className={className}+ data-instance-id={to.params?.instanceId}+ data-route-name={to.name}+ onClick={onClick}+ >+ {children}+ </a>+ ),+}));++vi.mock("@/stores/app", () => {+ const appState = {+ get instancesByName() {+ return mocks.instancesByName;+ },+ };+ const useAppStore = (selector: (state: typeof appState) => unknown) =>+ selector(appState);+ useAppStore.getState = () => ({+ fetchInstance: mocks.fetchInstance,+ });+ return { useAppStore };+});++vi.mock("@/utils", async (importOriginal) => ({+ ...(await importOriginal<typeof import("@/utils")>()),+ hasWorkspacePermissionV2: mocks.hasWorkspacePermissionV2,+}));++import { InstanceLabel } from "./InstanceLabel";++const render = async (element: ReactElement) => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);++ await act(async () => {+ root.render(element);+ await Promise.resolve();+ });++ return { container, root };+};++describe("InstanceLabel", () => {+ let root: Root | undefined;++ beforeEach(() => {+ vi.clearAllMocks();+ mocks.hasWorkspacePermissionV2.mockReturnValue(true);+ mocks.instancesByName = {+ "instances/prod": {+ name: "instances/prod",+ title: "Prod Instance",+ engine: Engine.POSTGRES,+ activation: true,+ dataSources: [],+ } as never,+ };+ });++ afterEach(() => {+ act(() => root?.unmount());+ document.body.innerHTML = "";+ root = undefined;+ });++ test("renders engine icon and instance title as a label", async () => {+ const rendered = await render(<InstanceLabel instanceName="instances/prod" />);+ root = rendered.root;++ expect(rendered.container.querySelector("a")).toBeNull();+ expect(rendered.container.querySelector("[data-testid='engine-icon']"))+ .not.toBeNull();+ expect(rendered.container.textContent).toBe("Prod Instance");+ expect(mocks.fetchInstance).toHaveBeenCalledWith("instances/prod");+ });++ test("renders a provided instance resource without fetching", async () => {+ const rendered = await render(+ <InstanceLabel+ instance={{+ name: "instances/reporting",+ title: "Reporting",+ engine: Engine.MYSQL,+ activation: true,+ dataSources: [],+ } as never}+ />+ );+ root = rendered.root;++ expect(rendered.container.querySelector("[data-testid='engine-icon']"))+ .not.toBeNull();+ expect(rendered.container.textContent).toBe("Reporting");+ expect(mocks.fetchInstance).not.toHaveBeenCalled();+ });++ test("renders engine icon and instance title as a link", async () => {+ const rendered = await render(+ <InstanceLabel instanceName="instances/prod" link />+ );+ root = rendered.root;++ const link = rendered.container.querySelector("a");+ expect(link?.textContent).toBe("Prod Instance");+ expect(link?.getAttribute("data-route-name")).toBe(+ "workspace.instance.detail"+ );+ expect(link?.getAttribute("data-instance-id")).toBe("prod");+ });++ test("renders invalid instance names as plain text even when link is requested", async () => {+ const rendered = await render(<InstanceLabel instanceName="instances/" link />);+ root = rendered.root;++ expect(rendered.container.querySelector("a")).toBeNull();+ expect(rendered.container.querySelector("[data-testid='engine-icon']")).toBeNull();+ expect(rendered.container.textContent).toBe("instances/");+ expect(mocks.fetchInstance).not.toHaveBeenCalled();+ });++ test("renders the instance resource name as plain text without instance get permission", async () => {+ mocks.hasWorkspacePermissionV2.mockImplementation(+ (permission) => permission !== "bb.instances.get"+ );++ const rendered = await render(+ <InstanceLabel instanceName="instances/prod" link />+ );+ root = rendered.root;++ expect(rendered.container.querySelector("a")).toBeNull();+ expect(rendered.container.querySelector("[data-testid='engine-icon']")).toBeNull();+ expect(rendered.container.textContent).toBe("instances/prod");+ expect(mocks.fetchInstance).not.toHaveBeenCalled();+ });+});diff --git a/frontend/src/components/InstanceLabel.tsx b/frontend/src/components/InstanceLabel.tsxnew file mode 100644index 0000000000..449554d250--- /dev/null+++ b/frontend/src/components/InstanceLabel.tsx@@ -0,0 +1,117 @@+import { type MouseEventHandler, type ReactNode, useEffect } from "react";+import { useTranslation } from "react-i18next";+import { INSTANCE_ROUTE_DETAIL } from "@/app/router/handles";+import { EngineIcon } from "@/components/EngineIcon";+import { RouterLink, type RouterLinkProps } from "@/components/RouterLink";+import { cn } from "@/lib/utils";+import { useAppStore } from "@/stores/app";+import type {+ Instance,+ InstanceResource,+} from "@/types/proto-es/v1/instance_service_pb";+import { isValidInstanceName } from "@/types/v1/instance";+import {+ extractInstanceResourceName,+ hasWorkspacePermissionV2,+ instanceV1Name,+} from "@/utils";++export function InstanceLabel({+ children,+ instance: instanceProp,+ instanceName,+ showResourceType = false,+ className,+ link,+ onClick,+ ...linkProps+}: {+ children?: ReactNode;+ instance?: Instance | InstanceResource;+ instanceName?: string;+ showResourceType?: boolean;+ link?: boolean;+ onClick?: MouseEventHandler<HTMLAnchorElement>;+} & Pick<RouterLinkProps, "className" | "rel" | "target">) {+ const { t } = useTranslation();+ const name = instanceProp?.name ?? instanceName ?? "";+ const instanceId = extractInstanceResourceName(name);+ const validInstanceName = isValidInstanceName(name) && !!instanceId;+ const canGetInstance = hasWorkspacePermissionV2("bb.instances.get");+ const cachedInstance = useAppStore((s) =>+ validInstanceName && canGetInstance ? s.instancesByName[name] : undefined+ );+ const instance = instanceProp ?? cachedInstance;+ const shouldFetchInstance = children === undefined;++ useEffect(() => {+ if (+ shouldFetchInstance &&+ validInstanceName &&+ canGetInstance &&+ !instanceProp+ ) {+ void useAppStore.getState().fetchInstance(name);+ }+ }, [+ canGetInstance,+ instanceProp,+ name,+ shouldFetchInstance,+ validInstanceName,+ ]);++ if (!validInstanceName || !canGetInstance) {+ return <span className={className}>{children ?? (name || "-")}</span>;+ }++ const label = instance?.title ? instanceV1Name(instance) : instanceId;+ const content: ReactNode = children ?? (+ <>+ {showResourceType && (+ <span className="mr-1 text-xs text-control-light">+ {t("common.instance")}:+ </span>+ )}+ {instance && <EngineIcon engine={instance.engine} className="size-4" />}+ <span className="truncate">{label}</span>+ </>+ );++ if (!link) {+ if (className) {+ return (+ <span+ className={cn("inline-flex min-w-0 items-center gap-x-1", className)}+ >+ {content}+ </span>+ );+ }+ return (+ <span className="inline-flex min-w-0 items-center gap-x-1">+ {content}+ </span>+ );+ }++ return (+ <RouterLink+ {...linkProps}+ to={{+ name: INSTANCE_ROUTE_DETAIL,+ params: { instanceId },+ }}+ className={cn(+ "inline-flex min-w-0 max-w-full items-center gap-x-1 normal-link hover:underline",+ className+ )}+ onClick={(event) => {+ event.stopPropagation();+ onClick?.(event);+ }}+ >+ {content}+ </RouterLink>+ );+}diff --git a/frontend/src/components/ProjectLabel.test.tsx b/frontend/src/components/ProjectLabel.test.tsxindex fa8de5e6c7..0685e04624 100644--- a/frontend/src/components/ProjectLabel.test.tsx+++ b/frontend/src/components/ProjectLabel.test.tsx@@ -10,7 +10,6 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";const mocks = vi.hoisted(() => ({useProjectByName: vi.fn(),getOrFetchProjectByName: vi.fn(),- hasWorkspacePermissionV2: vi.fn(() => true),isDefaultProject: vi.fn((_name: string) => false),}));@@ -54,11 +53,6 @@ vi.mock("@/stores/app", () => ({},}));-vi.mock("@/utils", async (importOriginal) => ({- ...(await importOriginal<typeof import("@/utils")>()),- hasWorkspacePermissionV2: mocks.hasWorkspacePermissionV2,-}));-vi.mock("@/types/v1/project", async (importOriginal) => ({...(await importOriginal<typeof import("@/types/v1/project")>()),isDefaultProject: mocks.isDefaultProject,@@ -84,7 +78,6 @@ describe("ProjectLabel", () => {beforeEach(() => {vi.clearAllMocks();- mocks.hasWorkspacePermissionV2.mockReturnValue(true);mocks.isDefaultProject.mockReturnValue(false);mocks.useProjectByName.mockReturnValue({name: "projects/sample",diff --git a/frontend/src/components/ProjectLabel.tsx b/frontend/src/components/ProjectLabel.tsxindex 376d679e1b..b34af8fe8c 100644--- a/frontend/src/components/ProjectLabel.tsx+++ b/frontend/src/components/ProjectLabel.tsx@@ -6,7 +6,7 @@ import { useProjectByName } from "@/hooks/useProjectByName";import { cn } from "@/lib/utils";import { useAppStore } from "@/stores/app";import { isDefaultProject, isValidProjectName } from "@/types/v1/project";-import { extractProjectResourceName, hasWorkspacePermissionV2 } from "@/utils";+import { extractProjectResourceName } from "@/utils";export function ProjectLabel({children,@@ -31,12 +31,7 @@ export function ProjectLabel({const shouldFetchProject = children === undefined;useEffect(() => {- if (- shouldFetchProject &&- validProjectName &&- !defaultProject &&- hasWorkspacePermissionV2("bb.projects.get")- ) {+ if (shouldFetchProject && validProjectName && !defaultProject) {void useAppStore.getState().getOrFetchProjectByName(projectName, true);}}, [defaultProject, projectName, shouldFetchProject, validProjectName]);diff --git a/frontend/src/components/WorkspaceSetupGuide.test.tsx b/frontend/src/components/WorkspaceSetupGuide.test.tsxindex b01a141af3..c456b1a8c3 100644--- a/frontend/src/components/WorkspaceSetupGuide.test.tsx+++ b/frontend/src/components/WorkspaceSetupGuide.test.tsx@@ -376,7 +376,7 @@ describe("WorkspaceSetupGuide", () => {expect(mocks.fetchProjectList).not.toHaveBeenCalled();});- it("advances to the instance step after a project exists", async () => {+ it("advances to the project database connection step after a project exists", async () => {mocks.fetchProjectList.mockResolvedValue({projects: [{ name: "projects/project-a" }],nextPageToken: "",@@ -394,8 +394,9 @@ describe("WorkspaceSetupGuide", () => {await Promise.resolve();});expect(mocks.routerPush).toHaveBeenCalledWith({- name: "workspace.instance",- query: { intro: "create-instance" },+ name: "workspace.project.database",+ params: { projectId: "project-a" },+ query: { intro: "connect-database" },});expect(container.querySelector("[data-testid='setup-step-hasFirstQuery']")diff --git a/frontend/src/components/WorkspaceSetupGuide.tsx b/frontend/src/components/WorkspaceSetupGuide.tsxindex 7f05b837c0..1030f07c90 100644--- a/frontend/src/components/WorkspaceSetupGuide.tsx+++ b/frontend/src/components/WorkspaceSetupGuide.tsx@@ -8,6 +8,7 @@ import {DATABASE_ROUTE_DASHBOARD,INSTANCE_ROUTE_DASHBOARD,PROJECT_V1_ROUTE_DASHBOARD,+ PROJECT_V1_ROUTE_DATABASES,SQL_EDITOR_DATABASE_MODULE,} from "@/app/router/handles";import { RouterLink } from "@/components/RouterLink";@@ -16,6 +17,7 @@ import { Tooltip } from "@/components/ui/tooltip";import { useIntroStateByKey } from "@/hooks/useAppState";import { preCreateIssue } from "@/lib/plan/issue";import {+ CONNECT_DATABASE_PRODUCT_INTRO,CREATE_INSTANCE_PRODUCT_INTRO,CREATE_PROJECT_PRODUCT_INTRO,PREPARE_DATABASE_PRODUCT_INTRO,@@ -245,10 +247,23 @@ export function WorkspaceSetupGuide() {key: "hasInstance",label: t("workspace-setup-guide.steps.instance"),description: t("workspace-setup-guide.descriptions.instance"),- link: {- name: INSTANCE_ROUTE_DASHBOARD,- query: { [PRODUCT_INTRO_QUERY_KEY]: CREATE_INSTANCE_PRODUCT_INTRO },- },+ link:+ !setupState.hasInstance && setupState.projectName+ ? {+ name: PROJECT_V1_ROUTE_DATABASES,+ params: {+ projectId: extractProjectResourceName(setupState.projectName),+ },+ query: {+ [PRODUCT_INTRO_QUERY_KEY]: CONNECT_DATABASE_PRODUCT_INTRO,+ },+ }+ : {+ name: INSTANCE_ROUTE_DASHBOARD,+ query: {+ [PRODUCT_INTRO_QUERY_KEY]: CREATE_INSTANCE_PRODUCT_INTRO,+ },+ },done: setupState.hasInstance,matchesRoute: (routeName) =>isRouteInside(routeName, INSTANCE_ROUTE_DASHBOARD),diff --git a/frontend/src/components/header/HeaderBreadcrumb.test.tsx b/frontend/src/components/header/HeaderBreadcrumb.test.tsxindex 89d9e335ab..2f3f468e62 100644--- a/frontend/src/components/header/HeaderBreadcrumb.test.tsx+++ b/frontend/src/components/header/HeaderBreadcrumb.test.tsx@@ -22,7 +22,16 @@ const mocks = vi.hoisted(() => ({resolve: vi.fn(({ name }: { name: string }) => ({fullPath: `/${name}`,})),+ projectSwitchPanelProps: undefined as+ | { excludeDefaultProject?: boolean }+ | undefined,switchWorkspace: vi.fn(),+ workspaceList: [+ {+ name: "workspaces/default",+ title: "Default Workspace",+ },+ ],}));vi.mock("react-i18next", () => ({@@ -60,12 +69,7 @@ vi.mock("@/hooks/useAppState", () => ({name: "workspaces/default",title: "Default Workspace",}),- useWorkspaceList: () => [- {- name: "workspaces/default",- title: "Default Workspace",- },- ],+ useWorkspaceList: () => mocks.workspaceList,}));vi.mock("@/components/RouterLink", () => ({@@ -134,7 +138,10 @@ vi.mock("@/components/ui/popover", () => ({}));vi.mock("@/components/header/ProjectSwitchPanel", () => ({- ProjectSwitchPanel: () => <div data-testid="project-switch-panel" />,+ ProjectSwitchPanel: (props: { excludeDefaultProject?: boolean }) => {+ mocks.projectSwitchPanelProps = props;+ return <div data-testid="project-switch-panel" />;+ },}));vi.mock("@/components/header/ProjectCreateDialog", () => ({@@ -164,6 +171,13 @@ const renderIntoContainer = (element: ReactElement) => {beforeEach(async () => {vi.clearAllMocks();+ mocks.projectSwitchPanelProps = undefined;+ mocks.workspaceList = [+ {+ name: "workspaces/default",+ title: "Default Workspace",+ },+ ];({ HeaderBreadcrumb } = await import("./HeaderBreadcrumb"));});@@ -201,4 +215,59 @@ describe("HeaderBreadcrumb", () => {unmount();});++ test("checks before switching workspace", () => {+ mocks.workspaceList = [+ {+ name: "workspaces/default",+ title: "Default Workspace",+ },+ {+ name: "workspaces/other",+ title: "Other Workspace",+ },+ ];+ const onBeforeSwitchWorkspace = vi.fn(() => false);+ const { container, render, unmount } = renderIntoContainer(+ <HeaderBreadcrumb onBeforeSwitchWorkspace={onBeforeSwitchWorkspace} />+ );++ render();++ const workspaceSwitchButton = container.querySelector<HTMLButtonElement>(+ "button"+ );+ act(() => {+ workspaceSwitchButton?.click();+ });+ const otherWorkspaceButton = Array.from(+ container.querySelectorAll("button")+ ).find((button) => button.textContent?.includes("Other Workspace"));+ act(() => {+ otherWorkspaceButton?.click();+ });++ expect(onBeforeSwitchWorkspace).toHaveBeenCalledTimes(1);+ expect(mocks.switchWorkspace).not.toHaveBeenCalled();++ unmount();+ });++ test("passes default-project visibility to the project switcher", () => {+ const { container, render, unmount } = renderIntoContainer(+ <HeaderBreadcrumb projectSwitchExcludeDefaultProject={false} />+ );++ render();++ const projectSwitchButton = container.querySelector<HTMLButtonElement>(+ "button"+ );+ act(() => {+ projectSwitchButton?.click();+ });+ expect(mocks.projectSwitchPanelProps?.excludeDefaultProject).toBe(false);++ unmount();+ });});diff --git a/frontend/src/components/header/HeaderBreadcrumb.tsx b/frontend/src/components/header/HeaderBreadcrumb.tsxindex 7e3f2a4f3d..c1012aa2ef 100644--- a/frontend/src/components/header/HeaderBreadcrumb.tsx+++ b/frontend/src/components/header/HeaderBreadcrumb.tsx@@ -31,7 +31,18 @@ import {import { cn } from "@/lib/utils";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";import { ProjectCreateDialog } from "./ProjectCreateDialog";-import { ProjectSwitchPanel } from "./ProjectSwitchPanel";+import {+ ProjectSwitchPanel,+ type ProjectSwitchPanelProps,+} from "./ProjectSwitchPanel";++export type HeaderBreadcrumbProps = {+ projectId?: string;+ currentProjectName?: string;+ projectSwitchExcludeDefaultProject?: boolean;+ onBeforeSwitchWorkspace?: () => boolean;+ onSelectProject?: NonNullable<ProjectSwitchPanelProps["onSelectProject"]>;+};function planLabel(t: (key: string) => string,@@ -65,7 +76,9 @@ function planVariant(// ---------------------------------------------------------------------------// WorkspaceSegment — shows workspace name + plan badge + optional dropdown// ----------------------------------------------------------------------------export function WorkspaceSegment() {+export function WorkspaceSegment({+ onBeforeSwitchWorkspace,+}: Pick<HeaderBreadcrumbProps, "onBeforeSwitchWorkspace"> = {}) {const { t } = useTranslation();const workspace = useWorkspace();const workspaceList = useWorkspaceList();@@ -82,10 +95,11 @@ export function WorkspaceSegment() {const onSwitch = useCallback((workspaceName: string) => {if (workspaceName === currentWorkspaceName) return;+ if (onBeforeSwitchWorkspace && !onBeforeSwitchWorkspace()) return;setOpen(false);void switchWorkspace(workspaceName);},- [currentWorkspaceName, switchWorkspace]+ [currentWorkspaceName, onBeforeSwitchWorkspace, switchWorkspace]);return (@@ -169,15 +183,27 @@ export function WorkspaceSegment() {// ---------------------------------------------------------------------------// ProjectSegment — shows project name + dropdown, only when inside a project// ----------------------------------------------------------------------------export function ProjectSegment() {+export function ProjectSegment({+ projectId: projectIdOverride,+ currentProjectName: currentProjectNameOverride,+ projectSwitchExcludeDefaultProject = true,+ onSelectProject,+}: Pick<+ HeaderBreadcrumbProps,+ | "projectId"+ | "currentProjectName"+ | "projectSwitchExcludeDefaultProject"+ | "onSelectProject"+> = {}) {const { t } = useTranslation();const route = useCurrentRoute();const [open, setOpen] = useState(false);const [createOpen, setCreateOpen] = useState(false);- const projectId = route.params.projectId as string | undefined;- const currentProjectName = projectId- ? `${projectNamePrefix}${projectId}`- : "";+ const projectId =+ projectIdOverride ?? (route.params.projectId as string | undefined);+ const currentProjectName =+ currentProjectNameOverride ??+ (projectId ? `${projectNamePrefix}${projectId}` : "");const currentProject = useProject(currentProjectName);const hasProject = isValidProjectName(currentProject?.name);const { record } = useRecentVisit();@@ -236,6 +262,9 @@ export function ProjectSegment() {className="w-[24rem] max-w-[calc(100vw-2rem)] p-0! py-3!"><ProjectSwitchPanel+ currentProjectName={currentProjectName}+ excludeDefaultProject={projectSwitchExcludeDefaultProject}+ onSelectProject={onSelectProject}onClose={() => setOpen(false)}onRequestCreate={() => {setOpen(false);@@ -257,14 +286,25 @@ export function ProjectSegment() {// ---------------------------------------------------------------------------// HeaderBreadcrumb — the assembled breadcrumb bar// ----------------------------------------------------------------------------export function HeaderBreadcrumb() {+export function HeaderBreadcrumb({+ projectId,+ currentProjectName,+ projectSwitchExcludeDefaultProject,+ onBeforeSwitchWorkspace,+ onSelectProject,+}: HeaderBreadcrumbProps = {}) {return (<div className="flex items-center gap-x-1"><div className="hidden md:flex items-center gap-x-1">- <WorkspaceSegment />+ <WorkspaceSegment onBeforeSwitchWorkspace={onBeforeSwitchWorkspace} /><span className="text-control-placeholder select-none">/</span></div>- <ProjectSegment />+ <ProjectSegment+ projectId={projectId}+ currentProjectName={currentProjectName}+ projectSwitchExcludeDefaultProject={projectSwitchExcludeDefaultProject}+ onSelectProject={onSelectProject}+ /></div>);}diff --git a/frontend/src/components/header/ProjectSwitchPanel.test.tsx b/frontend/src/components/header/ProjectSwitchPanel.test.tsxindex 510beafd0d..e28fa4e503 100644--- a/frontend/src/components/header/ProjectSwitchPanel.test.tsx+++ b/frontend/src/components/header/ProjectSwitchPanel.test.tsx@@ -48,6 +48,8 @@ const mocks = vi.hoisted(() => ({close: vi.fn(),recentProjects: [] as Array<typeof recentProject>,allProjects: [] as Array<typeof allProject>,+ recentOptions: undefined as { excludeDefault?: boolean } | undefined,+ projectListOptions: undefined as { excludeDefault?: boolean } | undefined,hasMore: false,loadMore: vi.fn(),onPageSizeChange: vi.fn(),@@ -80,19 +82,28 @@ vi.mock("@/hooks/useAppState", () => ({record: mocks.record,}),useProject: () => recentProject,- useRecentProjects: () => ({- projects: mocks.recentProjects,- }),- useProjectList: () => ({- projects: mocks.allProjects,- isLoading: false,- isFetchingMore: false,- hasMore: mocks.hasMore,- loadMore: mocks.loadMore,- pageSize: 50,- pageSizeOptions: [50],- onPageSizeChange: mocks.onPageSizeChange,- }),+ useRecentProjects: (options?: { excludeDefault?: boolean }) => {+ mocks.recentOptions = options;+ return {+ projects: mocks.recentProjects,+ };+ },+ useProjectList: (+ _query: string,+ options?: { excludeDefault?: boolean }+ ) => {+ mocks.projectListOptions = options;+ return {+ projects: mocks.allProjects,+ isLoading: false,+ isFetchingMore: false,+ hasMore: mocks.hasMore,+ loadMore: mocks.loadMore,+ pageSize: 50,+ pageSizeOptions: [50],+ onPageSizeChange: mocks.onPageSizeChange,+ };+ },useWorkspacePermission: () => true,projectMatchesKeyword: (project: typeof recentProject, keyword: string) =>project.title.toLowerCase().includes(keyword.toLowerCase()) ||@@ -164,6 +175,8 @@ beforeEach(async () => {vi.clearAllMocks();mocks.recentProjects = [recentProject];mocks.allProjects = [allProject];+ mocks.recentOptions = undefined;+ mocks.projectListOptions = undefined;mocks.hasMore = false;mocks.inputOnChange = undefined;window.open = vi.fn();@@ -322,6 +335,52 @@ describe("ProjectSwitchPanel", () => {unmount();});+ test("delegates project selection to a custom handler", () => {+ const selectProject = vi.fn();+ const { container, render, unmount } = renderIntoContainer(+ <ProjectSwitchPanel+ onClose={mocks.close}+ onRequestCreate={mocks.requestCreate}+ onSelectProject={selectProject}+ />+ );++ render();++ const row = Array.from(container.querySelectorAll("tr")).find((tr) =>+ tr.textContent?.includes("Recent Project")+ );+ act(() => {+ row?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(selectProject).toHaveBeenCalledWith(+ recentProject,+ expect.objectContaining({ type: "click" })+ );+ expect(mocks.resolve).not.toHaveBeenCalled();+ expect(mocks.record).not.toHaveBeenCalled();+ expect(mocks.push).not.toHaveBeenCalled();+ expect(mocks.close).toHaveBeenCalled();+ unmount();+ });++ test("can keep the default project in both switcher lists", () => {+ const { render, unmount } = renderIntoContainer(+ <ProjectSwitchPanel+ onClose={mocks.close}+ onRequestCreate={mocks.requestCreate}+ excludeDefaultProject={false}+ />+ );++ render();++ expect(mocks.recentOptions).toEqual({ excludeDefault: false });+ expect(mocks.projectListOptions).toEqual({ excludeDefault: false });+ unmount();+ });+test("keeps project lists constrained to vertical scrolling", () => {const { container, render, unmount } = renderIntoContainer(<ProjectSwitchPaneldiff --git a/frontend/src/components/header/ProjectSwitchPanel.tsx b/frontend/src/components/header/ProjectSwitchPanel.tsxindex 64c42d560f..b8fffe0f76 100644--- a/frontend/src/components/header/ProjectSwitchPanel.tsx+++ b/frontend/src/components/header/ProjectSwitchPanel.tsx@@ -42,6 +42,12 @@ import type { Project } from "@/types/proto-es/v1/project_service_pb";export interface ProjectSwitchPanelProps {onClose: () => void;onRequestCreate: () => void;+ currentProjectName?: string;+ excludeDefaultProject?: boolean;+ onSelectProject?: (+ project: Project,+ event: ReactMouseEvent<HTMLElement>+ ) => void;}type ProjectSwitchTab = "recent" | "all";@@ -97,12 +103,17 @@ function ProjectSwitchFooter({export function ProjectSwitchPanel({onClose,onRequestCreate,+ currentProjectName: currentProjectNameOverride,+ excludeDefaultProject = true,+ onSelectProject,}: ProjectSwitchPanelProps) {const { t } = useTranslation();const { record } = useRecentVisit();const navigate = useNavigate();const route = useCurrentRoute();- const { projects: recentProjectList } = useRecentProjects();+ const { projects: recentProjectList } = useRecentProjects({+ excludeDefault: excludeDefaultProject,+ });const [searchText, setSearchText] = useState("");const [selectedTab, setSelectedTab] = useState<ProjectSwitchTab>(() =>recentProjectList.length > 0 ? "recent" : "all"@@ -115,9 +126,9 @@ export function ProjectSwitchPanel({}}, [recentProjectList.length]);const projectId = route.params.projectId as string | undefined;- const currentProjectName = projectId- ? `${projectNamePrefix}${projectId}`- : "";+ const currentProjectName =+ currentProjectNameOverride ??+ (projectId ? `${projectNamePrefix}${projectId}` : "");const currentProject = useProject(currentProjectName);const allowToCreateProject = useWorkspacePermission("bb.projects.create");@@ -151,10 +162,16 @@ export function ProjectSwitchPanel({pageSize,pageSizeOptions,onPageSizeChange,- } = useProjectList(searchText);+ } = useProjectList(searchText, { excludeDefault: excludeDefaultProject });const handleProjectSelect = useCallback((project: Project, event: ReactMouseEvent<HTMLElement>) => {+ if (onSelectProject) {+ onSelectProject(project, event);+ onClose();+ return;+ }+const route = navigate.resolve({name: PROJECT_V1_ROUTE_DETAIL,params: {@@ -171,7 +188,7 @@ export function ProjectSwitchPanel({onClose();},- [navigate, onClose, record]+ [navigate, onClose, onSelectProject, record]);const handleGotoWorkspace = useCallback(diff --git a/frontend/src/components/instance/InstanceFormBody.test.ts b/frontend/src/components/instance/InstanceFormBody.test.tsindex 33271548e5..f94664487c 100644--- a/frontend/src/components/instance/InstanceFormBody.test.ts+++ b/frontend/src/components/instance/InstanceFormBody.test.ts@@ -65,6 +65,9 @@ describe("InstanceFormBody", () => {expect(source).toContain("instance.sync-databases.project-description");expect(source).toContain("instance.sync-databases.project-sync-all");expect(source).toContain("projectName");+ expect(source).toContain('useProjectByName(projectName ?? "")');+ expect(source).toContain("project.title || projectName");+ expect(source).toContain("values={{ project: projectTitle }}");expect(source).toContain("fetchProject(routeProjectName");expect(source).toContain("ResourceLink");expect(source).toContain("showResourceType={false}");diff --git a/frontend/src/components/instance/InstanceFormBody.tsx b/frontend/src/components/instance/InstanceFormBody.tsxindex 5e405eeaa9..95ef0fda83 100644--- a/frontend/src/components/instance/InstanceFormBody.tsx+++ b/frontend/src/components/instance/InstanceFormBody.tsx@@ -30,6 +30,7 @@ import {} from "@/components/ui/form";import { Input } from "@/components/ui/input";import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";+import { useProjectByName } from "@/hooks/useProjectByName";import { cn } from "@/lib/utils";import { pushNotification } from "@/stores";import { useAppStore } from "@/stores/app";@@ -430,6 +431,7 @@ function SyncDatabases({const { t } = useTranslation();const ctx = useInstanceFormContext();const { hideAdvancedFeatures, instance, pendingCreateInstance } = ctx;+ const project = useProjectByName(projectName ?? "");const [syncAll, setSyncAll] = useState(syncDatabases === undefined);const [selectedSet, setSelectedSet] = useState<Set<string>>(@@ -504,6 +506,8 @@ function SyncDatabases({const visibleDatabases = filteredDatabases.slice(0, visibleDatabaseCount);const hasMore = filteredDatabases.length > visibleDatabaseCount;const hasProjectContext = !!projectName && isCreatingProp;+ const projectTitle =+ project.name === projectName ? project.title || projectName : projectName;const handleKeyDown = (e: React.KeyboardEvent) => {if (e.nativeEvent.isComposing) return;@@ -548,7 +552,7 @@ function SyncDatabases({<Transt={t}i18nKey="instance.sync-databases.project-description"- values={{ project: projectName }}+ values={{ project: projectTitle }}components={{project: (<ResourceLinkdiff --git a/frontend/src/hooks/useAppState.test.tsx b/frontend/src/hooks/useAppState.test.tsxnew file mode 100644index 0000000000..e8cea7d169--- /dev/null+++ b/frontend/src/hooks/useAppState.test.tsx@@ -0,0 +1,81 @@+import { renderHook, waitFor } from "@testing-library/react";+import { beforeEach, describe, expect, test, vi } from "vitest";+import type { Project } from "@/types/proto-es/v1/project_service_pb";+import {+ storageKeyRecentProjects,+ workspaceCacheScope,+} from "@/utils/storage-keys";++const mocks = vi.hoisted(() => ({+ batchFetchProjects: vi.fn(),+ getProjectByName: vi.fn(),+ loadCurrentUser: vi.fn(),+ loadServerInfo: vi.fn(),+ projectsByName: {} as Record<string, Project>,+}));++vi.mock("@/stores/app", () => ({+ getProjectResourceId: (name: string) => name.split("/").pop() ?? "",+ isConnectAlreadyExists: () => false,+ isDefaultProjectName: (name: string) => name === "projects/default",+ useAppStore: (selector: (state: unknown) => unknown) =>+ selector({+ appFeatures: {},+ batchFetchProjects: mocks.batchFetchProjects,+ currentUser: {+ email: "[email protected]",+ workspace: "workspaces/default",+ },+ getProjectByName: mocks.getProjectByName,+ loadCurrentUser: mocks.loadCurrentUser,+ loadServerInfo: mocks.loadServerInfo,+ projectsByName: mocks.projectsByName,+ serverInfo: { saas: false },+ }),+}));++import { useRecentProjects } from "./useAppState";++const recentProjectsKey = storageKeyRecentProjects(+ workspaceCacheScope(false, "workspaces/default"),+);++describe("useRecentProjects", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ localStorage.clear();+ mocks.projectsByName = {};+ mocks.batchFetchProjects.mockResolvedValue([]);+ mocks.getProjectByName.mockImplementation((name: string) => ({+ name: name === "projects/default" ? name : "projects/-1",+ }));+ });++ test("does not expose the unknown project placeholder for uncached recent projects", async () => {+ localStorage.setItem(recentProjectsKey, JSON.stringify(["projects/app"]));++ const { result } = renderHook(() => useRecentProjects());++ await waitFor(() => {+ expect(mocks.batchFetchProjects).toHaveBeenCalledWith(["projects/app"]);+ });++ expect(result.current.projects).toEqual([]);+ });++ test("keeps the synthesized default project when requested", async () => {+ localStorage.setItem(+ recentProjectsKey,+ JSON.stringify(["projects/default"])+ );++ const { result } = renderHook(() =>+ useRecentProjects({ excludeDefault: false })+ );++ await waitFor(() => {+ expect(result.current.projects).toEqual([{ name: "projects/default" }]);+ });+ });+});diff --git a/frontend/src/hooks/useAppState.ts b/frontend/src/hooks/useAppState.tsindex d48859f0d9..0474154e2f 100644--- a/frontend/src/hooks/useAppState.ts+++ b/frontend/src/hooks/useAppState.ts@@ -16,6 +16,7 @@ import {nullEnvironment,unknownEnvironment,} from "@/types/v1/environment";+import { isValidProjectName } from "@/types/v1/project";import { unknownUser } from "@/types/v1/user";import {storageKeyRecentProjects,@@ -341,7 +342,10 @@ export function useAccessGrant(name: string) {return useAppStore((state) => state.accessGrantsByName[name]);}-export function useProjectList(query: string) {+export function useProjectList(+ query: string,+ { excludeDefault = true }: { excludeDefault?: boolean } = {}+) {const searchProjects = useAppStore((state) => state.searchProjects);const [projects, setProjects] = useState<Project[]>([]);const [pageToken, setPageToken] = useState("");@@ -367,6 +371,7 @@ export function useProjectList(query: string) {pageSize,pageToken: mode === "refresh" ? "" : pageTokenRef.current,query,+ excludeDefault,});if (requestId !== requestIdRef.current) {return;@@ -388,7 +393,7 @@ export function useProjectList(query: string) {}}},- [pageSize, query, searchProjects]+ [excludeDefault, pageSize, query, searchProjects]);useEffect(() => {@@ -428,10 +433,15 @@ function readRecentProjectNames(scope: string, email: string) {}}-export function useRecentProjects() {+export function useRecentProjects({+ excludeDefault = true,+}: {+ excludeDefault?: boolean;+} = {}) {const currentUser = useOptionalCurrentUser();const isSaaS = useIsSaaSMode();const batchFetchProjects = useAppStore((state) => state.batchFetchProjects);+ const getProjectByName = useAppStore((state) => state.getProjectByName);const projectsByName = useAppStore((state) => state.projectsByName);const [projectNames, setProjectNames] = useState<string[]>([]);@@ -452,10 +462,13 @@ export function useRecentProjects() {const projects = useMemo(() => {return projectNames- .map((name) => projectsByName[name])+ .map((name) => getProjectByName(name)).filter((project): project is Project => Boolean(project))- .filter((project) => !isDefaultProjectName(project.name));- }, [projectNames, projectsByName]);+ .filter((project) => isValidProjectName(project.name))+ .filter(+ (project) => !excludeDefault || !isDefaultProjectName(project.name)+ );+ }, [excludeDefault, getProjectByName, projectNames, projectsByName]);return { projects, refresh: refreshNames };}diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 55f195a7c9..96f567e1d6 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -821,7 +821,7 @@"project-instance-synced-title": "Database connected","project-instance-syncing-description": "This may take a few seconds to a few minutes. You can refresh this page later.","project-instance-syncing-empty": "Databases are still syncing. Refresh this page in a moment to see them here.",- "project-instance-syncing-title": "Databases from {{instance}} are syncing.",+ "project-instance-syncing-title": "Databases from <instance></instance> are syncing.","schema": {"default": "Default schema"},@@ -2945,11 +2945,6 @@"no-data-available": "No data available","no-database-selected": "No database selected","no-history-found": "No history found",- "no-project": {- "contact-the-admin-to-grant-access": "Contact to the admin to grant access.",- "go-to-create": "Go to create",- "not-member-of-any-projects": "You are not any member of any projects."- },"no-queriable-database": "No queriable database","notify-empty-statement": "Please input your SQL statements in the editor","only-select-allowed": "Only read-only statements are allowed to execute.",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex e95d25b1d3..72ba793a90 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -821,7 +821,7 @@"project-instance-synced-title": "Base de datos conectada","project-instance-syncing-description": "Esto puede tardar de unos segundos a unos minutos. Puedes actualizar esta página más tarde.","project-instance-syncing-empty": "Las bases de datos aún se están sincronizando. Actualiza esta página en un momento para verlas aquí.",- "project-instance-syncing-title": "Las bases de datos de {{instance}} se están sincronizando.",+ "project-instance-syncing-title": "Las bases de datos de <instance></instance> se están sincronizando.","schema": {"default": "Esquema predeterminado"},@@ -2945,11 +2945,6 @@"no-data-available": "No hay datos disponibles","no-database-selected": "No se ha seleccionado una base de datos","no-history-found": "No se encontró historial",- "no-project": {- "contact-the-admin-to-grant-access": "Póngase en contacto con el administrador para otorgar acceso.",- "go-to-create": "ir a crear",- "not-member-of-any-projects": "No eres miembro de ningún proyecto."- },"no-queriable-database": "No hay base de datos consultable","notify-empty-statement": "Ingrese sus declaraciones SQL en el editor","only-select-allowed": "Solo se permiten ejecutar declaraciones de solo lectura.",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 2ca0014802..c0a4392316 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -821,7 +821,7 @@"project-instance-synced-title": "データベースが接続されました","project-instance-syncing-description": "数秒から数分かかる場合があります。後でこのページを更新してください。","project-instance-syncing-empty": "データベースはまだ同期中です。しばらくしてからこのページを更新すると表示されます。",- "project-instance-syncing-title": "{{instance}} のデータベースを同期中です。",+ "project-instance-syncing-title": "<instance></instance> のデータベースを同期中です。","schema": {"default": "デフォルトスキーマ"},@@ -2945,11 +2945,6 @@"no-data-available": "データがありません","no-database-selected": "データベースが選択されていません","no-history-found": "まだ履歴がありません",- "no-project": {- "contact-the-admin-to-grant-access": "管理者に連絡してアクセスを許可してください。",- "go-to-create": "作成に行く",- "not-member-of-any-projects": "あなたはどのプロジェクトのメンバーでもありません。"- },"no-queriable-database": "クエリ可能なデータベースがありません","notify-empty-statement": "エディターに SQL ステートメントを入力してください","only-select-allowed": "読み取り専用ステートメントのみが実行を許可されます",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 7c30a1671d..6454c01667 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -821,7 +821,7 @@"project-instance-synced-title": "Đã kết nối cơ sở dữ liệu","project-instance-syncing-description": "Quá trình này có thể mất vài giây đến vài phút. Bạn có thể làm mới trang này sau.","project-instance-syncing-empty": "Cơ sở dữ liệu vẫn đang được đồng bộ hóa. Hãy làm mới trang này sau ít phút để thấy chúng ở đây.",- "project-instance-syncing-title": "Cơ sở dữ liệu từ {{instance}} đang được đồng bộ hóa.",+ "project-instance-syncing-title": "Cơ sở dữ liệu từ <instance></instance> đang được đồng bộ hóa.","schema": {"default": "Schema mặc định"},@@ -2945,11 +2945,6 @@"no-data-available": "Không có dữ liệu","no-database-selected": "Chưa chọn cơ sở dữ liệu","no-history-found": "Không tìm thấy lịch sử",- "no-project": {- "contact-the-admin-to-grant-access": "Liên hệ với quản trị viên để cấp quyền truy cập.",- "go-to-create": "Đi tới tạo",- "not-member-of-any-projects": "Bạn không phải là thành viên của bất kỳ dự án nào."- },"no-queriable-database": "Không có cơ sở dữ liệu có thể truy vấn","notify-empty-statement": "Vui lòng nhập câu lệnh SQL của bạn vào trình soạn thảo","only-select-allowed": "Chỉ cho phép thực thi câu lệnh chỉ đọc.",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 63b15928a1..d1e8bd12e5 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -821,7 +821,7 @@"project-instance-synced-title": "数据库已连接","project-instance-syncing-description": "这可能需要几秒到几分钟。你可以稍后刷新此页面。","project-instance-syncing-empty": "数据库仍在同步中。稍后刷新此页面即可在这里看到它们。",- "project-instance-syncing-title": "{{instance}} 的数据库正在同步。",+ "project-instance-syncing-title": "<instance></instance> 的数据库正在同步。","schema": {"default": "默认 Schema"},@@ -2945,11 +2945,6 @@"no-data-available": "暂无数据","no-database-selected": "未选择数据库","no-history-found": "暂无历史记录",- "no-project": {- "contact-the-admin-to-grant-access": "联系管理员以授予访问权限。",- "go-to-create": "去创建",- "not-member-of-any-projects": "你不是任何项目的成员。"- },"no-queriable-database": "没有可查询的数据库","notify-empty-statement": "请在编辑器中输入 SQL 语句","only-select-allowed": "只允许执行只读语句",diff --git a/frontend/src/modules/sql-editor/components/AsidePanel.tsx b/frontend/src/modules/sql-editor/components/AsidePanel.tsxindex 63816b3a21..dec82358cc 100644--- a/frontend/src/modules/sql-editor/components/AsidePanel.tsx+++ b/frontend/src/modules/sql-editor/components/AsidePanel.tsx@@ -1,16 +1,5 @@-import { useCallback, useEffect } from "react";-import { useTranslation } from "react-i18next";-import { PROJECT_V1_ROUTE_DASHBOARD } from "@/app/router/handles";-import { ProjectSelect } from "@/components/ProjectSelect";-import { RouterLink } from "@/components/RouterLink";import { useSQLEditorStore } from "@/modules/sql-editor/store";-import {- getSQLEditorEditorState,- useSQLEditorEditorState,-} from "@/modules/sql-editor/store/editor";import { useIsDisconnected } from "@/modules/sql-editor/store/tab";-import { useAppStore } from "@/stores/app";-import { defaultProject, isValidProjectName } from "@/types";import { AccessPane } from "./AccessPane";import { ActionBar } from "./AsidePanel/ActionBar";import { GutterBar } from "./GutterBar";@@ -25,78 +14,15 @@ import { WorksheetPane } from "./WorksheetPane";* 1. GutterBar (vertical icon rail) — fixed.* 2. ActionBar — only when `asidePanelTab === "SCHEMA"` and the tab is* connected to a database. Vertical button column for view drill-downs.- * 3. Main column — project picker on top + active pane (Worksheet /- * Schema / History / Access) below.+ * 3. Main column — active pane (Worksheet / Schema / History / Access).** Schema-viewer modal stays in `SQLEditorHomePage.vue` (Vue parent) since* the embedded `TableSchemaViewer` is Vue-only; the React side triggers* it via the `show-schema-viewer` event on `sqlEditorEvents`.*/export function AsidePanel() {- const { t } = useTranslation();- const maybeSwitchProject = useSQLEditorStore((s) => s.maybeSwitchProject);-const asidePanelTab = useSQLEditorStore((s) => s.asidePanelTab);const isDisconnected = useIsDisconnected();- const project = useSQLEditorEditorState((s) => s.project);- const projectContextReady = useSQLEditorEditorState(- (s) => s.projectContextReady- );-- const defaultProjectName = useAppStore(- (s) => s.serverInfo?.defaultProject ?? ""- );- // Self-fetch workspace permission state — the SQL editor route doesn't- // mount the dashboard shells that hydrate roles + workspace IAM, so the- // permission selectors below would otherwise read empty state.- const loadWorkspacePermissionState = useAppStore(- (s) => s.loadWorkspacePermissionState- );- useEffect(() => {- void loadWorkspacePermissionState();- }, [loadWorkspacePermissionState]);- const allowAccessDefaultProject = useAppStore((s) =>- s.hasProjectPermission(- defaultProject(defaultProjectName),- "bb.projects.get"- )- );- const allowCreateProject = useAppStore((s) =>- s.hasWorkspacePermission("bb.projects.create")- );-- const handleSwitchProject = useCallback(- (name: string) => {- if (!name || !isValidProjectName(name)) {- getSQLEditorEditorState().setProject("");- } else {- void maybeSwitchProject(name);- }- },- [maybeSwitchProject]- );-- // Vue's `<template #empty>` — rich empty state when the user is not- // a member of any project. Shows a "go to create" link when the user- // has `bb.projects.create`, or an "ask the admin" hint otherwise.- const emptyContent = (- <div className="text-sm text-control-placeholder flex flex-col gap-1">- <p>- {t("sql-editor.no-project.not-member-of-any-projects")}{" "}- {allowCreateProject ? (- <RouterLink- to={{ name: PROJECT_V1_ROUTE_DASHBOARD, hash: "#new" }}- className="text-accent hover:underline"- >- {t("sql-editor.no-project.go-to-create")}- </RouterLink>- ) : null}- </p>- {!allowCreateProject ? (- <p>{t("sql-editor.no-project.contact-the-admin-to-grant-access")}</p>- ) : null}- </div>- );return (<div className="h-full flex flex-row overflow-hidden">@@ -109,17 +35,6 @@ export function AsidePanel() {</div>) : null}<div className="h-full flex-1 flex flex-col overflow-hidden">- <div className="flex flex-row items-center gap-x-1 px-1 py-1 border-b">- <ProjectSelect- className="w-full project-select"- value={project ?? ""}- onChange={handleSwitchProject}- disabled={!projectContextReady}- excludeDefault={!allowAccessDefaultProject}- emptyContent={emptyContent}- />- </div>-<div className="flex-1 flex flex-row overflow-hidden"><div className="h-full flex-1 flex flex-col pt-1 overflow-hidden">{asidePanelTab === "WORKSHEET" ? <WorksheetPane /> : null}diff --git a/frontend/src/modules/sql-editor/components/GutterBar.test.tsx b/frontend/src/modules/sql-editor/components/GutterBar.test.tsxindex d1da60a101..6a24cb0228 100644--- a/frontend/src/modules/sql-editor/components/GutterBar.test.tsx+++ b/frontend/src/modules/sql-editor/components/GutterBar.test.tsx@@ -58,10 +58,6 @@ vi.mock("@/app/router", async (importOriginal) => ({},}));-vi.mock("@/assets/logo-icon.svg", () => ({- default: "/assets/logo-icon.svg",-}));-vi.mock("@/components/ui/tooltip", () => ({Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,}));@@ -128,15 +124,12 @@ describe("GutterBar", () => {unmount();});- test("logo link has target=_blank and rel=noopener noreferrer", () => {+ test("does not render the Bytebase logo", () => {mocks.projectData = { allowJustInTimeAccess: false };- mocks.routerResolve.mockReturnValue({ href: "/workspace/home" });const { container, render, unmount } = renderIntoContainer(<GutterBar />);render();- const link = container.querySelector("a");- expect(link?.getAttribute("href")).toBe("/workspace/home");- expect(link?.getAttribute("target")).toBe("_blank");- expect(link?.getAttribute("rel")).toBe("noopener noreferrer");+ expect(container.querySelector("a")).toBeNull();+ expect(container.querySelector('img[alt="Bytebase"]')).toBeNull();unmount();});});diff --git a/frontend/src/modules/sql-editor/components/GutterBar.tsx b/frontend/src/modules/sql-editor/components/GutterBar.tsxindex b0ea6cd0c2..6b556d3dba 100644--- a/frontend/src/modules/sql-editor/components/GutterBar.tsx+++ b/frontend/src/modules/sql-editor/components/GutterBar.tsx@@ -1,21 +1,13 @@-import {- PROJECT_V1_ROUTE_DETAIL,- WORKSPACE_ROUTE_LANDING,-} from "@/app/router/handles";-import logoIcon from "@/assets/logo-icon.svg";-import { RouterLink } from "@/components/RouterLink";-import { Separator } from "@/components/ui/separator";import { useAppProject } from "@/hooks/useAppProject";-import { useReactiveRoute } from "@/hooks/useReactiveRoute";import type { AsidePanelTab } from "@/modules/sql-editor/store";import { useSQLEditorStore } from "@/modules/sql-editor/store";import { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";import { TabItem } from "./TabItem";/**- * Left gutter of the SQL Editor aside panel. Shows the Bytebase logo at- * the top and 4 tab buttons (WORKSHEET, SCHEMA, HISTORY, and optionally- * ACCESS when the current project allows JIT).+ * Left gutter of the SQL Editor aside panel. Shows 4 tab buttons+ * (WORKSHEET, SCHEMA, HISTORY, and optionally ACCESS when the current+ * project allows JIT).** Replaces frontend/src/views/sql-editor/AsidePanel/GutterBar/GutterBar.vue.*/@@ -26,17 +18,6 @@ export function GutterBar() {const resolvedProject = useAppProject(projectName);const project = projectName ? resolvedProject : undefined;- const routeProjectParam = useReactiveRoute().params.project as- | string- | undefined;-- const logoRoute = routeProjectParam- ? {- name: PROJECT_V1_ROUTE_DETAIL,- params: { projectId: routeProjectParam },- }- : { name: WORKSPACE_ROUTE_LANDING };-const handleClickTab = (target: AsidePanelTab) => {setAsidePanelTab(target);};@@ -44,12 +25,6 @@ export function GutterBar() {return (<div className="h-full flex flex-col items-stretch justify-between overflow-hidden text-sm p-1"><div className="flex flex-col gap-y-1">- <div className="flex flex-col justify-center items-center pb-1">- <RouterLink to={logoRoute} target="_blank" rel="noopener noreferrer">- <img className="w-9 h-auto" src={logoIcon} alt="Bytebase" />- </RouterLink>- </div>- <Separator /><TabItem tab="WORKSHEET" onClick={() => handleClickTab("WORKSHEET")} /><TabItem tab="SCHEMA" onClick={() => handleClickTab("SCHEMA")} /><TabItem tab="HISTORY" onClick={() => handleClickTab("HISTORY")} />diff --git a/frontend/src/modules/sql-editor/components/SQLEditorChromeLayout.test.ts b/frontend/src/modules/sql-editor/components/SQLEditorChromeLayout.test.tsnew file mode 100644index 0000000000..150761a3c1--- /dev/null+++ b/frontend/src/modules/sql-editor/components/SQLEditorChromeLayout.test.ts@@ -0,0 +1,25 @@+import { readFileSync } from "node:fs";+import { join } from "node:path";+import { describe, expect, test } from "vitest";++const componentsDir = join(process.cwd(), "src/modules/sql-editor/components");++describe("SQL Editor chrome layout", () => {+ test("mounts the shared SQL Editor header above the split panels", () => {+ const source = readFileSync(+ join(componentsDir, "SQLEditorHomePage.tsx"),+ "utf-8"+ );++ expect(source).toContain("SQLEditorHeader");+ expect(source.indexOf("<SQLEditorHeader />")).toBeLessThan(+ source.indexOf("<PanelGroup")+ );+ });++ test("keeps project switching out of the aside panel", () => {+ const source = readFileSync(join(componentsDir, "AsidePanel.tsx"), "utf-8");++ expect(source).not.toContain("ProjectSelect");+ });+});diff --git a/frontend/src/modules/sql-editor/components/SQLEditorHeader.test.tsx b/frontend/src/modules/sql-editor/components/SQLEditorHeader.test.tsxnew file mode 100644index 0000000000..f5d9caad65--- /dev/null+++ b/frontend/src/modules/sql-editor/components/SQLEditorHeader.test.tsx@@ -0,0 +1,316 @@+import type { ReactElement, ReactNode } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { beforeEach, describe, expect, test, vi } from "vitest";+import { WORKSPACE_ROUTE_LANDING } from "@/app/router";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const mocks = vi.hoisted(() => ({+ breadcrumbProps: undefined as+ | {+ projectId?: string;+ currentProjectName?: string;+ projectSwitchExcludeDefaultProject?: boolean;+ onBeforeSwitchWorkspace?: () => boolean;+ onSelectProject?: (+ project: { name: string },+ event: { ctrlKey?: boolean; metaKey?: boolean }+ ) => void;+ }+ | undefined,+ maybeSwitchProject: vi.fn().mockResolvedValue(undefined),+ record: vi.fn(),+ setRecentProject: vi.fn(),+ loadWorkspacePermissionState: vi.fn().mockResolvedValue(undefined),+ hasProjectPermission: vi.fn(),+ allowAccessDefaultProject: true,+ defaultProjectName: "projects/default",+ openTmpTabList: [] as Array<{ id: string }>,+ tabsById: new Map<string, { status: "CLEAN" | "DIRTY" | "SAVING" }>(),+ themeDark: true,+ resolve: vi.fn(+ ({+ params,+ }: {+ name: string;+ params?: { project?: string };+ }) => ({+ fullPath: params?.project+ ? `/sql-editor/projects/${params.project}`+ : "/sql-editor",+ })+ ),+ project: "projects/recent-project",+}));++vi.mock("react-i18next", () => ({+ useTranslation: () => ({+ t: (key: string) =>+ ({+ "sql-editor.self": "SQL Editor",+ "sql-editor.tab.unsaved-worksheet": "Unsaved worksheet.",+ })[key] ?? key,+ }),+}));++vi.mock("@/app/router", () => ({+ SQL_EDITOR_PROJECT_MODULE: "sql-editor.project",+ WORKSPACE_ROUTE_LANDING: "workspace.landing",+ useNavigate: () => ({+ resolve: mocks.resolve,+ }),+}));++vi.mock("@/hooks/useAppState", () => ({+ useRecentVisit: () => ({+ record: mocks.record,+ }),+}));++vi.mock("@/stores/app", () => ({+ useAppStore: (+ selector: (state: {+ serverInfo: { defaultProject: string };+ setRecentProject: typeof mocks.setRecentProject;+ loadWorkspacePermissionState: typeof mocks.loadWorkspacePermissionState;+ hasProjectPermission: typeof mocks.hasProjectPermission;+ }) => unknown+ ) =>+ selector({+ serverInfo: { defaultProject: mocks.defaultProjectName },+ setRecentProject: mocks.setRecentProject,+ loadWorkspacePermissionState: mocks.loadWorkspacePermissionState,+ hasProjectPermission: mocks.hasProjectPermission,+ }),+}));++vi.mock("@/types/v1/project", () => ({+ defaultProject: (name: string) => ({+ name,+ title: "Default project",+ }),+}));++vi.mock("@/modules/sql-editor/store", () => ({+ useSQLEditorStore: (+ selector: (state: {+ maybeSwitchProject: typeof mocks.maybeSwitchProject;+ }) => unknown+ ) =>+ selector({+ maybeSwitchProject: mocks.maybeSwitchProject,+ }),+}));++vi.mock("@/modules/sql-editor/store/editor", () => ({+ useSQLEditorEditorState: (selector: (state: { project: string }) => unknown) =>+ selector({ project: mocks.project }),+}));++vi.mock("@/modules/sql-editor/store/tab", () => ({+ getSQLEditorTabsState: () => ({+ openTmpTabList: mocks.openTmpTabList,+ tabsById: mocks.tabsById,+ }),+}));++vi.mock("@/modules/sql-editor/components/theme/SQLEditorThemeScope", () => ({+ useSQLEditorTheme: () => ({+ id: mocks.themeDark ? "dark" : "light",+ }),+}));++vi.mock("@/modules/sql-editor/components/theme/derive", () => ({+ isDarkTheme: () => mocks.themeDark,+}));++vi.mock("@/components/BytebaseLogo", () => ({+ BytebaseLogo: ({+ redirect,+ builtinTheme,+ }: {+ redirect?: string;+ builtinTheme?: string;+ className?: string;+ }) => (+ <div+ data-testid="sql-editor-logo"+ data-redirect={redirect}+ data-builtin-theme={builtinTheme}+ />+ ),+}));++vi.mock("@/components/header/HeaderBreadcrumb", () => ({+ HeaderBreadcrumb: (props: NonNullable<typeof mocks.breadcrumbProps>) => {+ mocks.breadcrumbProps = props;+ return (+ <div+ data-testid="sql-editor-breadcrumb"+ data-project-id={props.projectId}+ data-current-project-name={props.currentProjectName}+ />+ );+ },+}));++vi.mock("@/components/header/ProfileMenuTrigger", () => ({+ ProfileMenuTrigger: ({+ children,+ }: {+ children?: ReactNode;+ size?: string;+ link?: boolean;+ }) => <div data-testid="sql-editor-profile">{children}</div>,+}));++let SQLEditorHeader: typeof import("./SQLEditorHeader").SQLEditorHeader;++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ const root = createRoot(container);+ document.body.appendChild(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ unmount: () => {+ act(() => {+ root.unmount();+ });+ container.remove();+ },+ };+};++beforeEach(async () => {+ vi.clearAllMocks();+ mocks.breadcrumbProps = undefined;+ mocks.project = "projects/recent-project";+ mocks.allowAccessDefaultProject = true;+ mocks.defaultProjectName = "projects/default";+ mocks.openTmpTabList = [];+ mocks.tabsById = new Map();+ mocks.hasProjectPermission.mockImplementation(+ () => mocks.allowAccessDefaultProject+ );+ mocks.loadWorkspacePermissionState.mockResolvedValue(undefined);+ mocks.themeDark = true;+ window.alert = vi.fn();+ window.open = vi.fn();+ ({ SQLEditorHeader } = await import("./SQLEditorHeader"));+});++describe("SQLEditorHeader", () => {+ test("renders logo, breadcrumb, and profile dropdown", () => {+ const { container, render, unmount } = renderIntoContainer(+ <SQLEditorHeader />+ );+ render();++ const logo = container.querySelector("[data-testid='sql-editor-logo']");+ expect(logo?.getAttribute("data-redirect")).toBe(WORKSPACE_ROUTE_LANDING);+ expect(logo?.getAttribute("data-builtin-theme")).toBe("dark");+ expect(+ container.querySelector("[data-testid='sql-editor-breadcrumb']")+ ).not.toBeNull();+ expect(+ container.querySelector("[data-testid='sql-editor-profile']")+ ).not.toBeNull();+ expect(mocks.breadcrumbProps?.projectId).toBe("recent-project");+ expect(mocks.breadcrumbProps?.currentProjectName).toBe(+ "projects/recent-project"+ );+ expect(mocks.breadcrumbProps?.projectSwitchExcludeDefaultProject).toBe(+ false+ );+ expect(mocks.loadWorkspacePermissionState).toHaveBeenCalled();+ expect(mocks.breadcrumbProps?.onBeforeSwitchWorkspace?.()).toBe(true);+ expect(window.alert).not.toHaveBeenCalled();++ unmount();+ });++ test("alerts and blocks workspace switching when SQL Editor has dirty tabs", () => {+ mocks.openTmpTabList = [{ id: "tab-1" }];+ mocks.tabsById = new Map([["tab-1", { status: "DIRTY" }]]);+ const { render, unmount } = renderIntoContainer(<SQLEditorHeader />);+ render();++ expect(mocks.breadcrumbProps?.onBeforeSwitchWorkspace?.()).toBe(false);+ expect(window.alert).toHaveBeenCalledWith("Unsaved worksheet.");++ unmount();+ });++ test("excludes the default project when SQL Editor cannot access it", () => {+ mocks.allowAccessDefaultProject = false;+ const { render, unmount } = renderIntoContainer(<SQLEditorHeader />);+ render();++ expect(mocks.breadcrumbProps?.projectSwitchExcludeDefaultProject).toBe(true);++ unmount();+ });++ test("switches the SQL Editor project from the breadcrumb switcher", () => {+ const { render, unmount } = renderIntoContainer(<SQLEditorHeader />);+ render();++ act(() => {+ mocks.breadcrumbProps?.onSelectProject?.(+ { name: "projects/other-project" },+ { ctrlKey: false, metaKey: false }+ );+ });++ expect(mocks.resolve).toHaveBeenCalledWith({+ name: "sql-editor.project",+ params: { project: "other-project" },+ });+ expect(mocks.record).toHaveBeenCalledWith(+ "/sql-editor/projects/other-project"+ );+ expect(mocks.setRecentProject).toHaveBeenCalledWith(+ "projects/other-project"+ );+ expect(mocks.maybeSwitchProject).toHaveBeenCalledWith(+ "projects/other-project"+ );+ expect(window.open).not.toHaveBeenCalled();++ unmount();+ });++ test("records recent project when opening the SQL Editor project in a new tab", () => {+ const { render, unmount } = renderIntoContainer(<SQLEditorHeader />);+ render();++ act(() => {+ mocks.breadcrumbProps?.onSelectProject?.(+ { name: "projects/other-project" },+ { ctrlKey: true, metaKey: false }+ );+ });++ expect(mocks.record).toHaveBeenCalledWith(+ "/sql-editor/projects/other-project"+ );+ expect(mocks.setRecentProject).toHaveBeenCalledWith(+ "projects/other-project"+ );+ expect(window.open).toHaveBeenCalledWith(+ "/sql-editor/projects/other-project",+ "_blank"+ );+ expect(mocks.maybeSwitchProject).not.toHaveBeenCalled();++ unmount();+ });+});diff --git a/frontend/src/modules/sql-editor/components/SQLEditorHeader.tsx b/frontend/src/modules/sql-editor/components/SQLEditorHeader.tsxnew file mode 100644index 0000000000..a0252db8ce--- /dev/null+++ b/frontend/src/modules/sql-editor/components/SQLEditorHeader.tsx@@ -0,0 +1,103 @@+import { useCallback, useEffect } from "react";+import { useTranslation } from "react-i18next";+import {+ SQL_EDITOR_PROJECT_MODULE,+ useNavigate,+ WORKSPACE_ROUTE_LANDING,+} from "@/app/router";+import { BytebaseLogo } from "@/components/BytebaseLogo";+import { HeaderBreadcrumb } from "@/components/header/HeaderBreadcrumb";+import { ProfileMenuTrigger } from "@/components/header/ProfileMenuTrigger";+import { useRecentVisit } from "@/hooks/useAppState";+import { getProjectName, isValidProjectName } from "@/lib/resourceName";+import { useSQLEditorStore } from "@/modules/sql-editor/store";+import { useSQLEditorEditorState } from "@/modules/sql-editor/store/editor";+import { getSQLEditorTabsState } from "@/modules/sql-editor/store/tab";+import { useAppStore } from "@/stores/app";+import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { defaultProject } from "@/types/v1/project";+import { isDarkTheme } from "./theme/derive";+import { useSQLEditorTheme } from "./theme/SQLEditorThemeScope";++export function SQLEditorHeader() {+ const { t } = useTranslation();+ const navigate = useNavigate();+ const { record } = useRecentVisit();+ const theme = useSQLEditorTheme();+ const projectName = useSQLEditorEditorState((s) => s.project);+ const maybeSwitchProject = useSQLEditorStore((s) => s.maybeSwitchProject);+ const setRecentProject = useAppStore((s) => s.setRecentProject);+ const loadWorkspacePermissionState = useAppStore(+ (s) => s.loadWorkspacePermissionState+ );+ const defaultProjectName = useAppStore(+ (s) => s.serverInfo?.defaultProject ?? ""+ );+ const allowAccessDefaultProject = useAppStore((s) =>+ defaultProjectName+ ? s.hasProjectPermission(+ defaultProject(defaultProjectName),+ "bb.projects.get"+ )+ : false+ );+ const projectId = isValidProjectName(projectName)+ ? getProjectName(projectName)+ : undefined;++ useEffect(() => {+ void loadWorkspacePermissionState();+ }, [loadWorkspacePermissionState]);++ const handleSelectProject = useCallback(+ (project: Project, event: React.MouseEvent<HTMLElement>) => {+ const route = navigate.resolve({+ name: SQL_EDITOR_PROJECT_MODULE,+ params: {+ project: getProjectName(project.name),+ },+ });+ record(route.fullPath);+ setRecentProject(project.name);++ if (event.ctrlKey || event.metaKey) {+ window.open(route.fullPath, "_blank");+ } else {+ void maybeSwitchProject(project.name);+ }+ },+ [maybeSwitchProject, navigate, record, setRecentProject]+ );++ const handleBeforeSwitchWorkspace = useCallback(() => {+ const tabsState = getSQLEditorTabsState();+ for (const persisted of tabsState.openTmpTabList) {+ const tab = tabsState.tabsById.get(persisted.id);+ if (tab && tab.status !== "CLEAN") {+ window.alert(t("sql-editor.tab.unsaved-worksheet"));+ return false;+ }+ }+ return true;+ }, [t]);++ return (+ <header className="h-12 shrink-0 border-b border-block-border bg-background px-3 flex items-center justify-between gap-x-4">+ <div className="min-w-0 flex items-center gap-x-4">+ <BytebaseLogo+ redirect={WORKSPACE_ROUTE_LANDING}+ builtinTheme={isDarkTheme(theme) ? "dark" : "light"}+ className="h-9 md:h-10"+ />+ <HeaderBreadcrumb+ projectId={projectId}+ currentProjectName={projectName}+ projectSwitchExcludeDefaultProject={!allowAccessDefaultProject}+ onBeforeSwitchWorkspace={handleBeforeSwitchWorkspace}+ onSelectProject={handleSelectProject}+ />+ </div>+ <ProfileMenuTrigger size="medium" link />+ </header>+ );+}diff --git a/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx b/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsxindex 1245fd359c..3a4ad4f31d 100644--- a/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx+++ b/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx@@ -23,6 +23,7 @@ import { resizeHandleClass } from "@/modules/schema-editor/resize";import { AsidePanel } from "@/modules/sql-editor/components/AsidePanel";import { ConnectionPanel } from "@/modules/sql-editor/components/ConnectionPanel";import { Panels } from "@/modules/sql-editor/components/Panels/Panels";+import { SQLEditorHeader } from "@/modules/sql-editor/components/SQLEditorHeader";import { TabList } from "@/modules/sql-editor/components/TabList";import {SQLEditorThemeScope,@@ -197,6 +198,7 @@ export function SQLEditorHomePage() {return (<div className="sqleditor--wrapper w-full flex-1 overflow-hidden flex flex-col bg-background text-main">+ <SQLEditorHeader />{mobileToggle}{hideSidebar &&sidebarExpanded &&diff --git a/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.test.tsx b/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.test.tsxindex df25dad04e..1641ea0b6f 100644--- a/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.test.tsx+++ b/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.test.tsx@@ -185,8 +185,11 @@ vi.mock("@/components/HumanizeTs", () => ({}));vi.mock("@/components/ui/input", () => ({- Input: (props: React.InputHTMLAttributes<HTMLInputElement>) => (- <input data-testid="search-input" {...props} />+ Input: ({+ size,+ ...props+ }: React.InputHTMLAttributes<HTMLInputElement> & { size?: string }) => (+ <input data-testid="search-input" data-size={size} {...props} />),}));@@ -195,12 +198,19 @@ vi.mock("@/components/ui/button", () => ({children,onClick,disabled,+ size,}: {children: React.ReactNode;onClick?: () => void;disabled?: boolean;+ size?: string;}) => (- <button type="button" disabled={disabled} onClick={onClick}>+ <button+ type="button"+ data-size={size}+ disabled={disabled}+ onClick={onClick}+ >{children}</button>),@@ -289,6 +299,19 @@ describe("SchemaPane shell", () => {unmount();});+ test("aligns search input and sync button control sizes", () => {+ const { container, render, unmount } = renderInto(<SchemaPane />);+ render();++ const input = container.querySelector("[data-testid='search-input']");+ const button = container.querySelector("button");+ expect(input?.getAttribute("data-size")).toBe("sm");+ expect(button?.getAttribute("data-size")).toBe("sm");+ expect(input?.className).not.toContain("h-8");++ unmount();+ });+test("does not call getOrFetchDatabaseMetadata when database name is invalid", () => {const { render, unmount } = renderInto(<SchemaPane />);render();diff --git a/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.tsx b/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.tsxindex e3baefa6d5..b63a168483 100644--- a/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.tsx+++ b/frontend/src/modules/sql-editor/components/SchemaPane/SchemaPane.tsx@@ -429,11 +429,12 @@ function SchemaPaneInner() {<div className="px-1 flex flex-row gap-1"><div className="flex-1 overflow-hidden"><Input+ size="sm"value={searchPattern}placeholder={t("common.search")}disabled={!currentTab}onChange={(e) => setSearchPattern(e.target.value)}- className="h-8 text-sm w-full"+ className="w-full"/></div><div className="shrink-0 flex items-center">diff --git a/frontend/src/modules/sql-editor/components/TabList.test.tsx b/frontend/src/modules/sql-editor/components/TabList.test.tsxindex 868f9125ae..61fc6c6cca 100644--- a/frontend/src/modules/sql-editor/components/TabList.test.tsx+++ b/frontend/src/modules/sql-editor/components/TabList.test.tsx@@ -299,6 +299,16 @@ describe("TabList", () => {unmount();});+ test("does not render the profile dropdown in the tab list", () => {+ setup([makeTab("a")]);+ const { container, render, unmount } = renderIntoContainer(<TabList />);+ render();+ expect(+ container.querySelector("[data-testid='header-profile-menu']")+ ).toBeNull();+ unmount();+ });+test("subscribes to close-tab bus event on mount", () => {setup([makeTab("a")]);const { render, unmount } = renderIntoContainer(<TabList />);diff --git a/frontend/src/modules/sql-editor/components/TabList.tsx b/frontend/src/modules/sql-editor/components/TabList.tsxindex 397724aedf..714d31234a 100644--- a/frontend/src/modules/sql-editor/components/TabList.tsx+++ b/frontend/src/modules/sql-editor/components/TabList.tsx@@ -20,7 +20,6 @@ import {} from "react";import { useTranslation } from "react-i18next";import scrollIntoView from "scroll-into-view-if-needed";-import { HeaderProfileMenuMount } from "@/components/HeaderProfileMenuMount";import {AlertDialog,AlertDialogContent,@@ -317,10 +316,6 @@ export function TabList() {</DndContext></div>- {/* Profile menu (avatar + workspace branding) sits to the right of- the tab scroll area, matching the Vue TabList layout. */}- <HeaderProfileMenuMount size="small" />-<TabContextMenu ref={contextMenuRef} /><AlertDialogdiff --git a/frontend/src/routes/project/ProjectDatabasesPage.test.tsx b/frontend/src/routes/project/ProjectDatabasesPage.test.tsxindex 42c9c33b66..7d7699e736 100644--- a/frontend/src/routes/project/ProjectDatabasesPage.test.tsx+++ b/frontend/src/routes/project/ProjectDatabasesPage.test.tsx@@ -10,10 +10,12 @@ import { preCreateIssue } from "@/lib/plan/issue";const mocks = vi.hoisted(() => ({visibleDatabases: [] as { name: string }[],databasesByName: {} as Record<string, { name: string }>,+ instancesByName: {} as Record<string, { name: string; title: string }>,routerCurrentQuery: {} as Record<string, unknown>,routerPush: vi.fn(),useProductIntro: vi.fn(),removeDatabaseMetadataCache: vi.fn(),+ fetchInstance: vi.fn(),fetchInstanceList: vi.fn(async () => ({instances: [] as { name: string; title: string }[],})),@@ -27,12 +29,28 @@ let ProjectDatabasesPage: typeof import("./ProjectDatabasesPage").ProjectDatabasvi.mock("react-i18next", () => ({initReactI18next: { type: "3rdParty", init: () => {} },- useTranslation: () => ({ t: (key: string) => key }),+ Trans: ({+ i18nKey,+ components,+ }: {+ i18nKey: string;+ components?: { instance?: React.ReactNode };+ }) => (+ <>+ {i18nKey}+ {components?.instance}+ </>+ ),+ useTranslation: () => ({+ t: (key: string, options?: { instance?: string }) =>+ options?.instance ? `${key}:${options.instance}` : key,+ }),}));vi.mock("@/app/router", () => ({router: {push: mocks.routerPush,+ resolve: ({ name }: { name?: string }) => ({ href: `/${name ?? ""}` }),currentRoute: {get value() {return { query: mocks.routerCurrentQuery };@@ -156,12 +174,16 @@ vi.mock("@/stores/app", () => {get databasesByName() {return mocks.databasesByName;},+ get instancesByName() {+ return mocks.instancesByName;+ },projectsByName: {},environmentList: [],};const useAppStore = (selector: (state: typeof appState) => unknown) =>selector(appState);useAppStore.getState = () => ({+ fetchInstance: mocks.fetchInstance,fetchInstanceList: mocks.fetchInstanceList,batchSyncDatabases: vi.fn(),batchUpdateDatabases: vi.fn(),@@ -194,9 +216,11 @@ beforeEach(async () => {vi.clearAllMocks();mocks.visibleDatabases = [];mocks.databasesByName = {};+ mocks.instancesByName = {};mocks.routerCurrentQuery = {};mocks.workspacePermissions = new Set(["bb.instances.create",+ "bb.instances.get","bb.instances.list",]);({ ProjectDatabasesPage } = await import("./ProjectDatabasesPage"));@@ -339,6 +363,9 @@ describe("ProjectDatabasesPage", () => {test("shows syncing guidance when redirected from project-aware instance creation", async () => {mocks.routerCurrentQuery = { syncingInstance: "prod" };+ mocks.instancesByName = {+ "instances/prod": { name: "instances/prod", title: "Prod Instance" },+ };const container = document.createElement("div");const root = createRoot(container);@@ -347,7 +374,10 @@ describe("ProjectDatabasesPage", () => {});expect(container.textContent).toContain(- "db.project-instance-syncing-title"+ "db.project-instance-syncing-titleProd Instance"+ );+ expect(container.textContent).not.toContain(+ "db.project-instance-syncing-titleprod");expect(container.textContent).toContain("db.project-instance-syncing-description"diff --git a/frontend/src/routes/project/ProjectDatabasesPage.tsx b/frontend/src/routes/project/ProjectDatabasesPage.tsxindex 62233feae8..bc921b425d 100644--- a/frontend/src/routes/project/ProjectDatabasesPage.tsx+++ b/frontend/src/routes/project/ProjectDatabasesPage.tsx@@ -2,7 +2,7 @@ import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { Plus, SquareTerminal } from "lucide-react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";-import { useTranslation } from "react-i18next";+import { Trans, useTranslation } from "react-i18next";import { router } from "@/app/router";import {INSTANCE_ROUTE_CREATE,@@ -23,6 +23,7 @@ import {TransferProjectSheet,} from "@/components/database";import { EditEnvironmentSheet } from "@/components/EditEnvironmentSheet";+import { InstanceLabel } from "@/components/InstanceLabel";import { PermissionGuard } from "@/components/PermissionGuard";import {ProjectPageLayout,@@ -240,6 +241,10 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {? syncingInstance: undefined;}, []);+ const syncingInstanceName = syncingInstanceId+ ? `${instanceNamePrefix}${syncingInstanceId}`+ : undefined;+const selectedDatabases = useMemo(() => {if (selectedNames.size === 0) return [];return Array.from(selectedNames)@@ -607,9 +612,20 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {{showSyncingInstanceHint && (<Alertvariant="info"- title={t("db.project-instance-syncing-title", {- instance: syncingInstanceId,- })}+ title={+ <Trans+ t={t}+ i18nKey="db.project-instance-syncing-title"+ components={{+ instance: (+ <InstanceLabel+ instanceName={syncingInstanceName ?? ""}+ link+ />+ ),+ }}+ />+ }description={<div className="flex flex-col gap-y-3 sm:flex-row sm:items-center sm:justify-between sm:gap-x-4"><span>{t("db.project-instance-syncing-description")}</span>diff --git a/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx b/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsxindex 7bce9177c4..c39321361f 100644--- a/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx+++ b/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx@@ -1,8 +1,7 @@import { Check, Copy, ShieldAlert } from "lucide-react";import { useCallback, useMemo, useState } from "react";import { useTranslation } from "react-i18next";-import { INSTANCE_ROUTE_DETAIL } from "@/app/router/handles";-import { EngineIcon } from "@/components/EngineIcon";+import { InstanceLabel } from "@/components/InstanceLabel";import { RouterLink } from "@/components/RouterLink";import { useEnvironment, usePlanFeature } from "@/hooks/useAppState";import { writeTextToClipboard } from "@/lib/clipboard";@@ -17,9 +16,7 @@ import {import {extractInstanceResourceName,getInstanceResource,- hasWorkspacePermissionV2,hexToRgb,- instanceV1Name,} from "@/utils";import { extractReleaseUID } from "@/utils/v1/release";import { DatabaseSQLEditorButton } from "./DatabaseSQLEditorButton";@@ -49,9 +46,7 @@ export function DatabaseDetailHeader({);const instanceResource = getInstanceResource(database);- const instanceLabel = instanceV1Name(instanceResource);const instanceId = extractInstanceResourceName(instanceResource.name);- const canViewInstance = hasWorkspacePermissionV2("bb.instances.get");const environment = useEnvironment(database.effectiveEnvironment ?? "");const hasEnvironmentTierFeature = usePlanFeature(@@ -149,30 +144,13 @@ export function DatabaseDetailHeader({</div><div className="flex items-center gap-x-1.5"><span className="text-control-light">{t("common.instance")}</span>- {canViewInstance && instanceId ? (- <RouterLink- to={{- name: INSTANCE_ROUTE_DETAIL,- params: { instanceId },- }}- className="inline-flex cursor-pointer items-center gap-x-1 hover:underline"- onClick={(e) => e.stopPropagation()}- >- <EngineIcon- engine={instanceResource.engine}- className="h-4 w-4"- />- {instanceLabel}- </RouterLink>- ) : (- <span className="inline-flex items-center gap-x-1">- <EngineIcon- engine={instanceResource.engine}- className="h-4 w-4"- />- {instanceLabel}- </span>- )}+ <InstanceLabel+ instance={instanceResource}+ instanceName={instanceResource.name}+ link={!!instanceId}+ className="inline-flex items-center gap-x-1"+ onClick={(e) => e.stopPropagation()}+ /></div>{database.release && (<div className="flex items-center gap-x-1.5">diff --git a/frontend/src/routes/workspace/InstanceDetailPage.test.tsx b/frontend/src/routes/workspace/InstanceDetailPage.test.tsxindex 350da2aed1..9739ae72f2 100644--- a/frontend/src/routes/workspace/InstanceDetailPage.test.tsx+++ b/frontend/src/routes/workspace/InstanceDetailPage.test.tsx@@ -52,6 +52,18 @@ vi.mock("react-router", () => ({vi.mock("react-i18next", () => ({initReactI18next: { type: "3rdParty", init: () => {} },+ Trans: ({+ i18nKey,+ components,+ }: {+ i18nKey: string;+ components?: { instance?: ReactNode };+ }) => (+ <>+ {i18nKey}+ {components?.instance}+ </>+ ),useTranslation: () => ({t: (key: string) => key,}),@@ -88,8 +100,10 @@ vi.mock("@/stores", () => ({}));vi.mock("@/utils", () => ({+ extractInstanceResourceName: (name: string) => name.split("/").pop() ?? "",extractProjectResourceName: (name: string) => name.split("/").pop() ?? "",getDefaultPagination: () => 10,+ hasWorkspacePermissionV2: () => true,instanceV1Name: (instance: Instance) => instance.title,isValidDatabaseName: (name: string) =>/^instances\/[^/]+\/databases\/[^/]+$/.test(name),diff --git a/frontend/src/routes/workspace/InstanceDetailPage.tsx b/frontend/src/routes/workspace/InstanceDetailPage.tsxindex d859f062d0..6452199754 100644--- a/frontend/src/routes/workspace/InstanceDetailPage.tsx+++ b/frontend/src/routes/workspace/InstanceDetailPage.tsx@@ -1,7 +1,7 @@import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { useCallback, useEffect, useMemo, useRef, useState } from "react";-import { useTranslation } from "react-i18next";+import { Trans, useTranslation } from "react-i18next";import { useLocation, useNavigate } from "react-router";import {AdvancedSearch,@@ -20,6 +20,7 @@ import {import { EditEnvironmentSheet } from "@/components/EditEnvironmentSheet";import { EngineIcon } from "@/components/EngineIcon";import { EnvironmentLabel } from "@/components/EnvironmentLabel";+import { InstanceLabel } from "@/components/InstanceLabel";import {InstanceActionDropdown,InstanceFormBody,@@ -501,10 +502,11 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {syncingRefreshExhausted;const showPostSyncTransferAction =!!syncingInstanceId && visibleDatabases.length > 0 && hasUserProject;- const syncingInstanceTitle =- syncingInstanceId === instanceId- ? instanceV1Name(instance)- : syncingInstanceId;+ const syncingInstanceName = syncingInstanceId+ ? `${instanceNamePrefix}${syncingInstanceId}`+ : undefined;+ const syncingInstance =+ syncingInstanceId === instanceId ? instance : undefined;const handleTransferSyncedDatabases = useCallback(() => {setSelectedNames(new Set(visibleDatabases.map((database) => database.name))@@ -571,9 +573,20 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {{showSyncingInstanceHint && (<Alertvariant="info"- title={t("db.project-instance-syncing-title", {- instance: syncingInstanceTitle,- })}+ title={+ <Trans+ t={t}+ i18nKey="db.project-instance-syncing-title"+ components={{+ instance: (+ <InstanceLabel+ instance={syncingInstance}+ instanceName={syncingInstanceName}+ />+ ),+ }}+ />+ }description={<div className="flex flex-col gap-y-3 sm:flex-row sm:items-center sm:justify-between sm:gap-x-4"><span>{t("db.project-instance-syncing-description")}</span>diff --git a/frontend/src/stores/app/index.test.ts b/frontend/src/stores/app/index.test.tsindex 4afb429da6..be154a1f86 100644--- a/frontend/src/stores/app/index.test.ts+++ b/frontend/src/stores/app/index.test.ts@@ -1430,6 +1430,42 @@ describe("useAppStore", () => {expect(mocks.getProject).toHaveBeenCalledTimes(2);});+ test("keeps default project only when searchProjects opts in", async () => {+ const defaultProject = createProto(ProjectSchema, {+ name: "projects/default",+ title: "Default project",+ state: State.ACTIVE,+ });+ mocks.searchProjects.mockResolvedValue({+ projects: [defaultProject, projectA],+ nextPageToken: "",+ });+ const store = createAppStore();+ store.setState({+ serverInfo: createProto(ActuatorInfoSchema, {+ defaultProject: defaultProject.name,+ }),+ });++ await expect(+ store.getState().searchProjects({+ pageSize: 50,+ pageToken: "",+ })+ ).resolves.toMatchObject({+ projects: [projectA],+ });+ await expect(+ store.getState().searchProjects({+ pageSize: 50,+ pageToken: "",+ excludeDefault: false,+ })+ ).resolves.toMatchObject({+ projects: [defaultProject, projectA],+ });+ });+test("writes created projects into the entity cache", async () => {mocks.createProject.mockResolvedValue(projectA);const store = createAppStore();diff --git a/frontend/src/stores/app/project.ts b/frontend/src/stores/app/project.tsindex 1a534f5794..0d9b049a72 100644--- a/frontend/src/stores/app/project.ts+++ b/frontend/src/stores/app/project.ts@@ -226,7 +226,12 @@ export const createProjectSlice: AppSliceCreator<ProjectSlice> = (set, get) => {return validNames.map((name) => get().getProjectByName(name));},- searchProjects: async ({ pageSize, pageToken, query }) => {+ searchProjects: async ({+ pageSize,+ pageToken,+ query,+ excludeDefault = true,+ }) => {const response = await projectServiceClientConnect.searchProjects(createProto(SearchProjectsRequestSchema, {pageSize,@@ -245,11 +250,10 @@ export const createProjectSlice: AppSliceCreator<ProjectSlice> = (set, get) => {},}));return {- projects: response.projects.filter(- (project) =>- project.state === State.ACTIVE &&- project.name !== defaultProjectName(get)- ),+ projects: response.projects.filter((project) => {+ if (project.state !== State.ACTIVE) return false;+ return !excludeDefault || project.name !== defaultProjectName(get);+ }),nextPageToken: response.nextPageToken,};},diff --git a/frontend/src/stores/app/types.ts b/frontend/src/stores/app/types.tsindex e19bf0a474..dd3c53dd79 100644--- a/frontend/src/stores/app/types.ts+++ b/frontend/src/stores/app/types.ts@@ -101,6 +101,7 @@ export type ProjectListParams = {pageSize: number;pageToken: string;query?: string;+ excludeDefault?: boolean;};export type GroupFilter = {