GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-06-15 02:49:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

✨ feat(elasticsearch): 补齐新建连接入口

Browse Source 
- 前端连接弹窗新增 Elasticsearch 入口、默认端口、URI 示例和默认索引配置

- 补齐 Elasticsearch 图标、数据源能力、SQL dialect 和只读查询策略

- 后端驱动管理注册 Elasticsearch 版本、模块路径、构建标签和默认安装入口

- 增加连接展示、能力识别和驱动定义测试覆盖
This commit is contained in:
Syngnat
2026-06-02 15:31:00 +08:00
parent 864ad8a371
commit c315ea9c96
13 changed files with 240 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/ConnectionModal.edit-password.test.tsx
View File

@@ -16,3 +16,17 @@ describe('ConnectionModal edit password behavior', () => {
expect(source).toContain('String(config.password || "") === ""');
});
});
describe('ConnectionModal data source registry', () => {
it('exposes Elasticsearch in the create-connection picker with HTTP defaults', () => {
expect(source).toContain('case "elasticsearch":\n return 9200;');
expect(source).toContain('elasticsearch: ["http", "https"]');
expect(source).toContain('key: "elasticsearch"');
expect(source).toContain('name: "Elasticsearch"');
expect(source).toContain('getDbIcon("elasticsearch", undefined, 36)');
expect(source).toContain('type === "elasticsearch"');
expect(source).toContain('"http://elastic:pass@127.0.0.1:9200/logs-*"');
expect(source).toContain('label="默认索引（可选）"');
expect(source).toContain('"显示索引 (留空显示全部)"');
});
});

80
frontend/src/components/ConnectionModal.tsx
View File

