feat(connection): select new databases when visible
This commit is contained in:
4 files changed
+32
-1
No files matched your search
@@ -2989,6 +2989,7 @@ async function createDuckDbAttachedDatabaseFile() {
|
|||||||
attached_databases: [...(config.attached_databases ?? []), { name, path }],
|
attached_databases: [...(config.attached_databases ?? []), { name, path }],
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
await connectionStore.ensureVisibleDatabase(node.connectionId, name);
|
||||||
await connectionStore.loadDatabases(node.connectionId, { force: true });
|
await connectionStore.loadDatabases(node.connectionId, { force: true });
|
||||||
connectionStore.selectedTreeNodeId = `${node.connectionId}:${name}`;
|
connectionStore.selectedTreeNodeId = `${node.connectionId}:${name}`;
|
||||||
toast(t("contextMenu.createDuckDbFileSuccess", { name }), 3000);
|
toast(t("contextMenu.createDuckDbFileSuccess", { name }), 3000);
|
||||||
@@ -3008,6 +3009,7 @@ async function confirmCreateDatabase() {
|
|||||||
if (config?.db_type === "mongodb") {
|
if (config?.db_type === "mongodb") {
|
||||||
await api.mongoCreateDatabase(node.connectionId, name);
|
await api.mongoCreateDatabase(node.connectionId, name);
|
||||||
toast(t("contextMenu.createDatabaseSuccess", { name }), 3000);
|
toast(t("contextMenu.createDatabaseSuccess", { name }), 3000);
|
||||||
|
await connectionStore.ensureVisibleDatabase(node.connectionId, name);
|
||||||
await connectionStore.loadMongoDatabases(node.connectionId);
|
await connectionStore.loadMongoDatabases(node.connectionId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -3021,6 +3023,7 @@ async function confirmCreateDatabase() {
|
|||||||
});
|
});
|
||||||
await api.executeQuery(node.connectionId, "", sql);
|
await api.executeQuery(node.connectionId, "", sql);
|
||||||
toast(t("contextMenu.createDatabaseSuccess", { name }), 3000);
|
toast(t("contextMenu.createDatabaseSuccess", { name }), 3000);
|
||||||
|
await connectionStore.ensureVisibleDatabase(node.connectionId, name);
|
||||||
await connectionStore.loadDatabases(node.connectionId, { force: true });
|
await connectionStore.loadDatabases(node.connectionId, { force: true });
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
toast(t("contextMenu.tableOperationFailed", { message: e?.message || String(e) }), 5000);
|
toast(t("contextMenu.tableOperationFailed", { message: e?.message || String(e) }), 5000);
|
||||||
|
|||||||
@@ -25,6 +25,13 @@ export function initialVisibleDatabaseSelection(databaseNames: string[], visible
|
|||||||
return filterDatabaseNamesForVisiblePicker(databaseNames, connection);
|
return filterDatabaseNamesForVisiblePicker(databaseNames, connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function appendVisibleDatabaseSelection(visibleDatabases: string[] | undefined, databaseName: string): string[] | undefined {
|
||||||
|
if (!Array.isArray(visibleDatabases)) return undefined;
|
||||||
|
const name = databaseName.trim();
|
||||||
|
if (!name || visibleDatabases.includes(name)) return visibleDatabases;
|
||||||
|
return [...visibleDatabases, name];
|
||||||
|
}
|
||||||
|
|
||||||
export function visibleDatabaseSelectionIsStale(previous: VisibleDatabaseConnectionFields, current: VisibleDatabaseConnectionFields): boolean {
|
export function visibleDatabaseSelectionIsStale(previous: VisibleDatabaseConnectionFields, current: VisibleDatabaseConnectionFields): boolean {
|
||||||
return visibleDatabaseFingerprint(previous) !== visibleDatabaseFingerprint(current);
|
return visibleDatabaseFingerprint(previous) !== visibleDatabaseFingerprint(current);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ import { kvRootNodeLabel } from "@/lib/kv/kvRootPresentation";
|
|||||||
import { REDIS_SCAN_PAGE_SIZE_DEFAULT } from "@/lib/redis/redisKeyPattern";
|
import { REDIS_SCAN_PAGE_SIZE_DEFAULT } from "@/lib/redis/redisKeyPattern";
|
||||||
import { appendAgentDriverUpdateHint, hasAgentDriverUpdate, type AgentDriverInstallState } from "@/lib/connection/agentDriverInstallHint";
|
import { appendAgentDriverUpdateHint, hasAgentDriverUpdate, type AgentDriverInstallState } from "@/lib/connection/agentDriverInstallHint";
|
||||||
import { appendConnectionErrorHints } from "@/lib/connection/connectionErrorHints";
|
import { appendConnectionErrorHints } from "@/lib/connection/connectionErrorHints";
|
||||||
|
import { appendVisibleDatabaseSelection } from "@/lib/connection/connectionVisibleDatabases";
|
||||||
import { createMetadataLoadTrace, logMetadataLoadTrace, MetadataLoadCoordinator, type MetadataLoadTraceLogger } from "@/lib/metadata/metadataLoadCoordinator";
|
import { createMetadataLoadTrace, logMetadataLoadTrace, MetadataLoadCoordinator, type MetadataLoadTraceLogger } from "@/lib/metadata/metadataLoadCoordinator";
|
||||||
import type { MetadataScopeInput } from "@/lib/metadata/metadataLoadScope";
|
import type { MetadataScopeInput } from "@/lib/metadata/metadataLoadScope";
|
||||||
import { MetadataResultCache, type MetadataCacheInvalidation } from "@/lib/metadata/metadataResultCache";
|
import { MetadataResultCache, type MetadataCacheInvalidation } from "@/lib/metadata/metadataResultCache";
|
||||||
@@ -1637,6 +1638,14 @@ export const useConnectionStore = defineStore("connection", () => {
|
|||||||
await reloadConnectionDatabaseChildren(connectionId);
|
await reloadConnectionDatabaseChildren(connectionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function ensureVisibleDatabase(connectionId: string, databaseName: string) {
|
||||||
|
const config = getConfig(connectionId);
|
||||||
|
if (!config) return;
|
||||||
|
const visibleDatabases = appendVisibleDatabaseSelection(config.visible_databases, databaseName);
|
||||||
|
if (visibleDatabases === config.visible_databases) return;
|
||||||
|
await updateVisibleDatabasesConfig(connectionId, visibleDatabases);
|
||||||
|
}
|
||||||
|
|
||||||
async function updateVisibleDatabasesConfig(connectionId: string, visibleDatabases: string[] | undefined) {
|
async function updateVisibleDatabasesConfig(connectionId: string, visibleDatabases: string[] | undefined) {
|
||||||
const idx = connections.value.findIndex((connection) => connection.id === connectionId);
|
const idx = connections.value.findIndex((connection) => connection.id === connectionId);
|
||||||
if (idx < 0) return;
|
if (idx < 0) return;
|
||||||
@@ -4776,6 +4785,7 @@ export const useConnectionStore = defineStore("connection", () => {
|
|||||||
isDefaultDatabase,
|
isDefaultDatabase,
|
||||||
setVisibleDatabases,
|
setVisibleDatabases,
|
||||||
clearVisibleDatabases,
|
clearVisibleDatabases,
|
||||||
|
ensureVisibleDatabase,
|
||||||
setVisibleSchemas,
|
setVisibleSchemas,
|
||||||
clearVisibleSchemas,
|
clearVisibleSchemas,
|
||||||
removeConnection,
|
removeConnection,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import assert from "node:assert/strict";
|
import assert from "node:assert/strict";
|
||||||
import { test } from "vitest";
|
import { test } from "vitest";
|
||||||
import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, visibleDatabaseSelectionIsStale, initialVisibleDatabaseSelection } from "../../apps/desktop/src/lib/connection/connectionVisibleDatabases.ts";
|
import { appendVisibleDatabaseSelection, buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, visibleDatabaseSelectionIsStale, initialVisibleDatabaseSelection } from "../../apps/desktop/src/lib/connection/connectionVisibleDatabases.ts";
|
||||||
import { connectionUsesVisibleSchemaFilter, filterDatabaseNamesForConnection, filterDatabaseNamesForVisiblePicker } from "../../apps/desktop/src/lib/database/visibleDatabases.ts";
|
import { connectionUsesVisibleSchemaFilter, filterDatabaseNamesForConnection, filterDatabaseNamesForVisiblePicker } from "../../apps/desktop/src/lib/database/visibleDatabases.ts";
|
||||||
import type { ConnectionConfig } from "../../apps/desktop/src/types/database.ts";
|
import type { ConnectionConfig } from "../../apps/desktop/src/types/database.ts";
|
||||||
|
|
||||||
@@ -67,6 +67,17 @@ test("connection database filtering still applies saved visible database filters
|
|||||||
assert.deepEqual(filterDatabaseNamesForConnection(["app", "analytics", "mysql", "sys"], config({ visible_databases: ["app"] })), ["app"]);
|
assert.deepEqual(filterDatabaseNamesForConnection(["app", "analytics", "mysql", "sys"], config({ visible_databases: ["app"] })), ["app"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("append visible database selection only when filter is enabled", () => {
|
||||||
|
assert.deepEqual(appendVisibleDatabaseSelection(["app"], "analytics"), ["app", "analytics"]);
|
||||||
|
assert.deepEqual(appendVisibleDatabaseSelection(["app", "analytics"], "analytics"), ["app", "analytics"]);
|
||||||
|
assert.equal(appendVisibleDatabaseSelection(undefined, "analytics"), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("append visible database selection trims new database names and ignores empty names", () => {
|
||||||
|
assert.deepEqual(appendVisibleDatabaseSelection(["app"], " analytics "), ["app", "analytics"]);
|
||||||
|
assert.deepEqual(appendVisibleDatabaseSelection(["app"], " "), ["app"]);
|
||||||
|
});
|
||||||
|
|
||||||
test("ZooKeeper connections do not offer visible database selection", () => {
|
test("ZooKeeper connections do not offer visible database selection", () => {
|
||||||
assert.equal(connectionCanChooseVisibleDatabases(config({ db_type: "zookeeper" })), false);
|
assert.equal(connectionCanChooseVisibleDatabases(config({ db_type: "zookeeper" })), false);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user