From 5db35307d3f51d9e122ed2f0f8163d20ac61db9c Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Mon, 6 Jul 2026 13:29:15 +0800 Subject: [PATCH] fix(influxdb): support InfluxDB 2 connections --- .../connection/ConnectionDialog.vue | 124 ++++- apps/desktop/src/types/influxdb.ts | 6 + crates/dbx-core/src/connection.rs | 11 +- crates/dbx-core/src/db/influxdb_driver.rs | 452 +++++++++++++++++- src-tauri/src/commands/connection.rs | 22 +- 5 files changed, 563 insertions(+), 52 deletions(-) create mode 100644 apps/desktop/src/types/influxdb.ts diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue index c857972fbd..780877939f 100644 --- a/apps/desktop/src/components/connection/ConnectionDialog.vue +++ b/apps/desktop/src/components/connection/ConnectionDialog.vue @@ -14,6 +14,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; import { Switch } from "@/components/ui/switch"; import type { ConnectionConfig, DatabaseType, HttpTunnelConfig, JdbcDriverInfo, JdbcMavenBundleInfo, ProxyTunnelConfig, SshConfigHostEntry, SshTunnelConfig, TransportLayerConfig } from "@/types/database"; +import type { InfluxDbExternalConfig, InfluxDbVersion } from "@/types/influxdb"; import type { MqAdminConfig, MqAuth, MqSystemKind } from "@/types/mq"; import type { NacosAdminConfig, NacosAuthConfig } from "@/types/nacos"; import { CONNECTION_ATTEMPT_CANCELLED_MESSAGE, useConnectionStore } from "@/stores/connectionStore"; @@ -756,6 +757,38 @@ function hydrateNacosFields(value: unknown) { resetNacosFields(value as Partial); } +const influxDbVersion = ref("1"); +const influxDbOrg = ref(""); + +function resetInfluxDbFields(config?: Partial) { + influxDbVersion.value = config?.version === "2" ? "2" : "1"; + influxDbOrg.value = config?.org?.trim() || ""; +} + +function hydrateInfluxDbFields(value: unknown) { + if (!value || typeof value !== "object") { + resetInfluxDbFields(); + return; + } + resetInfluxDbFields(value as Partial); +} + +function buildInfluxDbExternalConfig(): InfluxDbExternalConfig { + if (influxDbVersion.value !== "2") return { version: "1" }; + const org = influxDbOrg.value.trim(); + if (!org) throw new Error("InfluxDB 2.x organization is required"); + if (!form.value.password.trim()) throw new Error("InfluxDB 2.x token is required"); + if (!form.value.database?.trim()) throw new Error("InfluxDB 2.x bucket is required"); + return { version: "2", org }; +} + +watch(influxDbVersion, (version) => { + if (form.value.db_type !== "influxdb") return; + if (version === "2") { + form.value.username = ""; + } +}); + function requireMqField(value: string, message: string): string { const trimmed = value.trim(); if (!trimmed) throw new Error(message); @@ -1235,6 +1268,12 @@ function applyProfile(val: string, preserveConnectionFields = false) { form.value.connection_string = undefined; form.value.url_params = ""; } + if (profile.type === "influxdb") { + resetInfluxDbFields(); + form.value.database = undefined; + form.value.password = ""; + form.value.connection_string = undefined; + } } } @@ -1302,6 +1341,7 @@ watch( redis_scan_page_size: config.redis_scan_page_size ?? REDIS_SCAN_PAGE_SIZE_DEFAULT, etcd_endpoints: config.etcd_endpoints || "", informix_server: config.informix_server || "", + external_config: config.external_config, read_only: config.read_only || false, visible_databases: config.visible_databases, }; @@ -1317,6 +1357,11 @@ watch( } else { resetNacosFields(); } + if (config.db_type === "influxdb") { + hydrateInfluxDbFields(config.external_config); + } else { + resetInfluxDbFields(); + } h2ConnectionMode.value = h2ConnectionModeForConfig(config); customColorInput.value = config.color || ""; selectedTransportLayerId.value = form.value.transport_layers?.[0]?.id || null; @@ -1343,6 +1388,7 @@ watch( customDriverName.value = ""; resetMqFields(); resetNacosFields(); + resetInfluxDbFields(); oceanbaseSubMode.value = "mysql"; h2ConnectionMode.value = "file"; dremioConnectionMode.value = "legacy"; @@ -1363,7 +1409,11 @@ watch( }, ); -const databaseLabel = computed(() => (form.value.db_type === "oracle" ? t("connection.serviceName") : t("connection.database"))); +const databaseLabel = computed(() => { + if (form.value.db_type === "oracle") return t("connection.serviceName"); + if (form.value.db_type === "influxdb" && influxDbVersion.value === "2") return "Bucket"; + return t("connection.database"); +}); const databasePlaceholder = computed(() => { const fallback = defaultDatabaseForProfile(); @@ -2110,6 +2160,14 @@ function connectionConfigForSubmit(id: string): ConnectionConfig { config.database = nacosConfig.namespace || undefined; config.connection_string = undefined; config.url_params = ""; + } else if (config.db_type === "influxdb") { + config.external_config = buildInfluxDbExternalConfig(); + config.connection_string = undefined; + if (influxDbVersion.value === "2") { + config.username = ""; + config.password = config.password.trim(); + config.database = config.database?.trim() || undefined; + } } else { config.external_config = undefined; } @@ -4201,6 +4259,66 @@ function openExternalUrl(url: string) { + + +