Skip to content

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

chore: some ux optimize (#21122)

ecmadao562b3495048a
diff --git a/frontend/src/components/AdvancedSearch.test.tsx b/frontend/src/components/AdvancedSearch.test.tsx
index 716068493f..9d1747b3a8 100644
--- a/frontend/src/components/AdvancedSearch.test.tsx
+++ b/frontend/src/components/AdvancedSearch.test.tsx
@@ -107,4 +107,66 @@ describe("AdvancedSearch", () => {
HTMLElement.prototype.scrollIntoView = originalScrollIntoView;
}
});
+
+ test("renders selected scope values with fixed height and centered custom content", () => {
+ render(
+ <AdvancedSearch
+ params={{
+ query: "",
+ scopes: [
+ { id: "project", value: "unassigned" },
+ { id: "engine", value: "COSMOSDB" },
+ ],
+ }}
+ scopeOptions={[
+ {
+ id: "project",
+ title: "Project",
+ options: [
+ {
+ value: "unassigned",
+ keywords: ["unassigned"],
+ custom: true,
+ render: () => <i>Unassigned</i>,
+ },
+ ],
+ },
+ {
+ id: "engine",
+ title: "Engine",
+ options: [
+ {
+ value: "COSMOSDB",
+ keywords: ["cosmosdb"],
+ custom: true,
+ render: () => (
+ <span>
+ <span aria-hidden>🛸</span>
+ CosmosDB
+ </span>
+ ),
+ },
+ ],
+ },
+ ]}
+ onParamsChange={vi.fn()}
+ />
+ );
+
+ const projectTag = document.querySelector(
+ '[data-search-scope-id="project"]'
+ );
+ const engineTag = document.querySelector(
+ '[data-search-scope-id="engine"]'
+ );
+ expect(projectTag?.className).toContain("h-6");
+ expect(engineTag?.className).toContain("h-6");
+
+ const projectValue = projectTag?.children.item(1);
+ const engineValue = engineTag?.children.item(1);
+ expect(projectValue?.className).toContain("inline-flex");
+ expect(projectValue?.className).toContain("items-center");
+ expect(engineValue?.className).toContain("inline-flex");
+ expect(engineValue?.className).toContain("items-center");
+ });
});
diff --git a/frontend/src/components/AdvancedSearch.tsx b/frontend/src/components/AdvancedSearch.tsx
index f8a57cf916..eed96e5db1 100644
--- a/frontend/src/components/AdvancedSearch.tsx
+++ b/frontend/src/components/AdvancedSearch.tsx
@@ -696,7 +696,7 @@ export function AdvancedSearch({
data-search-scope-id={scope.id}
data-search-scope-index={originalIndex}
className={cn(
- "inline-flex max-w-[16rem] min-w-0 shrink-0 items-center gap-1 rounded-xs bg-control-bg px-1.5 py-0.5 text-xs whitespace-nowrap dark:bg-zinc-700 dark:text-gray-100",
+ "inline-flex h-6 max-w-[16rem] min-w-0 shrink-0 items-center gap-1 rounded-xs bg-control-bg px-1.5 text-xs whitespace-nowrap dark:bg-zinc-700 dark:text-gray-100",
focusedTagIndex === originalIndex && "ring-1 ring-accent"
)}
onClick={(e) => {
@@ -708,11 +708,14 @@ export function AdvancedSearch({
}}
>
<span className="text-control">{scope.id}:</span>
- <span className="min-w-0 truncate" title={scope.value}>
+ <span
+ className="inline-flex h-full min-w-0 items-center overflow-hidden truncate"
+ title={scope.value}
+ >
{renderTagValue(scope)}
</span>
<button
- className="ml-0.5 hover:text-error"
+ className="ml-0.5 inline-flex size-4 shrink-0 items-center justify-center hover:text-error"
onClick={(e) => {
e.stopPropagation();
removeScope(originalIndex);
diff --git a/frontend/src/components/ui/radio-group.test.tsx b/frontend/src/components/ui/radio-group.test.tsx
index 8e7c2b3340..dacc566019 100644
--- a/frontend/src/components/ui/radio-group.test.tsx
+++ b/frontend/src/components/ui/radio-group.test.tsx
@@ -94,4 +94,24 @@ describe("RadioGroupItem", () => {
unmount();
});
+
+ test("uses a not-allowed cursor for a disabled option", () => {
+ const { container, unmount } = renderIntoContainer(
+ createElement(
+ RadioGroup,
+ { value: "workspace", onValueChange: () => undefined },
+ createElement(
+ RadioGroupItem,
+ { value: "workspace", disabled: true },
+ "Workspace"
+ )
+ )
+ );
+
+ const label = container.querySelector("label");
+ expect(label?.className).toContain("cursor-not-allowed");
+ expect(label?.className).not.toContain("cursor-pointer");
+
+ unmount();
+ });
});
diff --git a/frontend/src/components/ui/radio-group.tsx b/frontend/src/components/ui/radio-group.tsx
index 33a1cd97fb..2ac8c26437 100644
--- a/frontend/src/components/ui/radio-group.tsx
+++ b/frontend/src/components/ui/radio-group.tsx
@@ -18,6 +18,7 @@ function RadioGroupItem({
children,
className,
contentClassName,
+ disabled,
radioClassName,
value,
...props
@@ -28,10 +29,15 @@ function RadioGroupItem({
}) {
return (
<label
- className={cn("flex items-center gap-x-2 cursor-pointer", className)}
+ className={cn(
+ "flex items-center gap-x-2",
+ disabled ? "cursor-not-allowed" : "cursor-pointer",
+ className
+ )}
>
<Radio.Root
value={value}
+ disabled={disabled}
className={cn(
"flex size-4 shrink-0 items-center justify-center rounded-full border border-control-border",
"data-[checked]:border-[rgb(var(--color-accent))] data-[checked]:border-[5px]",
diff --git a/frontend/src/modules/sql-editor/components/SheetTree.test.tsx b/frontend/src/modules/sql-editor/components/SheetTree.test.tsx
index 0bb6d24713..0dd880e1bc 100644
--- a/frontend/src/modules/sql-editor/components/SheetTree.test.tsx
+++ b/frontend/src/modules/sql-editor/components/SheetTree.test.tsx
@@ -1120,6 +1120,7 @@ describe("SheetTree", () => {
expect(loadMoreButton?.classList.contains("text-control-light")).toBe(false);
expect(loadMoreButton?.classList.contains("text-xs")).toBe(true);
expect(loadMoreButton?.classList.contains("cursor-pointer")).toBe(true);
+ expect(loadMoreButton?.classList.contains("pb-1")).toBe(true);
expect(loadMoreButton?.textContent).toBe("···common.load-more");
await act(async () => {
@@ -1182,6 +1183,7 @@ describe("SheetTree", () => {
expect(loadMoreButton?.classList.contains("text-control-light")).toBe(false);
expect(loadMoreButton?.classList.contains("text-xs")).toBe(true);
expect(loadMoreButton?.classList.contains("cursor-pointer")).toBe(true);
+ expect(loadMoreButton?.classList.contains("pb-1")).toBe(true);
expect(loadMoreButton?.textContent).toBe("···common.load-more");
await act(async () => {
diff --git a/frontend/src/modules/sql-editor/components/SheetTree.tsx b/frontend/src/modules/sql-editor/components/SheetTree.tsx
index 60bd8e7d17..5f3ceeead6 100644
--- a/frontend/src/modules/sql-editor/components/SheetTree.tsx
+++ b/frontend/src/modules/sql-editor/components/SheetTree.tsx
@@ -194,7 +194,7 @@ function WorksheetTreeLoadMoreButton({
type="button"
appearance="secondary"
size="xs"
- className="tree-label cursor-pointer text-xs font-medium text-accent hover:text-accent-hover"
+ className="tree-label cursor-pointer pb-1 text-xs font-medium text-accent hover:text-accent-hover"
onClick={onClick}
>
<span aria-hidden="true">···</span>
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
index fc19b00f52..9684ac841a 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
@@ -185,7 +185,7 @@ describe("sheet context", () => {
expect(container.textContent).toContain("Created worksheet");
});
- test("does not restore worksheet search keyword from localStorage", async () => {
+ test("does not restore worksheet filter from localStorage", async () => {
window.localStorage.setItem(
storageKeySqlEditorWorksheetFilter(
"",
@@ -215,12 +215,16 @@ describe("sheet context", () => {
root.render(<Probe />);
});
- expect(sheetContext!.filter.keyword).toBe("");
- expect(sheetContext!.filter.onlyShowStarred).toBe(true);
- expect(sheetContext!.filter.showShared).toBe(false);
+ expect(sheetContext!.filter).toEqual({
+ keyword: "",
+ showMine: true,
+ showShared: true,
+ showDraft: true,
+ onlyShowStarred: false,
+ });
});
- test("persists worksheet filter without deprecated keyword", async () => {
+ test("does not persist worksheet filter to localStorage", async () => {
const key = storageKeySqlEditorWorksheetFilter(
"",
"projects/proj1",
@@ -249,13 +253,7 @@ describe("sheet context", () => {
});
});
- const stored = JSON.parse(window.localStorage.getItem(key)!);
- expect(stored).toEqual({
- showMine: true,
- showShared: true,
- showDraft: true,
- onlyShowStarred: true,
- });
+ expect(window.localStorage.getItem(key)).toBeNull();
});
test("uses a collision-free key for load-more rows", async () => {
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.ts b/frontend/src/modules/sql-editor/model/Sheet/context.ts
index be36771f87..8cb21cad28 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.ts
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.ts
@@ -28,7 +28,6 @@ import {
getDefaultPagination,
getSheetStatement,
isWorksheetReadableV1,
- storageKeySqlEditorWorksheetFilter,
storageKeySqlEditorWorksheetFolder,
storageKeySqlEditorWorksheetTree,
workspaceCacheScope,
@@ -71,10 +70,6 @@ export interface WorksheetFilter {
showDraft: boolean;
}
-type PersistedWorksheetFilter = Omit<WorksheetFilter, "keyword"> & {
- keyword?: string;
-};
-
export interface FolderContext {
rootPath: string;
folders: string[];
@@ -446,32 +441,10 @@ const currentScope = (): {
}
};
-const isPersistedWorksheetFilter = (
- v: unknown
-): v is PersistedWorksheetFilter =>
- typeof v === "object" &&
- v !== null &&
- typeof (v as PersistedWorksheetFilter).onlyShowStarred === "boolean" &&
- typeof (v as PersistedWorksheetFilter).showMine === "boolean" &&
- typeof (v as PersistedWorksheetFilter).showShared === "boolean" &&
- typeof (v as PersistedWorksheetFilter).showDraft === "boolean";
-
const reloadFromStorage = () => {
const scope = currentScope();
if (!scope) return;
- const filter = safeReadJSON(
- storageKeySqlEditorWorksheetFilter(
- scope.wsScope,
- scope.project,
- scope.email
- ),
- (v) => (isPersistedWorksheetFilter(v) ? v : undefined)
- );
- const hydratedFilter = filter
- ? { ...INITIAL_FILTER, ...filter, keyword: INITIAL_FILTER.keyword }
- : { ...INITIAL_FILTER };
-
const expandedArray = safeReadJSON<string[]>(
storageKeySqlEditorWorksheetTree(scope.wsScope, scope.project, scope.email),
(v) =>
@@ -503,7 +476,7 @@ const reloadFromStorage = () => {
}
useSheetContextStore.getState().hydrate({
- filter: hydratedFilter,
+ filter: { ...INITIAL_FILTER },
expandedKeys,
selectedKeys: [],
editingNode: undefined,
@@ -511,24 +484,6 @@ const reloadFromStorage = () => {
});
};
-const persistFilter = (filter: WorksheetFilter) => {
- const scope = currentScope();
- if (!scope) return;
- safeWriteJSON(
- storageKeySqlEditorWorksheetFilter(
- scope.wsScope,
- scope.project,
- scope.email
- ),
- {
- onlyShowStarred: filter.onlyShowStarred,
- showMine: filter.showMine,
- showShared: filter.showShared,
- showDraft: filter.showDraft,
- }
- );
-};
-
const persistExpandedKeys = (keys: Set<string>) => {
const scope = currentScope();
if (!scope) return;
@@ -1400,7 +1355,6 @@ const bindWatchers = () => {
});
useSheetContextStore.subscribe((state, prev) => {
- if (state.filter !== prev.filter) persistFilter(state.filter);
if (state.expandedKeys !== prev.expandedKeys)
persistExpandedKeys(state.expandedKeys);
diff --git a/frontend/src/routes/project/ProjectDatabasesPage.test.tsx b/frontend/src/routes/project/ProjectDatabasesPage.test.tsx
index 6b5d08136f..c47d548be7 100644
--- a/frontend/src/routes/project/ProjectDatabasesPage.test.tsx
+++ b/frontend/src/routes/project/ProjectDatabasesPage.test.tsx
@@ -14,6 +14,7 @@ const mocks = vi.hoisted(() => ({
routerCurrentName: "workspace.project.database",
routerCurrentQuery: {} as Record<string, unknown>,
routerPush: vi.fn(),
+ batchUpdateDatabases: vi.fn(),
useProductIntro: vi.fn(),
captureMetric: vi.fn(),
removeDatabaseMetadataCache: vi.fn(),
@@ -153,9 +154,24 @@ vi.mock("@/components/database", async () => {
);
},
LabelEditorSheet: () => null,
- TransferProjectSheet: ({ open }: { open: boolean }) =>
+ TransferProjectSheet: ({
+ open,
+ onTransfer,
+ }: {
+ open: boolean;
+ onTransfer: (projectName: string) => Promise<void>;
+ }) =>
open
- ? React.createElement("div", { "data-testid": "transfer-project-sheet" })
+ ? React.createElement(
+ "button",
+ {
+ "data-testid": "transfer-project-sheet",
+ onClick: () => {
+ void onTransfer("projects/target");
+ },
+ },
+ "transfer"
+ )
: null,
};
});
@@ -201,7 +217,7 @@ vi.mock("@/stores/app", () => {
fetchInstance: mocks.fetchInstance,
fetchInstanceList: mocks.fetchInstanceList,
batchSyncDatabases: vi.fn(),
- batchUpdateDatabases: vi.fn(),
+ batchUpdateDatabases: mocks.batchUpdateDatabases,
serverInfo: { defaultProject: "projects/default" },
});
return { useAppStore };
@@ -234,6 +250,7 @@ beforeEach(async () => {
mocks.instancesByName = {};
mocks.routerCurrentName = "workspace.project.database";
mocks.routerCurrentQuery = {};
+ mocks.batchUpdateDatabases.mockResolvedValue(undefined);
mocks.workspacePermissions = new Set([
"bb.instances.create",
"bb.instances.get",
@@ -621,4 +638,51 @@ describe("ProjectDatabasesPage", () => {
});
});
+ test("redirects to target project databases page after batch transfer", async () => {
+ mocks.visibleDatabases = [{ name: "instances/prod/databases/app" }];
+ mocks.databasesByName = {
+ "instances/prod/databases/app": { name: "instances/prod/databases/app" },
+ };
+ const container = document.createElement("div");
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(<ProjectDatabasesPage projectId="default" />);
+ await Promise.resolve();
+ });
+
+ const selectAllButton = container.querySelector(
+ '[data-testid="batch-select-all"]'
+ ) as HTMLButtonElement;
+ await act(async () => {
+ selectAllButton.click();
+ });
+
+ const transferButton = container.querySelector(
+ '[data-testid="batch-transfer-project"]'
+ ) as HTMLButtonElement;
+ await act(async () => {
+ transferButton.click();
+ });
+
+ const transferSheet = container.querySelector(
+ '[data-testid="transfer-project-sheet"]'
+ ) as HTMLButtonElement;
+ await act(async () => {
+ transferSheet.click();
+ await Promise.resolve();
+ });
+
+ expect(mocks.routerPush).toHaveBeenCalledWith({
+ name: "workspace.project.database",
+ params: {
+ projectId: "target",
+ },
+ });
+
+ act(() => {
+ root.unmount();
+ });
+ });
+
});
diff --git a/frontend/src/routes/project/ProjectDatabasesPage.tsx b/frontend/src/routes/project/ProjectDatabasesPage.tsx
index f9714de74f..1bb9fa2ea1 100644
--- a/frontend/src/routes/project/ProjectDatabasesPage.tsx
+++ b/frontend/src/routes/project/ProjectDatabasesPage.tsx
@@ -8,6 +8,7 @@ import { behaviorAnalytics } from "@/app/analytics/provider";
import { router, useCurrentRoute } from "@/app/router";
import {
INSTANCE_ROUTE_CREATE,
+ PROJECT_V1_ROUTE_DATABASES,
SQL_EDITOR_DATABASE_MODULE,
} from "@/app/router/handles";
import { markListScrollRestorationEntry } from "@/app/router/NavigationScrollRestoration";
@@ -80,6 +81,7 @@ import {
PERMISSIONS_FOR_DATABASE_CREATE_ISSUE,
supportedEngineV1List,
} from "@/utils";
+import { extractProjectResourceName } from "@/utils/v1/project";
export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
@@ -443,6 +445,12 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
style: "SUCCESS",
title: t("database.successfully-transferred-databases"),
});
+ router.push({
+ name: PROJECT_V1_ROUTE_DATABASES,
+ params: {
+ projectId: extractProjectResourceName(projectName),
+ },
+ });
} catch {
pushNotification({
module: "bytebase",
diff --git a/frontend/src/routes/workspace/InstanceDetailPage.test.tsx b/frontend/src/routes/workspace/InstanceDetailPage.test.tsx
index c8f1236eed..eeb7f6e629 100644
--- a/frontend/src/routes/workspace/InstanceDetailPage.test.tsx
+++ b/frontend/src/routes/workspace/InstanceDetailPage.test.tsx
@@ -43,6 +43,7 @@ const mocks = vi.hoisted(() => ({
batchSyncDatabases: vi.fn(),
batchUpdateDatabases: vi.fn(),
pushNotification: vi.fn(),
+ routerPush: vi.fn(),
}));
vi.mock("react-router", () => ({
@@ -50,6 +51,14 @@ vi.mock("react-router", () => ({
useNavigate: () => mocks.navigate,
}));
+vi.mock("@/app/router", () => ({
+ PROJECT_V1_ROUTE_DATABASES: "workspace.project.database",
+ router: {
+ beforeEach: () => () => {},
+ push: mocks.routerPush,
+ },
+}));
+
vi.mock("react-i18next", () => ({
initReactI18next: { type: "3rdParty", init: () => {} },
Trans: ({
@@ -100,11 +109,16 @@ vi.mock("@/stores", () => ({
}));
vi.mock("@/utils", () => ({
+ extractDatabaseResourceName: (name: string) => {
+ const [, instanceName, , databaseName] = name.split("/");
+ return { instanceName, databaseName };
+ },
extractInstanceResourceName: (name: string) => name.split("/").pop() ?? "",
extractProjectResourceName: (name: string) => name.split("/").pop() ?? "",
getDefaultPagination: () => 10,
hasWorkspacePermissionV2: () => true,
instanceV1Name: (instance: Instance) => instance.title,
+ isNullOrUndefined: (value: unknown) => value === null || value === undefined,
isValidDatabaseName: (name: string) =>
/^instances\/[^/]+\/databases\/[^/]+$/.test(name),
setDocumentTitle: vi.fn(),
@@ -168,7 +182,24 @@ vi.mock("@/components/database", () => ({
);
},
LabelEditorSheet: () => null,
- TransferProjectSheet: () => null,
+ TransferProjectSheet: ({
+ open,
+ onTransfer,
+ }: {
+ open: boolean;
+ onTransfer: (projectName: string) => Promise<void>;
+ }) =>
+ open ? (
+ <button
+ type="button"
+ data-testid="transfer-project-sheet"
+ onClick={() => {
+ void onTransfer("projects/app");
+ }}
+ >
+ transfer
+ </button>
+ ) : null,
}));
vi.mock("@/lib/productIntro", () => ({
@@ -261,4 +292,38 @@ describe("InstanceDetailPage", () => {
?.getAttribute("data-selection-column-intro-target")
).toBe("prepare-database");
});
+
+ it("redirects to the target project databases page after transferring from the instance database list", async () => {
+ mocks.projects = [
+ { name: "projects/default" },
+ { name: "projects/app" },
+ ] as Project[];
+
+ await render(<InstanceDetailPage instanceId="prod" />);
+
+ const transferSyncedButton = Array.from(
+ container.querySelectorAll("button")
+ ).find((button) =>
+ button.textContent?.includes("db.instance-databases-synced-action")
+ ) as HTMLButtonElement;
+ await act(async () => {
+ transferSyncedButton.click();
+ await Promise.resolve();
+ });
+
+ const transferSheet = container.querySelector(
+ '[data-testid="transfer-project-sheet"]'
+ ) as HTMLButtonElement;
+ await act(async () => {
+ transferSheet.click();
+ await Promise.resolve();
+ });
+
+ expect(mocks.routerPush).toHaveBeenCalledWith({
+ name: "workspace.project.database",
+ params: {
+ projectId: "app",
+ },
+ });
+ });
});
diff --git a/frontend/src/routes/workspace/InstanceDetailPage.tsx b/frontend/src/routes/workspace/InstanceDetailPage.tsx
index a69603eb25..14a814bdcd 100644
--- a/frontend/src/routes/workspace/InstanceDetailPage.tsx
+++ b/frontend/src/routes/workspace/InstanceDetailPage.tsx
@@ -3,6 +3,7 @@ import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Trans, useTranslation } from "react-i18next";
import { useLocation, useNavigate } from "react-router";
+import { PROJECT_V1_ROUTE_DATABASES, router } from "@/app/router";
import {
AdvancedSearch,
getValueFromScopes,
@@ -285,6 +286,12 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
style: "SUCCESS",
title: t("database.successfully-transferred-databases"),
});
+ void router.push({
+ name: PROJECT_V1_ROUTE_DATABASES,
+ params: {
+ projectId: extractProjectResourceName(projectName),
+ },
+ });
} catch {
pushNotification({
module: "bytebase",