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。

fix(nacos): make config syntax diagnostics advisory

二丫讲梵c1948bff0a3e
diff --git a/apps/desktop/src/components/nacos/NacosAdminConsole.vue b/apps/desktop/src/components/nacos/NacosAdminConsole.vue
index 2ac9a4e7b5..ff24f40b77 100644
--- a/apps/desktop/src/components/nacos/NacosAdminConsole.vue
+++ b/apps/desktop/src/components/nacos/NacosAdminConsole.vue
@@ -65,7 +65,7 @@ import { useTheme } from "@/composables/useTheme";
import { executeWithProductionContextGuard } from "@/lib/database/productionExecutionGuard";
import { productionContextForDatabase } from "@/lib/database/productionSafety";
import { connectionIsEffectivelyReadOnly } from "@/lib/database/readOnlyWriteAccess";
-import { validateNacosConfigContent, nacosConfigDiagnosticSeverity, nacosConfigValidationBlocksPublish, type NacosConfigDiagnostic } from "@/lib/nacos/nacosConfigValidation";
+import { validateNacosConfigContent, nacosConfigDiagnosticSeverity, nacosConfigValidationHasErrors, type NacosConfigDiagnostic } from "@/lib/nacos/nacosConfigValidation";
import { loadNacosConfigLanguage, resolveNacosConfigFormat } from "@/lib/nacos/nacosConfigLanguage";
import { nacosConfigYamlLintDiagnostics, nacosConfigYamlLintExtension } from "@/lib/nacos/nacosConfigYamlLint";
import { translateNacosYamlDiagnostic } from "@/lib/nacos/nacosYamlDiagnostics";
@@ -879,7 +879,7 @@ function clearConfigValidation(clearHighlight = true) {
/** True when the open config is YAML, which shows diagnostics through CodeMirror's linter rather than the legacy decoration. */
const configUsesYamlLint = computed(() => resolveNacosConfigFormat(configType.value, configDataId.value) === "yaml");
-const configValidationHasError = computed(() => configValidationDiagnostics.value.some((diagnostic) => nacosConfigDiagnosticSeverity(diagnostic) === "error"));
+const configValidationHasError = computed(() => nacosConfigValidationHasErrors(configValidationDiagnostics.value));
function configDiagnosticTranslate(key: string, params: Record<string, string>) {
return t(key, params);
@@ -906,25 +906,17 @@ function refreshConfigValidationHighlights(content: string, generation: number,
});
}
-function validateCurrentConfig(showSuccess = true): boolean {
- if (!selectedConfig.value) return true;
+function validateCurrentConfig(): void {
+ if (!selectedConfig.value) return;
const diagnostics = validateNacosConfigContent(configContent.value, configType.value);
configValidationDiagnostics.value = diagnostics;
configValidationHighlightActive = false;
configEditorView.value?.dispatch({ effects: setConfigValidationHighlight.of([]) });
- // Only errors block publishing: a parser warning must never trap a config the
- // user is entitled to publish (#9405).
- if (nacosConfigValidationBlocksPublish(diagnostics)) {
- configValidationOpen.value = true;
- return false;
- }
- if (!showSuccess) return true;
if (diagnostics.length) {
configValidationOpen.value = true;
- return true;
+ return;
}
toast(t("nacos.validationPassed"), 2000);
- return true;
}
function focusConfigValidationDiagnostic() {
@@ -1845,7 +1837,7 @@ async function setConfigFormat(format: string) {
function requestSaveConfig() {
if (!selectedConfig.value || !canRequestConfigSave.value) return;
- if (!validateCurrentConfig(false)) return;
+ // Syntax diagnostics are advisory; publish the original content for Nacos to accept or reject.
if (!isCreatingConfig.value && configContent.value !== originalConfigContent.value) {
pendingConfigSave.value = true;
return;
diff --git a/apps/desktop/src/components/nacos/__tests__/NacosAdminConsoleYamlDiagnostics.spec.ts b/apps/desktop/src/components/nacos/__tests__/NacosAdminConsoleYamlDiagnostics.spec.ts
index 5e610cc21f..b2e39d5d80 100644
--- a/apps/desktop/src/components/nacos/__tests__/NacosAdminConsoleYamlDiagnostics.spec.ts
+++ b/apps/desktop/src/components/nacos/__tests__/NacosAdminConsoleYamlDiagnostics.spec.ts
@@ -11,12 +11,13 @@ const source = readFileSync(new URL("../NacosAdminConsole.vue", import.meta.url)
* wiring that only exists inside this component, which is too large to mount.
*/
describe("NacosAdminConsole YAML diagnostics wiring", () => {
- it("blocks publishing on error severity only", () => {
- expect(source).toContain("if (nacosConfigValidationBlocksPublish(diagnostics)) {");
- expect(source).not.toContain('diagnostics.some((diagnostic) => nacosConfigDiagnosticSeverity(diagnostic) === "error")');
- // `showSuccess` now also means "the user asked for validation", so a warnings-only
- // run reports them instead of a success toast, and publishing is not blocked.
- expect(source).toContain("if (!showSuccess) return true;");
+ it("keeps syntax validation separate from publishing", () => {
+ const saveRequest = source.slice(source.indexOf("function requestSaveConfig()"), source.indexOf("async function saveConfig()"));
+ expect(saveRequest).not.toContain("validateCurrentConfig");
+ expect(saveRequest).toContain("canRequestConfigSave.value");
+ expect(saveRequest).toContain("void saveConfig()");
+ expect(source).toContain('@click="validateCurrentConfig()"');
+ expect(source).toContain("nacosConfigValidationHasErrors(configValidationDiagnostics.value)");
});
it("localizes every key it references, including the new severity labels", () => {
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index e2480b13c7..27e608db65 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -10112,7 +10112,7 @@ export default withEnglishFallback({
validate: "Yoxla",
validationPassed: "Konfiqurasiyanın sintaksisi düzgündür",
validationErrorTitle: "Konfiqurasiya sintaksisi xətası",
- validationErrorDescription: "Bu konfiqurasiyanı dərc etməzdən əvvəl sintaksis xətalarını düzəldin.",
+ validationErrorDescription: "Sintaksis diaqnostikası məlumat xarakterlidir və dərc etməni bloklamır. Məzmunun onu istifadə edən tətbiqlərin tələblərinə uyğun olduğunu yoxlayın.",
validationLine: "Sətir: {line}",
validationColumn: "Sütun: {column}",
validationLocate: "Xətanın yerini tap",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index eae09f64a2..468f0fcd89 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -11225,7 +11225,7 @@ export default {
validate: "Validate",
validationPassed: "Configuration syntax is valid",
validationErrorTitle: "Configuration syntax error",
- validationErrorDescription: "Fix the syntax errors before publishing this configuration.",
+ validationErrorDescription: "Syntax diagnostics are advisory and do not block publishing. Check that the content meets the requirements of its consumers.",
validationLine: "Line: {line}",
validationColumn: "Column: {column}",
validationLocate: "Locate error",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 6df8bdafe1..76ac298815 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -9256,7 +9256,7 @@ export default withEnglishFallback({
validate: "Validar",
validationPassed: "La sintaxis de la configuración es válida",
validationErrorTitle: "Error de sintaxis de configuración",
- validationErrorDescription: "Corrige los errores de sintaxis antes de publicar.",
+ validationErrorDescription: "Los diagnósticos de sintaxis son orientativos y no bloquean la publicación. Comprueba que el contenido cumpla los requisitos de quienes lo utilizan.",
validationLine: "Línea: {line}",
validationColumn: "Columna: {column}",
validationLocate: "Ir al error",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index 2fb79050f3..d3503bde37 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -10978,7 +10978,7 @@ export default withEnglishFallback({
validate: "Validasi",
validationPassed: "Sintaks konfigurasi valid",
validationErrorTitle: "Galat sintaks konfigurasi",
- validationErrorDescription: "Perbaiki galat sintaks sebelum menerbitkan konfigurasi ini.",
+ validationErrorDescription: "Diagnostik sintaks hanya sebagai panduan dan tidak menghalangi penerbitan. Pastikan konten memenuhi persyaratan aplikasi yang menggunakannya.",
validationLine: "Baris: {line}",
validationColumn: "Kolom: {column}",
validationLocate: "Temukan galat",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index dedff4b05f..c737f64edc 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -9001,7 +9001,7 @@ export default withEnglishFallback({
validate: "Convalida",
validationPassed: "La sintassi della configurazione è valida",
validationErrorTitle: "Errore di sintassi della configurazione",
- validationErrorDescription: "Correggi gli errori di sintassi prima di pubblicare.",
+ validationErrorDescription: "Le segnalazioni di sintassi sono indicative e non bloccano la pubblicazione. Verifica che il contenuto soddisfi i requisiti di chi lo utilizza.",
validationLine: "Riga: {line}",
validationColumn: "Colonna: {column}",
validationLocate: "Vai all'errore",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index abb17587d6..7f61012dd9 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -9029,7 +9029,7 @@ export default withEnglishFallback({
validate: "検証",
validationPassed: "設定の構文は有効です",
validationErrorTitle: "設定の構文エラー",
- validationErrorDescription: "公開する前に構文エラーを修正してください。",
+ validationErrorDescription: "構文診断は参考情報であり、公開をブロックしません。利用側の要件を満たす内容であることを確認してください。",
validationLine: "行: {line}",
validationColumn: "列: {column}",
validationLocate: "エラーに移動",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index d07e706a49..66719b4962 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -9890,7 +9890,7 @@ export default withEnglishFallback({
validate: "검증",
validationPassed: "구성 구문이 올바릅니다",
validationErrorTitle: "구성 구문 오류",
- validationErrorDescription: "게시하기 전에 구문 오류를 수정하세요.",
+ validationErrorDescription: "구문 진단은 참고용이며 게시를 차단하지 않습니다. 내용을 사용하는 애플리케이션의 요구 사항을 충족하는지 확인하세요.",
validationLine: "줄: {line}",
validationColumn: "열: {column}",
validationLocate: "오류 위치",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index f6eae9fa03..8039380f7b 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -9000,7 +9000,7 @@ export default withEnglishFallback({
validate: "Validar",
validationPassed: "A sintaxe da configuração é válida",
validationErrorTitle: "Erro de sintaxe da configuração",
- validationErrorDescription: "Corrija os erros de sintaxe antes de publicar.",
+ validationErrorDescription: "O diagnóstico de sintaxe é apenas informativo e não bloqueia a publicação. Verifique se o conteúdo atende aos requisitos de quem o utiliza.",
validationLine: "Linha: {line}",
validationColumn: "Coluna: {column}",
validationLocate: "Localizar erro",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index d9a08ee7a6..4fe05d1a2f 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -11527,7 +11527,7 @@ export default withEnglishFallback({
validate: "Проверить",
validationPassed: "Синтаксис конфигурации корректен",
validationErrorTitle: "Ошибка синтаксиса конфигурации",
- validationErrorDescription: "Исправьте синтаксические ошибки перед публикацией этой конфигурации.",
+ validationErrorDescription: "Диагностика синтаксиса носит рекомендательный характер и не блокирует публикацию. Убедитесь, что содержимое соответствует требованиям использующих его приложений.",
validationLine: "Строка: {line}",
validationColumn: "Столбец: {column}",
validationLocate: "Перейти к ошибке",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index e302a02fb5..07153a1a39 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -9995,7 +9995,7 @@ export default withEnglishFallback({
validate: "Doğrula",
validationPassed: "Yapılandırma sözdizimi geçerli",
validationErrorTitle: "Yapılandırma sözdizimi hatası",
- validationErrorDescription: "Bu yapılandırmayı yayımlamadan önce sözdizimi hatalarını düzeltin.",
+ validationErrorDescription: "Sözdizimi tanılamaları bilgilendirme amaçlıdır ve yayımlamayı engellemez. İçeriğin, onu kullanan uygulamaların gereksinimlerini karşıladığını kontrol edin.",
validationLine: "Satır: {line}",
validationColumn: "Sütun: {column}",
validationLocate: "Hatayı bul",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index c4d869676d..8dc493460b 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -11206,7 +11206,7 @@ export default withEnglishFallback({
validate: "校验",
validationPassed: "配置内容校验通过",
validationErrorTitle: "配置内容语法有误",
- validationErrorDescription: "请修正语法错误后再发布配置。",
+ validationErrorDescription: "语法检测仅供参考,不会阻止发布。请确认配置内容符合使用方要求。",
validationLine: "行号:{line}",
validationColumn: "列号:{column}",
validationLocate: "定位错误",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index a7b4b86bdf..78840ca690 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -8346,7 +8346,7 @@ export default withEnglishFallback({
validate: "校驗",
validationPassed: "配置內容校驗通過",
validationErrorTitle: "配置內容語法錯誤",
- validationErrorDescription: "請修正語法錯誤後再發布配置。",
+ validationErrorDescription: "語法檢查僅供參考,不會阻止發布。請確認配置內容符合使用方要求。",
validationLine: "行號:{line}",
validationColumn: "列號:{column}",
validationLocate: "定位錯誤",
diff --git a/apps/desktop/src/lib/nacos/nacosConfigValidation.ts b/apps/desktop/src/lib/nacos/nacosConfigValidation.ts
index 766a53d00f..0351e89c83 100644
--- a/apps/desktop/src/lib/nacos/nacosConfigValidation.ts
+++ b/apps/desktop/src/lib/nacos/nacosConfigValidation.ts
@@ -26,10 +26,10 @@ export function nacosConfigDiagnosticSeverity(diagnostic: NacosConfigDiagnostic)
}
/**
- * Whether a configuration must not be published. Only errors block: a parser
- * warning is a note about content the user is still entitled to publish (#9405).
+ * Whether diagnostics contain errors, for presentation only. Syntax diagnostics
+ * are advisory and do not determine whether a configuration can be published.
*/
-export function nacosConfigValidationBlocksPublish(diagnostics: readonly NacosConfigDiagnostic[]): boolean {
+export function nacosConfigValidationHasErrors(diagnostics: readonly NacosConfigDiagnostic[]): boolean {
return diagnostics.some((diagnostic) => nacosConfigDiagnosticSeverity(diagnostic) === "error");
}
diff --git a/packages/app-tests/nacosYamlDiagnostics.test.ts b/packages/app-tests/nacosYamlDiagnostics.test.ts
index 83247f41a5..74ab948431 100644
--- a/packages/app-tests/nacosYamlDiagnostics.test.ts
+++ b/packages/app-tests/nacosYamlDiagnostics.test.ts
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { test } from "vitest";
import { analyzeNacosYaml, nacosYamlDiagnosticMessageKey, translateNacosYamlDiagnostic, type NacosYamlDiagnostic } from "../../apps/desktop/src/lib/nacos/nacosYamlDiagnostics.ts";
-import { nacosConfigDiagnosticSeverity, nacosConfigValidationBlocksPublish, validateNacosConfigContent } from "../../apps/desktop/src/lib/nacos/nacosConfigValidation.ts";
+import { nacosConfigDiagnosticSeverity, nacosConfigValidationHasErrors, validateNacosConfigContent } from "../../apps/desktop/src/lib/nacos/nacosConfigValidation.ts";
import en from "../../apps/desktop/src/i18n/locales/en.ts";
/** The exact text a marker underlines, so placement is asserted and not just line numbers. */
@@ -107,7 +107,7 @@ test("duplicate keys are still found in a later document", () => {
assert.equal(analyzeNacosYaml(source)[0]!.line, 4);
});
-test("parser warnings are downgraded so they cannot block publishing", () => {
+test("parser warnings retain warning severity", () => {
const source = "a: !unknownTag bar\n";
const diagnostics = analyzeNacosYaml(source);
@@ -115,7 +115,7 @@ test("parser warnings are downgraded so they cannot block publishing", () => {
assert.equal(diagnostics[0]!.code, "parserWarning");
assert.equal(diagnostics[0]!.severity, "warning");
assert.equal(diagnostics[0]!.params.reason, "Unresolved tag: !unknownTag");
- assert.equal(nacosConfigValidationBlocksPublish(validateNacosConfigContent(source, "yaml")), false);
+ assert.equal(nacosConfigValidationHasErrors(validateNacosConfigContent(source, "yaml")), false);
});
test("one broken construct collapses into the widest marker instead of stacking", () => {
@@ -159,12 +159,12 @@ test("diagnostics outside YAML formats never reach the linter", () => {
);
});
-test("only error severity blocks publishing", () => {
- assert.equal(nacosConfigValidationBlocksPublish([]), false);
- assert.equal(nacosConfigValidationBlocksPublish([{ message: "warn", line: 1, column: 1, from: 0, to: 1, severity: "warning" }]), false);
- assert.equal(nacosConfigValidationBlocksPublish([{ message: "err", line: 1, column: 1, from: 0, to: 1 }]), true);
+test("only error severity is classified as an error", () => {
+ assert.equal(nacosConfigValidationHasErrors([]), false);
+ assert.equal(nacosConfigValidationHasErrors([{ message: "warn", line: 1, column: 1, from: 0, to: 1, severity: "warning" }]), false);
+ assert.equal(nacosConfigValidationHasErrors([{ message: "err", line: 1, column: 1, from: 0, to: 1 }]), true);
assert.equal(
- nacosConfigValidationBlocksPublish([
+ nacosConfigValidationHasErrors([
{ message: "warn", line: 1, column: 1, from: 0, to: 1, severity: "warning" },
{ message: "err", line: 1, column: 1, from: 0, to: 1 },
]),