@@ -259,6 +259,8 @@ const getDefaultPortByType = (type: string) => {
return 1972;
case "mongodb":
return 27017;
case "elasticsearch":
return 9200;
case "highgo":
return 5866;
case "mariadb":
@@ -282,6 +284,7 @@ const singleHostUriSchemesByType: Record<string, string[]> = {
sqlserver: ["sqlserver"],
iris: ["iris", "intersystems"],
redis: ["redis"],
elasticsearch: ["http", "https"],
tdengine: ["tdengine"],
dameng: ["dameng", "dm"],
kingbase: ["kingbase"],
@@ -308,6 +311,7 @@ const sslSupportedTypes = new Set([
"opengauss",
"mongodb",
"redis",
"elasticsearch",
"tdengine",
]);
@@ -334,6 +338,7 @@ const sslCAPathSupportedTypes = new Set([
"opengauss",
"mongodb",
"redis",
"elasticsearch",
]);
const sslClientCertificateSupportedTypes = new Set([
@@ -352,6 +357,7 @@ const sslClientCertificateSupportedTypes = new Set([
"opengauss",
"mongodb",
"redis",
"elasticsearch",
]);
const supportsSSLCAPathForType = (type: string) =>
@@ -405,6 +411,7 @@ const supportsConnectionParamsForType = (type: string) =>
type === "iris" ||
type === "clickhouse" ||
type === "mongodb" ||
type === "elasticsearch" ||
type === "dameng" ||
type === "tdengine";
@@ -1967,6 +1974,15 @@ const ConnectionModal: React.FC<{
parsedValues.useSSL = false;
parsedValues.sslMode = "disable";
}
} else if (type === "elasticsearch") {
const isHTTPS = trimmedUri.toLowerCase().startsWith("https://");
const skipVerify = normalizeBool(parsed.params.get("skip_verify"));
parsedValues.useSSL = isHTTPS;
parsedValues.sslMode = isHTTPS
? skipVerify
? "skip-verify"
: "required"
: "disable";
}
}
return parsedValues;
@@ -2032,6 +2048,9 @@ const ConnectionModal: React.FC<{
if (dbType === "redis") {
return "redis://:pass@127.0.0.1:6379,127.0.0.2:6379/0?topology=cluster";
}
if (dbType === "elasticsearch") {
return "http://elastic:pass@127.0.0.1:9200/logs-*";
}
if (dbType === "oracle") {
return "oracle://user:pass@127.0.0.1:1521/ORCLPDB1";
}
@@ -2251,6 +2270,10 @@ const ConnectionModal: React.FC<{
? values.useSSL
? "https"
: "http"
: type === "elasticsearch"
? values.useSSL
? "https"
: "http"
: type;
const dbPath = database ? `/${encodeURIComponent(database)}` : "";
const params = new URLSearchParams();
@@ -2297,6 +2320,11 @@ const ConnectionModal: React.FC<{
if (mode === "skip-verify" || mode === "preferred") {
params.set("skip_verify", "true");
}
} else if (type === "elasticsearch") {
if (mode === "skip-verify" || mode === "preferred") {
params.set("skip_verify", "true");
}
appendSSLPathParamsForUri(params, type, values);
}
} else if (supportsSSLForType(type)) {
if (isPostgresCompatibleSSLType(type)) {
@@ -3813,7 +3841,13 @@ const ConnectionModal: React.FC<{
});
} else if (type !== "custom") {
const defaultUser =
type === "clickhouse" ? "default" : type === "redis" ? "" : "root";
type === "clickhouse"
? "default"
: type === "redis"
? ""
: type === "elasticsearch"
? "elastic"
: "root";
const sslCapableType = supportsSSLForType(type);
setUseSSL(false);
setUseHttpTunnel(false);
@@ -4005,6 +4039,11 @@ const ConnectionModal: React.FC<{
name: "Redis",
icon: getDbIcon("redis", undefined, 36),
},
{
key: "elasticsearch",
name: "Elasticsearch",
icon: getDbIcon("elasticsearch", undefined, 36),
},
],
},
{
@@ -4045,6 +4084,8 @@ const ConnectionModal: React.FC<{
return "单机 / 集群";
case "mongodb":
return "单机 / 副本集";
case "elasticsearch":
return "索引 / JSON DSL";
case "oceanbase":
return "MySQL / Oracle 租户";
case "sqlite":
@@ -5087,6 +5128,25 @@ const ConnectionModal: React.FC<{
),
})}
{dbType === "elasticsearch" &&
renderConfigSectionCard({
sectionKey: "service",
icon: <DatabaseOutlined />,
children: (
<Form.Item
name="database"
label="默认索引（可选）"
help="留空时 JSON DSL 和 query_string 会默认查询所有可见索引；也可以填写 logs-* 这类索引通配符。"
style={{ marginBottom: 0 }}
>
<Input
{...noAutoCapInputProps}
placeholder="例如：logs-*"
/>
</Form.Item>
),
})}
{(dbType === "oracle" || isOceanBaseOracle) &&
renderConfigSectionCard({
sectionKey: "service",
@@ -5703,13 +5763,25 @@ const ConnectionModal: React.FC<{
children: (
<Form.Item
name="includeDatabases"
label="显示数据库 (留空显示全部)"
help="连接测试成功后可选择"
label={
dbType === "elasticsearch"
? "显示索引 (留空显示全部)"
: "显示数据库 (留空显示全部)"
}
help={
dbType === "elasticsearch"
? "连接测试成功后可选择需要展示的索引"
: "连接测试成功后可选择"
}
style={{ marginBottom: 0 }}
>
<Select
mode="multiple"
placeholder="选择显示的数据库"
placeholder={
dbType === "elasticsearch"
? "选择显示的索引"
: "选择显示的数据库"
}
allowClear
>
{dbList.map((db) => (

6
frontend/src/components/DatabaseIcons.test.tsx
View File

@@ -10,6 +10,12 @@ describe('DatabaseIcons', () => {
expect(getDbIconLabel('iris')).toBe('InterSystems IRIS');
});
it('includes Elasticsearch in the selectable database icons', () => {
expect(DB_ICON_TYPES).toContain('elasticsearch');
expect(getDbIconLabel('elasticsearch')).toBe('Elasticsearch');
expect(renderToStaticMarkup(<>{getDbIcon('elasticsearch', undefined, 22)}</>)).toContain('ES');
});
it('wraps database icons in a consistent frame for sidebar sizing', () => {
const mysqlMarkup = renderToStaticMarkup(<>{getDbIcon('mysql', undefined, 22)}</>);
const jvmMarkup = renderToStaticMarkup(<>{getDbIcon('jvm', undefined, 22)}</>);

9
frontend/src/components/DatabaseIcons.tsx
View File

@@ -35,6 +35,7 @@ const DB_DEFAULT_COLORS: Record<string, string> = {
postgres: '#336791',
redis: '#DC382D',
mongodb: '#47A248',
elasticsearch: '#005571',
jvm: '#1677FF',
kingbase: '#1890FF',
dameng: '#E6002D',
@@ -130,6 +131,9 @@ const RedisIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
const MongoDBIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
<BrandSvgIcon type="mongodb" size={size} color={color} />
);
const ElasticsearchIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
<ColorBadge size={size} color={color || DB_DEFAULT_COLORS.elasticsearch} label="ES" />
);
const ClickHouseIcon: React.FC<DbIconProps> = ({ size = 16, color }) => (
<BrandSvgIcon type="clickhouse" size={size} color={color} />
);
@@ -214,6 +218,7 @@ const DB_ICON_MAP: Record<string, React.FC<DbIconProps>> = {
postgres: PostgresIcon,
redis: RedisIcon,
mongodb: MongoDBIcon,
elasticsearch: ElasticsearchIcon,
jvm: JVMIcon,
kingbase: KingBaseIcon,
dameng: DamengIcon,
@@ -232,7 +237,7 @@ const DB_ICON_MAP: Record<string, React.FC<DbIconProps>> = {
/** 可选图标类型列表（用于图标选择器 UI） */
export const DB_ICON_TYPES: string[] = [
'mysql', 'mariadb', 'oceanbase', 'postgres', 'redis', 'mongodb', 'jvm',
'mysql', 'mariadb', 'oceanbase', 'postgres', 'redis', 'mongodb', 'elasticsearch', 'jvm',
'oracle', 'sqlserver', 'sqlite', 'duckdb', 'clickhouse', 'starrocks',
'kingbase', 'dameng', 'vastbase', 'opengauss', 'highgo', 'iris', 'tdengine', 'custom',
];
@@ -251,7 +256,7 @@ export const getDbIcon = (type: string, color?: string, size?: number): React.Re
export const getDbIconLabel = (type: string): string => {
const labels: Record<string, string> = {
mysql: 'MySQL', mariadb: 'MariaDB', oceanbase: 'OceanBase', postgres: 'PostgreSQL',
redis: 'Redis', mongodb: 'MongoDB', jvm: 'JVM',
redis: 'Redis', mongodb: 'MongoDB', elasticsearch: 'Elasticsearch', jvm: 'JVM',
oracle: 'Oracle',
sqlserver: 'SQL Server', clickhouse: 'ClickHouse', sqlite: 'SQLite',
starrocks: 'StarRocks',