fix(app): 修复可见对象过滤器候选列表
修复 #2272:已保存可见对象过滤后,再次打开过滤器时仍显示当前连接可选对象全集。 已有 visible_databases 只用于初始勾选状态,侧边栏树展示仍继续应用已保存过滤。 Co-authored-by: zero <zero@zeroMacmini.local>
This commit is contained in:
1 parent
889d0af92c
commit
d30d47ccda
5 files changed
+29
-7
No files matched your search
@@ -38,7 +38,7 @@ import { SQLITE_DATABASE_FILE_EXTENSIONS } from "@/lib/databaseFileDetection";
|
|||||||
import { connectionAttemptOriginalErrorMessage, connectionAttemptTimeoutMessage, connectionAttemptTimeoutMs } from "@/lib/connectionAttemptTimeout";
|
import { connectionAttemptOriginalErrorMessage, connectionAttemptTimeoutMessage, connectionAttemptTimeoutMs } from "@/lib/connectionAttemptTimeout";
|
||||||
import { ArrowLeft, ArrowDown, ArrowUp, CheckSquare, ChevronRight, CircleHelp, Copy, ExternalLink, FilePlus2, FolderOpen, GripVertical, Grid3X3, KeyRound, Link2, List, ListFilter, Loader2, Pipette, Plus, Search, ShieldCheck, Square, Trash2 } from "@lucide/vue";
|
import { ArrowLeft, ArrowDown, ArrowUp, CheckSquare, ChevronRight, CircleHelp, Copy, ExternalLink, FilePlus2, FolderOpen, GripVertical, Grid3X3, KeyRound, Link2, List, ListFilter, Loader2, Pipette, Plus, Search, ShieldCheck, Square, Trash2 } from "@lucide/vue";
|
||||||
import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, initialVisibleDatabaseSelection, visibleDatabaseSelectionIsStale } from "@/lib/connectionVisibleDatabases";
|
import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, initialVisibleDatabaseSelection, visibleDatabaseSelectionIsStale } from "@/lib/connectionVisibleDatabases";
|
||||||
import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForConnection, isSystemDatabaseName, normalizeVisibleDatabaseSelection, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/visibleDatabases";
|
import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, isSystemDatabaseName, normalizeVisibleDatabaseSelection, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/visibleDatabases";
|
||||||
import { isSchemaAware } from "@/lib/databaseFeatureSupport";
|
import { isSchemaAware } from "@/lib/databaseFeatureSupport";
|
||||||
import VisibleSchemasDialog from "@/components/sidebar/VisibleSchemasDialog.vue";
|
import VisibleSchemasDialog from "@/components/sidebar/VisibleSchemasDialog.vue";
|
||||||
import { oceanbaseModeConnectionPatch, oceanbaseSubModeFromConfig } from "@/lib/oceanbaseConnectionMode";
|
import { oceanbaseModeConnectionPatch, oceanbaseSubModeFromConfig } from "@/lib/oceanbaseConnectionMode";
|
||||||
@@ -1582,7 +1582,7 @@ const listedVisibleDatabaseNames = computed(() => {
|
|||||||
if (visibleFilterUsesSchemas.value) return visibleDatabaseNames.value;
|
if (visibleFilterUsesSchemas.value) return visibleDatabaseNames.value;
|
||||||
const connection = connectionConfigSnapshotForVisibleDatabases();
|
const connection = connectionConfigSnapshotForVisibleDatabases();
|
||||||
if (visibleDatabaseShowSystem.value) return visibleDatabaseNames.value;
|
if (visibleDatabaseShowSystem.value) return visibleDatabaseNames.value;
|
||||||
return filterDatabaseNamesForConnection(visibleDatabaseNames.value, connection);
|
return filterDatabaseNamesForVisiblePicker(visibleDatabaseNames.value, connection);
|
||||||
});
|
});
|
||||||
const filteredVisibleDatabaseNames = computed(() => {
|
const filteredVisibleDatabaseNames = computed(() => {
|
||||||
const query = visibleDatabaseSearchText.value.trim().toLowerCase();
|
const query = visibleDatabaseSearchText.value.trim().toLowerCase();
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
|
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { useConnectionStore } from "@/stores/connectionStore";
|
import { useConnectionStore } from "@/stores/connectionStore";
|
||||||
import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForConnection, isSystemDatabaseName, normalizeVisibleDatabaseSelection } from "@/lib/visibleDatabases";
|
import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, isSystemDatabaseName, normalizeVisibleDatabaseSelection } from "@/lib/visibleDatabases";
|
||||||
import * as api from "@/lib/api";
|
import * as api from "@/lib/api";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
@@ -43,7 +43,7 @@ const loadFailedKey = computed(() => (isSchemaFilterMode.value ? "visibleSchemas
|
|||||||
const listedObjectNames = computed(() => {
|
const listedObjectNames = computed(() => {
|
||||||
if (isSchemaFilterMode.value) return objectNames.value;
|
if (isSchemaFilterMode.value) return objectNames.value;
|
||||||
if (showSystemDatabases.value) return objectNames.value;
|
if (showSystemDatabases.value) return objectNames.value;
|
||||||
return filterDatabaseNamesForConnection(objectNames.value, connection.value);
|
return filterDatabaseNamesForVisiblePicker(objectNames.value, connection.value);
|
||||||
});
|
});
|
||||||
const filteredObjectNames = computed(() => {
|
const filteredObjectNames = computed(() => {
|
||||||
const query = searchText.value.trim().toLowerCase();
|
const query = searchText.value.trim().toLowerCase();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { ConnectionConfig, DatabaseType } from "@/types/database";
|
import type { ConnectionConfig, DatabaseType } from "@/types/database";
|
||||||
import { filterDatabaseNamesForConnection, normalizeVisibleDatabaseSelection } from "@/lib/visibleDatabases";
|
import { filterDatabaseNamesForVisiblePicker, normalizeVisibleDatabaseSelection } from "@/lib/visibleDatabases";
|
||||||
|
|
||||||
const DRAFT_VISIBLE_DATABASES_PREFIX = "__visible_draft_";
|
const DRAFT_VISIBLE_DATABASES_PREFIX = "__visible_draft_";
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ export function initialVisibleDatabaseSelection(databaseNames: string[], visible
|
|||||||
if (Array.isArray(visibleDatabases)) {
|
if (Array.isArray(visibleDatabases)) {
|
||||||
return normalizeVisibleDatabaseSelection(visibleDatabases, databaseNames);
|
return normalizeVisibleDatabaseSelection(visibleDatabases, databaseNames);
|
||||||
}
|
}
|
||||||
return filterDatabaseNamesForConnection(databaseNames, connection);
|
return filterDatabaseNamesForVisiblePicker(databaseNames, connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function visibleDatabaseSelectionIsStale(previous: VisibleDatabaseConnectionFields, current: VisibleDatabaseConnectionFields): boolean {
|
export function visibleDatabaseSelectionIsStale(previous: VisibleDatabaseConnectionFields, current: VisibleDatabaseConnectionFields): boolean {
|
||||||
|
|||||||
@@ -93,6 +93,10 @@ export function filterDatabaseNamesForConnection(databaseNames: string[], connec
|
|||||||
if (visibleDatabaseFilterIsEnabled(visibleDatabases)) {
|
if (visibleDatabaseFilterIsEnabled(visibleDatabases)) {
|
||||||
return filterVisibleDatabaseNames(databaseNames, visibleDatabases);
|
return filterVisibleDatabaseNames(databaseNames, visibleDatabases);
|
||||||
}
|
}
|
||||||
|
return filterDatabaseNamesForVisiblePicker(databaseNames, connection);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function filterDatabaseNamesForVisiblePicker(databaseNames: string[], connection: Pick<ConnectionConfig, "db_type" | "driver_profile"> | undefined): string[] {
|
||||||
if (connection?.db_type === "gbase" && connection.driver_profile === "gbase8s") {
|
if (connection?.db_type === "gbase" && connection.driver_profile === "gbase8s") {
|
||||||
return databaseNames;
|
return databaseNames;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
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/connectionVisibleDatabases.ts";
|
import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, visibleDatabaseSelectionIsStale, initialVisibleDatabaseSelection } from "../../apps/desktop/src/lib/connectionVisibleDatabases.ts";
|
||||||
import { connectionUsesVisibleSchemaFilter, filterDatabaseNamesForConnection } from "../../apps/desktop/src/lib/visibleDatabases.ts";
|
import { connectionUsesVisibleSchemaFilter, filterDatabaseNamesForConnection, filterDatabaseNamesForVisiblePicker } from "../../apps/desktop/src/lib/visibleDatabases.ts";
|
||||||
import type { ConnectionConfig } from "../../apps/desktop/src/types/database.ts";
|
import type { ConnectionConfig } from "../../apps/desktop/src/types/database.ts";
|
||||||
|
|
||||||
function config(overrides: Partial<ConnectionConfig> = {}): ConnectionConfig {
|
function config(overrides: Partial<ConnectionConfig> = {}): ConnectionConfig {
|
||||||
@@ -49,6 +49,24 @@ test("initial selection uses default visible database names when no filter is co
|
|||||||
assert.deepEqual(initialVisibleDatabaseSelection(["app", "mysql", "sys"], undefined, config()), ["app"]);
|
assert.deepEqual(initialVisibleDatabaseSelection(["app", "mysql", "sys"], undefined, config()), ["app"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("visible database picker ignores saved filters while keeping default system database hiding", () => {
|
||||||
|
const databaseNames = ["app", "analytics", "mysql", "sys"];
|
||||||
|
const connection = config({ visible_databases: ["app"] });
|
||||||
|
assert.deepEqual(filterDatabaseNamesForVisiblePicker(databaseNames, connection), ["app", "analytics"]);
|
||||||
|
assert.deepEqual(initialVisibleDatabaseSelection(databaseNames, connection.visible_databases, connection), ["app"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("Redis visible database picker keeps every database and initial selection uses saved filters", () => {
|
||||||
|
const databaseNames = ["0", "1", "2"];
|
||||||
|
const connection = config({ db_type: "redis", driver_profile: "redis", visible_databases: ["0"] });
|
||||||
|
assert.deepEqual(filterDatabaseNamesForVisiblePicker(databaseNames, connection), ["0", "1", "2"]);
|
||||||
|
assert.deepEqual(initialVisibleDatabaseSelection(databaseNames, connection.visible_databases, connection), ["0"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("connection database filtering still applies saved visible database filters for sidebar display", () => {
|
||||||
|
assert.deepEqual(filterDatabaseNamesForConnection(["app", "analytics", "mysql", "sys"], config({ visible_databases: ["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