fix(mysql): open editor when creating a new event

This commit is contained in:
jearhe authored and GitHub committed 2026-08-30 00:47:21 +08:00
1 parent c24e4352e8
commit 508369ee39
9 files changed
+368 -18

No files matched your search

@@ -0,0 +1,129 @@
import { createPinia, setActivePinia } from "pinia";
import { beforeEach, describe, expect, it, vi } from "vitest";
function installLocalStorage() {
const data = new Map<string, string>();
vi.stubGlobal("localStorage", {
getItem: vi.fn((key: string) => data.get(key) ?? null),
setItem: vi.fn((key: string, value: string) => data.set(key, value)),
removeItem: vi.fn((key: string) => data.delete(key)),
});
return data;
}
// queryStore 是巨型模块,每个用例 vi.resetModules() 后动态 import 需要数秒,
// 显式放宽超时(与 queryStore.database-open.spec.ts 的做法一致)。
const QUERY_STORE_TEST_TIMEOUT = 30_000;
describe("queryStore MySQL Event create navigation", () => {
beforeEach(() => {
vi.resetModules();
vi.unstubAllGlobals();
installLocalStorage();
setActivePinia(createPinia());
}, QUERY_STORE_TEST_TIMEOUT);
it(
"records an explicit CREATE request when opening a brand-new ObjectBrowser for New Event",
async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const tabId = store.openObjectBrowser("mysql-1", "shop", undefined, undefined, undefined, false, "events", 1);
expect(store.tabs).toHaveLength(1);
expect(store.tabs.find((tab) => tab.id === tabId)?.objectBrowser).toMatchObject({
eventName: undefined,
eventReadOnly: false,
eventOpenRequestId: undefined,
eventCreateRequestId: 1,
initialObjectFilter: "events",
});
},
QUERY_STORE_TEST_TIMEOUT,
);
it(
"reuses the existing ObjectBrowser tab and re-triggers CREATE on every New Event click",
async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const firstTabId = store.openObjectBrowser("mysql-1", "shop", undefined, undefined, undefined, false, "events", 1);
const tab = store.tabs.find((item) => item.id === firstTabId)!;
// Second click on the SAME tab: request id must increment so the tab can
// re-enter CREATE mode instead of swallowing the action.
const secondTabId = store.openObjectBrowser("mysql-1", "shop", undefined, undefined, undefined, false, "events", 2);
expect(secondTabId).toBe(firstTabId);
expect(tab.objectBrowser?.eventCreateRequestId).toBe(2);
expect(tab.objectBrowser?.eventName).toBeUndefined();
},
QUERY_STORE_TEST_TIMEOUT,
);
it(
"opens an existing event in edit mode without any create state",
async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const tabId = store.openObjectBrowser("mysql-1", "shop", undefined, undefined, "foo_event", false, "events");
const tab = store.tabs.find((item) => item.id === tabId)!;
expect(tab.objectBrowser?.eventName).toBe("foo_event");
expect(tab.objectBrowser?.eventOpenRequestId).toBe(1);
expect(tab.objectBrowser?.eventCreateRequestId).toBeUndefined();
expect(tab.objectBrowser?.initialObjectFilter).toBe("events");
// Re-opening the same existing event on the reused tab increments edit request id
store.openObjectBrowser("mysql-1", "shop", undefined, undefined, "foo_event", true, "events");
expect(tab.objectBrowser?.eventOpenRequestId).toBe(2);
expect(tab.objectBrowser?.eventReadOnly).toBe(true);
expect(tab.objectBrowser?.eventCreateRequestId).toBeUndefined();
},
QUERY_STORE_TEST_TIMEOUT,
);
it(
"keeps create and edit requests mutually exclusive on a reused tab",
async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const tabId = store.openObjectBrowser("mysql-1", "shop", undefined, undefined, undefined, false, "events", 1);
const tab = store.tabs.find((item) => item.id === tabId)!;
// Edit request after a create request clears the stale create state
store.openObjectBrowser("mysql-1", "shop", undefined, undefined, "foo_event", false, "events");
expect(tab.objectBrowser?.eventName).toBe("foo_event");
expect(tab.objectBrowser?.eventCreateRequestId).toBeUndefined();
// A later create request clears the stale edit state
store.openObjectBrowser("mysql-1", "shop", undefined, undefined, undefined, false, "events", 3);
expect(tab.objectBrowser?.eventCreateRequestId).toBe(3);
expect(tab.objectBrowser?.eventName).toBeUndefined();
expect(tab.objectBrowser?.eventOpenRequestId).toBeUndefined();
},
QUERY_STORE_TEST_TIMEOUT,
);
it(
"plain Event list open carries no create or edit intent",
async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
const tabId = store.openObjectBrowser("mysql-1", "shop", undefined, undefined, undefined, false, "events");
expect(store.tabs.find((tab) => tab.id === tabId)?.objectBrowser).toMatchObject({
eventName: undefined,
eventCreateRequestId: undefined,
eventOpenRequestId: undefined,
initialObjectFilter: "events",
});
},
QUERY_STORE_TEST_TIMEOUT,
);
});
+18 -5
View File
@@ -1942,15 +1942,27 @@ export const useQueryStore = defineStore("query", () => {
return id;
}
function openObjectBrowser(connectionId: string, database: string, schema?: string, catalog?: string, eventName?: string, eventReadOnly = false, initialObjectFilter?: "tables" | "events") {
function openObjectBrowser(connectionId: string, database: string, schema?: string, catalog?: string, eventName?: string, eventReadOnly = false, initialObjectFilter?: "tables" | "events", eventCreateRequestId?: number) {
const title = catalog ? `${catalog}.${database} objects` : schema ? `${schema} objects` : `${database} objects`;
const existing = tabs.value.find((tab) => tab.mode === "objects" && tab.connectionId === connectionId && tab.database === database && (tab.objectBrowser?.catalog || "") === (catalog || "") && (tab.objectBrowser?.schema || "") === (schema || ""));
if (existing) {
if (eventName) {
if (eventCreateRequestId !== undefined) {
// 新建事件:显式 CREATE 请求优先,并清掉可能残留的"编辑已有事件"状态,
// 保证同一 tab 被复用时每次点击都能重新进入 CREATE 编辑器(请求号单调递增)。
existing.objectBrowser = {
...existing.objectBrowser,
eventName: undefined,
eventReadOnly: false,
eventOpenRequestId: undefined,
eventCreateRequestId,
initialObjectFilter: initialObjectFilter ?? "events",
};
} else if (eventName) {
existing.objectBrowser = {
...existing.objectBrowser,
eventName,
eventReadOnly,
eventCreateRequestId: undefined,
initialObjectFilter: initialObjectFilter ?? (eventName ? "events" : existing.objectBrowser?.initialObjectFilter),
eventOpenRequestId: (existing.objectBrowser?.eventOpenRequestId ?? 0) + 1,
};
@@ -1975,10 +1987,11 @@ export const useQueryStore = defineStore("query", () => {
catalog,
schema,
objectType: "tables",
eventName,
eventReadOnly,
initialObjectFilter: initialObjectFilter ?? (eventName ? "events" : undefined),
eventName: eventCreateRequestId !== undefined ? undefined : eventName,
eventReadOnly: eventCreateRequestId !== undefined ? false : eventReadOnly,
initialObjectFilter: initialObjectFilter ?? (eventName || eventCreateRequestId !== undefined ? "events" : undefined),
eventOpenRequestId: eventName ? 1 : undefined,
eventCreateRequestId,
},
};
tabs.value.push(tab);