Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

feat(export): refine result export menus and Oracle sidebar visibility

efeire049615725f6c
diff --git a/agents/drivers/oracle-go/connection_info.go b/agents/drivers/oracle-go/connection_info.go
index 4812e1b02b..d7662ce861 100644
--- a/agents/drivers/oracle-go/connection_info.go
+++ b/agents/drivers/oracle-go/connection_info.go
@@ -1,6 +1,10 @@
package main
-import "strings"
+import (
+ "context"
+ "errors"
+ "strings"
+)
// Match the JDBC connection_info contract used to open native job contexts.
// Version metadata is optional: dictionary visibility must not prevent the
@@ -17,12 +21,27 @@ func (s *server) connectionInfo() (map[string]any, error) {
for _, query := range oracleDatabaseVersionQueries {
rows, err := s.queryRowsWithTimeout(query, nil, int(oracleDatabaseVersionProbeTimeout.Seconds()))
if err != nil {
+ s.activeCancelMu.Lock()
+ probeTimedOut := s.activeTimedOut
+ s.activeCancelMu.Unlock()
+ if errors.Is(err, context.Canceled) && !probeTimedOut {
+ return nil, err
+ }
continue
}
var version string
- valid := rows.Next() && rows.Scan(&version) == nil && rows.Err() == nil
+ valid := rows.Next()
+ if valid {
+ err = rows.Scan(&version)
+ }
+ if err == nil {
+ err = rows.Err()
+ }
s.closeRows(rows)
- if valid && strings.TrimSpace(version) != "" {
+ if errors.Is(err, context.Canceled) {
+ return nil, err
+ }
+ if valid && err == nil && strings.TrimSpace(version) != "" {
info["productVersion"] = strings.TrimSpace(version)
break
}
diff --git a/agents/drivers/oracle-go/connection_info_test.go b/agents/drivers/oracle-go/connection_info_test.go
index 7cc2e15a9b..2a0be291b3 100644
--- a/agents/drivers/oracle-go/connection_info_test.go
+++ b/agents/drivers/oracle-go/connection_info_test.go
@@ -1,9 +1,13 @@
package main
import (
+ "context"
"database/sql/driver"
"encoding/json"
+ "errors"
+ "strings"
"testing"
+ "time"
"github.com/sijms/go-ora/v2/network"
)
@@ -78,3 +82,74 @@ func TestConnectionInfoRequiresConnectedSession(t *testing.T) {
t.Fatalf("disconnected connection_info should fail: %+v", resp)
}
}
+func TestConnectionInfoHonorsCancelledContext(t *testing.T) {
+ db, _ := openOracleViewSourceTestDB(t, nil)
+ s := newServer()
+ s.db = db
+ ctx, cancel := context.WithCancel(context.Background())
+ cancel()
+ s.statementCtx = ctx
+ if _, _, err := s.dispatch("connection_info", nil); !errors.Is(err, context.Canceled) {
+ t.Fatalf("expected cancelled context, got %v", err)
+ }
+}
+
+func TestConnectionInfoProbeTimeoutRemainsOptional(t *testing.T) {
+ db, _ := openOracleViewSourceTestDB(t, nil)
+ db.SetMaxOpenConns(1)
+ conn, err := db.Conn(context.Background())
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer conn.Close()
+ s := newServer()
+ s.db = db
+ result, _, err := s.dispatch("connection_info", nil)
+ if err != nil || result == nil {
+ t.Fatalf("optional version probe timeout must not fail connection_info: %v", err)
+ }
+}
+
+func TestConnectionInfoCanCancelConnectionAcquisition(t *testing.T) {
+ db, _ := openOracleViewSourceTestDB(t, nil)
+ db.SetMaxOpenConns(1)
+ reserved, err := db.Conn(context.Background())
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer reserved.Close()
+ s := newServer()
+ s.db = db
+ runtime := newRuntimeServer()
+ runtime.sessions["identity"] = &agentSession{server: s}
+ finished := make(chan response, 1)
+ go func() {
+ result, _ := runtime.handleLine(`{"id":1,"method":"connection_info","params":{"agentSessionId":"identity"}}`)
+ finished <- result
+ }()
+ deadline := time.Now().Add(time.Second)
+ for {
+ s.activeCancelMu.Lock()
+ registered := s.activeCancel != nil
+ s.activeCancelMu.Unlock()
+ if registered {
+ break
+ }
+ if time.Now().After(deadline) {
+ t.Fatal("identity request did not register cancellation before acquiring a connection")
+ }
+ time.Sleep(time.Millisecond)
+ }
+ cancelled, _ := runtime.handleLine(`{"id":2,"method":"cancel_session","params":{"agentSessionId":"identity"}}`)
+ if cancelled.Error != nil {
+ t.Fatal(cancelled.Error)
+ }
+ select {
+ case result := <-finished:
+ if result.Error == nil || !strings.Contains(result.Error.Message, "canceled") {
+ t.Fatalf("cancelled identity request must fail: %#v", result)
+ }
+ case <-time.After(time.Second):
+ t.Fatal("cancel_session did not release the waiting identity request")
+ }
+}
diff --git a/agents/drivers/oracle-go/main_test.go b/agents/drivers/oracle-go/main_test.go
index 56819ae309..d3d6fcb044 100644
--- a/agents/drivers/oracle-go/main_test.go
+++ b/agents/drivers/oracle-go/main_test.go
@@ -62,6 +62,17 @@ func TestHandshakeResponse(t *testing.T) {
}
}
+func TestConnectionInfoMethodIsSupported(t *testing.T) {
+ s := newServer()
+ resp, _ := s.handleLine(`{"jsonrpc":"2.0","id":8,"method":"connection_info","params":{}}`)
+ if resp.Error == nil {
+ t.Fatal("connection_info must fail on a disconnected server")
+ }
+ if !strings.Contains(resp.Error.Message, "not connected") {
+ t.Fatalf("connection_info must use the active connection: %s", resp.Error.Message)
+ }
+}
+
func TestRuntimeHandshakeAdvertisesMultiSessionProtocol(t *testing.T) {
runtime := newRuntimeServer()
resp, shutdown := runtime.handleLine(`{"jsonrpc":"2.0","id":7,"method":"handshake","params":{"appVersion":"dev"}}`)
diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index d31538eebf..e36bd4c936 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -120,6 +120,9 @@ import { looksLikeMongoSrvHost, mongodbAuthFailureHint, mongoConnectionUsesOidc,
import { isMongoLegacyDriverProfile } from "@/lib/mongo/mongoCapabilities";
import { mysqlCleartextPasswordAuthEnabled, setMysqlCleartextPasswordAuthEnabled } from "@/lib/database/mysqlConnectionOptions";
import { supportsOracleDatabaseLinks } from "@/lib/database/oracleDatabaseLinks";
+import { effectiveDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";
+import { connectionSupportsDatabaseUserAdmin } from "@/lib/database/databaseUserAdmin";
+import { nativeJobAdminSupported } from "@/lib/database/nativeJobAdmin";
import { applyDamengSslUrlParams, damengSslFormConfig } from "@/lib/database/damengSslOptions";
import { DAMENG_BUILTIN_DRIVER_PROFILE, DAMENG_CUSTOM_DRIVER_PROFILE, DAMENG_DEFAULT_JDBC_DRIVER_CLASS, damengCustomJdbcUrl, damengDriverModeForConfig, defaultDamengJdbcUrl, type DamengDriverMode } from "@/lib/database/damengDriverOptions";
import { doltSystemTablesVisible, isDoltDriverProfile, setDoltSystemTablesVisible } from "@/lib/database/doltProfile";
@@ -489,6 +492,8 @@ const defaultForm = (): ConnectionForm => ({
read_only: false,
show_system_schemas: false,
show_database_links: true,
+ show_native_jobs: true,
+ show_user_admin: true,
sidebar_auto_load_all_tables: false,
is_production: false,
production_databases: [],
@@ -698,6 +703,13 @@ function sshLayersForConfig(config: LegacyConnectionConfig): SshTunnelConfig[] {
}
const form = ref(defaultForm());
+const sidebarVisibilitySettings = computed(() => {
+ const config = { ...form.value, database_info: visibleTestDatabaseInfo.value ?? visibleSavedDatabaseInfo.value ?? undefined } as ConnectionConfig;
+ return [
+ { key: "show_native_jobs" as const, label: "connection.showNativeJobs", hint: "connection.showNativeJobsHint", supported: nativeJobAdminSupported(config) },
+ { key: "show_user_admin" as const, label: "connection.showUserAdmin", hint: "connection.showUserAdminHint", supported: connectionSupportsDatabaseUserAdmin(config) || effectiveDatabaseTypeForConnection(config) === "xugu" },
+ ].filter((setting) => setting.supported);
+});
const supportsAutomaticTableLoading = computed(() => supportsDataDictionary(form.value.db_type) && !DIRECT_SIDEBAR_OBJECT_TYPES.has(form.value.db_type));
const redisKeyTemplatesText = ref("");
const noteTextareaRef = ref<HTMLTextAreaElement | null>(null);
@@ -3257,6 +3269,8 @@ watch(
read_only: config.read_only || false,
show_system_schemas: config.show_system_schemas || false,
show_database_links: config.show_database_links !== false,
+ show_native_jobs: config.show_native_jobs !== false,
+ show_user_admin: config.show_user_admin !== false,
sidebar_auto_load_all_tables: config.sidebar_auto_load_all_tables === true,
is_production: config.is_production || false,
production_databases: config.production_databases || [],
@@ -5602,6 +5616,8 @@ function connectionConfigForSubmit(id: string, generatedName = "", validatePlugi
}
if (!config.show_system_schemas) config.show_system_schemas = undefined;
if (config.show_database_links !== false && !preserveExistingShowDatabaseLinks) config.show_database_links = undefined;
+ if (config.show_native_jobs !== false) config.show_native_jobs = undefined;
+ if (config.show_user_admin !== false) config.show_user_admin = undefined;
if (!config.sidebar_auto_load_all_tables) config.sidebar_auto_load_all_tables = undefined;
if (config.visible_schemas && Object.keys(config.visible_schemas).length === 0) config.visible_schemas = undefined;
if (config.agent_java_options && config.agent_java_options.length === 0) config.agent_java_options = undefined;
@@ -8306,7 +8322,7 @@ function openExternalUrl(url: string) {
<Label :class="connectionLabelSmallClass">{{ t("connection.mqTls") }}</Label>
<label class="col-span-3 inline-flex items-center gap-2">
<input type="checkbox" v-model="mqTlsSkipVerify" class="mr-0" />
- <span class="text-xs text-muted-foreground">{{ t("connection.mqTlsSkipVerify") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.mqTlsSkipVerify") }}</span>
</label>
</div>
<div v-if="mqSystemKind === 'pulsar'" class="grid grid-cols-4 items-center gap-4">
@@ -8494,7 +8510,7 @@ function openExternalUrl(url: string) {
<Label :class="connectionLabelSmallClass">{{ t("connection.redisSentinelTls") }}</Label>
<label class="col-span-3 inline-flex items-center gap-2">
<input type="checkbox" v-model="form.redis_sentinel_tls" class="mr-0" />
- <span class="text-xs text-muted-foreground">{{ t("connection.redisSentinelTlsHint") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.redisSentinelTlsHint") }}</span>
</label>
</div>
</template>
@@ -9746,7 +9762,7 @@ function openExternalUrl(url: string) {
<Label :class="connectionLabelSmallClass">{{ t("connection.hiveTicketCache") }}</Label>
<label class="col-span-3 flex items-center gap-2 cursor-pointer">
<input type="checkbox" v-model="hiveUseSubjectCredsOnlyFalse" class="mr-0" />
- <span class="text-xs text-muted-foreground">{{ t("connection.hiveTicketCacheFallback") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.hiveTicketCacheFallback") }}</span>
</label>
</div>
<div class="grid grid-cols-4 items-start gap-4">
@@ -9805,7 +9821,7 @@ function openExternalUrl(url: string) {
<Label :class="connectionLabelSmallClass">SYSDBA</Label>
<label class="col-span-3 flex items-center gap-2 cursor-pointer">
<input type="checkbox" v-model="form.sysdba" class="mr-0" :disabled="isOracleSysUser(form)" />
- <span class="text-xs text-muted-foreground">as SYSDBA</span>
+ <span class="text-sm text-muted-foreground">as SYSDBA</span>
</label>
</div>
@@ -10026,7 +10042,7 @@ function openExternalUrl(url: string) {
/>
<div class="mt-1.5 flex shrink-0 items-center gap-2">
<div class="flex items-center gap-1">
- <Label for="connection-note-sidebar-visibility" class="text-xs font-normal text-muted-foreground">
+ <Label for="connection-note-sidebar-visibility" class="text-sm font-normal text-muted-foreground">
{{ t("connection.noteShow") }}
</Label>
<Tooltip>
@@ -10052,7 +10068,7 @@ function openExternalUrl(url: string) {
<Label :class="connectionLabelSmallClass">SSL/TLS</Label>
<label class="col-span-3 flex items-center gap-2 cursor-pointer">
<input type="checkbox" v-model="tlsEnabled" class="mr-0" />
- <span class="text-xs text-muted-foreground">{{ t("connection.sslEnable") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.sslEnable") }}</span>
</label>
</div>
@@ -10537,7 +10553,7 @@ function openExternalUrl(url: string) {
</div>
<label class="inline-flex shrink-0 items-center gap-2">
<Switch v-model="nacosHistoryEnabled" />
- <span class="text-xs text-muted-foreground">{{ t("nacos.nacosEnabled") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("nacos.nacosEnabled") }}</span>
</label>
</div>
<div class="grid gap-1.5">
@@ -10578,7 +10594,7 @@ function openExternalUrl(url: string) {
</div>
<span class="inline-flex shrink-0 items-center gap-2">
<input v-model="nacosTlsSkipVerify" type="checkbox" class="mr-0" />
- <span class="text-xs text-muted-foreground">{{ t("connection.nacosTlsSkipVerify") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.nacosTlsSkipVerify") }}</span>
</span>
</label>
</div>
@@ -10829,6 +10845,13 @@ function openExternalUrl(url: string) {
<span class="text-xs text-muted-foreground">{{ t("connection.showDatabaseLinksHint") }}</span>
</label>
</div>
+ <div v-for="setting in sidebarVisibilitySettings" :key="setting.key" class="grid grid-cols-4 items-center gap-4">
+ <Label :for="`sidebar-${setting.key}`" :class="connectionLabelSmallClass">{{ t(setting.label) }}</Label>
+ <label class="col-span-3 flex items-center gap-2 cursor-pointer">
+ <input :id="`sidebar-${setting.key}`" type="checkbox" v-model="form[setting.key]" :aria-label="t(setting.label)" class="mr-0" />
+ <span class="text-xs text-muted-foreground">{{ t(setting.hint) }}</span>
+ </label>
+ </div>
<div v-if="supportsAutomaticTableLoading" class="grid grid-cols-4 items-start gap-4">
<Label :class="connectionLabelSmallPaddedClass">{{ t("connection.tableLoading") }}</Label>
<div class="col-span-3 grid gap-1.5">
@@ -10917,7 +10940,7 @@ function openExternalUrl(url: string) {
<div class="col-span-3 space-y-1">
<div class="flex items-center gap-2">
<Input id="redis-value-preview-limit-input" v-model.number="editRedisValuePreviewLimitKiB" type="number" :min="REDIS_VALUE_PREVIEW_LIMIT_KIB_MIN" :max="REDIS_VALUE_PREVIEW_LIMIT_KIB_MAX" step="1" class="h-8 w-32 text-xs" />
- <span class="text-xs text-muted-foreground">KiB</span>
+ <span class="text-sm text-muted-foreground">KiB</span>
</div>
<p class="text-xs text-muted-foreground">{{ t("settings.redisValuePreviewLimitDescription") }}</p>
</div>
@@ -11139,7 +11162,7 @@ function openExternalUrl(url: string) {
<span />
<label class="col-span-3 flex items-center gap-2 cursor-pointer">
<input type="checkbox" v-model="selectedSshLayer.expose_lan" class="mr-0" :disabled="selectedSshLayer.enabled === false" />
- <span class="text-xs text-muted-foreground">{{ t("connection.sshExposeLan") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.sshExposeLan") }}</span>
</label>
</div>
<div class="grid grid-cols-4 items-start gap-4">
@@ -11153,7 +11176,7 @@ function openExternalUrl(url: string) {
<span />
<label class="col-span-3 flex items-start gap-2 cursor-pointer">
<input type="checkbox" v-model="selectedSshLayer.allow_exec_channel_proxy" class="mt-0.5 mr-0" :disabled="selectedSshLayer.enabled === false" />
- <span class="text-xs text-muted-foreground">{{ t("connection.sshAllowExecChannelProxy") }}</span>
+ <span class="text-sm text-muted-foreground">{{ t("connection.sshAllowExecChannelProxy") }}</span>
</label>
</div>
<div class="grid grid-cols-4 items-start gap-4">
@@ -11759,6 +11782,30 @@ html.dbx-legacy-webview.dark .connection-transport-layer-option--selected:hover
border-radius: var(--dbx-radius-fixed-4, 4px);
}
+.connection-config-step .connection-form-body :is(label, button, [data-slot="input"], [data-slot="select-trigger"], textarea),
+.connection-config-step .connection-form-body label :is(.text-xs, .text-sm):not(.text-muted-foreground) {
+ font-size: var(--text-sm, 0.875rem);
+ line-height: var(--text-sm--line-height, 1.25rem);
+}
+
+.connection-config-step .connection-form-body [data-slot="label"]:not(.font-normal) {
+ font-weight: 500;
+}
+
+.connection-config-step .connection-form-body :is(label:not([data-slot="label"]), [data-slot="input"], [data-slot="select-trigger"], textarea) {
+ font-weight: 400;
+}
+
+.connection-config-step .connection-form-body label:not([data-slot="label"]) .font-medium {
+ font-weight: inherit;
+}
+
+.connection-config-step .connection-form-body :is(p, .text-xs.text-muted-foreground, [class~="text-[11px]"]) {
+ font-size: var(--text-xs, 0.75rem);
+ line-height: 1.25rem;
+ font-weight: 400;
+}
+
.connection-dialog-content[data-wide="true"] .grid.grid-cols-4 {
grid-template-columns: minmax(5.5rem, 0.7fr) repeat(3, minmax(0, 1fr));
}
diff --git a/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts b/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts
index f9b2c8e4c9..76bc59322d 100644
--- a/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts
+++ b/apps/desktop/src/components/connection/__tests__/ConnectionDialog.deepLinkEdit.spec.ts
@@ -655,6 +655,33 @@ describe("ConnectionDialog deep-link edit confirmation", () => {
});
});
+ it.each([undefined, true, false] as const)("saves and reopens two-state sidebar opt-outs without changing production protection (%s)", async (value) => {
+ visibleTab.value = "advanced";
+ backend.listInstalledAgentsLocal.mockResolvedValue([{ db_type: "oracle", installed: true }]);
+ const saved = savedConnection({ db_type: "oracle", driver_profile: "oracle", production_databases: undefined, show_database_links: false, show_native_jobs: value, show_user_admin: value });
+ await mountDialog(saved, "");
+ for (const field of ["show_native_jobs", "show_user_admin"] as const) {
+ const checkbox = document.querySelector<HTMLInputElement>(`#sidebar-${field}`)!;
+ expect(checkbox.type).toBe("checkbox");
+ expect(checkbox.checked).toBe(value !== false);
+ checkbox.click();
+ await settle();
+ }
+ expect(document.querySelector('input[type="radio"][name^="sidebar-"]')).toBeNull();
+ [...document.querySelectorAll("button")].find((button) => button.textContent?.trim() === "Save")!.click();
+ await settle();
+ const submitted = store.updateConnection.mock.calls[0][0] as ConnectionConfig;
+ expect(submitted.show_native_jobs).toBe(value === false ? undefined : false);
+ expect(submitted.show_user_admin).toBe(value === false ? undefined : false);
+ expect(submitted.show_database_links).toBe(false);
+ expect(submitted.is_production).toBe(saved.is_production);
+ expect(submitted.production_databases).toEqual(saved.production_databases);
+ for (const app of mountedApps.splice(0)) app.unmount();
+ document.body.innerHTML = "";
+ await mountDialog(submitted, "");
+ for (const field of ["show_native_jobs", "show_user_admin"] as const) expect(document.querySelector<HTMLInputElement>(`#sidebar-${field}`)!.checked).toBe(value === false);
+ });
+
it.each([true, false] as const)("preserves protected target settings through real Store load and Dialog save (%s DB links)", async (showDatabaseLinks) => {
setActivePinia(createPinia());
const saved = savedConnection({
diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
index db8575dabd..7edc5420c3 100644
--- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue
+++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
@@ -1056,7 +1056,6 @@ const editRedisDatabaseDisplayLimit = ref(settingsStore.editorSettings.redisData
const editSidebarObjectInfoMode = ref<SidebarObjectInfoMode>(settingsStore.editorSettings.sidebarObjectInfoMode);
const editSidebarAllowHorizontalScroll = ref(settingsStore.editorSettings.sidebarAllowHorizontalScroll);
const editSidebarShowTooltips = ref(settingsStore.editorSettings.sidebarShowTooltips);
-const editSidebarShowUserAdmin = ref(settingsStore.editorSettings.sidebarShowUserAdmin);
const editSidebarIndent = ref(settingsStore.editorSettings.sidebarIndent);
const editSidebarFontSize = ref(settingsStore.editorSettings.sidebarFontSize);
const editSidebarDensity = ref<SidebarDensity>(settingsStore.editorSettings.sidebarDensity);
@@ -1370,7 +1369,6 @@ function currentEditorSettingsDraft(): EditorSettingsDraft {
sidebarObjectInfoMode: editSidebarObjectInfoMode.value,
sidebarAllowHorizontalScroll: editSidebarAllowHorizontalScroll.value,
sidebarShowTooltips: editSidebarShowTooltips.value,
- sidebarShowUserAdmin: editSidebarShowUserAdmin.value,
sidebarIndent: editSidebarIndent.value,
sidebarFontSize: editSidebarFontSize.value,
sidebarDensity: editSidebarDensity.value,
@@ -2082,7 +2080,6 @@ function syncEditorSettingsDraftFromStore() {
editSidebarObjectInfoMode.value = settingsStore.editorSettings.sidebarObjectInfoMode;
editSidebarAllowHorizontalScroll.value = settingsStore.editorSettings.sidebarAllowHorizontalScroll;
editSidebarShowTooltips.value = settingsStore.editorSettings.sidebarShowTooltips;
- editSidebarShowUserAdmin.value = settingsStore.editorSettings.sidebarShowUserAdmin;
editSidebarIndent.value = settingsStore.editorSettings.sidebarIndent;
editSidebarFontSize.value = settingsStore.editorSettings.sidebarFontSize;
editSidebarDensity.value = settingsStore.editorSettings.sidebarDensity;
@@ -2254,7 +2251,6 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = {
sidebarObjectInfoMode: editSidebarObjectInfoMode,
sidebarAllowHorizontalScroll: editSidebarAllowHorizontalScroll,
sidebarShowTooltips: editSidebarShowTooltips,
- sidebarShowUserAdmin: editSidebarShowUserAdmin,
sidebarIndent: editSidebarIndent,
sidebarFontSize: editSidebarFontSize,
sidebarDensity: editSidebarDensity,
@@ -2843,7 +2839,6 @@ function resetDefaultsForTab(tab: SettingsCategory) {
editSidebarObjectInfoMode.value = DEFAULT_EDITOR_SETTINGS.sidebarObjectInfoMode;
editSidebarAllowHorizontalScroll.value = DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll;
editSidebarShowTooltips.value = DEFAULT_EDITOR_SETTINGS.sidebarShowTooltips;
- editSidebarShowUserAdmin.value = DEFAULT_EDITOR_SETTINGS.sidebarShowUserAdmin;
editSidebarIndent.value = DEFAULT_EDITOR_SETTINGS.sidebarIndent;
editSidebarFontSize.value = DEFAULT_EDITOR_SETTINGS.sidebarFontSize;
editSidebarDensity.value = DEFAULT_EDITOR_SETTINGS.sidebarDensity;
@@ -3076,7 +3071,6 @@ function resetAllDefaults() {
editSidebarObjectInfoMode.value = DEFAULT_EDITOR_SETTINGS.sidebarObjectInfoMode;
editSidebarAllowHorizontalScroll.value = DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll;
editSidebarShowTooltips.value = DEFAULT_EDITOR_SETTINGS.sidebarShowTooltips;
- editSidebarShowUserAdmin.value = DEFAULT_EDITOR_SETTINGS.sidebarShowUserAdmin;
editSidebarIndent.value = DEFAULT_EDITOR_SETTINGS.sidebarIndent;
editSidebarFontSize.value = DEFAULT_EDITOR_SETTINGS.sidebarFontSize;
editSidebarDensity.value = DEFAULT_EDITOR_SETTINGS.sidebarDensity;
@@ -9956,17 +9950,6 @@ onUnmounted(() => {
</div>
<Switch id="sidebar-show-tooltips" v-model="editSidebarShowTooltips" />
</div>
- <div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
- <div class="flex items-center gap-2">
- <Label for="sidebar-show-user-admin">
- {{ t("settings.sidebarShowUserAdmin") }}
- </Label>
- <HelpTooltip :label="t('settings.sidebarShowUserAdmin')">
- {{ t("settings.sidebarShowUserAdminDescription") }}
- </HelpTooltip>
- </div>
- <Switch id="sidebar-show-user-admin" v-model="editSidebarShowUserAdmin" />
- </div>
<div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
<div class="space-y-1">
<Label for="sidebar-indent">{{ t("settings.sidebarIndent") }}</Label>
diff --git a/apps/desktop/src/components/editor/__tests__/QueryEditor.componentSplit.integration.spec.ts b/apps/desktop/src/components/editor/__tests__/QueryEditor.componentSplit.integration.spec.ts
index a765d0bd10..4e23bee89f 100644
--- a/apps/desktop/src/components/editor/__tests__/QueryEditor.componentSplit.integration.spec.ts
+++ b/apps/desktop/src/components/editor/__tests__/QueryEditor.componentSplit.integration.spec.ts
@@ -90,6 +90,29 @@ function foldedRangeCount(view: EditorView): number {
}
describe("QueryEditor component split integration", () => {
+ it("renders and remains editable when completion prefetch is enabled across scope changes", async () => {
+ const { host, view, props, connectionStore } = await mountEditor({ prefetchCompletion: true });
+ expect(host.querySelector(".cm-content")?.textContent).toContain("SELECT 1;");
+ const prefetch = vi.spyOn(connectionStore, "listCompletionTables").mockResolvedValue([]);
+ props.connectionId = "prefetch-test";
+ props.database = "demo";
+ await nextTick();
+ expect(prefetch).toHaveBeenCalled();
+ props.database = "updated";
+ props.catalog = "catalog";
+ props.schema = "public";
+ await nextTick();
+ expect(prefetch).toHaveBeenLastCalledWith("prefetch-test", "updated", "", expect.any(Number), undefined, false, "public", "catalog", { activateConnection: false });
+ view.dispatch({ changes: { from: view.state.doc.length, insert: "\nSELECT 3;" } });
+ await vi.waitFor(() => expect(props.modelValue).toContain("SELECT 3;"));
+ expect(host.querySelector(".cm-editor")).toBe(view.dom);
+ prefetch.mockClear();
+ props.prefetchCompletion = false;
+ props.database = "disabled";
+ await nextTick();
+ expect(prefetch).not.toHaveBeenCalled();
+ });
+
it("keeps composing Vim navigation and committed IME text out of the SQL model", async () => {
const { view, props } = await mountEditor({}, true);
const original = props.modelValue;
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 98aff9f877..7ee61ef709 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -10189,6 +10189,18 @@ function selectPageSizeMenuItem(value: string) {
changePageSize(Number(value));
}
+const exportWarning = computed(() => {
+ if (!settingsStore.editorSettings.warnIncompleteExport) return "";
+ const count = visibleDisplayItems.value.length;
+ const total = displayedTotalRowCount.value;
+ const partial = props.result.truncated === true || props.result.has_more === true || props.result.page_has_more === true || (props.pageOffset ?? 0) > 0 || props.result.rows.length > count || (typeof total === "number" && total > count);
+ return partial ? t("grid.incompleteExportWarning", { count }) : "";
+});
+const loadAllToolbarState = computed(() => ({
+ visible: props.paginationEnabled && props.loadAllRowsEnabled,
+ disabled: gridPaginationBusy.value || infiniteScrollLoading.value || props.result.rows.length === 0,
+}));
+
function selectExportMenuItem(value: string) {
if (compatibilityReadOnly.value && !exportMenuItems.value.some((item) => item.value === value)) return;
const actions: Record<string, () => void> = {
@@ -14527,6 +14539,11 @@ watch(
);
defineExpose({
+ exportMenuItems,
+ exportWarning,
+ selectExportMenuItem,
+ loadAllToolbarState,
+ loadAllRowsAndGoToLast,
tableInfoToolbarCapability,
goToColumnToolbarCapability,
useTransaction,
@@ -17373,13 +17390,14 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
:infinite-scroll-enabled="infiniteScrollEnabled"
:infinite-scroll-all-loaded="infiniteScrollAllLoaded"
:load-all-rows-active="loadAllRowsActive"
- :load-all-rows-enabled="loadAllRowsEnabled"
+ :load-all-rows-enabled="loadAllRowsEnabled && !(context === 'results' && hasResultToolbarActionsSlot && settingsStore.editorSettings.dataGridLoadAllInToolbar)"
:can-load-all-rows="result.rows.length > 0"
- :can-export="result.columns.length > 0"
+ :can-export="result.columns.length > 0 && !(context === 'results' && hasResultToolbarActionsSlot && settingsStore.editorSettings.dataGridExportInToolbar)"
:page-size="pageSize"
:default-page-size="defaultPageSize"
:page-size-menu-items="pageSizeMenuItems"
:export-menu-items="exportMenuItems"
+ :export-warning="exportWarning"
:current-page="currentPage"
:max-page="maximumPage"
:can-go-next-page="canGoNextPage"
diff --git a/apps/desktop/src/components/grid/DataGridExportMenu.vue b/apps/desktop/src/components/grid/DataGridExportMenu.vue
index 61b7f14d41..9c7d824d78 100644
--- a/apps/desktop/src/components/grid/DataGridExportMenu.vue
+++ b/apps/desktop/src/components/grid/DataGridExportMenu.vue
@@ -1,28 +1,105 @@
<script setup lang="ts">
-import { Upload } from "@lucide/vue";
-import LightDropdown, { type LightDropdownItem } from "@/components/ui/LightDropdown.vue";
+import { computed, ref } from "vue";
+import { AlertTriangle, ChevronDown, Download, Upload } from "@lucide/vue";
+import { useI18n } from "vue-i18n";
+import type { LightDropdownItem } from "@/components/ui/LightDropdown.vue";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
-defineProps<{
+const props = defineProps<{
items: LightDropdownItem[];
label: string;
onSelect: (value: string) => void;
+ warning?: string;
+ compact?: boolean;
}>();
+const { t } = useI18n();
+const open = ref(false);
+const formats = ["csv", "xlsx", "xlsx-with-sql", "json", "markdown", "html", "sql", "txt"];
+const rows = computed(() =>
+ formats.flatMap((format) => {
+ const page = props.items.find((item) => item.value === `page-${format}`);
+ const selected = props.items.find((item) => item.value === `selected-${format}`);
+ const result = props.items.find((item) => item.value === format);
+ return result ? [{ format, label: format === "xlsx-with-sql" ? t("grid.exportFormatXlsxWithSql") : format === "sql" ? "SQL INSERT" : format === "markdown" ? "Markdown" : format.toUpperCase(), selected, page, result }] : [];
+ }),
+);
+const hasPageScope = computed(() => rows.value.some((row) => row.page));
+const hasSelectedScope = computed(() => rows.value.some((row) => row.selected));
+const gridColumns = computed(() => `minmax(0,1fr) ${hasSelectedScope.value ? "80px " : ""}${hasPageScope.value ? "80px " : ""}88px`);
+const extraItems = computed(() => props.items.filter((item) => !formats.includes(item.value) && !formats.some((format) => item.value === `page-${format}` || item.value === `selected-${format}`)));
+function select(item: LightDropdownItem) {
+ if (item.disabled) return;
+ open.value = false;
+ props.onSelect(item.value);
+}
+function onKeydown(event: KeyboardEvent) {
+ event.stopPropagation();
+ if (event.key === "Escape") {
+ event.preventDefault();
+ open.value = false;
+ }
+}
</script>
<template>
- <LightDropdown
- model-value=""
- :items="items"
- :aria-label="label"
- :trigger-icon="Upload"
- :trigger-label="label"
- trigger-class="inline-flex h-6 shrink-0 items-center justify-center gap-1 whitespace-nowrap rounded-md px-2 text-foreground/80 hover:bg-accent hover:text-accent-foreground"
- trigger-icon-class="h-3.5 w-3.5"
- :show-trigger-label="true"
- :show-chevron="true"
- :highlight-selected="false"
- check-position="none"
- align="end"
- @update:model-value="onSelect"
- />
+ <Popover v-model:open="open">
+ <PopoverTrigger as-child>
+ <button type="button" :aria-label="label" :title="label" class="inline-flex h-6 shrink-0 items-center justify-center gap-1 whitespace-nowrap rounded-md text-xs leading-none text-foreground/80 hover:bg-accent hover:text-accent-foreground" :class="compact ? 'w-6' : 'px-2'">
+ <Upload class="h-3.5 w-3.5" /><span v-if="!compact">{{ label }}</span
+ ><ChevronDown v-if="!compact" class="h-3 w-3 opacity-50" />
+ </button>
+ </PopoverTrigger>
+ <PopoverContent align="end" :collision-padding="8" class="max-w-[calc(100vw-1rem)] max-h-[var(--reka-popover-content-available-height)] overflow-y-auto p-1 text-sm" :class="hasSelectedScope ? 'w-[440px]' : 'w-[360px]'" @click.stop @keydown="onKeydown">
+ <div class="grid items-center gap-x-1 px-2 py-1.5 text-muted-foreground" :style="{ gridTemplateColumns: gridColumns }">
+ <span class="text-xs">{{ t("grid.exportFormat") }}</span>
+ <span v-if="hasSelectedScope" class="text-center text-xs">{{ t("grid.exportSelectedRowsScope") }}</span>
+ <span v-if="hasPageScope" class="flex items-center justify-center gap-1 text-xs">{{ t("grid.exportPageScope") }}<AlertTriangle v-if="warning" class="h-3.5 w-3.5 text-amber-600 dark:text-amber-400" :aria-label="warning" :title="warning" /></span>
+ <span class="text-center text-xs">{{ t(hasPageScope ? "grid.exportResultScope" : "grid.exportLoadedScope") }}</span>
+ <template v-for="row in rows" :key="row.format">
+ <span class="py-2 text-foreground">{{ row.label }}</span>
+ <template v-if="hasSelectedScope">
+ <button
+ v-if="row.selected"
+ type="button"
+ class="flex h-8 items-center justify-center gap-1 rounded-sm text-foreground hover:bg-accent focus-visible:outline-2 focus-visible:outline-ring disabled:opacity-50"
+ :disabled="row.selected.disabled"
+ :title="row.selected.label"
+ :aria-label="row.selected.label"
+ @click="select(row.selected)"
+ >
+ <Download class="h-3.5 w-3.5" />
+ </button>
+ <span v-else />
+ </template>
+ <button
+ v-if="row.page"
+ type="button"
+ class="flex h-8 items-center justify-center gap-1 rounded-sm text-foreground hover:bg-accent focus-visible:outline-2 focus-visible:outline-ring disabled:opacity-50"
+ :disabled="row.page.disabled"
+ :title="row.page.label"
+ :aria-label="row.page.label"
+ @click="select(row.page)"
+ >
+ <Download class="h-3.5 w-3.5" />
+ </button>
+ <button
+ type="button"
+ class="flex h-8 items-center justify-center gap-1 rounded-sm text-foreground hover:bg-accent focus-visible:outline-2 focus-visible:outline-ring disabled:opacity-50"
+ :disabled="row.result.disabled"
+ :title="row.result.label"
+ :aria-label="row.result.label"
+ @click="select(row.result)"
+ >
+ <Download class="h-3.5 w-3.5" />
+ </button>
+ </template>
+ </div>
+ <p v-if="warning" role="note" class="mx-2 mb-2 text-xs leading-relaxed text-amber-700 dark:text-amber-400">{{ warning }}</p>
+ <div v-if="extraItems.length" class="my-1 h-px bg-border" />
+ <template v-for="(item, index) in extraItems" :key="item.value">
+ <div v-if="index > 0 && item.separatorBefore" class="my-1 h-px bg-border" />
+ <button type="button" class="block w-full rounded-sm px-2 py-1.5 text-left hover:bg-accent focus-visible:outline-2 focus-visible:outline-ring disabled:opacity-50" :disabled="item.disabled" @click="select(item)">{{ item.label }}</button>
+ </template>
+ </PopoverContent>
+ </Popover>
</template>
diff --git a/apps/desktop/src/components/grid/DataGridExportOptionsControl.vue b/apps/desktop/src/components/grid/DataGridExportOptionsControl.vue
new file mode 100644
index 0000000000..2214188131
--- /dev/null
+++ b/apps/desktop/src/components/grid/DataGridExportOptionsControl.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { useI18n } from "vue-i18n";
+import { Switch } from "@/components/ui/switch";
+import { useSettingsStore } from "@/stores/settingsStore";
+
+const { t } = useI18n();
+defineProps<{ queryResult?: boolean }>();
+const settingsStore = useSettingsStore();
+const options = [
+ { key: "dataGridExportInToolbar", label: "grid.exportInToolbar" },
+ { key: "dataGridLoadAllInToolbar", label: "grid.loadAllInToolbar" },
+ { key: "showSaveResult", label: "grid.showSaveResult" },
+ { key: "warnIncompleteExport", label: "grid.warnIncompleteExport" },
+] as const;
+</script>
+
+<template>
+ <template v-for="option in options" :key="option.key">
+ <div v-if="queryResult || option.key === 'warnIncompleteExport'" class="flex items-center justify-between gap-3 px-3 py-1.5 text-xs">
+ <span class="font-medium">{{ t(option.label) }}</span>
+ <Switch size="sm" :model-value="settingsStore.editorSettings[option.key]" :aria-label="t(option.label)" @update:model-value="settingsStore.updateEditorSettings({ [option.key]: $event })" />
+ </div>
+ </template>
+</template>
diff --git a/apps/desktop/src/components/grid/DataGridPagination.vue b/apps/desktop/src/components/grid/DataGridPagination.vue
index ec6b9a4c9c..6cf3cbdbde 100644
--- a/apps/desktop/src/components/grid/DataGridPagination.vue
+++ b/apps/desktop/src/components/grid/DataGridPagination.vue
@@ -34,6 +34,7 @@ const props = withDefaults(
defaultPageSize: number;
pageSizeMenuItems: LightDropdownItem[];
exportMenuItems: LightDropdownItem[];
+ exportWarning?: string;
currentPage: number;
maxPage?: number;
canGoNextPage: boolean;
@@ -230,6 +231,6 @@ function handlePageInputKeydown(event: KeyboardEvent) {
</TooltipTrigger>
<TooltipContent side="bottom">{{ t("grid.loadAllAndGoToLastRow") }}</TooltipContent>
</Tooltip>
- <DataGridExportMenu v-if="canExport" :items="exportMenuItems" :label="t('grid.export')" :on-select="(value) => emit('selectExport', value)" />
+ <DataGridExportMenu v-if="canExport" :items="exportMenuItems" :warning="exportWarning" :label="t('grid.export')" :on-select="(value) => emit('selectExport', value)" />
</div>
</template>
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridExportMenu.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridExportMenu.spec.ts
new file mode 100644
index 0000000000..05c134d362
--- /dev/null
+++ b/apps/desktop/src/components/grid/__tests__/DataGridExportMenu.spec.ts
@@ -0,0 +1,83 @@
+// @vitest-environment happy-dom
+import { createApp, h, nextTick, ref } from "vue";
+import { afterEach, expect, it, vi } from "vitest";
+import i18n from "@/i18n";
+import DataGridExportMenu from "../DataGridExportMenu.vue";
+
+let unmount: (() => void) | undefined;
+afterEach(() => {
+ unmount?.();
+ document.body.replaceChildren();
+});
+
+it("aligns selected rows before page and full-result formats and dispatches each original action once", async () => {
+ const onSelect = vi.fn();
+ const items = [
+ ...["csv", "xlsx", "xlsx-with-sql", "json", "markdown", "html", "sql", "txt"].flatMap((format) => [
+ { value: `selected-${format}`, label: `Selected ${format}` },
+ { value: `page-${format}`, label: `Page ${format}` },
+ { value: format, label: `All ${format}` },
+ ]),
+ { value: "database", label: "Database" },
+ { value: "selected-cells-json", label: "Selected cells JSON", separatorBefore: true },
+ ];
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp({ render: () => h(DataGridExportMenu, { items, label: "Export", onSelect }) });
+ app.use(i18n);
+ app.mount(host);
+ unmount = () => app.unmount();
+ for (const item of items) {
+ host.querySelector<HTMLButtonElement>("button")!.click();
+ await nextTick();
+ await nextTick();
+ const target = [...document.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.getAttribute("aria-label") === item.label || button.textContent?.trim() === item.label);
+ expect(target, item.value).toBeDefined();
+ if (item === items[0]) {
+ const selected = document.querySelector('button[aria-label="Selected csv"]')!;
+ const page = document.querySelector('button[aria-label="Page csv"]')!;
+ const all = document.querySelector('button[aria-label="All csv"]')!;
+ expect(selected.compareDocumentPosition(page) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+ expect(page.compareDocumentPosition(all) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+ expect(selected.textContent?.trim()).toBe("");
+ expect(page.textContent?.trim()).toBe("");
+ expect(all.textContent?.trim()).toBe("");
+ expect(document.querySelectorAll('button[aria-label="Selected csv"]')).toHaveLength(1);
+ }
+ target!.click();
+ await nextTick();
+ expect(onSelect).toHaveBeenLastCalledWith(item.value);
+ expect(host.querySelector("button")!.getAttribute("aria-expanded")).toBe("false");
+ }
+ expect(onSelect).toHaveBeenCalledTimes(items.length);
+ host.querySelector<HTMLButtonElement>("button")!.click();
+ await nextTick();
+ await nextTick();
+ document.querySelector<HTMLButtonElement>('button[aria-label="Page csv"]')!.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true, cancelable: true }));
+ await nextTick();
+ expect(host.querySelector("button")!.getAttribute("aria-expanded")).toBe("false");
+ expect(onSelect).toHaveBeenCalledTimes(items.length);
+});
+
+it("shows the selected-row column only while selected-row actions exist", async () => {
+ const items = ref([
+ { value: "page-csv", label: "Page CSV" },
+ { value: "csv", label: "All CSV" },
+ ]);
+ const host = document.createElement("div");
+ document.body.append(host);
+ const app = createApp({ render: () => h(DataGridExportMenu, { items: items.value, label: "Export", onSelect: vi.fn() }) });
+ app.use(i18n);
+ app.mount(host);
+ unmount = () => app.unmount();
+ host.querySelector<HTMLButtonElement>("button")!.click();
+ await nextTick();
+ expect(document.body.textContent).not.toContain(i18n.global.t("grid.exportSelectedRowsScope"));
+ items.value.push({ value: "selected-csv", label: "Selected CSV" });
+ await nextTick();
+ expect(document.body.textContent).toContain(i18n.global.t("grid.exportSelectedRowsScope"));
+ expect(document.querySelectorAll('button[aria-label="Selected CSV"]')).toHaveLength(1);
+ items.value.pop();
+ await nextTick();
+ expect(document.body.textContent).not.toContain(i18n.global.t("grid.exportSelectedRowsScope"));
+});
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridPaginationShortcuts.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridPaginationShortcuts.spec.ts
index 780b2db075..12b35f6e68 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridPaginationShortcuts.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridPaginationShortcuts.spec.ts
@@ -178,6 +178,29 @@ afterEach(() => {
});
describe("DataGrid pagination shortcuts", () => {
+ it("warns only when the exported page may omit rows and respects the view option", async () => {
+ const { host, gridState, settingsStore } = mountGrid();
+ await settle();
+ const openExport = async () => {
+ host.querySelector<HTMLButtonElement>(`button[aria-label="${i18n.global.t("grid.export")}"]`)!.click();
+ await settle();
+ };
+ await openExport();
+ expect(document.querySelector('[role="note"]')?.textContent).toContain(i18n.global.t("grid.incompleteExportWarning", { count: 1 }));
+ document.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));
+ await settle();
+ gridState.value = { pageOffset: 0, totalRowCount: 1 };
+ await settle();
+ await openExport();
+ expect(document.querySelector('[role="note"]')).toBeNull();
+ gridState.value = { pageOffset: 0, totalRowCount: undefined, result: { columns: ["id"], rows: [[1]], affected_rows: 0, execution_time_ms: 0, has_more: true } };
+ await settle();
+ expect(document.querySelector('[role="note"]')).not.toBeNull();
+ settingsStore.updateEditorSettings({ warnIncompleteExport: false });
+ await settle();
+ expect(document.querySelector('[role="note"]')).toBeNull();
+ });
+
it("allows pointer focus and editing in the custom page size input", async () => {
const { host, paginate } = mountGrid();
await settle();
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts
index 41b5d8d436..4582b01660 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts
@@ -447,7 +447,7 @@ describe("DataGridPagination", () => {
canExport: true,
});
- const findExportMenu = () => findAll(mounted.root, (node) => node.props["data-stub"] === "LightDropdown" && node.props["aria-label"] === "grid.export");
+ const findExportMenu = () => findAll(mounted.root, (node) => node.props["aria-label"] === "grid.export");
expect(findExportMenu()).toHaveLength(1);
await mounted.setProps({ canExport: false });
@@ -474,7 +474,7 @@ describe("DataGridPagination", () => {
canJumpLastPage: false,
});
- const exportMenus = findAll(mounted.root, (node) => node.props["data-stub"] === "LightDropdown" && node.props["aria-label"] === "grid.export");
+ const exportMenus = findAll(mounted.root, (node) => node.props["aria-label"] === "grid.export");
expect(exportMenus).toHaveLength(1);
});
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index 00c35f40c9..1536243d20 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -21,6 +21,7 @@ import { provideTabUiState } from "@/lib/tabs/tabUiState";
import { shouldPinResultRunOnClick } from "@/lib/tabs/resultRunPin";
import {
Check,
+ ChevronsDown,
CheckSquare2,
Columns3,
Columns3Cog,
@@ -90,6 +91,9 @@ const OracleInvalidObjectsDialog = defineAsyncComponent(() => import("@/componen
import { objectDependencyTarget, type ObjectDependencyTarget, type ObjectDetailsSection } from "@/lib/database/objectDependencyDetails";
import DataGridFreezeFirstColumnControl from "@/components/grid/DataGridFreezeFirstColumnControl.vue";
import DataGridStatusSqlControl from "@/components/grid/DataGridStatusSqlControl.vue";
+import DataGridExportOptionsControl from "@/components/grid/DataGridExportOptionsControl.vue";
+import DataGridExportMenu from "@/components/grid/DataGridExportMenu.vue";
+import type { LightDropdownItem } from "@/components/ui/LightDropdown.vue";
import type { DataGridSqlPreview } from "@/components/grid/dataGridSqlPreview";
import DataGridCopyFormatControl from "@/components/grid/DataGridCopyFormatControl.vue";
import DataGridFontFamilyControl from "@/components/grid/DataGridFontFamilyControl.vue";
@@ -236,6 +240,11 @@ import { mysqlDataCharsetEnabled } from "@/lib/connection/mysqlDataCharset";
import { isAiRedisConsoleTarget, type AiConversationBinding } from "@/lib/ai/aiConversationBinding";
type DataGridHandle = DataGridColumnLayoutHandle & {
+ exportMenuItems: LightDropdownItem[];
+ exportWarning: string;
+ selectExportMenuItem: (value: string) => void;
+ loadAllToolbarState: { visible: boolean; disabled: boolean };
+ loadAllRowsAndGoToLast: () => void;
tableInfoToolbarCapability: DataGridToolbarActionCapability;
goToColumnToolbarCapability: DataGridToolbarActionCapability;
onToolbarRefresh: () => Promise<void> | void;
@@ -2803,6 +2812,7 @@ defineExpose({
<DataGridEmptyColumnsControl :count="dataGridRef?.allEmptyColumnCount" :column-count="dataGridRef?.displayableColumnCount" />
<DataGridFreezeFirstColumnControl />
<DataGridStatusSqlControl />
+ <DataGridExportOptionsControl query-result />
<DataGridCopyFormatControl
:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'"
:current-value="dataGridRef?.defaultCopyPreference ?? ''"
@@ -2841,7 +2851,7 @@ defineExpose({
:active-view="activeOutputView"
:can-show-explain="canShowExplainOutput"
:can-show-profile="canShowProfile"
- :can-export-archive="canExportResultArchive"
+ :can-export-archive="canExportResultArchive && settingsStore.editorSettings.showSaveResult"
:archive-exporting="resultArchiveExporting"
:compact="standaloneResultToolbarCompact"
:has-result="!!activeTab.result"
@@ -2849,7 +2859,23 @@ defineExpose({
@select-profile="selectOutputView(activeTab.id, 'profile')"
@export-archive="exportResultArchive"
@open-result-view="openPluginResultView"
- />
+ >
+ <template v-if="activeOutputView === 'result' && redisResultViewMode === 'grid' && hasTabularResult && !activeElasticsearchJsonResponse && !showElasticsearchRawJson && dataGridRef">
+ <DataGridExportMenu v-if="settingsStore.editorSettings.dataGridExportInToolbar" :items="dataGridRef.exportMenuItems" :warning="dataGridRef.exportWarning" :label="t('grid.export')" :compact="standaloneResultToolbarCompact" :on-select="dataGridRef.selectExportMenuItem" />
+ <Button
+ v-if="settingsStore.editorSettings.dataGridLoadAllInToolbar && dataGridRef.loadAllToolbarState?.visible"
+ variant="ghost"
+ size="sm"
+ class="h-5 shrink-0 gap-1 px-2 text-xs"
+ :disabled="dataGridRef.loadAllToolbarState.disabled"
+ :title="t('grid.loadAllAndGoToLastRow')"
+ :aria-label="t('grid.loadAllAndGoToLastRow')"
+ @click="dataGridRef.loadAllRowsAndGoToLast()"
+ >
+ <ChevronsDown class="h-3.5 w-3.5" /><span v-if="!standaloneResultToolbarCompact">{{ t("grid.loadAllRows") }}</span>
+ </Button>
+ </template>
+ </QueryResultToolbarActions>
</div>
<div v-if="activeTab.redisMonitorActive" class="flex shrink-0 items-center justify-between border-b px-3 py-1 text-xs text-muted-foreground">
@@ -3142,7 +3168,7 @@ defineExpose({
:active-view="activeOutputView"
:can-show-explain="canShowExplainOutput"
:can-show-profile="canShowProfile"
- :can-export-archive="canExportResultArchive"
+ :can-export-archive="canExportResultArchive && settingsStore.editorSettings.showSaveResult"
:archive-exporting="resultArchiveExporting"
:compact="compact"
:has-result="!!activeTab.result"
@@ -3150,7 +3176,23 @@ defineExpose({
@select-profile="selectOutputView(activeTab.id, 'profile')"
@export-archive="exportResultArchive"
@open-result-view="openPluginResultView"
- />
+ >
+ <template v-if="activeOutputView === 'result' && redisResultViewMode === 'grid' && hasTabularResult && !activeElasticsearchJsonResponse && !showElasticsearchRawJson && dataGridRef">
+ <DataGridExportMenu v-if="settingsStore.editorSettings.dataGridExportInToolbar" :items="dataGridRef.exportMenuItems" :warning="dataGridRef.exportWarning" :label="t('grid.export')" :compact="compact" :on-select="dataGridRef.selectExportMenuItem" />
+ <Button
+ v-if="settingsStore.editorSettings.dataGridLoadAllInToolbar && dataGridRef.loadAllToolbarState?.visible"
+ variant="ghost"
+ size="sm"
+ class="h-5 shrink-0 gap-1 px-2 text-xs"
+ :disabled="dataGridRef.loadAllToolbarState.disabled"
+ :title="t('grid.loadAllAndGoToLastRow')"
+ :aria-label="t('grid.loadAllAndGoToLastRow')"
+ @click="dataGridRef.loadAllRowsAndGoToLast()"
+ >
+ <ChevronsDown class="h-3.5 w-3.5" /><span v-if="!compact">{{ t("grid.loadAllRows") }}</span>
+ </Button>
+ </template>
+ </QueryResultToolbarActions>
</template>
<template v-if="activeTab.result && isQueryExecutionErrorResult(activeTab.result)" #error-actions="{ errorMessage }">
<QueryErrorActions
@@ -3546,6 +3588,7 @@ defineExpose({
<DataGridEmptyColumnsControl :count="dataGridRef?.allEmptyColumnCount" :column-count="dataGridRef?.displayableColumnCount" />
<DataGridFreezeFirstColumnControl />
<DataGridStatusSqlControl />
+ <DataGridExportOptionsControl />
<DataGridCopyFormatControl
:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'"
:current-value="dataGridRef?.defaultCopyPreference ?? ''"
diff --git a/apps/desktop/src/components/layout/EditorGroupTabBar.vue b/apps/desktop/src/components/layout/EditorGroupTabBar.vue
index 0338fb24c9..694f02432a 100644
--- a/apps/desktop/src/components/layout/EditorGroupTabBar.vue
+++ b/apps/desktop/src/components/layout/EditorGroupTabBar.vue
@@ -1659,11 +1659,6 @@ function handleSaveAllTabs() {
function getTabMenuItems(tab: QueryTab): ContextMenuItem[] {
const items: ContextMenuItem[] = [
- {
- label: compactTabTitle.value ? t("contextMenu.fullTabTitle") : t("contextMenu.compactTabTitle"),
- action: toggleCompactTabTitle,
- icon: compactTabTitle.value ? Maximize2 : Minimize2,
- },
...createRenameDuplicateTabItems({
tab,
t,
@@ -1678,7 +1673,7 @@ function getTabMenuItems(tab: QueryTab): ContextMenuItem[] {
visible: canSetTabSuffix(tab),
},
{
- label: t("contextMenu.copyName"),
+ label: t("contextMenu.copyTabName"),
action: async () => {
try {
await copyToClipboard(tabTitleText(tab));
@@ -1695,88 +1690,51 @@ function getTabMenuItems(tab: QueryTab): ContextMenuItem[] {
icon: Maximize2,
visible: !!props.canDetachTabs && isDetachableTab(tab),
},
- createLocateTabMenuItem({
- t,
- visible: !!activeTabSidebarTarget(tab),
- onLocate: () => emit("locate-tab", tab),
- }),
- {
- label: t("sidebar.locateSqlFile"),
- icon: Crosshair,
- visible: !!queryTabExternalFilePath(tab),
- action: () => emit("locate-sql-file", tab),
- },
- {
- label: t("sqlFileTree.locateActiveFile"),
- icon: Crosshair,
- visible: !!tab.savedSqlId,
- action: () => emit("locate-sql-library-file", tab),
- },
- { label: "", separator: true },
- createPinTabMenuItem({
- label: tab.pinned ? t("contextMenu.unpinTab") : t("contextMenu.pinTab"),
- onToggle: () => queryStore.togglePinnedTab(tab.id),
- }),
// Split actions stay visible but render disabled when they cannot produce
// a new layout — at the four-group cap, or with a single open tab (the
// store rejects with the same rules). Every tab type can split: groups
// host non-query tabs via ContentArea, same as moving them between groups.
{
- label: t("contextMenu.splitRight"),
- action: () => queryStore.splitTabRight(tab.id),
- disabled: splitUnavailable.value,
+ label: t("contextMenu.splitTab"),
icon: ArrowRight,
+ children: [
+ {
+ label: t("contextMenu.splitRight"),
+ action: () => queryStore.splitTabRight(tab.id),
+ disabled: splitUnavailable.value,
+ icon: ArrowRight,
+ },
+ {
+ label: t("contextMenu.splitDown"),
+ action: () => queryStore.splitTabDown(tab.id),
+ disabled: splitUnavailable.value,
+ icon: ArrowDown,
+ },
+ ...(canChangeOrientation.value
+ ? [
+ {
+ label: t("contextMenu.changeOrientation"),
+ action: () => queryStore.setOrientation(queryStore.orientation === "vertical" ? "horizontal" : "vertical"),
+ icon: RotateCw,
+ },
+ ]
+ : []),
+ ...(isSecondaryGroup.value
+ ? [
+ {
+ label: t("contextMenu.unsplit"),
+ action: () => queryStore.unsplitTab(tab.id),
+ icon: ArrowRight,
+ visible: true,
+ },
+ ]
+ : []),
+ ],
},
- {
- label: t("contextMenu.splitDown"),
- action: () => queryStore.splitTabDown(tab.id),
- disabled: splitUnavailable.value,
- icon: ArrowDown,
- },
- ...(canChangeOrientation.value
- ? [
- {
- label: t("contextMenu.changeOrientation"),
- action: () => queryStore.setOrientation(queryStore.orientation === "vertical" ? "horizontal" : "vertical"),
- icon: RotateCw,
- },
- ]
- : []),
- ...(isSecondaryGroup.value
- ? [
- {
- label: t("contextMenu.unsplit"),
- action: () => queryStore.unsplitTab(tab.id),
- icon: ArrowRight,
- visible: true,
- },
- ]
- : []),
- createCloseOtherTabMenuItem({
- label: t("contextMenu.closeOtherTabs"),
- onClose: () => queryStore.closeOtherTabsInGroup(props.groupId, tab.id),
- }),
- createCloseLeftTabMenuItem({
- label: t("contextMenu.closeLeftTabs"),
- disabled: !hasTabsToLeft(tab),
- onClose: () => {
- const tabsToClose = tabsToLeftInDisplayOrder(tab).map((item) => item.id);
- const finalActiveTabId = queryStore.activeTabId && !tabsToClose.includes(queryStore.activeTabId) ? queryStore.activeTabId : tab.id;
- queryStore.closeTabsByIds(tabsToClose, finalActiveTabId);
- },
- }),
- createCloseRightTabMenuItem({
- label: t("contextMenu.closeRightTabs"),
- disabled: !hasTabsToRight(tab),
- onClose: () => {
- const tabsToClose = tabsToRightInDisplayOrder(tab).map((item) => item.id);
- const finalActiveTabId = queryStore.activeTabId && !tabsToClose.includes(queryStore.activeTabId) ? queryStore.activeTabId : tab.id;
- queryStore.closeTabsByIds(tabsToClose, finalActiveTabId);
- },
- }),
- createCloseAllTabMenuItem({
- label: t("contextMenu.closeAllTabs"),
- onClose: () => queryStore.closeAllTabsInGroup(props.groupId, tab.id),
+ { label: "", separator: true },
+ createPinTabMenuItem({
+ label: tab.pinned ? t("contextMenu.unpinTab") : t("contextMenu.pinTab"),
+ onToggle: () => queryStore.togglePinnedTab(tab.id),
}),
createSaveAllTabsMenuItem({
label: t("contextMenu.saveAllTabs"),
@@ -1784,22 +1742,77 @@ function getTabMenuItems(tab: QueryTab): ContextMenuItem[] {
shortcut: formatShortcut(settingsStore.editorSettings.shortcuts?.saveAllTabs ?? ""),
onSaveAll: () => handleSaveAllTabs(),
}),
- {
- label: t("contextMenu.closeTabGroup"),
- action: () => closeTabGroup(tab),
- visible: settingsStore.editorSettings.tabGroupMode !== "none",
- icon: X,
- },
- createCloseTabMenuItem({
- label: t("contextMenu.closeTab"),
- onClose: () => closeTab(tab),
- }),
createReopenClosedTabMenuItem({
label: t("contextMenu.reopenClosedTab"),
disabled: !queryStore.canReopenClosedTab,
shortcut: formatShortcut(settingsStore.editorSettings.shortcuts?.reopenClosedTab ?? "Shift+Mod+T"),
onReopen: () => queryStore.reopenClosedTab(),
}),
+ createCloseTabMenuItem({
+ label: t("contextMenu.closeTab"),
+ onClose: () => closeTab(tab),
+ }),
+ {
+ label: t("contextMenu.batchCloseTabs"),
+ icon: X,
+ children: [
+ createCloseOtherTabMenuItem({
+ label: t("contextMenu.closeOtherTabs"),
+ onClose: () => queryStore.closeOtherTabsInGroup(props.groupId, tab.id),
+ }),
+ createCloseLeftTabMenuItem({
+ label: t("contextMenu.closeLeftTabs"),
+ disabled: !hasTabsToLeft(tab),
+ onClose: () => {
+ const tabsToClose = tabsToLeftInDisplayOrder(tab).map((item) => item.id);
+ const finalActiveTabId = queryStore.activeTabId && !tabsToClose.includes(queryStore.activeTabId) ? queryStore.activeTabId : tab.id;
+ queryStore.closeTabsByIds(tabsToClose, finalActiveTabId);
+ },
+ }),
+ createCloseRightTabMenuItem({
+ label: t("contextMenu.closeRightTabs"),
+ disabled: !hasTabsToRight(tab),
+ onClose: () => {
+ const tabsToClose = tabsToRightInDisplayOrder(tab).map((item) => item.id);
+ const finalActiveTabId = queryStore.activeTabId && !tabsToClose.includes(queryStore.activeTabId) ? queryStore.activeTabId : tab.id;
+ queryStore.closeTabsByIds(tabsToClose, finalActiveTabId);
+ },
+ }),
+ createCloseAllTabMenuItem({
+ label: t("contextMenu.closeAllTabs"),
+ onClose: () => queryStore.closeAllTabsInGroup(props.groupId, tab.id),
+ }),
+ {
+ label: t("contextMenu.closeTabGroup"),
+ action: () => closeTabGroup(tab),
+ visible: settingsStore.editorSettings.tabGroupMode !== "none",
+ icon: X,
+ },
+ ],
+ },
+ { label: "", separator: true },
+ {
+ label: compactTabTitle.value ? t("contextMenu.fullTabTitle") : t("contextMenu.compactTabTitle"),
+ action: toggleCompactTabTitle,
+ icon: compactTabTitle.value ? Maximize2 : Minimize2,
+ },
+ createLocateTabMenuItem({
+ t,
+ visible: !!activeTabSidebarTarget(tab),
+ onLocate: () => emit("locate-tab", tab),
+ }),
+ {
+ label: t("sidebar.locateSqlFile"),
+ icon: Crosshair,
+ visible: !!queryTabExternalFilePath(tab),
+ action: () => emit("locate-sql-file", tab),
+ },
+ {
+ label: t("sqlFileTree.locateActiveFile"),
+ icon: Crosshair,
+ visible: !!tab.savedSqlId,
+ action: () => emit("locate-sql-library-file", tab),
+ },
];
return items;
}
diff --git a/apps/desktop/src/components/layout/QueryResultToolbarActions.vue b/apps/desktop/src/components/layout/QueryResultToolbarActions.vue
index fbb8e0019c..524a07f3b0 100644
--- a/apps/desktop/src/components/layout/QueryResultToolbarActions.vue
+++ b/apps/desktop/src/components/layout/QueryResultToolbarActions.vue
@@ -55,6 +55,7 @@ void refreshInstalledPlugins();
<template>
<div data-query-result-toolbar-actions class="flex shrink-0 items-center gap-1 border-r px-1">
+ <slot />
<LightTooltip :text="t('explain.title')" :disabled="!compact" side="bottom" :delay="0" :close-delay="0" nowrap>
<Button
size="sm"
diff --git a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.behavior.spec.ts b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.behavior.spec.ts
index 4ec9865c8c..a3eed3ed98 100644
--- a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.behavior.spec.ts
+++ b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.behavior.spec.ts
@@ -14,7 +14,7 @@ vi.mock("@/components/ui/CustomContextMenu.vue", () => ({
updated() {
(this.$el as any).__ctxMenuItems = this.items;
},
- template: `<div class="ctx-menu-stub" :data-menu-items="JSON.stringify(items.map((item) => ({ label: item.label, disabled: item.disabled === true, visible: item.visible })))"><slot /></div>`,
+ template: `<div class="ctx-menu-stub" :data-menu-items="JSON.stringify(items.flatMap((item) => item.children ?? [item]).map((item) => ({ label: item.label, disabled: item.disabled === true, visible: item.visible })))"><slot /></div>`,
},
}));
@@ -107,6 +107,9 @@ function mountBar(
tooltipDatabase: "Database:",
},
contextMenu: {
+ splitTab: "Split",
+ batchCloseTabs: "Close multiple tabs",
+ copyTabName: "Copy tab name",
splitRight: "Split right",
splitDown: "Split down",
changeOrientation: "Change orientation",
@@ -549,6 +552,24 @@ describe("EditorGroupTabBar behavior", () => {
host.remove();
});
+ it("groups tab actions without dropping split and bulk close commands", async () => {
+ const store = useQueryStore();
+ const id = store.createTab("pg-1", "app", "Query 1", "query");
+ const { app, host } = mountBar(store.groups[0].id, [id], id, pinia);
+ await settle();
+ const items = (tabPill(host, id).closest(".ctx-menu-stub") as any).__ctxMenuItems.filter((item: any) => item.visible !== false);
+ expect(items.map((item: any) => item.label)).toEqual(["Rename", "Duplicate", "Copy tab name", "Split", "", "Pin", "Save all tabs", "Reopen closed tab", "Close", "Close multiple tabs", "", "Full title", "Locate"]);
+ expect(items.find((item: any) => item.label === "Split").children.map((item: any) => item.label)).toEqual(["Split right", "Split down"]);
+ expect(
+ items
+ .find((item: any) => item.label === "Close multiple tabs")
+ .children.filter((item: any) => item.visible !== false)
+ .map((item: any) => item.label),
+ ).toEqual(["Close other tabs", "Close left tabs", "Close right tabs", "Close all tabs"]);
+ app.unmount();
+ host.remove();
+ });
+
it("disables the split actions while only one tab exists, enabling them once a second tab joins", async () => {
const store = useQueryStore();
const onlyId = store.createTab("pg-1", "app", "Query 1", "query");
diff --git a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts
index 08d3eea5ff..8cc3950b55 100644
--- a/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts
+++ b/apps/desktop/src/components/layout/__tests__/EditorGroupTabBar.groups.spec.ts
@@ -62,6 +62,9 @@ function mountBar(groupId: string, tabs: ReturnType<ReturnType<typeof useQuerySt
messages: {
en: {
contextMenu: {
+ splitTab: "Split",
+ batchCloseTabs: "Close multiple tabs",
+ copyTabName: "Copy tab name",
renameTab: "Rename",
duplicateTab: "Duplicate",
copyName: "Copy name",
@@ -876,7 +879,11 @@ describe("EditorGroupTabBar group behavior", () => {
const menu = document.body.querySelector<HTMLElement>("[data-dbx-context-menu]")!;
expect(menu).not.toBeNull();
- const closeGroupItem = Array.from(menu.querySelectorAll<HTMLButtonElement>("button")).find((button) => button.textContent?.includes("Close group"));
+ Array.from(menu.querySelectorAll<HTMLButtonElement>("button"))
+ .find((button) => button.textContent?.includes("Close multiple tabs"))!
+ .click();
+ await settle();
+ const closeGroupItem = Array.from(document.querySelectorAll<HTMLButtonElement>("[data-dbx-context-menu] button")).find((button) => button.textContent?.includes("Close group"));
expect(closeGroupItem).toBeDefined();
closeGroupItem!.click();
await settle();
@@ -908,7 +915,11 @@ describe("EditorGroupTabBar group behavior", () => {
pgPill.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true, clientX: 10, clientY: 10 }));
await settle();
const menu = document.body.querySelector<HTMLElement>("[data-dbx-context-menu]")!;
- const closeGroupItem = Array.from(menu.querySelectorAll<HTMLButtonElement>("button")).find((button) => button.textContent?.includes("Close group"));
+ Array.from(menu.querySelectorAll<HTMLButtonElement>("button"))
+ .find((button) => button.textContent?.includes("Close multiple tabs"))!
+ .click();
+ await settle();
+ const closeGroupItem = Array.from(document.querySelectorAll<HTMLButtonElement>("[data-dbx-context-menu] button")).find((button) => button.textContent?.includes("Close group"));
expect(closeGroupItem).toBeDefined();
closeGroupItem!.click();
await settle();
diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vue
index 9c2fda845b..542a14dc39 100644
--- a/apps/desktop/src/components/sidebar/ConnectionTree.vue
+++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue
@@ -98,6 +98,7 @@ import { resetSidebarTreeDialogState } from "./sidebarTreeDialogState";
import type { OracleTriggerSqlBinding } from "@/lib/database/oracleTriggerSql";
import { SidebarDdlViewDialog, SidebarElasticsearchIndexMetadataDialog, SidebarObjectSourceDialog, SidebarProcedureExecutionDialog, SidebarVisibleDatabasesDialog, SidebarVisibleNacosNamespacesDialog, SidebarVisibleSchemasDialog } from "./sidebarAsyncDialogs";
import { sortConnectionListForDisplay } from "@/lib/sidebar/connectionListSort";
+import { orderSidebarConnectionUtilitiesForDisplay } from "@/lib/sidebar/sidebarNodeOrdering";
import { sidebarDisplayTableName } from "@/lib/sidebar/sidebarTableNameDisplay";
import { sidebarTreeDisplayLabel, sidebarTreeSecondaryValue } from "@/lib/sidebar/sidebarTreeLabel";
import { canTreeNodePin, sidebarPinnedActionSlotWidthPx, alignedSidebarCommentLabelWidths, isSidebarCommentAlignableNode, sidebarTreeNaturalContentWidth, sidebarTreeNodeComment, usesFullWidthTreeLabel } from "@/lib/sidebar/sidebarTreeItemLayout";
@@ -518,8 +519,8 @@ function restoreTableSearchInput(focusRestore: TableSearchFocusRestore) {
});
}
-const userAdminVisibility = computed(() => sidebarUserAdminVisibility(store.treeNodes, settingsStore.editorSettings.sidebarShowUserAdmin !== false));
-const displayedTreeNodes = computed(() => sortConnectionListForDisplay(userAdminVisibility.value.nodes, settingsStore.editorSettings.sidebarConnectionSortMode));
+const userAdminVisibility = computed(() => sidebarUserAdminVisibility(store.treeNodes, store.getConfig));
+const displayedTreeNodes = computed(() => sortConnectionListForDisplay(orderSidebarConnectionUtilitiesForDisplay(userAdminVisibility.value.nodes), settingsStore.editorSettings.sidebarConnectionSortMode));
const localTableSearchResults = ref<Record<string, TableInfo[] | null>>({});
const localTableSearchRequestRevisions = new Map<string, number>();
type InvalidatedTableSearchScope = SidebarRegexScopeIdentity & { parentNodeId: string };
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 13d5e439ea..866be7a5b3 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2384,6 +2384,10 @@ export default {
showSystemSchemasHint: "Show built-in and metadata schemas in the sidebar and schema pickers for this connection.",
showDatabaseLinks: "Show Database Links",
showDatabaseLinksHint: "Show the database links entry in the sidebar for this connection.",
+ showNativeJobs: "Show Native Jobs",
+ showNativeJobsHint: "Show the native jobs entry in the sidebar for this connection.",
+ showUserAdmin: "Show Users & Privileges",
+ showUserAdminHint: "Show the users and privileges entry in the sidebar for this connection.",
tableLoading: "Table loading",
autoLoadAllTables: "Load all tables automatically",
autoLoadAllTablesHint: "In Advanced sidebar view, opening a Tables group loads every page for this connection so table-name filtering covers all tables. Large schemas may take longer.",
@@ -2940,6 +2944,17 @@ export default {
showLabels: "Show Values",
},
grid: {
+ exportSelectedRowsScope: "Selected rows",
+ exportFormat: "Format",
+ exportPageScope: "Current page",
+ exportResultScope: "All results",
+ exportLoadedScope: "Loaded data",
+ exportFormatXlsxWithSql: "XLSX (with SQL)",
+ exportInToolbar: "Show export in top toolbar",
+ loadAllInToolbar: "Show load all in top toolbar",
+ showSaveResult: "Show save results",
+ warnIncompleteExport: "Warn about incomplete exports",
+ incompleteExportWarning: "This page exports only the {count} displayed rows and may not include all data.",
showStatusSql: "Show SQL in Footer",
showStatusSqlHint: "Show SQL in the footer of all query results and table data grids.",
rows: "{count} rows",
@@ -2959,6 +2974,7 @@ export default {
"Elasticsearch search_after cannot jump directly to a page. DBX must fetch missing cursors in order, and backward navigation restarts from page 1. Jumping to page {page} is expected to send {requests} queries. This may take a long time and increase cluster load. Continue?",
esDeepPageJumpContinue: "Continue",
allLoaded: "all loaded",
+ loadAllRows: "Load all",
loadAllAndGoToLastRow: "Load all and go to the last row",
loadAllRowsConfirmTitle: "Confirm loading all rows",
loadAllRowsConfirmMessage: "Loading everything fetches up to {count} more rows in one request. Very large results consume significant memory and can take a long time. Continue?",
@@ -4988,6 +5004,9 @@ export default {
noDatabasesFound: "No databases found",
},
contextMenu: {
+ splitTab: "Split",
+ batchCloseTabs: "Close multiple tabs",
+ copyTabName: "Copy Tab Name",
openConnection: "Open Connection",
closeConnection: "Close Connection",
closeSelectedConnections: "Close Selected {count} Connections",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index b9eb6bf196..7ba1c841f1 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2085,6 +2085,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "Mostrar el Schema integrado/de metadatos para la conexión actual en la barra lateral y el selector de Schema.",
showDatabaseLinks: "Mostrar enlaces de base de datos",
showDatabaseLinksHint: "Mostrar la entrada de enlaces de base de datos (DB Link) en la barra lateral para esta conexión.",
+ showNativeJobs: "Mostrar tareas nativas",
+ showNativeJobsHint: "Mostrar la entrada de tareas nativas en la barra lateral para esta conexión.",
+ showUserAdmin: "Mostrar usuarios y privilegios",
+ showUserAdminHint: "Mostrar la entrada de usuarios y privilegios en la barra lateral para esta conexión.",
tableLoading: "Carga de tablas",
autoLoadAllTables: "Cargar todas las tablas automáticamente",
autoLoadAllTablesHint: "En la vista avanzada de la barra lateral, abrir un grupo de Tablas carga todas las páginas para esta conexión, de modo que el filtro por nombre de tabla cubra todas las tablas. Los esquemas grandes pueden tardar más.",
@@ -2662,6 +2666,17 @@ export default withEnglishFallback({
showLabels: "Mostrar valores",
},
grid: {
+ exportSelectedRowsScope: "Filas seleccionadas",
+ exportFormat: "Formato",
+ exportPageScope: "Página actual",
+ exportResultScope: "Todos los resultados",
+ exportLoadedScope: "Datos cargados",
+ exportFormatXlsxWithSql: "XLSX (con SQL)",
+ exportInToolbar: "Mostrar exportación arriba",
+ loadAllInToolbar: "Mostrar cargar todo arriba",
+ showSaveResult: "Mostrar guardar resultados",
+ warnIncompleteExport: "Avisar de exportaciones incompletas",
+ incompleteExportWarning: "Esta página solo exporta las {count} filas mostradas y puede no incluir todos los datos.",
showStatusSql: "Mostrar SQL al pie",
showStatusSqlHint: "Mostrar SQL al pie de todos los resultados de consultas y datos de tablas.",
agentExecuteTime: "Ejecución: {duration}",
@@ -2714,6 +2729,7 @@ export default withEnglishFallback({
"search_after de Elasticsearch no puede saltar directamente a una página. DBX debe obtener en orden los cursores que faltan y, al retroceder, comienza de nuevo desde la página 1. Saltar a la página {page} enviará aproximadamente {requests} consultas. Puede tardar y aumentar la carga del clúster. ¿Continuar?",
esDeepPageJumpContinue: "Continuar",
allLoaded: "todo cargado",
+ loadAllRows: "Cargar todo",
loadAllAndGoToLastRow: "Cargar todo e ir a la última fila",
loadAllRowsConfirmTitle: "Confirmar carga de todas las filas",
loadAllRowsConfirmMessage: "Cargar todo puede traer hasta {count} filas más en una sola solicitud. Los resultados muy grandes consumen mucha memoria y pueden tardar. ¿Continuar?",
@@ -4694,6 +4710,9 @@ export default withEnglishFallback({
editCancel: "Cancelar",
},
contextMenu: {
+ splitTab: "Dividir",
+ batchCloseTabs: "Cerrar varias pestañas",
+ copyTabName: "Copiar nombre de pestaña",
compileObjectFailedTitle: "Error al compilar la vista",
compileObjectFailedMessage: 'No se pudo compilar la vista "{name}":\n{message}',
openConnection: "Abrir conexión",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index c75fb2d00d..683314bce9 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -1997,6 +1997,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "Mostra lo Schema built-in/di metadati nella barra laterale e nel selettore Schema per la connessione corrente.",
showDatabaseLinks: "Mostra collegamenti database",
showDatabaseLinksHint: "Mostra la voce dei collegamenti al database (DB Link) nella barra laterale per questa connessione.",
+ showNativeJobs: "Mostra processi nativi",
+ showNativeJobsHint: "Mostra la voce dei processi nativi nella barra laterale per questa connessione.",
+ showUserAdmin: "Mostra utenti e privilegi",
+ showUserAdminHint: "Mostra la voce degli utenti e dei privilegi nella barra laterale per questa connessione.",
docsNotesPath: "File delle note",
docsNotesPathPlaceholder: "docs/dbx-docs.json",
docsNotesPathHint: "Dove vengono salvate le note della documentazione. Lascia vuoto per tenerle nella directory dati dell'applicazione, oppure indica un file nel tuo repository per revisionare la documentazione dello schema nelle pull request.",
@@ -2561,6 +2565,17 @@ export default withEnglishFallback({
showLabels: "Mostra valori",
},
grid: {
+ exportSelectedRowsScope: "Righe selezionate",
+ exportFormat: "Formato",
+ exportPageScope: "Pagina attuale",
+ exportResultScope: "Tutti i risultati",
+ exportLoadedScope: "Dati caricati",
+ exportFormatXlsxWithSql: "XLSX (con SQL)",
+ exportInToolbar: "Mostra esportazione in alto",
+ loadAllInToolbar: "Mostra carica tutto in alto",
+ showSaveResult: "Mostra salva risultati",
+ warnIncompleteExport: "Avvisa di esportazioni incomplete",
+ incompleteExportWarning: "Questa pagina esporta solo le {count} righe visualizzate e potrebbe non includere tutti i dati.",
showStatusSql: "Mostra SQL nel piè di pagina",
showStatusSqlHint: "Mostra SQL nel piè di pagina di tutti i risultati delle query e dei dati delle tabelle.",
agentExecuteTime: "Esecuzione: {duration}",
@@ -2613,6 +2628,7 @@ export default withEnglishFallback({
"search_after di Elasticsearch non può passare direttamente a una pagina. DBX deve recuperare in ordine i cursori mancanti e, tornando indietro, riparte dalla pagina 1. Il passaggio alla pagina {page} invierà circa {requests} query. Potrebbe richiedere tempo e aumentare il carico del cluster. Continuare?",
esDeepPageJumpContinue: "Continua",
allLoaded: "tutto caricato",
+ loadAllRows: "Carica tutto",
loadAllAndGoToLastRow: "Carica tutto e vai all'ultima riga",
loadAllRowsConfirmTitle: "Conferma caricamento di tutte le righe",
loadAllRowsConfirmMessage: "Il caricamento completo può recuperare fino a {count} righe aggiuntive in un'unica richiesta. Risultati molto grandi consumano molta memoria e possono richiedere tempo. Continuare?",
@@ -4540,6 +4556,9 @@ export default withEnglishFallback({
editCancel: "Annulla",
},
contextMenu: {
+ splitTab: "Dividi",
+ batchCloseTabs: "Chiudi più schede",
+ copyTabName: "Copia nome scheda",
compileObjectFailedTitle: "Compilazione della vista non riuscita",
compileObjectFailedMessage: 'Compilazione della vista "{name}" non riuscita:\n{message}',
openConnection: "Apri Connessione",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 6ebcb9d9d0..3bd07736ca 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -1995,6 +1995,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "現在の接続で、サイドバーとスキーマセレクターに組み込み/メタデータスキーマを表示します。",
showDatabaseLinks: "データベースリンクを表示",
showDatabaseLinksHint: "現在の接続でサイドバーにデータベースリンク(DB Link)のエントリを表示します。",
+ showNativeJobs: "ネイティブジョブを表示",
+ showNativeJobsHint: "この接続のネイティブジョブの項目をサイドバーに表示します。",
+ showUserAdmin: "ユーザーと権限を表示",
+ showUserAdminHint: "この接続のユーザーと権限の項目をサイドバーに表示します。",
docsNotesPath: "ノートファイル",
docsNotesPathPlaceholder: "docs/dbx-docs.json",
docsNotesPathHint: "ドキュメントのノートの保存先です。空のままにするとアプリのデータディレクトリに保存されます。リポジトリ内のファイルを指定すると、スキーマのドキュメントをプルリクエストでレビューできます。",
@@ -2581,6 +2585,17 @@ export default withEnglishFallback({
showLabels: "値を表示",
},
grid: {
+ exportSelectedRowsScope: "選択行",
+ exportFormat: "形式",
+ exportPageScope: "現在のページ",
+ exportResultScope: "全結果",
+ exportLoadedScope: "読み込み済み",
+ exportFormatXlsxWithSql: "XLSX(SQL を含む)",
+ exportInToolbar: "右上にエクスポートを表示",
+ loadAllInToolbar: "右上に全データ読み込みを表示",
+ showSaveResult: "結果の保存を表示",
+ warnIncompleteExport: "不完全なエクスポートを警告",
+ incompleteExportWarning: "現在のページでは表示中の {count} 行のみをエクスポートするため、全データが含まれない場合があります。",
showStatusSql: "フッターに SQL を表示",
showStatusSqlHint: "すべてのクエリ結果とテーブルデータのフッターに SQL を表示します。",
agentExecuteTime: "実行時間:{duration}",
@@ -3366,6 +3381,7 @@ export default withEnglishFallback({
"Elasticsearch の search_after では指定ページへ直接移動できません。DBX は不足しているカーソルを順番に取得し、前のページへ戻る場合は 1 ページ目からやり直します。ページ {page} への移動では約 {requests} 回のクエリが送信される見込みです。時間がかかり、クラスター負荷が増える可能性があります。続行しますか?",
esDeepPageJumpContinue: "移動を続ける",
allLoaded: "すべて読み込み済み",
+ loadAllRows: "すべて読み込む",
loadAllAndGoToLastRow: "すべて読み込み、最終行へ移動",
loadAllRowsConfirmTitle: "全行ロードの確認",
loadAllRowsConfirmMessage: "すべて読み込むと、1 回のリクエストで最大 {count} 行を追加取得します。非常に大きな結果セットは多くのメモリを消費し、時間がかかることがあります。続行しますか?",
@@ -4561,6 +4577,9 @@ export default withEnglishFallback({
editCancel: "キャンセル",
},
contextMenu: {
+ splitTab: "分割",
+ batchCloseTabs: "タブをまとめて閉じる",
+ copyTabName: "タブ名をコピー",
compileObjectFailedTitle: "ビューのコンパイルに失敗しました",
compileObjectFailedMessage: "ビュー「{name}」のコンパイルに失敗しました:\n{message}",
openConnection: "接続を開く",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 9b9bfdc967..0f0af71a23 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -1982,6 +1982,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "이 연결의 사이드바와 스키마 선택기에 내장 및 메타데이터 스키마를 표시합니다.",
showDatabaseLinks: "데이터베이스 링크 표시",
showDatabaseLinksHint: "이 연결의 사이드바에 데이터베이스 링크(DB Link) 항목을 표시합니다.",
+ showNativeJobs: "네이티브 작업 표시",
+ showNativeJobsHint: "이 연결의 사이드바에 네이티브 작업 항목을 표시합니다.",
+ showUserAdmin: "사용자 및 권한 표시",
+ showUserAdminHint: "이 연결의 사이드바에 사용자 및 권한 항목을 표시합니다.",
docsNotesPath: "노트 파일",
docsNotesPathPlaceholder: "docs/dbx-docs.json",
docsNotesPathHint: "문서 노트를 저장할 위치입니다. 비워 두면 앱 데이터 디렉터리에 저장되며, 저장소 내 파일을 지정하면 스키마 문서를 풀 리퀘스트에서 검토할 수 있습니다.",
@@ -2559,6 +2563,17 @@ export default withEnglishFallback({
showLabels: "값 표시",
},
grid: {
+ exportSelectedRowsScope: "선택한 행",
+ exportFormat: "형식",
+ exportPageScope: "현재 페이지",
+ exportResultScope: "전체 결과",
+ exportLoadedScope: "로드된 데이터",
+ exportFormatXlsxWithSql: "XLSX (SQL 포함)",
+ exportInToolbar: "오른쪽 위에 내보내기 표시",
+ loadAllInToolbar: "오른쪽 위에 전체 로드 표시",
+ showSaveResult: "결과 저장 표시",
+ warnIncompleteExport: "불완전한 내보내기 경고",
+ incompleteExportWarning: "현재 페이지는 표시된 {count}개 행만 내보내므로 전체 데이터가 포함되지 않을 수 있습니다.",
showStatusSql: "하단에 SQL 표시",
showStatusSqlHint: "모든 쿼리 결과와 테이블 데이터의 하단 상태 표시줄에 SQL을 표시합니다.",
agentExecuteTime: "실행 시간: {duration}",
@@ -2610,6 +2625,7 @@ export default withEnglishFallback({
"Elasticsearch의 search_after는 지정한 페이지로 바로 이동할 수 없습니다. DBX는 누락된 커서를 순서대로 가져와야 하며 이전 페이지로 이동할 때는 1페이지부터 다시 시작합니다. {page}페이지로 이동하면 약 {requests}개의 쿼리가 전송됩니다. 시간이 오래 걸리고 클러스터 부하가 증가할 수 있습니다. 계속하시겠습니까?",
esDeepPageJumpContinue: "계속 이동",
allLoaded: "모두 로드됨",
+ loadAllRows: "모두 불러오기",
loadAllAndGoToLastRow: "모두 불러오고 마지막 행으로 이동",
loadAllRowsConfirmTitle: "전체 로드 확인",
loadAllRowsConfirmMessage: "모두 로드하면 한 번의 요청으로 최대 {count}개의 행을 더 가져옵니다. 매우 큰 결과 집합은 많은 메모리를 사용하고 시간이 오래 걸릴 수 있습니다. 계속하시겠습니까?",
@@ -4485,6 +4501,9 @@ export default withEnglishFallback({
noDatabasesFound: "데이터베이스를 찾을 수 없습니다",
},
contextMenu: {
+ splitTab: "분할",
+ batchCloseTabs: "여러 탭 닫기",
+ copyTabName: "탭 이름 복사",
compileObjectFailedTitle: "뷰 컴파일 실패",
compileObjectFailedMessage: '뷰 "{name}" 컴파일에 실패했습니다:\n{message}',
openConnection: "연결 열기",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 05ba1dd1d7..6e54f5ab87 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -1996,6 +1996,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "Exibir Schemas de sistema/metadados integrados na barra lateral e no seletor de Schema para a conexão atual.",
showDatabaseLinks: "Mostrar links de banco de dados",
showDatabaseLinksHint: "Exibir a entrada de links de banco de dados (DB Link) na barra lateral para esta conexão.",
+ showNativeJobs: "Mostrar tarefas nativas",
+ showNativeJobsHint: "Exibir a entrada de tarefas nativas na barra lateral para esta conexão.",
+ showUserAdmin: "Mostrar usuários e privilégios",
+ showUserAdminHint: "Exibir a entrada de usuários e privilégios na barra lateral para esta conexão.",
docsNotesPath: "Arquivo de notas",
docsNotesPathPlaceholder: "docs/dbx-docs.json",
docsNotesPathHint: "Onde as notas da documentação são gravadas. Deixe vazio para mantê-las no diretório de dados do aplicativo, ou aponte para um arquivo do seu repositório para revisar a documentação do schema em pull requests.",
@@ -2561,6 +2565,17 @@ export default withEnglishFallback({
showLabels: "Mostrar valores",
},
grid: {
+ exportSelectedRowsScope: "Linhas selecionadas",
+ exportFormat: "Formato",
+ exportPageScope: "Página atual",
+ exportResultScope: "Todos os resultados",
+ exportLoadedScope: "Dados carregados",
+ exportFormatXlsxWithSql: "XLSX (com SQL)",
+ exportInToolbar: "Mostrar exportação no topo",
+ loadAllInToolbar: "Mostrar carregar tudo no topo",
+ showSaveResult: "Mostrar salvar resultados",
+ warnIncompleteExport: "Avisar sobre exportações incompletas",
+ incompleteExportWarning: "Esta página exporta apenas as {count} linhas exibidas e pode não incluir todos os dados.",
showStatusSql: "Mostrar SQL no rodapé",
showStatusSqlHint: "Mostrar SQL no rodapé de todos os resultados de consultas e dados de tabelas.",
agentExecuteTime: "Execução: {duration}",
@@ -2613,6 +2628,7 @@ export default withEnglishFallback({
"O search_after do Elasticsearch não pode ir diretamente para uma página. O DBX precisa buscar os cursores ausentes em ordem e, ao voltar, reinicia pela página 1. Ir para a página {page} deve enviar cerca de {requests} consultas. Isso pode demorar e aumentar a carga do cluster. Continuar?",
esDeepPageJumpContinue: "Continuar",
allLoaded: "tudo carregado",
+ loadAllRows: "Carregar tudo",
loadAllAndGoToLastRow: "Carregar tudo e ir para a última linha",
loadAllRowsConfirmTitle: "Confirmar carregamento de todas as linhas",
loadAllRowsConfirmMessage: "Carregar tudo pode buscar até {count} linhas adicionais em uma única solicitação. Resultados muito grandes consomem muita memória e podem demorar. Continuar?",
@@ -4538,6 +4554,9 @@ export default withEnglishFallback({
editCancel: "Cancelar",
},
contextMenu: {
+ splitTab: "Dividir",
+ batchCloseTabs: "Fechar várias abas",
+ copyTabName: "Copiar nome da aba",
compileObjectFailedTitle: "Falha na compilação da visão",
compileObjectFailedMessage: 'Falha ao compilar a visão "{name}":\n{message}',
openConnection: "Abrir Conexão",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 8c4eeb5310..c98b3dec4b 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -2080,6 +2080,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "Показывать встроенные схемы и схемы метаданных на боковой панели и в выборе схем для этого подключения.",
showDatabaseLinks: "Показывать связи баз данных",
showDatabaseLinksHint: "Показывать раздел связей баз данных (DB Link) на боковой панели для этого подключения.",
+ showNativeJobs: "Показывать встроенные задания",
+ showNativeJobsHint: "Показывать раздел встроенных заданий на боковой панели для этого подключения.",
+ showUserAdmin: "Показывать пользователей и права",
+ showUserAdminHint: "Показывать раздел пользователей и прав на боковой панели для этого подключения.",
docsNotesPath: "Файл заметок",
docsNotesPathPlaceholder: "docs/dbx-docs.json",
docsNotesPathHint: "Где хранятся заметки документации. Оставьте пустым, чтобы хранить их в каталоге данных приложения, или укажите файл в вашем репозитории, чтобы просматривать документацию схемы в pull request.",
@@ -2648,6 +2652,17 @@ export default withEnglishFallback({
showLabels: "Показывать значения",
},
grid: {
+ exportSelectedRowsScope: "Выбранные строки",
+ exportFormat: "Формат",
+ exportPageScope: "Текущая страница",
+ exportResultScope: "Все результаты",
+ exportLoadedScope: "Загруженные данные",
+ exportFormatXlsxWithSql: "XLSX (с SQL)",
+ exportInToolbar: "Показывать экспорт вверху",
+ loadAllInToolbar: "Показывать загрузку всех данных вверху",
+ showSaveResult: "Показывать сохранение результатов",
+ warnIncompleteExport: "Предупреждать о неполном экспорте",
+ incompleteExportWarning: "Экспортируются только отображаемые строки ({count}); часть данных может не попасть в файл.",
showStatusSql: "Показывать SQL внизу",
showStatusSqlHint: "Показывать SQL в нижней строке всех результатов запросов и данных таблиц.",
rows: "Строк: {count}",
@@ -2667,6 +2682,7 @@ export default withEnglishFallback({
"Elasticsearch search_after не может перейти сразу на нужную страницу. DBX должен последовательно получить пропущенные курсоры, а переход назад начинается со страницы 1. Переход на страницу {page} потребует примерно {requests} запросов. Это может занять много времени и увеличить нагрузку на кластер. Продолжить?",
esDeepPageJumpContinue: "Продолжить",
allLoaded: "загружено всё",
+ loadAllRows: "Загрузить всё",
calculateTotalRows: "Подсчитать общее число строк",
calculateTotalRowsInline: "(подсчитать общее число строк)",
calculateTotalRowsFailed: "Не удалось подсчитать: {message}",
@@ -4645,6 +4661,9 @@ export default withEnglishFallback({
noDatabasesFound: "Базы данных не найдены",
},
contextMenu: {
+ splitTab: "Разделить",
+ batchCloseTabs: "Закрыть несколько вкладок",
+ copyTabName: "Копировать имя вкладки",
openConnection: "Открыть подключение",
closeConnection: "Закрыть подключение",
closeSelectedConnections: "Закрыть выбранные подключения ({count})",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index e4d55a8cd8..b7149875ee 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -2227,6 +2227,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "แสดง Schema ในตัวและ Schema เมทาดาทาในแถบด้านข้างและตัวเลือก Schema สำหรับการเชื่อมต่อนี้",
showDatabaseLinks: "แสดง Database Link",
showDatabaseLinksHint: "แสดงรายการ Database Link ในแถบด้านข้างสำหรับการเชื่อมต่อนี้",
+ showNativeJobs: "แสดงงานดั้งเดิม",
+ showNativeJobsHint: "แสดงรายการงานดั้งเดิมในแถบด้านข้างสำหรับการเชื่อมต่อนี้",
+ showUserAdmin: "แสดงผู้ใช้และสิทธิ์",
+ showUserAdminHint: "แสดงรายการผู้ใช้และสิทธิ์ในแถบด้านข้างสำหรับการเชื่อมต่อนี้",
tableLoading: "การโหลดตาราง",
autoLoadAllTables: "โหลดตารางทั้งหมดโดยอัตโนมัติ",
autoLoadAllTablesHint: "ในมุมมองแถบด้านข้างขั้นสูง การเปิดกลุ่มตารางจะโหลดทุกหน้าสำหรับการเชื่อมต่อนี้ เพื่อให้การกรองชื่อตารางครอบคลุมทุกตาราง Schema ขนาดใหญ่อาจใช้เวลานานขึ้น",
@@ -2797,6 +2801,17 @@ export default withEnglishFallback({
showLabels: "แสดงค่า",
},
grid: {
+ exportSelectedRowsScope: "แถวที่เลือก",
+ exportFormat: "รูปแบบ",
+ exportPageScope: "หน้าปัจจุบัน",
+ exportResultScope: "ผลลัพธ์ทั้งหมด",
+ exportLoadedScope: "ข้อมูลที่โหลดแล้ว",
+ exportFormatXlsxWithSql: "XLSX (รวม SQL)",
+ exportInToolbar: "แสดงส่งออกที่มุมขวาบน",
+ loadAllInToolbar: "แสดงโหลดทั้งหมดที่มุมขวาบน",
+ showSaveResult: "แสดงบันทึกผลลัพธ์",
+ warnIncompleteExport: "เตือนเมื่อส่งออกไม่ครบ",
+ incompleteExportWarning: "หน้านี้ส่งออกเฉพาะ {count} แถวที่แสดงอยู่ และอาจไม่รวมข้อมูลทั้งหมด",
showStatusSql: "แสดง SQL ที่ด้านล่าง",
showStatusSqlHint: "แสดง SQL ในแถบสถานะด้านล่างของผลลัพธ์คิวรีและข้อมูลตารางทั้งหมด",
rows: "{count} แถว",
@@ -2816,6 +2831,7 @@ export default withEnglishFallback({
esDeepPageJumpConfirmMessage: "Elasticsearch search_after ไม่สามารถกระโดดไปหน้าโดยตรงได้ DBX ต้องดึง Cursor ที่ขาดหายตามลำดับ และการนำทางย้อนกลับจะเริ่มใหม่จากหน้า 1 การกระโดดไปหน้า {page} คาดว่าจะส่ง Query {requests} รายการ อาจใช้เวลานานและเพิ่มภาระ Cluster ดำเนินการต่อหรือไม่?",
esDeepPageJumpContinue: "ดำเนินการต่อ",
allLoaded: "โหลดทั้งหมดแล้ว",
+ loadAllRows: "โหลดทั้งหมด",
loadAllAndGoToLastRow: "โหลดทั้งหมดและไปยังแถวสุดท้าย",
loadAllRowsConfirmTitle: "ยืนยันการโหลดแถวทั้งหมด",
loadAllRowsConfirmMessage: "การโหลดทั้งหมดจะดึงเพิ่มสูงสุด {count} แถวใน Request เดียว ผลลัพธ์ขนาดใหญ่มากใช้หน่วยความจำมากและอาจใช้เวลานาน ดำเนินการต่อหรือไม่?",
@@ -4807,6 +4823,9 @@ export default withEnglishFallback({
magpieConfigDirectoryFailed: "ไม่สามารถระบุตำแหน่งไดเรกทอรีกำหนดค่าของ Magpie ได้",
},
contextMenu: {
+ splitTab: "แยก",
+ batchCloseTabs: "ปิดหลายแท็บ",
+ copyTabName: "คัดลอกชื่อแท็บ",
openConnection: "เปิดการเชื่อมต่อ",
closeConnection: "ปิดการเชื่อมต่อ",
closeSelectedConnections: "ปิดการเชื่อมต่อที่เลือก {count} รายการ",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index b1da91c42c..88eb24a196 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2321,6 +2321,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "为当前连接在侧边栏和 Schema 选择器中显示内置/元数据 Schema。",
showDatabaseLinks: "显示数据库链接",
showDatabaseLinksHint: "在侧边栏中显示当前连接的数据库链接(DB Link)入口。",
+ showNativeJobs: "显示原生作业",
+ showNativeJobsHint: "在侧边栏中显示当前连接的原生作业入口。",
+ showUserAdmin: "显示用户与权限",
+ showUserAdminHint: "在侧边栏中显示当前连接的用户与权限入口。",
tableLoading: "表加载策略",
autoLoadAllTables: "自动加载全部表",
autoLoadAllTablesHint: "使用侧边栏高级视图时,展开“表”分组会自动加载该连接的全部分页,使表名筛选覆盖所有表。表很多时可能需要更长时间。",
@@ -2872,6 +2876,17 @@ export default withEnglishFallback({
showLabels: "显示数值",
},
grid: {
+ exportSelectedRowsScope: "选中行",
+ exportFormat: "格式",
+ exportPageScope: "当前页",
+ exportResultScope: "全部结果",
+ exportLoadedScope: "已加载数据",
+ exportFormatXlsxWithSql: "XLSX(含 SQL)",
+ exportInToolbar: "右上角显示导出菜单",
+ loadAllInToolbar: "右上角显示加载全部数据",
+ showSaveResult: "显示保存结果",
+ warnIncompleteExport: "导出不完整警告",
+ incompleteExportWarning: "当前页仅导出已显示的 {count} 行,可能不包含全部数据。",
showStatusSql: "显示底部 SQL",
showStatusSqlHint: "在所有查询结果和表数据的底部状态栏中显示 SQL。",
rows: "{count} 行",
@@ -2890,6 +2905,7 @@ export default withEnglishFallback({
esDeepPageJumpConfirmMessage: "Elasticsearch 的 search_after 不能直接定位到指定页面。DBX 必须按顺序获取缺失的游标,跳回较小页码时还会从第 1 页重新开始。跳转到第 {page} 页预计会发送 {requests} 次查询,可能耗时较长并增加集群负载。是否继续?",
esDeepPageJumpContinue: "继续跳转",
allLoaded: "已全部加载",
+ loadAllRows: "加载全部",
loadAllAndGoToLastRow: "加载全部并转到末行",
loadAllRowsConfirmTitle: "确认加载全部行",
loadAllRowsConfirmMessage: "加载全部将通过一次请求最多再获取 {count} 行。超大结果集会占用大量内存并可能耗时较长。是否继续?",
@@ -4915,6 +4931,9 @@ export default withEnglishFallback({
noDatabasesFound: "未找到数据库",
},
contextMenu: {
+ splitTab: "拆分",
+ batchCloseTabs: "批量关闭",
+ copyTabName: "复制标签页名称",
openConnection: "打开连接",
closeConnection: "关闭连接",
closeSelectedConnections: "关闭选中的 {count} 个连接",
@@ -4994,7 +5013,7 @@ export default withEnglishFallback({
compactTabTitle: "缩短标签标题",
fullTabTitle: "完整标签标题",
closeTab: "关闭标签页",
- reopenClosedTab: "重新打开关闭的标签页",
+ reopenClosedTab: "恢复关闭标签页",
editTabGroup: "编辑标签分组",
resetTabGroup: "恢复默认分组",
closeTabGroup: "关闭本组标签页",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 7f50c105c5..7c08a34fa6 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -1986,6 +1986,10 @@ export default withEnglishFallback({
showSystemSchemasHint: "為目前連線在側邊欄和 Schema 選擇器中顯示內建/中繼資料 Schema。",
showDatabaseLinks: "顯示資料庫連結",
showDatabaseLinksHint: "在側邊欄中顯示目前連線的資料庫連結(DB Link)入口。",
+ showNativeJobs: "顯示原生作業",
+ showNativeJobsHint: "在側邊欄中顯示目前連線的原生作業入口。",
+ showUserAdmin: "顯示使用者與權限",
+ showUserAdminHint: "在側邊欄中顯示目前連線的使用者與權限入口。",
docsNotesPath: "筆記檔案",
docsNotesPathPlaceholder: "docs/dbx-docs.json",
docsNotesPathHint: "文件筆記的儲存位置。留空則儲存在應用程式資料目錄中;指向存放庫中的檔案後,即可在 Pull Request 中審閱 Schema 文件。",
@@ -2541,6 +2545,17 @@ export default withEnglishFallback({
showLabels: "顯示數值",
},
grid: {
+ exportSelectedRowsScope: "選取列",
+ exportFormat: "格式",
+ exportPageScope: "目前頁",
+ exportResultScope: "全部結果",
+ exportLoadedScope: "已載入資料",
+ exportFormatXlsxWithSql: "XLSX(含 SQL)",
+ exportInToolbar: "右上角顯示匯出選單",
+ loadAllInToolbar: "右上角顯示載入全部資料",
+ showSaveResult: "顯示儲存結果",
+ warnIncompleteExport: "匯出不完整警告",
+ incompleteExportWarning: "目前頁僅匯出已顯示的 {count} 列,可能不包含全部資料。",
showStatusSql: "顯示底部 SQL",
showStatusSqlHint: "在所有查詢結果和資料表資料的底部狀態列中顯示 SQL。",
rows: "{count} 列",
@@ -2559,6 +2574,7 @@ export default withEnglishFallback({
esDeepPageJumpConfirmMessage: "Elasticsearch 的 search_after 無法直接定位到指定頁面。DBX 必須依序取得缺少的游標,跳回較小頁碼時還會從第 1 頁重新開始。跳轉到第 {page} 頁預計會傳送 {requests} 次查詢,可能耗時較長並增加叢集負載。是否繼續?",
esDeepPageJumpContinue: "繼續跳轉",
allLoaded: "已全部載入",
+ loadAllRows: "載入全部",
loadAllAndGoToLastRow: "載入全部並前往最後一列",
loadAllRowsConfirmTitle: "確認載入全部資料列",
loadAllRowsConfirmMessage: "載入全部將透過一次請求最多再取得 {count} 筆。超大型結果集會佔用大量記憶體且可能耗時較長。是否繼續?",
@@ -4517,6 +4533,9 @@ export default withEnglishFallback({
noDatabasesFound: "未找到資料庫",
},
contextMenu: {
+ splitTab: "分割",
+ batchCloseTabs: "批次關閉",
+ copyTabName: "複製分頁名稱",
compileObjectFailedTitle: "檢視編譯失敗",
compileObjectFailedMessage: "檢視「{name}」編譯失敗:\n{message}",
openConnection: "開啟連線",
diff --git a/apps/desktop/src/lib/__tests__/sidebar/sidebarNodeOrdering.oracle.spec.ts b/apps/desktop/src/lib/__tests__/sidebar/sidebarNodeOrdering.oracle.spec.ts
index 52d2c12397..c2caf74996 100644
--- a/apps/desktop/src/lib/__tests__/sidebar/sidebarNodeOrdering.oracle.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sidebar/sidebarNodeOrdering.oracle.spec.ts
@@ -1,8 +1,36 @@
import { describe, expect, it } from "vitest";
-import { sortSidebarTreeChildrenForParent } from "@/lib/sidebar/sidebarNodeOrdering";
+import { orderSidebarConnectionUtilitiesForDisplay, sortSidebarTreeChildrenForParent } from "@/lib/sidebar/sidebarNodeOrdering";
import type { TreeNode } from "@/types/database";
describe("Oracle sidebar ordering", () => {
+ it("projects an already-loaded grouped connection without changing schema order, nested objects, or the live tree", () => {
+ const children: TreeNode[] = [
+ { id: "links", type: "oracle-db-links", label: "links" },
+ { id: "z", type: "schema", label: "Z", children: [{ id: "table", type: "table", label: "table" }] },
+ { id: "a", type: "schema", label: "A" },
+ { id: "users", type: "user-admin", label: "users" },
+ { id: "jobs", type: "database-job-admin", label: "jobs" },
+ { id: "sql", type: "saved-sql-root", label: "sql" },
+ ];
+ const nodes: TreeNode[] = [{ id: "folder", type: "connection-group", label: "folder", children: [{ id: "c1", type: "connection", label: "c1", children }] }];
+ const result = orderSidebarConnectionUtilitiesForDisplay(nodes);
+ expect(result[0].children![0].children!.map((node) => node.id)).toEqual(["sql", "z", "a", "links", "jobs", "users"]);
+ expect(children.map((node) => node.id)).toEqual(["links", "z", "a", "users", "jobs", "sql"]);
+ expect(result[0].children![0].children![1]).toBe(children[1]);
+ expect(orderSidebarConnectionUtilitiesForDisplay(result)).toBe(result);
+ });
+ it("keeps schemas sorted before the three connection tools after cache normalization", () => {
+ const children: TreeNode[] = [
+ { id: "users", type: "user-admin", label: "users" },
+ { id: "jobs", type: "database-job-admin", label: "jobs" },
+ { id: "z", type: "schema", label: "ZEBRA" },
+ { id: "links", type: "oracle-db-links", label: "links" },
+ { id: "a", type: "schema", label: "ALPHA" },
+ ];
+ const result = sortSidebarTreeChildrenForParent({ type: "connection" }, children, "oracle");
+ expect(result.map((node) => node.id)).toEqual(["a", "z", "links", "jobs", "users"]);
+ expect(sortSidebarTreeChildrenForParent({ type: "connection" }, result, "oracle")).toEqual(result);
+ });
it("sorts schema nodes alphabetically and places database links at the bottom", () => {
const children: TreeNode[] = [
{ id: "c1:__oracle_db_links", label: "tree.databaseLinks", type: "oracle-db-links", connectionId: "c1" },
diff --git a/apps/desktop/src/lib/__tests__/sidebar/sidebarUtilityVisibility.spec.ts b/apps/desktop/src/lib/__tests__/sidebar/sidebarUtilityVisibility.spec.ts
new file mode 100644
index 0000000000..ffda9e2e39
--- /dev/null
+++ b/apps/desktop/src/lib/__tests__/sidebar/sidebarUtilityVisibility.spec.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from "vitest";
+import { sidebarUserAdminVisibility } from "@/lib/sidebar/sidebarUserAdminVisibility";
+import type { ConnectionConfig, TreeNode } from "@/types/database";
+
+describe("sidebar utility visibility", () => {
+ const entries = [
+ ["oracle-db-links", "show_database_links"],
+ ["database-job-admin", "show_native_jobs"],
+ ["dameng-job-admin", "show_native_jobs"],
+ ["user-admin", "show_user_admin"],
+ ["xugu-user-admin", "show_user_admin"],
+ ] as const;
+
+ it.each(entries)("applies %s connection opt-outs without mutating the live tree", (type, field) => {
+ for (const override of [undefined, false, true]) {
+ const utility: TreeNode = { id: "entry", type, label: "tool", connectionId: "c1", children: [{ id: "child", type: "oracle-db-link", label: "link", connectionId: "c1" }] };
+ const nodes: TreeNode[] = [{ id: "c1", type: "connection", label: "connection", children: [utility], hiddenChildren: [utility] }];
+ const config = { id: "c1", [field]: override } as ConnectionConfig;
+ const result = sidebarUserAdminVisibility(nodes, () => config);
+ const visible = override !== false;
+ expect(result.nodes[0].children).toHaveLength(visible ? 1 : 0);
+ expect(result.nodes[0].hiddenChildren).toHaveLength(visible ? 1 : 0);
+ expect(result.hiddenNodeIds.has("entry")).toBe(!visible);
+ expect(result.hiddenNodeIds.has("child")).toBe(!visible);
+ expect(nodes[0].children).toEqual([utility]);
+ const restored = sidebarUserAdminVisibility(nodes, () => undefined);
+ expect(restored.nodes).toBe(nodes);
+ }
+ });
+
+ it("keeps opt-outs scoped to their connection", () => {
+ const nodes: TreeNode[] = ["c1", "c2"].map((connectionId) => ({ id: connectionId, connectionId, type: "database-job-admin", label: "jobs" }));
+ const result = sidebarUserAdminVisibility(nodes, (id) => ({ id, show_native_jobs: id === "c1" ? false : undefined }) as ConnectionConfig);
+ expect(result.nodes.map((node) => node.id)).toEqual(["c2"]);
+ });
+});
diff --git a/apps/desktop/src/lib/backend/__tests__/connectionVisibilityMigration.spec.ts b/apps/desktop/src/lib/backend/__tests__/connectionVisibilityMigration.spec.ts
new file mode 100644
index 0000000000..19d0313f9b
--- /dev/null
+++ b/apps/desktop/src/lib/backend/__tests__/connectionVisibilityMigration.spec.ts
@@ -0,0 +1,34 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import * as http from "../http";
+import * as tauri from "../tauri";
+
+const { invoke } = vi.hoisted(() => ({ invoke: vi.fn() }));
+vi.mock("@tauri-apps/api/core", () => ({ invoke, Channel: class {} }));
+
+describe("connection visibility migration transport", () => {
+ const fetch = vi.fn();
+ beforeEach(() => {
+ vi.resetAllMocks();
+ vi.stubGlobal("fetch", fetch);
+ fetch.mockImplementation(async () => new Response("[]", { headers: { "Content-Type": "application/json" } }));
+ invoke.mockResolvedValue([]);
+ });
+ afterEach(() => vi.unstubAllGlobals());
+
+ it("keeps ordinary reads free of migration input", async () => {
+ await tauri.loadConnections();
+ expect(invoke).toHaveBeenCalledExactlyOnceWith("load_connections", undefined);
+ await http.loadConnections();
+ const url = new URL(String(fetch.mock.calls[0][0]), "http://localhost");
+ expect(url.pathname).toBe("/api/connection/list");
+ expect(url.search).toBe("");
+ });
+
+ it.each([false, true])("preserves an explicit legacy value of %s on both adapters", async (visible) => {
+ await tauri.loadConnections(visible);
+ expect(invoke).toHaveBeenCalledExactlyOnceWith("load_connections", { legacySidebarShowUserAdmin: visible });
+ await http.loadConnections(visible);
+ const url = new URL(String(fetch.mock.calls[0][0]), "http://localhost");
+ expect(url.searchParams.get("legacySidebarShowUserAdmin")).toBe(String(visible));
+ });
+});
diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.ts
index 4b4a39ecef..39ce0b602a 100644
--- a/apps/desktop/src/lib/backend/http.ts
+++ b/apps/desktop/src/lib/backend/http.ts
@@ -679,8 +679,8 @@ export async function saveConnections(configs: ConnectionConfig[], removedIds: s
return post("/api/connection/save", { configs });
}
-export async function loadConnections(): Promise<ConnectionConfig[]> {
- return get("/api/connection/list");
+export async function loadConnections(legacySidebarShowUserAdmin?: boolean): Promise<ConnectionConfig[]> {
+ return get(legacySidebarShowUserAdmin === undefined ? "/api/connection/list" : `/api/connection/list?legacySidebarShowUserAdmin=${legacySidebarShowUserAdmin}`);
}
export async function loadTunnelProfiles(): Promise<TunnelProfile[]> {
diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts
index 3e379c7f9d..d721a2129b 100644
--- a/apps/desktop/src/lib/backend/tauri.ts
+++ b/apps/desktop/src/lib/backend/tauri.ts
@@ -3116,8 +3116,8 @@ export async function saveConnections(configs: ConnectionConfig[], removedIds: s
return invoke("save_connections", { configs, removedIds });
}
-export async function loadConnections(): Promise<ConnectionConfig[]> {
- return invoke("load_connections");
+export async function loadConnections(legacySidebarShowUserAdmin?: boolean): Promise<ConnectionConfig[]> {
+ return legacySidebarShowUserAdmin === undefined ? invoke("load_connections") : invoke("load_connections", { legacySidebarShowUserAdmin });
}
export async function loadTunnelProfiles(): Promise<TunnelProfile[]> {
diff --git a/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts b/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts
index 09b4d64c8a..ef20e3c5a8 100644
--- a/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts
+++ b/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts
@@ -87,6 +87,7 @@ describe("connectionDatabaseInfo", () => {
expect(connectionConfigFingerprint({ ...original, default_schema: "archive" })).toBe(connectionConfigFingerprint(original));
expect(connectionConfigFingerprint({ ...original, sidebar_auto_load_all_tables: true })).toBe(connectionConfigFingerprint(original));
expect(connectionConfigFingerprint({ ...original, show_database_links: false })).toBe(connectionConfigFingerprint(original));
+ expect(connectionConfigFingerprint({ ...original, show_native_jobs: false, show_user_admin: true })).toBe(connectionConfigFingerprint(original));
expect(connectionConfigFingerprint({ ...original, jdbc_dialect: "oceanbase-oracle" })).toBe(connectionConfigFingerprint(original));
});
diff --git a/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts b/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts
index 6f84a90c4e..66dcb3e9d2 100644
--- a/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts
+++ b/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts
@@ -95,7 +95,18 @@ function fnv1a(value: string, seed: number): number {
}
export function connectionConfigFingerprint(config: ConnectionConfig, sourceName = config.name): string {
- const { database_info: _databaseInfo, default_schema: _defaultSchema, note: _note, show_database_links: _showDatabaseLinks, sidebar_auto_load_all_tables: _sidebarAutoLoadAllTables, redis_key_filter: _redisKeyFilter, jdbc_dialect: _jdbcDialect, ...submittedConfig } = config;
+ const {
+ database_info: _databaseInfo,
+ default_schema: _defaultSchema,
+ note: _note,
+ show_database_links: _showDatabaseLinks,
+ show_native_jobs: _showNativeJobs,
+ show_user_admin: _showUserAdmin,
+ sidebar_auto_load_all_tables: _sidebarAutoLoadAllTables,
+ redis_key_filter: _redisKeyFilter,
+ jdbc_dialect: _jdbcDialect,
+ ...submittedConfig
+ } = config;
const serialized = JSON.stringify(stableValue({ config: submittedConfig, sourceName }));
const first = fnv1a(serialized, 0x811c9dc5).toString(16).padStart(8, "0");
const second = fnv1a(serialized, 0x9e3779b9).toString(16).padStart(8, "0");
diff --git a/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts b/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts
index 2209060426..b3aa28bb31 100644
--- a/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts
+++ b/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts
@@ -23,6 +23,14 @@ function fileWithSections(sections: Record<string, unknown>): string {
}
describe("settingsTransfer", () => {
+ it("does not export or reactivate the retired global user visibility setting", () => {
+ const text = serializeSettingsTransfer({ ...DEFAULT_EDITOR_SETTINGS, sidebarShowUserAdmin: false });
+ expect(JSON.parse(text).settings.editor).not.toHaveProperty("sidebarShowUserAdmin");
+ const imported = parseSettingsTransferFile(fileWith({ sidebarShowUserAdmin: false, sidebarFontSize: 14 }));
+ expect(imported.ok).toBe(true);
+ if (imported.ok) expect(imported.value.editorSettings).not.toHaveProperty("sidebarShowUserAdmin");
+ });
+
it("round-trips column comment placement as a data preference and rejects non-booleans", () => {
const text = serializeSettingsTransfer({ ...DEFAULT_EDITOR_SETTINGS, dataGridColumnCommentsInInfoArea: true, dataGridTransposeMetadataInInfoColumn: true });
const result = parseSettingsTransferFile(text);
diff --git a/apps/desktop/src/lib/settings/editorSettingsDraft.ts b/apps/desktop/src/lib/settings/editorSettingsDraft.ts
index 11101e089c..eb24845540 100644
--- a/apps/desktop/src/lib/settings/editorSettingsDraft.ts
+++ b/apps/desktop/src/lib/settings/editorSettingsDraft.ts
@@ -148,7 +148,6 @@ export const EDITOR_SETTINGS_DRAFT_KEYS = [
"sidebarObjectInfoMode",
"sidebarAllowHorizontalScroll",
"sidebarShowTooltips",
- "sidebarShowUserAdmin",
"sidebarIndent",
"sidebarFontSize",
"sidebarDensity",
diff --git a/apps/desktop/src/lib/settings/settingsSearch.ts b/apps/desktop/src/lib/settings/settingsSearch.ts
index a5f84b769e..6183702996 100644
--- a/apps/desktop/src/lib/settings/settingsSearch.ts
+++ b/apps/desktop/src/lib/settings/settingsSearch.ts
@@ -389,7 +389,6 @@ export const SETTINGS_SEARCH_DEFINITIONS: readonly SettingsSearchDefinition[] =
},
{ id: "navigation-sidebar-scroll", category: "navigation", titleKey: "settings.sidebarAllowHorizontalScroll", descriptionKey: "settings.sidebarAllowHorizontalScrollDescription", targetId: "navigation" },
{ id: "navigation-sidebar-tooltips", category: "navigation", titleKey: "settings.sidebarShowTooltips", descriptionKey: "settings.sidebarShowTooltipsDescription", targetId: "navigation" },
- { id: "navigation-sidebar-user-admin", category: "navigation", titleKey: "settings.sidebarShowUserAdmin", descriptionKey: "settings.sidebarShowUserAdminDescription", targetId: "navigation" },
{ id: "navigation-sidebar-indent", category: "navigation", titleKey: "settings.sidebarIndent", descriptionKey: "settings.sidebarIndentDescription", targetId: "navigation" },
{ id: "navigation-sidebar-font-size", category: "navigation", titleKey: "settings.sidebarFontSize", descriptionKey: "settings.sidebarFontSizeDescription", targetId: "navigation" },
{ id: "navigation-sidebar-density", category: "navigation", titleKey: "settings.sidebarDensity", descriptionKey: "settings.sidebarDensityDescription", targetId: "navigation" },
diff --git a/apps/desktop/src/lib/settings/settingsTransfer.ts b/apps/desktop/src/lib/settings/settingsTransfer.ts
index fda2670883..9b1484d5a2 100644
--- a/apps/desktop/src/lib/settings/settingsTransfer.ts
+++ b/apps/desktop/src/lib/settings/settingsTransfer.ts
@@ -216,7 +216,6 @@ const SETTINGS_TRANSFER_CATEGORY_KEYS: Record<SettingsTransferCategoryId, readon
"sidebarObjectInfoMode",
"sidebarAllowHorizontalScroll",
"sidebarShowTooltips",
- "sidebarShowUserAdmin",
"sidebarIndent",
"sidebarFontSize",
"sidebarDensity",
@@ -398,7 +397,6 @@ const PASS_THROUGH_BOOLEAN_KEYS = [
"sidebarPinDefaultDatabase",
"sidebarAllowHorizontalScroll",
"sidebarShowTooltips",
- "sidebarShowUserAdmin",
"updateNotificationsEnabled",
"autoDownloadUpdates",
"autoUpdateApp",
diff --git a/apps/desktop/src/lib/sidebar/sidebarNodeOrdering.ts b/apps/desktop/src/lib/sidebar/sidebarNodeOrdering.ts
index d559e97bb9..1a27a94082 100644
--- a/apps/desktop/src/lib/sidebar/sidebarNodeOrdering.ts
+++ b/apps/desktop/src/lib/sidebar/sidebarNodeOrdering.ts
@@ -49,7 +49,32 @@ export function sortSidebarTreeChildrenByNameKeepingTableVGroups(parent: Pick<Tr
}
function isBottomConnectionUtilityNode(child: TreeNode): boolean {
- return child.type === "oracle-db-links" || child.type === "user-admin" || child.type === "xugu-user-admin" || child.type === "dameng-users" || child.type === "dameng-roles" || child.type === "dameng-job-admin" || child.type === "group-tablespaces";
+ return child.type === "oracle-db-links" || child.type === "database-job-admin" || child.type === "user-admin" || child.type === "xugu-user-admin" || child.type === "dameng-users" || child.type === "dameng-roles" || child.type === "dameng-job-admin" || child.type === "group-tablespaces";
+}
+
+function connectionChildSections(children: readonly TreeNode[]) {
+ const savedSqlNodes = children.filter((child) => child.type === "saved-sql-root");
+ const bottomUtilityNodes = children.filter(isBottomConnectionUtilityNode);
+ const utilityOrder = ["oracle-db-links", "database-job-admin", "user-admin", "xugu-user-admin"];
+ const utilityRank = (child: TreeNode) => (utilityOrder.includes(child.type) ? utilityOrder.indexOf(child.type) : utilityOrder.length);
+ bottomUtilityNodes.sort((left, right) => utilityRank(left) - utilityRank(right));
+ const regularChildren = children.filter((child) => child.type !== "saved-sql-root" && !isBottomConnectionUtilityNode(child));
+ return { savedSqlNodes, bottomUtilityNodes, regularChildren };
+}
+
+export function orderSidebarConnectionUtilitiesForDisplay(nodes: TreeNode[]): TreeNode[] {
+ const ordered = nodes.map((node) => {
+ if (!node.children) return node;
+ let children = node.children;
+ if (node.type === "connection-group") children = orderSidebarConnectionUtilitiesForDisplay(children);
+ else if (node.type === "connection") {
+ const { savedSqlNodes, regularChildren, bottomUtilityNodes } = connectionChildSections(children);
+ const next = [...savedSqlNodes, ...regularChildren, ...bottomUtilityNodes];
+ if (!next.every((child, index) => child === children[index])) children = next;
+ }
+ return children === node.children ? node : { ...node, children };
+ });
+ return ordered.every((node, index) => node === nodes[index]) ? nodes : ordered;
}
function orderSidebarTreeChildrenForParent(parent: Pick<TreeNode, "type">, children: readonly TreeNode[], databaseType?: DatabaseType): TreeNode[] {
@@ -70,9 +95,7 @@ function orderSidebarTreeChildrenForParent(parent: Pick<TreeNode, "type">, child
}
if (parent.type === "connection") {
- const savedSqlNodes = normalized.filter((child) => child.type === "saved-sql-root");
- const bottomUtilityNodes = normalized.filter(isBottomConnectionUtilityNode);
- const regularChildren = normalized.filter((child) => child.type !== "saved-sql-root" && !isBottomConnectionUtilityNode(child));
+ const { savedSqlNodes, bottomUtilityNodes, regularChildren } = connectionChildSections(normalized);
const withConnectionUtilityOrder = (children: TreeNode[]) => [...savedSqlNodes, ...children, ...bottomUtilityNodes];
if (
diff --git a/apps/desktop/src/lib/sidebar/sidebarUserAdminVisibility.ts b/apps/desktop/src/lib/sidebar/sidebarUserAdminVisibility.ts
index 57f7bfc3dc..e8b79e5801 100644
--- a/apps/desktop/src/lib/sidebar/sidebarUserAdminVisibility.ts
+++ b/apps/desktop/src/lib/sidebar/sidebarUserAdminVisibility.ts
@@ -1,15 +1,23 @@
-import type { TreeNode } from "@/types/database";
+import type { ConnectionConfig, TreeNode } from "@/types/database";
-export function sidebarUserAdminVisibility(nodes: TreeNode[], showUserAdmin: boolean): { nodes: TreeNode[]; hiddenNodeIds: ReadonlySet<string> } {
+export function sidebarUserAdminVisibility(nodes: TreeNode[], getConfig?: (connectionId: string) => ConnectionConfig | undefined): { nodes: TreeNode[]; hiddenNodeIds: ReadonlySet<string> } {
const hiddenNodeIds = new Set<string>();
- if (showUserAdmin) return { nodes, hiddenNodeIds };
+
+ function hideNode(node: TreeNode) {
+ hiddenNodeIds.add(node.id);
+ node.children?.forEach(hideNode);
+ node.hiddenChildren?.forEach(hideNode);
+ }
function filterNodes(source: TreeNode[]): TreeNode[] {
let changed = false;
const visible: TreeNode[] = [];
for (const node of source) {
- if (node.type === "user-admin" || node.type === "xugu-user-admin") {
- hiddenNodeIds.add(node.id);
+ const field = node.type === "user-admin" || node.type === "xugu-user-admin" ? "show_user_admin" : node.type === "oracle-db-links" ? "show_database_links" : node.type === "database-job-admin" || node.type === "dameng-job-admin" ? "show_native_jobs" : undefined;
+ const config = field && node.connectionId ? getConfig?.(node.connectionId) : undefined;
+ const visibleEntry = !field || config?.[field] !== false;
+ if (!visibleEntry) {
+ hideNode(node);
changed = true;
continue;
}
diff --git a/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts
index baad8226ba..dc04bddbc4 100644
--- a/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts
+++ b/apps/desktop/src/stores/__tests__/connectionStore.metadataLoading.spec.ts
@@ -892,8 +892,8 @@ describe("connectionStore metadata loading", () => {
expect(connectionNode.children?.map((node) => [node.type, node.label, node.database, node.schema])).toEqual([
["schema", "DBX_TEST", "DBX_TEST", "DBX_TEST"],
["oracle-db-links", "tree.databaseLinks", "", undefined],
- ["user-admin", "tree.userAdmin", "", undefined],
["database-job-admin", "tree.nativeJobs", "", undefined],
+ ["user-admin", "tree.userAdmin", "", undefined],
]);
const linkRoot = connectionNode.children!.find((node) => node.type === "oracle-db-links")!;
@@ -948,8 +948,8 @@ describe("connectionStore metadata loading", () => {
expect(connectionNode.children?.map((node) => [node.type, node.label])).toEqual([
["schema", "DBX_TEST"],
- ["user-admin", "tree.userAdmin"],
["database-job-admin", "tree.nativeJobs"],
+ ["user-admin", "tree.userAdmin"],
]);
});
diff --git a/apps/desktop/src/stores/__tests__/connectionStore.timeout.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.timeout.spec.ts
index f3b02dc811..d119ea9bee 100644
--- a/apps/desktop/src/stores/__tests__/connectionStore.timeout.spec.ts
+++ b/apps/desktop/src/stores/__tests__/connectionStore.timeout.spec.ts
@@ -202,11 +202,12 @@ describe("connectionStore timeout recovery", () => {
expect(store.connections[0]?.keepalive_interval_secs).toBe(30);
});
- it("loads persisted editor settings before startup timeout migration", async () => {
+ it.each([undefined, false, true])("loads persisted editor settings before startup migrations (%s user visibility)", async (legacyVisible) => {
const callOrder: string[] = [];
const loadEditorSettings = vi.fn(async () => {
callOrder.push("settings");
return {
+ sidebarShowUserAdmin: legacyVisible,
appLayout: "separated",
uiFontFamily: "persisted-font",
snippets: [{ id: "persisted", label: "Persisted", prefix: "persisted", body: "SELECT 42", enabled: true }],
@@ -241,6 +242,7 @@ describe("connectionStore timeout recovery", () => {
await useConnectionStore().initFromDisk();
expect(callOrder).toEqual(["settings", "connections"]);
+ expect(loadConnections).toHaveBeenCalledWith(legacyVisible !== false);
expect(saveEditorSettings).toHaveBeenCalledWith(
expect.objectContaining({
appLayout: "separated",
@@ -266,6 +268,25 @@ describe("connectionStore timeout recovery", () => {
expect(saveEditorSettings).not.toHaveBeenCalled();
});
+ it("retries a failed visibility migration with the original legacy opt-out", async () => {
+ const loadConnections = vi.fn().mockRejectedValueOnce(new Error("migration failed")).mockResolvedValue([]);
+ vi.doMock("@/lib/backend/api", () => ({
+ loadEditorSettings: vi.fn().mockResolvedValue({ sidebarShowUserAdmin: false }),
+ loadConnections,
+ loadPinnedTreeNodeIds: vi.fn().mockResolvedValue([]),
+ loadSidebarLayout: vi.fn().mockResolvedValue(null),
+ loadTableVGroups: vi.fn().mockResolvedValue({}),
+ loadTunnelProfiles: vi.fn().mockResolvedValue([]),
+ saveEditorSettings: vi.fn().mockResolvedValue(undefined),
+ saveSidebarLayout: vi.fn().mockResolvedValue(undefined),
+ }));
+ const { useConnectionStore } = await import("@/stores/connectionStore");
+ const store = useConnectionStore();
+ await expect(store.initFromDisk()).rejects.toThrow("migration failed");
+ await store.initFromDisk();
+ expect(loadConnections.mock.calls).toEqual([[false], [false]]);
+ });
+
it("migrates legacy timeout defaults to global inheritance and preserves custom overrides", async () => {
const saveConnections = vi.fn().mockResolvedValue(undefined);
vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
index bd615c8f32..f5660d396d 100644
--- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
+++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
@@ -31,6 +31,26 @@ import { DATA_GRID_DEFAULT_VISIBLE_COPY_EXTRACTORS, DATA_GRID_EXTRACTOR_OPTIONS_
import { DEFAULT_MONO_FONT_FAMILY } from "@/lib/app/appFonts";
describe("normalizeEditorSettings", () => {
+ it("retains only an explicit legacy sidebar value without creating a global default", () => {
+ expect(DEFAULT_EDITOR_SETTINGS).not.toHaveProperty("sidebarShowUserAdmin");
+ expect(normalizeEditorSettings({})).not.toHaveProperty("sidebarShowUserAdmin");
+ for (const visible of [false, true]) {
+ expect(normalizeEditorSettings({ sidebarShowUserAdmin: visible }).sidebarShowUserAdmin).toBe(visible);
+ }
+ expect(normalizeEditorSettings({ sidebarShowUserAdmin: "false" as any })).not.toHaveProperty("sidebarShowUserAdmin");
+ });
+
+ it("preserves result export view options across settings updates and reload normalization", async () => {
+ const defaults = { dataGridExportInToolbar: false, dataGridLoadAllInToolbar: false, showSaveResult: true, warnIncompleteExport: true };
+ expect(normalizeEditorSettings({})).toMatchObject(defaults);
+ setActivePinia(createPinia());
+ const { useSettingsStore } = await import("@/stores/settingsStore");
+ const settings = useSettingsStore();
+ const changes = { dataGridExportInToolbar: true, dataGridLoadAllInToolbar: true, showSaveResult: false, warnIncompleteExport: false };
+ settings.updateEditorSettings(changes);
+ expect(normalizeEditorSettings(JSON.parse(JSON.stringify(settings.editorSettings)))).toMatchObject(changes);
+ });
+
it("defaults query connection group paths to hidden and validates the toggle", () => {
expect(DEFAULT_EDITOR_SETTINGS.showConnectionGroupPath).toBe(false);
expect(normalizeEditorSettings({}).showConnectionGroupPath).toBe(false);
@@ -1713,6 +1733,32 @@ describe("settingsStore persisted settings initialization", () => {
setActivePinia(createPinia());
});
+ it.each(["persisted", "legacy"])("preserves a %s global opt-out through unrelated saves until connection migration", async (source) => {
+ const old = { sidebarShowUserAdmin: false, theme: "xcode-dark" };
+ const data = new Map(source === "legacy" ? [["dbx-editor-settings", JSON.stringify(old)]] : []);
+ vi.stubGlobal("localStorage", {
+ getItem: (key: string) => data.get(key) ?? null,
+ setItem: (key: string, value: string) => data.set(key, value),
+ removeItem: (key: string) => data.delete(key),
+ });
+ try {
+ const loadEditorSettings = vi.fn().mockResolvedValue(source === "persisted" ? old : null);
+ const saveEditorSettings = vi.fn().mockResolvedValue(undefined);
+ vi.doMock("@/lib/backend/api", () => ({ loadEditorSettings, saveEditorSettings }));
+ const { useSettingsStore } = await import("@/stores/settingsStore");
+ const store = useSettingsStore();
+ await store.initEditorSettings();
+ expect(store.editorSettings.sidebarShowUserAdmin).toBe(false);
+ expect(saveEditorSettings).toHaveBeenCalledWith(expect.objectContaining({ sidebarShowUserAdmin: false }));
+ store.updateEditorSettings({ fontSize: 16 });
+ await store.persistEditorSettings();
+ expect(saveEditorSettings).toHaveBeenLastCalledWith(expect.objectContaining({ sidebarShowUserAdmin: false, fontSize: 16 }));
+ if (source === "legacy") expect(data.has("dbx-editor-settings")).toBe(false);
+ } finally {
+ vi.unstubAllGlobals();
+ }
+ });
+
it("does not treat an editor settings read failure as an empty record", async () => {
const loadEditorSettings = vi.fn().mockRejectedValue(new Error("storage temporarily unavailable"));
const saveEditorSettings = vi.fn().mockResolvedValue(undefined);
diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts
index c67b28f5ca..44fe766ecd 100644
--- a/apps/desktop/src/stores/connectionStore.ts
+++ b/apps/desktop/src/stores/connectionStore.ts
@@ -2433,7 +2433,7 @@ export const useConnectionStore = defineStore("connection", () => {
const damengRoleNode = buildDamengRoleNode(connectionId, existingConnectionNode);
const damengJobAdminNode = buildDamengJobAdminNode(connectionId, existingConnectionNode);
const xuguTablespacesNode = buildXuguTablespacesNode(connectionId, existingConnectionNode);
- return [...nonUtilityChildren, buildOracleDatabaseLinksNode(connectionId, existingConnectionNode), userAdminNode, xuguUserAdminNode, damengUserNode, damengRoleNode, damengJobAdminNode, buildDatabaseJobAdminNode(connectionId), xuguTablespacesNode].filter(Boolean) as TreeNode[];
+ return [...nonUtilityChildren, buildOracleDatabaseLinksNode(connectionId, existingConnectionNode), buildDatabaseJobAdminNode(connectionId), userAdminNode, xuguUserAdminNode, damengUserNode, damengRoleNode, damengJobAdminNode, xuguTablespacesNode].filter(Boolean) as TreeNode[];
}
function withSavedSqlRoot(connectionId: string, children: TreeNode[], existingConnectionNode?: TreeNode): TreeNode[] {
@@ -11339,7 +11339,7 @@ export const useConnectionStore = defineStore("connection", () => {
// 整体覆盖内存布局前,先落盘窗口内未写盘的分组编辑(防止 300ms 防抖窗口
// 内的编辑被备份轮询/重载带回的旧快照静默回滚)。
await flushTableVGroupPersist();
- const [pinnedOrder, saved, , loadedTableVGroups] = await Promise.all([loadPinnedTreeNodeOrder(), api.loadConnections(), tunnelProfileStore.init(), api.loadTableVGroups()]);
+ const [pinnedOrder, saved, , loadedTableVGroups] = await Promise.all([loadPinnedTreeNodeOrder(), api.loadConnections(settingsStore.editorSettings.sidebarShowUserAdmin !== false), tunnelProfileStore.init(), api.loadTableVGroups()]);
setPinnedTreeNodeOrder(pinnedOrder);
await migrateTimeoutInheritance(saved);
const loadedConnections = saved.map(normalizeConnection).map((loadedConfig) => {
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index 7ed3254c6d..a7d4e763c3 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -1091,6 +1091,10 @@ export interface EditorSettings {
showResultSourceDatabase: boolean;
/** Show SQL in the footer of query results and table data grids. */
showDataGridStatusSql: boolean;
+ dataGridExportInToolbar: boolean;
+ dataGridLoadAllInToolbar: boolean;
+ showSaveResult: boolean;
+ warnIncompleteExport: boolean;
/**
* Global Oracle Instant Client location (the directory that contains
* oci.dll / libclnts). Shared by every Oracle connection whose driver mode
@@ -1230,7 +1234,8 @@ export interface EditorSettings {
sidebarObjectInfoMode: SidebarObjectInfoMode;
sidebarShowConnectionNotes: boolean;
sidebarShowTooltips: boolean;
- sidebarShowUserAdmin: boolean;
+ /** Legacy input for the one-time connection visibility migration. */
+ sidebarShowUserAdmin?: boolean;
sidebarAllowHorizontalScroll: boolean;
sidebarIndent: number;
sidebarFontSize: number;
@@ -1482,6 +1487,10 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
showColumnHeaderTooltips: true,
showResultSourceDatabase: true,
showDataGridStatusSql: true,
+ dataGridExportInToolbar: false,
+ dataGridLoadAllInToolbar: false,
+ showSaveResult: true,
+ warnIncompleteExport: true,
oracleOciClientPath: "",
damengClientBinDir: "",
oracleOciNlsLang: "",
@@ -1587,7 +1596,6 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
sidebarObjectInfoMode: "comment-inline",
sidebarShowConnectionNotes: false,
sidebarShowTooltips: true,
- sidebarShowUserAdmin: true,
sidebarAllowHorizontalScroll: false,
sidebarIndent: SIDEBAR_INDENT_DEFAULT,
sidebarFontSize: SIDEBAR_FONT_SIZE_DEFAULT,
@@ -2187,6 +2195,10 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
showColumnHeaderTooltips: settings.showColumnHeaderTooltips ?? DEFAULT_EDITOR_SETTINGS.showColumnHeaderTooltips,
showResultSourceDatabase: settings.showResultSourceDatabase ?? DEFAULT_EDITOR_SETTINGS.showResultSourceDatabase,
showDataGridStatusSql: settings.showDataGridStatusSql !== false,
+ dataGridExportInToolbar: settings.dataGridExportInToolbar === true,
+ dataGridLoadAllInToolbar: settings.dataGridLoadAllInToolbar === true,
+ showSaveResult: settings.showSaveResult !== false,
+ warnIncompleteExport: settings.warnIncompleteExport !== false,
oracleOciNlsLang: typeof settings.oracleOciNlsLang === "string" ? settings.oracleOciNlsLang.trim() : "",
oracleOciTnsAdmin: typeof settings.oracleOciTnsAdmin === "string" ? settings.oracleOciTnsAdmin.trim() : "",
oracleOciClientPath: typeof settings.oracleOciClientPath === "string" ? settings.oracleOciClientPath.trim() : "",
@@ -2343,7 +2355,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
),
sidebarShowConnectionNotes: settings.sidebarShowConnectionNotes === true,
sidebarShowTooltips: settings.sidebarShowTooltips ?? DEFAULT_EDITOR_SETTINGS.sidebarShowTooltips,
- sidebarShowUserAdmin: settings.sidebarShowUserAdmin ?? DEFAULT_EDITOR_SETTINGS.sidebarShowUserAdmin,
+ ...(typeof settings.sidebarShowUserAdmin === "boolean" ? { sidebarShowUserAdmin: settings.sidebarShowUserAdmin } : {}),
sidebarAllowHorizontalScroll: settings.sidebarAllowHorizontalScroll ?? DEFAULT_EDITOR_SETTINGS.sidebarAllowHorizontalScroll,
sidebarIndent: normalizeSidebarIndent(settings.sidebarIndent),
sidebarFontSize: normalizeSidebarFontSize(settings.sidebarFontSize),
@@ -3130,6 +3142,10 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.showColumnHeaderTooltips !== undefined) editorSettings.value.showColumnHeaderTooltips = partial.showColumnHeaderTooltips;
if (partial.showResultSourceDatabase !== undefined) editorSettings.value.showResultSourceDatabase = partial.showResultSourceDatabase;
if (partial.showDataGridStatusSql !== undefined) editorSettings.value.showDataGridStatusSql = partial.showDataGridStatusSql !== false;
+ if (partial.dataGridExportInToolbar !== undefined) editorSettings.value.dataGridExportInToolbar = partial.dataGridExportInToolbar === true;
+ if (partial.dataGridLoadAllInToolbar !== undefined) editorSettings.value.dataGridLoadAllInToolbar = partial.dataGridLoadAllInToolbar === true;
+ if (partial.showSaveResult !== undefined) editorSettings.value.showSaveResult = partial.showSaveResult !== false;
+ if (partial.warnIncompleteExport !== undefined) editorSettings.value.warnIncompleteExport = partial.warnIncompleteExport !== false;
if (partial.oracleOciNlsLang !== undefined) editorSettings.value.oracleOciNlsLang = partial.oracleOciNlsLang.trim();
if (partial.oracleOciTnsAdmin !== undefined) editorSettings.value.oracleOciTnsAdmin = partial.oracleOciTnsAdmin.trim();
if (partial.oracleOciClientPath !== undefined) editorSettings.value.oracleOciClientPath = partial.oracleOciClientPath.trim();
@@ -3252,7 +3268,6 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.sidebarObjectInfoMode !== undefined) editorSettings.value.sidebarObjectInfoMode = normalizeSidebarObjectInfoMode(partial.sidebarObjectInfoMode);
if (partial.sidebarShowConnectionNotes !== undefined) editorSettings.value.sidebarShowConnectionNotes = partial.sidebarShowConnectionNotes === true;
if (partial.sidebarShowTooltips !== undefined) editorSettings.value.sidebarShowTooltips = partial.sidebarShowTooltips;
- if (partial.sidebarShowUserAdmin !== undefined) editorSettings.value.sidebarShowUserAdmin = partial.sidebarShowUserAdmin;
if (partial.sidebarAllowHorizontalScroll !== undefined) editorSettings.value.sidebarAllowHorizontalScroll = partial.sidebarAllowHorizontalScroll;
if (partial.sidebarIndent !== undefined) editorSettings.value.sidebarIndent = normalizeSidebarIndent(partial.sidebarIndent);
if (partial.sidebarFontSize !== undefined) editorSettings.value.sidebarFontSize = normalizeSidebarFontSize(partial.sidebarFontSize);
diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts
index 75d0ce0727..83fb59a256 100644
--- a/apps/desktop/src/types/database.ts
+++ b/apps/desktop/src/types/database.ts
@@ -158,8 +158,10 @@ export interface ConnectionConfig {
visible_database_patterns?: string[];
visible_schemas?: Record<string, string[]>;
show_system_schemas?: boolean;
- /** Whether to show Oracle / OceanBase-Oracle database links node in the sidebar tree. Defaults to true. */
+ /** Connection-level sidebar display preferences. Absent means shown. */
show_database_links?: boolean;
+ show_native_jobs?: boolean;
+ show_user_admin?: boolean;
/** Load every page when the sidebar's Tables group is opened for this connection. */
sidebar_auto_load_all_tables?: boolean;
attached_databases?: AttachedDatabaseConfig[];
diff --git a/crates/dbx-core/examples/table_import_live_bench.rs b/crates/dbx-core/examples/table_import_live_bench.rs
index 6ad6670831..4ef257cfb5 100644
--- a/crates/dbx-core/examples/table_import_live_bench.rs
+++ b/crates/dbx-core/examples/table_import_live_bench.rs
@@ -177,6 +177,8 @@ fn connection_config(id: &str, database: BenchDatabase) -> Result<ConnectionConf
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/mq/config.rs b/crates/dbx-core/src/admin/mq/config.rs
index c4a16d7e3f..176401f7c1 100644
--- a/crates/dbx-core/src/admin/mq/config.rs
+++ b/crates/dbx-core/src/admin/mq/config.rs
@@ -217,6 +217,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/mq/service.rs b/crates/dbx-core/src/admin/mq/service.rs
index 13bf86f8a2..4f4a991771 100644
--- a/crates/dbx-core/src/admin/mq/service.rs
+++ b/crates/dbx-core/src/admin/mq/service.rs
@@ -944,6 +944,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/nacos/config.rs b/crates/dbx-core/src/admin/nacos/config.rs
index ad26337467..1fe912e408 100644
--- a/crates/dbx-core/src/admin/nacos/config.rs
+++ b/crates/dbx-core/src/admin/nacos/config.rs
@@ -389,6 +389,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/nacos/service.rs b/crates/dbx-core/src/admin/nacos/service.rs
index 49b7c8fcdd..dfb391c136 100644
--- a/crates/dbx-core/src/admin/nacos/service.rs
+++ b/crates/dbx-core/src/admin/nacos/service.rs
@@ -665,6 +665,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -755,6 +757,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/ai/agent_tools.rs b/crates/dbx-core/src/ai/agent_tools.rs
index 18e26e0fd6..33c7300147 100644
--- a/crates/dbx-core/src/ai/agent_tools.rs
+++ b/crates/dbx-core/src/ai/agent_tools.rs
@@ -2076,6 +2076,8 @@ for line in sys.stdin:
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/connection/connection_secrets.rs b/crates/dbx-core/src/connection/connection_secrets.rs
index cfe13e9e62..668fb73318 100644
--- a/crates/dbx-core/src/connection/connection_secrets.rs
+++ b/crates/dbx-core/src/connection/connection_secrets.rs
@@ -1119,6 +1119,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/connection/mod.rs b/crates/dbx-core/src/connection/mod.rs
index 2493f89218..abc11e22ff 100644
--- a/crates/dbx-core/src/connection/mod.rs
+++ b/crates/dbx-core/src/connection/mod.rs
@@ -8239,6 +8239,12 @@ pub fn connection_configs_pool_equivalent(a: &ConnectionConfig, b: &ConnectionCo
// established database session.
a.sidebar_auto_load_all_tables = false;
b.sidebar_auto_load_all_tables = false;
+ a.show_database_links = None;
+ b.show_database_links = None;
+ a.show_native_jobs = None;
+ b.show_native_jobs = None;
+ a.show_user_admin = None;
+ b.show_user_admin = None;
// A default browser filter does not change the established Redis session.
a.redis_key_filter = None;
b.redis_key_filter = None;
@@ -8268,6 +8274,9 @@ pub fn connection_configs_session_credentials_compatible(a: &ConnectionConfig, b
config.visible_schemas = None;
config.show_system_schemas = false;
config.sidebar_auto_load_all_tables = false;
+ config.show_database_links = None;
+ config.show_native_jobs = None;
+ config.show_user_admin = None;
config.color = None;
config.docs_notes_path = None;
config.connect_timeout_secs = 0;
@@ -9055,6 +9064,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -12764,6 +12775,8 @@ sleep 30
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/src/data/transfer.rs b/crates/dbx-core/src/data/transfer.rs
index e39c70776e..4151f2a619 100644
--- a/crates/dbx-core/src/data/transfer.rs
+++ b/crates/dbx-core/src/data/transfer.rs
@@ -15366,6 +15366,8 @@ for line in sys.stdin:
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -23675,6 +23677,8 @@ SELECT 1 FROM dual"#
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/persistence/cloud_sync.rs b/crates/dbx-core/src/persistence/cloud_sync.rs
index fbbd6fe0eb..98d75aa01f 100644
--- a/crates/dbx-core/src/persistence/cloud_sync.rs
+++ b/crates/dbx-core/src/persistence/cloud_sync.rs
@@ -78,6 +78,7 @@ const DESKTOP_DEVICE_LOCAL_SETTINGS: &[&str] = &[
];
const NON_SYNCABLE_DESKTOP_SETTINGS: &[&str] = &["debug_logging_enabled"];
const NON_SYNCABLE_EDITOR_SETTINGS: &[&str] = &[
+ "sidebarShowUserAdmin",
"updateNotificationsEnabled",
"autoDownloadUpdates",
"autoUpdateApp",
@@ -3445,6 +3446,17 @@ mod tests {
};
use crate::persistence::secret_codec::{managed_key_path, SecretKeyPolicy};
+ #[test]
+ fn sidebar_user_admin_migration_input_is_not_cloud_synced() {
+ let settings = serde_json::json!({ "sidebarShowUserAdmin": false, "sidebarFontSize": 14 });
+ for selection in [None, Some(vec!["sidebarShowUserAdmin".into(), "sidebarFontSize".into()])] {
+ assert_eq!(
+ super::select_syncable_editor_settings(Some(settings.clone()), selection.as_ref()),
+ Some(serde_json::json!({ "sidebarFontSize": 14 }))
+ );
+ }
+ }
+
fn make_test_config(name: &str, is_default: bool) -> AiConfigItem {
AiConfigItem {
id: format!("cfg-{name}"),
@@ -3688,6 +3700,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -3779,6 +3793,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -4123,6 +4139,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: Some("CREATE SECRET (TYPE quack, TOKEN 'token-value');".to_string()),
color: None,
diff --git a/crates/dbx-core/src/persistence/storage.rs b/crates/dbx-core/src/persistence/storage.rs
index b707e182c8..82547d2725 100644
--- a/crates/dbx-core/src/persistence/storage.rs
+++ b/crates/dbx-core/src/persistence/storage.rs
@@ -8024,6 +8024,51 @@ impl Storage {
.await
}
+ pub async fn migrate_sidebar_user_admin_visibility(&self, legacy_show_user_admin: bool) -> Result<(), String> {
+ self.with_conn(move |conn| {
+ let tx =
+ conn.transaction_with_behavior(TransactionBehavior::Immediate).map_err(|error| error.to_string())?;
+ let migrated: bool = tx
+ .query_row(
+ "SELECT EXISTS(SELECT 1 FROM app_state WHERE key = 'sidebar_user_admin_visibility_migration_v1')",
+ [],
+ |row| row.get(0),
+ )
+ .map_err(|error| error.to_string())?;
+ if migrated {
+ return Ok(());
+ }
+ if !legacy_show_user_admin {
+ let rows = {
+ let mut stmt =
+ tx.prepare("SELECT id, config_json FROM connections").map_err(|error| error.to_string())?;
+ let rows = stmt
+ .query_map([], |row| Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)))
+ .map_err(|error| error.to_string())?;
+ rows.collect::<Result<Vec<_>, _>>().map_err(|error| error.to_string())?
+ };
+ for (id, json) in rows {
+ let Ok(serde_json::Value::Object(mut config)) = serde_json::from_str(&json) else {
+ continue;
+ };
+ config.insert("show_user_admin".into(), serde_json::Value::Bool(false));
+ tx.execute(
+ "UPDATE connections SET config_json = ?1 WHERE id = ?2",
+ params![serde_json::to_string(&config).map_err(|error| error.to_string())?, id],
+ )
+ .map_err(|error| error.to_string())?;
+ }
+ }
+ tx.execute(
+ "INSERT INTO app_state (key, value_json) VALUES ('sidebar_user_admin_visibility_migration_v1', 'true')",
+ [],
+ )
+ .map_err(|error| error.to_string())?;
+ tx.commit().map_err(|error| error.to_string())
+ })
+ .await
+ }
+
pub async fn load_connections(&self) -> Result<Vec<ConnectionConfig>, String> {
let rows: Vec<(String, String)> = self
.with_conn(|conn| {
@@ -10469,6 +10514,157 @@ mod tests {
use std::collections::BTreeMap;
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+ #[tokio::test]
+ async fn sidebar_user_admin_migration_preserves_other_fields_and_secrets() {
+ for legacy_visible in [false, true] {
+ let directory = tempfile::tempdir().unwrap();
+ let storage = crate::persistence::test_storage::open(&directory.path().join("storage.db")).await.unwrap();
+ let originals = vec![
+ ("missing", r#"{"show_database_links":false,"show_native_jobs":true,"future":{"value":42}}"#),
+ ("shown", r#"{"show_user_admin":true,"host":"unchanged"}"#),
+ ("hidden", r#"{"show_user_admin":false}"#),
+ ("broken", "not-json"),
+ ("array", "[]"),
+ ];
+ let inserted = originals.clone();
+ storage.with_conn(move |conn| {
+ for (id, json) in inserted {
+ conn.execute("INSERT INTO connections (id, config_json) VALUES (?1, ?2)", [id, json]).map_err(|e| e.to_string())?;
+ }
+ conn.execute("INSERT INTO connection_secrets (connection_id, key, secret, secret_enc) VALUES ('missing', 'password', '', 'unchanged-ciphertext')", []).map_err(|e| e.to_string())?;
+ Ok(())
+ }).await.unwrap();
+ storage.migrate_sidebar_user_admin_visibility(legacy_visible).await.unwrap();
+ let (rows, secret) = storage
+ .with_conn(|conn| {
+ let mut stmt = conn
+ .prepare("SELECT id, config_json FROM connections ORDER BY id")
+ .map_err(|e| e.to_string())?;
+ let rows = stmt
+ .query_map([], |row| Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)))
+ .map_err(|e| e.to_string())?
+ .collect::<Result<BTreeMap<_, _>, _>>()
+ .map_err(|e| e.to_string())?;
+ let secret: String = conn
+ .query_row(
+ "SELECT secret_enc FROM connection_secrets WHERE connection_id = 'missing'",
+ [],
+ |row| row.get(0),
+ )
+ .map_err(|e| e.to_string())?;
+ Ok((rows, secret))
+ })
+ .await
+ .unwrap();
+ assert_eq!(rows.len(), originals.len());
+ assert_eq!(secret, "unchanged-ciphertext");
+ for (id, original) in originals {
+ if legacy_visible || id == "broken" || id == "array" {
+ assert_eq!(rows[id], original);
+ } else {
+ let mut expected: serde_json::Value = serde_json::from_str(original).unwrap();
+ expected["show_user_admin"] = serde_json::Value::Bool(false);
+ assert_eq!(serde_json::from_str::<serde_json::Value>(&rows[id]).unwrap(), expected);
+ }
+ }
+ }
+ }
+
+ #[tokio::test]
+ async fn sidebar_user_admin_migration_keeps_later_choices_and_new_connections_after_reopen() {
+ let directory = tempfile::tempdir().unwrap();
+ let path = directory.path().join("storage.db");
+ let storage = crate::persistence::test_storage::open(&path).await.unwrap();
+ let mut config: ConnectionConfig = serde_json::from_value(serde_json::json!({
+ "id": "existing", "name": "Existing", "db_type": "oracle", "host": "localhost",
+ "port": 1521, "username": "test", "password": "", "save_password": false
+ }))
+ .unwrap();
+ storage.save_connections(&[config.clone()]).await.unwrap();
+ storage.migrate_sidebar_user_admin_visibility(false).await.unwrap();
+ assert_eq!(storage.load_connections().await.unwrap()[0].show_user_admin, Some(false));
+ config.show_user_admin = Some(true);
+ let mut added = config.clone();
+ added.id = "new".into();
+ added.show_user_admin = None;
+ storage.save_connections(&[config, added]).await.unwrap();
+ drop(storage);
+ let reopened = crate::persistence::test_storage::open(&path).await.unwrap();
+ reopened.migrate_sidebar_user_admin_visibility(false).await.unwrap();
+ let configs = reopened.load_connections().await.unwrap();
+ assert_eq!(configs.iter().find(|c| c.id == "existing").unwrap().show_user_admin, Some(true));
+ assert_eq!(configs.iter().find(|c| c.id == "new").unwrap().show_user_admin, None);
+ }
+
+ #[tokio::test]
+ async fn sidebar_user_admin_migration_rolls_back_updates_and_marker_before_retry() {
+ for failure in [
+ "CREATE TRIGGER reject_migration BEFORE UPDATE ON connections WHEN OLD.id = 'b' BEGIN SELECT RAISE(ABORT, 'injected update failure'); END;",
+ "CREATE TRIGGER reject_migration BEFORE INSERT ON app_state WHEN NEW.key = 'sidebar_user_admin_visibility_migration_v1' BEGIN SELECT RAISE(ABORT, 'injected marker failure'); END;",
+ ] {
+ let directory = tempfile::tempdir().unwrap();
+ let storage = crate::persistence::test_storage::open(&directory.path().join("storage.db")).await.unwrap();
+ storage.with_conn(move |conn| {
+ conn.execute_batch("INSERT INTO connections (id, config_json) VALUES ('a', '{}'), ('b', '{}');").map_err(|e| e.to_string())?;
+ conn.execute_batch(failure).map_err(|e| e.to_string())
+ }).await.unwrap();
+ assert!(storage.migrate_sidebar_user_admin_visibility(false).await.is_err());
+ storage.with_conn(|conn| {
+ let unchanged: i64 = conn.query_row("SELECT COUNT(*) FROM connections WHERE config_json = '{}'", [], |row| row.get(0)).map_err(|e| e.to_string())?;
+ let marked: bool = conn.query_row("SELECT EXISTS(SELECT 1 FROM app_state WHERE key = 'sidebar_user_admin_visibility_migration_v1')", [], |row| row.get(0)).map_err(|e| e.to_string())?;
+ assert_eq!(unchanged, 2);
+ assert!(!marked);
+ conn.execute_batch("DROP TRIGGER reject_migration;").map_err(|e| e.to_string())
+ }).await.unwrap();
+ storage.migrate_sidebar_user_admin_visibility(false).await.unwrap();
+ storage.with_conn(|conn| {
+ let changed: i64 = conn.query_row("SELECT COUNT(*) FROM connections WHERE json_extract(config_json, '$.show_user_admin') = 0", [], |row| row.get(0)).map_err(|e| e.to_string())?;
+ assert_eq!(changed, 2);
+ Ok(())
+ }).await.unwrap();
+ }
+ }
+
+ #[tokio::test]
+ async fn sidebar_user_admin_migration_first_client_wins_across_storage_instances() {
+ let directory = tempfile::tempdir().unwrap();
+ let path = directory.path().join("storage.db");
+ let first = crate::persistence::test_storage::open(&path).await.unwrap();
+ let second = crate::persistence::test_storage::open(&path).await.unwrap();
+ first
+ .with_conn(|conn| {
+ conn.execute_batch("INSERT INTO connections (id, config_json) VALUES ('a', '{}'), ('b', '{}');")
+ .map_err(|e| e.to_string())
+ })
+ .await
+ .unwrap();
+ let (a, b) = tokio::join!(
+ first.migrate_sidebar_user_admin_visibility(false),
+ second.migrate_sidebar_user_admin_visibility(true)
+ );
+ a.unwrap();
+ b.unwrap();
+ let values = first
+ .with_conn(|conn| {
+ let mut stmt =
+ conn.prepare("SELECT config_json FROM connections ORDER BY id").map_err(|e| e.to_string())?;
+ let rows = stmt.query_map([], |row| row.get::<_, String>(0)).map_err(|e| e.to_string())?;
+ rows.collect::<Result<Vec<_>, _>>().map_err(|e| e.to_string())
+ })
+ .await
+ .unwrap();
+ assert_eq!(values[0], values[1]);
+ second.migrate_sidebar_user_admin_visibility(false).await.unwrap();
+ let unchanged = first
+ .with_conn(|conn| {
+ conn.query_row("SELECT config_json FROM connections WHERE id = 'a'", [], |row| row.get::<_, String>(0))
+ .map_err(|e| e.to_string())
+ })
+ .await
+ .unwrap();
+ assert_eq!(unchanged, values[0]);
+ }
+
#[cfg(feature = "mq-admin")]
#[tokio::test]
async fn mqtt_history_reconciliation_recovers_sent_message_after_initial_append_failure() {
@@ -12673,6 +12869,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -12755,6 +12953,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/query/mod.rs b/crates/dbx-core/src/query/mod.rs
index 7c5dd979af..46702fe01b 100644
--- a/crates/dbx-core/src/query/mod.rs
+++ b/crates/dbx-core/src/query/mod.rs
@@ -9210,6 +9210,8 @@ for line in sys.stdin:
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -12542,6 +12544,8 @@ done
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/safety/production_safety.rs b/crates/dbx-core/src/safety/production_safety.rs
index c59c7d412b..3f6fdb767c 100644
--- a/crates/dbx-core/src/safety/production_safety.rs
+++ b/crates/dbx-core/src/safety/production_safety.rs
@@ -906,6 +906,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: vec![],
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/schema/mod.rs b/crates/dbx-core/src/schema/mod.rs
index b8f042d726..8a2e0633a9 100644
--- a/crates/dbx-core/src/schema/mod.rs
+++ b/crates/dbx-core/src/schema/mod.rs
@@ -3519,6 +3519,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/schema/normalization.rs b/crates/dbx-core/src/schema/normalization.rs
index 2291c80004..1b0e8fad38 100644
--- a/crates/dbx-core/src/schema/normalization.rs
+++ b/crates/dbx-core/src/schema/normalization.rs
@@ -166,6 +166,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/tests/connection_url_compatibility.rs b/crates/dbx-core/tests/connection_url_compatibility.rs
index f58f310a5f..c97cc1dced 100644
--- a/crates/dbx-core/tests/connection_url_compatibility.rs
+++ b/crates/dbx-core/tests/connection_url_compatibility.rs
@@ -30,6 +30,8 @@ fn mysql_config(username: &str, password: &str, database: Option<&str>) -> Conne
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/tests/dump_docs_fixture.rs b/crates/dbx-core/tests/dump_docs_fixture.rs
index 3ea8a84b67..95035961ba 100644
--- a/crates/dbx-core/tests/dump_docs_fixture.rs
+++ b/crates/dbx-core/tests/dump_docs_fixture.rs
@@ -90,6 +90,8 @@ fn live_postgres_config(
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_opengauss_table_import.rs b/crates/dbx-core/tests/live_opengauss_table_import.rs
index 4ccfbb06f6..0a3d7769ca 100644
--- a/crates/dbx-core/tests/live_opengauss_table_import.rs
+++ b/crates/dbx-core/tests/live_opengauss_table_import.rs
@@ -64,6 +64,8 @@ fn live_connection_config(id: &str, database: &str) -> ConnectionConfig {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/tests/live_postgres_docs_annotations.rs b/crates/dbx-core/tests/live_postgres_docs_annotations.rs
index eb777f9ef2..23cebc7d54 100644
--- a/crates/dbx-core/tests/live_postgres_docs_annotations.rs
+++ b/crates/dbx-core/tests/live_postgres_docs_annotations.rs
@@ -86,6 +86,8 @@ fn live_postgres_config(
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_docs_snapshot.rs b/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
index 61cd46d42b..4d28396037 100644
--- a/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
+++ b/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
@@ -81,6 +81,8 @@ fn live_postgres_config(
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_error_position.rs b/crates/dbx-core/tests/live_postgres_error_position.rs
index c626a05877..b18189ecb7 100644
--- a/crates/dbx-core/tests/live_postgres_error_position.rs
+++ b/crates/dbx-core/tests/live_postgres_error_position.rs
@@ -235,6 +235,8 @@ fn live_connection_config(
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_query_result_export.rs b/crates/dbx-core/tests/live_postgres_query_result_export.rs
index 09c11eb9d6..317ee9fbf3 100644
--- a/crates/dbx-core/tests/live_postgres_query_result_export.rs
+++ b/crates/dbx-core/tests/live_postgres_query_result_export.rs
@@ -86,6 +86,8 @@ fn live_postgres_config(
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_transfer.rs b/crates/dbx-core/tests/live_postgres_transfer.rs
index f3e3391cfd..eeb93c7e07 100644
--- a/crates/dbx-core/tests/live_postgres_transfer.rs
+++ b/crates/dbx-core/tests/live_postgres_transfer.rs
@@ -83,6 +83,8 @@ fn postgres_test_config(id: &str, database: &str) -> ConnectionConfig {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs b/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs
index 47f6092765..2eace0365f 100644
--- a/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs
+++ b/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs
@@ -86,6 +86,8 @@ fn sqlite_config(id: &str, path: &str) -> ConnectionConfig {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_completion.rs b/crates/dbx-core/tests/live_sqlserver_completion.rs
index 18b1a79f4f..7e6e7d7f36 100644
--- a/crates/dbx-core/tests/live_sqlserver_completion.rs
+++ b/crates/dbx-core/tests/live_sqlserver_completion.rs
@@ -87,6 +87,8 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
index 0e170fd9db..77cb3056dd 100644
--- a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
+++ b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
@@ -76,6 +76,8 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs b/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs
index 4f434ba957..538b079690 100644
--- a/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs
+++ b/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs
@@ -92,6 +92,8 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
database_info: None,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_transfer.rs b/crates/dbx-core/tests/live_sqlserver_transfer.rs
index 5a6de0977e..275ff7ff66 100644
--- a/crates/dbx-core/tests/live_sqlserver_transfer.rs
+++ b/crates/dbx-core/tests/live_sqlserver_transfer.rs
@@ -80,6 +80,8 @@ fn live_sqlserver_config(id: &str, database: &str) -> ConnectionConfig {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/sidebar_visibility.rs b/crates/dbx-core/tests/sidebar_visibility.rs
new file mode 100644
index 0000000000..eb976e4605
--- /dev/null
+++ b/crates/dbx-core/tests/sidebar_visibility.rs
@@ -0,0 +1,39 @@
+use dbx_core::connection::{connection_configs_pool_equivalent, connection_configs_session_credentials_compatible};
+use dbx_core::models::connection::ConnectionConfig;
+
+#[test]
+fn sidebar_visibility_preserves_sessions_without_ignoring_target_changes() {
+ let base: ConnectionConfig = serde_json::from_value(serde_json::json!({
+ "id": "sidebar", "name": "Sidebar", "db_type": "oracle", "host": "localhost",
+ "port": 1521, "username": "test", "password": "", "save_password": false
+ }))
+ .unwrap();
+ for field in ["show_database_links", "show_native_jobs", "show_user_admin"] {
+ for before in [None, Some(true), Some(false)] {
+ for after in [None, Some(true), Some(false)] {
+ let set = |config: &mut ConnectionConfig, value| match field {
+ "show_database_links" => config.show_database_links = value,
+ "show_native_jobs" => config.show_native_jobs = value,
+ _ => config.show_user_admin = value,
+ };
+ let mut initial = base.clone();
+ let mut edited = base.clone();
+ set(&mut initial, before);
+ set(&mut edited, after);
+ assert!(connection_configs_pool_equivalent(&initial, &edited));
+ assert!(connection_configs_session_credentials_compatible(&initial, &edited));
+
+ for target in ["host", "username", "tls"] {
+ let mut changed_target = edited.clone();
+ match target {
+ "host" => changed_target.host = "other.example.test".into(),
+ "username" => changed_target.username = "other-user".into(),
+ _ => changed_target.ssl = !initial.ssl,
+ }
+ assert!(!connection_configs_pool_equivalent(&initial, &changed_target));
+ assert!(!connection_configs_session_credentials_compatible(&initial, &changed_target));
+ }
+ }
+ }
+ }
+}
diff --git a/crates/dbx-core/tests/support/mod.rs b/crates/dbx-core/tests/support/mod.rs
index 3649610366..19cecfc337 100644
--- a/crates/dbx-core/tests/support/mod.rs
+++ b/crates/dbx-core/tests/support/mod.rs
@@ -201,6 +201,8 @@ pub fn postgres_test_config(id: &str, port: u16) -> ConnectionConfig {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
database_info: None,
}
}
diff --git a/crates/dbx-driver-agent/src/agent_connection.rs b/crates/dbx-driver-agent/src/agent_connection.rs
index eea850e88e..9b5abd81b0 100644
--- a/crates/dbx-driver-agent/src/agent_connection.rs
+++ b/crates/dbx-driver-agent/src/agent_connection.rs
@@ -818,6 +818,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-driver-redis/src/lib.rs b/crates/dbx-driver-redis/src/lib.rs
index 6053fe3849..6b9e3f3aec 100644
--- a/crates/dbx-driver-redis/src/lib.rs
+++ b/crates/dbx-driver-redis/src/lib.rs
@@ -12214,6 +12214,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-types/src/models/connection.rs b/crates/dbx-types/src/models/connection.rs
index eb4c063654..1e20d5da89 100644
--- a/crates/dbx-types/src/models/connection.rs
+++ b/crates/dbx-types/src/models/connection.rs
@@ -185,9 +185,13 @@ pub struct ConnectionConfig {
/// Frontend navigation preference: exhaust the paginated Tables group when opened.
#[serde(default, skip_serializing_if = "is_false")]
pub sidebar_auto_load_all_tables: bool,
- /// Oracle sidebar preference. Absent means shown; only an explicit opt-out is stored.
+ /// Sidebar preference. Absent means shown; only an explicit opt-out is stored.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub show_database_links: Option<bool>,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub show_native_jobs: Option<bool>,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub show_user_admin: Option<bool>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub attached_databases: Vec<AttachedDatabaseConfig>,
/// SQL statements executed right after the connection is established
@@ -763,6 +767,10 @@ struct ConnectionConfigData {
#[serde(default)]
pub show_database_links: Option<bool>,
#[serde(default)]
+ pub show_native_jobs: Option<bool>,
+ #[serde(default)]
+ pub show_user_admin: Option<bool>,
+ #[serde(default)]
pub attached_databases: Vec<AttachedDatabaseConfig>,
#[serde(default)]
pub init_script: Option<String>,
@@ -887,6 +895,8 @@ impl From<ConnectionConfigData> for ConnectionConfig {
show_system_schemas: data.show_system_schemas,
sidebar_auto_load_all_tables: data.sidebar_auto_load_all_tables,
show_database_links: data.show_database_links,
+ show_native_jobs: data.show_native_jobs,
+ show_user_admin: data.show_user_admin,
attached_databases: data.attached_databases,
init_script: data.init_script,
color: data.color,
@@ -3419,6 +3429,24 @@ mod tests {
assert_eq!(serde_json::to_value(hidden).unwrap()["show_database_links"], serde_json::json!(false));
}
+ #[test]
+ fn sidebar_visibility_preferences_round_trip() {
+ let base = serde_json::json!({
+ "id": "sidebar", "name": "Sidebar", "db_type": "oracle", "host": "localhost",
+ "port": 1521, "username": "test", "password": ""
+ });
+ for field in ["show_database_links", "show_native_jobs", "show_user_admin"] {
+ let legacy: ConnectionConfig = serde_json::from_value(base.clone()).unwrap();
+ assert!(serde_json::to_value(legacy).unwrap().get(field).is_none());
+ for visible in [true, false] {
+ let mut value = base.clone();
+ value[field] = serde_json::json!(visible);
+ let config: ConnectionConfig = serde_json::from_value(value).unwrap();
+ assert_eq!(serde_json::to_value(config).unwrap()[field], serde_json::json!(visible));
+ }
+ }
+ }
+
fn mysql_config(username: &str, password: &str, database: Option<&str>) -> ConnectionConfig {
ConnectionConfig {
oracle_oci_nls_lang: None,
@@ -3444,6 +3472,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-web/src/credentials.rs b/crates/dbx-web/src/credentials.rs
index 720bff4ea0..9088da3ee1 100644
--- a/crates/dbx-web/src/credentials.rs
+++ b/crates/dbx-web/src/credentials.rs
@@ -479,7 +479,13 @@ mod tests {
let (state, _dir) = web_state().await;
let original = config();
state.app.storage.save_connections(std::slice::from_ref(&original)).await.unwrap();
- let Json(mut listed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(mut listed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
assert!(listed[0].config.password.starts_with(REFERENCE_PREFIX));
assert_eq!(state.app.configs.read().await[&original.id].password, original.password);
listed[0].config.name = "Renamed".into();
@@ -506,7 +512,13 @@ mod tests {
.await
.unwrap();
assert_eq!(state.app.storage.load_connections().await.unwrap()[0].password, "replacement");
- let Json(mut listed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(mut listed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
listed[0].config.save_password = false;
let _ = connection::save_connections(
State(state.clone()),
@@ -534,7 +546,13 @@ mod tests {
.unwrap();
state.app.storage.save_connections(std::slice::from_ref(&original)).await.unwrap();
- let Json(mut listed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(mut listed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
let response_json = serde_json::to_value(&listed[0]).unwrap();
assert_eq!(response_json["jdbc_dialect"], "oceanbase-oracle");
assert!(listed[0].config.connection_string.as_deref().unwrap().starts_with(REFERENCE_PREFIX));
@@ -556,13 +574,25 @@ mod tests {
assert!(serde_json::to_value(&persisted[0]).unwrap().get("jdbc_dialect").is_none());
Arc::get_mut(&mut state).unwrap().password_viewer_enabled = true;
- let Json(viewed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(viewed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
assert_eq!(viewed[0].jdbc_dialect, Some(dbx_core::models::connection::JdbcDialectHint::OceanbaseOracle));
assert_eq!(viewed[0].config.connection_string.as_deref(), original.connection_string.as_deref());
assert_eq!(viewed[0].config.password, original.password);
Arc::get_mut(&mut state).unwrap().password_viewer_enabled = false;
- let Json(mut listed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(mut listed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
assert_eq!(listed[0].jdbc_dialect, Some(dbx_core::models::connection::JdbcDialectHint::OceanbaseOracle));
let mut changed_url = serde_json::to_value(listed.remove(0).config).unwrap();
changed_url["connection_string"] = serde_json::json!("jdbc:oracle:thin:@host/service");
@@ -576,7 +606,13 @@ mod tests {
)
.await
.unwrap();
- let Json(listed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(listed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
assert!(listed[0].jdbc_dialect.is_none());
assert_eq!(
state.app.storage.load_connections().await.unwrap()[0].connection_string.as_deref(),
@@ -595,7 +631,13 @@ mod tests {
)
.await
.unwrap();
- let Json(listed) = connection::load_connections(State(state.clone()), HeaderMap::new()).await.unwrap();
+ let Json(listed) = connection::load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ axum::extract::Query(Default::default()),
+ )
+ .await
+ .unwrap();
assert!(listed[0].jdbc_dialect.is_none());
assert!(state.app.storage.load_connections().await.unwrap()[0].connection_string.is_none());
}
diff --git a/crates/dbx-web/src/routes/connection.rs b/crates/dbx-web/src/routes/connection.rs
index 03dc2c345f..d191ce27f8 100644
--- a/crates/dbx-web/src/routes/connection.rs
+++ b/crates/dbx-web/src/routes/connection.rs
@@ -1129,10 +1129,20 @@ pub async fn mcp_remove_connection(
.await
}
+#[derive(Default, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LoadConnectionsQuery {
+ legacy_sidebar_show_user_admin: Option<bool>,
+}
+
pub async fn load_connections(
State(state): State<Arc<WebState>>,
headers: HeaderMap,
+ Query(query): Query<LoadConnectionsQuery>,
) -> Result<Json<Vec<ConnectionResponse>>, AppError> {
+ if let Some(visible) = query.legacy_sidebar_show_user_admin {
+ state.app.storage.migrate_sidebar_user_admin_visibility(visible).await?;
+ }
for _ in 0..3 {
let allowed = {
let current = state.app.configs.read().await;
@@ -1409,7 +1419,7 @@ mod tests {
SaveConnectionsRequest,
};
use crate::state::WebState;
- use axum::extract::State;
+ use axum::extract::{Query, State};
use axum::http::HeaderMap;
use axum::Json;
use dbx_core::connection::{AppState, PoolKind};
@@ -1466,6 +1476,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -2742,6 +2754,37 @@ done
let _ = std::fs::remove_dir_all(dir);
}
+ #[tokio::test]
+ async fn load_connections_migrates_visibility_only_for_an_explicit_client() {
+ let (state, dir) = test_web_state().await;
+ let mut config = sqlite_config("visibility", &dir.join("visibility.db").to_string_lossy());
+ config.show_user_admin = None;
+ state.app.storage.save_connections(&[config.clone()]).await.unwrap();
+ let _ = load_connections(State(state.clone()), HeaderMap::new(), Query(super::LoadConnectionsQuery::default()))
+ .await
+ .unwrap();
+ assert_eq!(state.app.storage.load_connections().await.unwrap()[0].show_user_admin, None);
+ let _ = load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ Query(super::LoadConnectionsQuery { legacy_sidebar_show_user_admin: Some(false) }),
+ )
+ .await
+ .unwrap();
+ assert_eq!(state.app.storage.load_connections().await.unwrap()[0].show_user_admin, Some(false));
+ config.show_user_admin = Some(true);
+ state.app.storage.save_connections(&[config]).await.unwrap();
+ let _ = load_connections(
+ State(state.clone()),
+ HeaderMap::new(),
+ Query(super::LoadConnectionsQuery { legacy_sidebar_show_user_admin: Some(false) }),
+ )
+ .await
+ .unwrap();
+ assert_eq!(state.app.storage.load_connections().await.unwrap()[0].show_user_admin, Some(true));
+ let _ = std::fs::remove_dir_all(dir);
+ }
+
#[tokio::test]
async fn load_connections_drops_cached_pool_for_updated_config() {
let (state, dir) = test_web_state().await;
@@ -2756,7 +2799,9 @@ done
})
.await;
- let result = load_connections(State(state.clone()), HeaderMap::new()).await;
+ let result =
+ load_connections(State(state.clone()), HeaderMap::new(), Query(super::LoadConnectionsQuery::default()))
+ .await;
assert!(result.is_ok());
let configs = state.app.configs.read().await;
diff --git a/crates/dbx-web/src/routes/docs.rs b/crates/dbx-web/src/routes/docs.rs
index 80b13bede7..e605b9ee4d 100644
--- a/crates/dbx-web/src/routes/docs.rs
+++ b/crates/dbx-web/src/routes/docs.rs
@@ -227,6 +227,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-web/src/routes/transfer.rs b/crates/dbx-web/src/routes/transfer.rs
index 4080074202..04883abd6a 100644
--- a/crates/dbx-web/src/routes/transfer.rs
+++ b/crates/dbx-web/src/routes/transfer.rs
@@ -353,6 +353,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/packages/app-tests/connectionClipboard.test.ts b/packages/app-tests/connectionClipboard.test.ts
index 348dee3090..8d9e1642de 100644
--- a/packages/app-tests/connectionClipboard.test.ts
+++ b/packages/app-tests/connectionClipboard.test.ts
@@ -44,7 +44,7 @@ async function withConnectionStore(initialConnections: ConnectionConfig[], initi
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify(savedConnections), { status: 200, headers: { "Content-Type": "application/json" } });
}
if (url === "/api/layout/sidebar") {
diff --git a/packages/app-tests/connectionImportRoundTrip.test.ts b/packages/app-tests/connectionImportRoundTrip.test.ts
index afa72b672d..f8c0ba70c0 100644
--- a/packages/app-tests/connectionImportRoundTrip.test.ts
+++ b/packages/app-tests/connectionImportRoundTrip.test.ts
@@ -67,7 +67,7 @@ function installBackend(initialConnections: ConnectionConfig[], initialLayout: S
globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
const url = String(input);
const json = (value: unknown) => new Response(JSON.stringify(value), { status: 200, headers: { "Content-Type": "application/json" } });
- if (url === "/api/connection/list") return json(state.connections);
+ if (url.split("?")[0] === "/api/connection/list") return json(state.connections);
if (url === "/api/layout/sidebar") {
if (init?.method === "POST") {
state.layout = JSON.parse(String(init.body ?? "null"));
diff --git a/packages/app-tests/connectionStoreGroupedConnect.test.ts b/packages/app-tests/connectionStoreGroupedConnect.test.ts
index 20ff6cdcf6..3a3ac6bf2a 100644
--- a/packages/app-tests/connectionStoreGroupedConnect.test.ts
+++ b/packages/app-tests/connectionStoreGroupedConnect.test.ts
@@ -55,7 +55,7 @@ test("connecting a grouped connection updates it in place instead of adding a ro
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response("[]", { status: 200, headers: { "Content-Type": "application/json" } });
}
if (url === "/api/layout/sidebar") {
@@ -112,7 +112,7 @@ test("duplicating a grouped connection keeps the copy in the same group", async
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify(savedConnections), { status: 200, headers: { "Content-Type": "application/json" } });
}
if (url === "/api/layout/sidebar") {
@@ -170,7 +170,7 @@ test("reloading connections preserves the current grouped layout when the saved
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify(savedConnections), { status: 200, headers: { "Content-Type": "application/json" } });
}
if (url === "/api/layout/sidebar") {
@@ -214,7 +214,7 @@ test("importing grouped dbx connections remaps exported layout to new connection
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify(savedConnections), { status: 200, headers: { "Content-Type": "application/json" } });
}
if (url === "/api/layout/sidebar") {
@@ -274,7 +274,7 @@ test("importing DBeaver connections remaps and applies nested folder layout", as
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify(savedConnections), { status: 200, headers: { "Content-Type": "application/json" } });
}
if (url === "/api/layout/sidebar") {
diff --git a/packages/app-tests/connectionStorePinnedCleanup.test.ts b/packages/app-tests/connectionStorePinnedCleanup.test.ts
index dd8085f576..bc4821bc3f 100644
--- a/packages/app-tests/connectionStorePinnedCleanup.test.ts
+++ b/packages/app-tests/connectionStorePinnedCleanup.test.ts
@@ -49,7 +49,7 @@ test("removeConnection prunes pinned ids and persists the pruned set", async ()
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify([conn("conn-a", "A"), conn("conn-b", "B")]), {
status: 200,
headers: { "Content-Type": "application/json" },
@@ -93,7 +93,7 @@ test("removeConnection clears persisted sidebar table filters for the removed co
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify([conn("conn-a", "A"), conn("conn-b", "B")]), {
status: 200,
headers: { "Content-Type": "application/json" },
@@ -136,7 +136,7 @@ test("removeConnections clears persisted sidebar table filters for every removed
globalThis.fetch = (async (input, init) => {
const url = String(input);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify([conn("conn-a", "A"), conn("conn-b", "B"), conn("conn-c", "C")]), {
status: 200,
headers: { "Content-Type": "application/json" },
diff --git a/packages/app-tests/sqlserverSemanticDiagnostics.test.ts b/packages/app-tests/sqlserverSemanticDiagnostics.test.ts
index e14c0f8e5d..dcd593fe85 100644
--- a/packages/app-tests/sqlserverSemanticDiagnostics.test.ts
+++ b/packages/app-tests/sqlserverSemanticDiagnostics.test.ts
@@ -67,7 +67,7 @@ test("sqlserver completion columns do not query using database name as schema fa
globalThis.fetch = (async (input) => {
const url = String(input);
requests.push(url);
- if (url === "/api/connection/list") {
+ if (url.split("?")[0] === "/api/connection/list") {
return new Response(JSON.stringify([sqlServerConn()]), {
status: 200,
headers: { "Content-Type": "application/json" },
diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rs
index 699bae245b..6cd2e2e8fe 100644
--- a/src-tauri/src/commands/connection.rs
+++ b/src-tauri/src/commands/connection.rs
@@ -484,6 +484,8 @@ mod tests {
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
show_database_links: None,
+ show_native_jobs: None,
+ show_user_admin: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -1398,7 +1400,13 @@ async fn remove_connection_pools_for_connection_ids(state: &AppState, connection
}
#[tauri::command]
-pub async fn load_connections(state: State<'_, Arc<AppState>>) -> Result<Vec<ConnectionResponse>, String> {
+pub async fn load_connections(
+ state: State<'_, Arc<AppState>>,
+ legacy_sidebar_show_user_admin: Option<bool>,
+) -> Result<Vec<ConnectionResponse>, String> {
+ if let Some(visible) = legacy_sidebar_show_user_admin {
+ state.storage.migrate_sidebar_user_admin_visibility(visible).await?;
+ }
load_connection_responses(state.inner()).await
}