feat(nacos): improve service and instance management
This commit is contained in:
38 files changed
+4787
-695
No files matched your search
+8
-2
@@ -7,13 +7,19 @@ describe("connection dialog scrolling", () => {
|
||||
it("keeps every configuration tab inside a shrinkable form viewport", () => {
|
||||
expect(dialogSource).toContain("return `${widthClass} connection-dialog-content--config`;");
|
||||
expect(dialogSource.match(/<TabsContent[^>]*class="m-0 flex min-h-0 flex-1 flex-col overflow-hidden">/g)).toHaveLength(4);
|
||||
expect(dialogSource.match(/class="connection-form-body grid min-h-0 flex-1 gap-4 overflow-y-auto/g)).toHaveLength(4);
|
||||
expect(dialogSource.match(/class="connection-form-body grid min-h-0 flex-1 scroll-pb-6 gap-4 overflow-y-auto/g)).toHaveLength(4);
|
||||
expect(dialogSource).not.toMatch(/\.connection-dialog-content--config\s*\{[\s\S]*?height:\s*min\(720px/);
|
||||
expect(dialogSource).toMatch(/@media \(max-height: 720px\)[\s\S]*?height:\s*calc\(var\(--dbx-viewport-height\) - 2rem\);/);
|
||||
expect(dialogSource).toMatch(/\.connection-dialog-content--config \.connection-form-body\s*\{[\s\S]*?align-content:\s*start;/);
|
||||
});
|
||||
|
||||
it("keeps the transport form inside a shrinkable scroll viewport", () => {
|
||||
expect(dialogSource).toContain('<TabsContent v-if="canUseTransportLayers" value="transport" class="m-0 flex min-h-0 flex-1 flex-col overflow-hidden">');
|
||||
expect(dialogSource).toContain('class="connection-form-body grid min-h-0 flex-1 gap-4 overflow-y-auto overflow-x-hidden pt-4 pr-2"');
|
||||
expect(dialogSource).toContain('class="connection-form-body grid min-h-0 flex-1 scroll-pb-6 gap-4 overflow-y-auto overflow-x-hidden pt-4 pr-2 pb-6"');
|
||||
});
|
||||
|
||||
it("keeps conditional Nacos authentication fields from shrinking earlier cards", () => {
|
||||
expect(dialogSource).toContain(":class=\"{ 'connection-form-body--nacos': form.db_type === 'nacos' }\"");
|
||||
expect(dialogSource).toMatch(/\.connection-form-body--nacos\s*\{[\s\S]*?grid-auto-rows:\s*max-content;/);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,66 @@
|
||||
import { readFileSync } from "node:fs";
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
const source = readFileSync(new URL("../../../components/connection/ConnectionDialog.vue", import.meta.url), "utf8");
|
||||
|
||||
describe("Nacos connection dialog layout", () => {
|
||||
it("presents implementation and version as one explicit connection profile", () => {
|
||||
expect(source).toContain("data-nacos-profile-selector");
|
||||
expect(source).toContain('v-for="profile in NACOS_CONNECTION_PROFILES"');
|
||||
expect(source).toContain("selectNacosConnectionProfile(profile.value)");
|
||||
expect(source).not.toContain("nacosVersionMode = 'auto'");
|
||||
expect(source).not.toContain("tryNacosDockerConsoleFallback");
|
||||
expect(source).not.toContain("dockerNacosConsoleFallbackUrl");
|
||||
});
|
||||
|
||||
it("keeps the primary form focused on endpoints and authentication", () => {
|
||||
const mainStart = source.indexOf("data-nacos-profile-selector");
|
||||
const mainEnd = source.indexOf("<!-- Redis: host, port, user, password, ssl -->", mainStart);
|
||||
const main = source.slice(mainStart, mainEnd);
|
||||
|
||||
expect(main).toContain("data-nacos-endpoint-section");
|
||||
expect(main).toContain("data-nacos-access-section");
|
||||
expect(main).toContain("data-nacos-advanced-hint");
|
||||
expect(main).toContain('t("nacos.nacosAdvancedHint")');
|
||||
expect(main).toContain("@click=\"configTab = 'advanced'\"");
|
||||
expect(main).toContain('v-model="nacosServerAddr"');
|
||||
expect(main).not.toContain('v-model="nacosV3ConsoleAddr"');
|
||||
expect(main).not.toContain('v-model="nacosNamespace"');
|
||||
expect(main).toContain('t("nacos.nacosAuthHint")');
|
||||
expect(main).not.toContain('v-model="nacosMetricsMode"');
|
||||
expect(main).not.toContain('v-model.number="nacosPageSize"');
|
||||
});
|
||||
|
||||
it("moves low-frequency and r-nacos console settings to the advanced tab", () => {
|
||||
const advancedStart = source.indexOf("data-nacos-advanced-settings");
|
||||
const advancedEnd = source.indexOf('v-if="showGaussdbConnectionMode"', advancedStart);
|
||||
const advanced = source.slice(advancedStart, advancedEnd);
|
||||
|
||||
expect(advanced).not.toContain('v-model="nacosContextPathInput"');
|
||||
expect(advanced).not.toContain("配置上下文路径");
|
||||
expect(advanced).toContain('v-model="nacosMetricsMode"');
|
||||
expect(advanced).toContain('v-model="nacosRNacosConsoleAddr"');
|
||||
expect(advanced).toContain('v-if="nacosHistoryEnabled"');
|
||||
expect(advanced).toContain('t("nacos.nacosRnacosDisabledHint")');
|
||||
expect(advanced).toContain('v-model="nacosTlsSkipVerify"');
|
||||
expect(advanced).toContain('v-model.number="nacosPageSize"');
|
||||
});
|
||||
|
||||
it("documents product default ports instead of local Docker mappings", () => {
|
||||
expect(source).toContain('t("nacos.nacosServiceAddressHint")');
|
||||
expect(source).toContain('t("nacos.nacosMetricsHint")');
|
||||
expect(source).not.toContain("DBX 不需要配置该地址");
|
||||
const mainStart = source.indexOf("data-nacos-profile-selector");
|
||||
const mainEnd = source.indexOf("<!-- Redis: host, port, user, password, ssl -->", mainStart);
|
||||
expect(source.slice(mainStart, mainEnd)).not.toContain('placeholder="http://127.0.0.1:8080"');
|
||||
expect(source).not.toContain("http://127.0.0.1:8010");
|
||||
expect(source).not.toContain("http://127.0.0.1:8818");
|
||||
});
|
||||
|
||||
it("uses a dedicated namespace selector instead of the database selector", () => {
|
||||
expect(source).toContain('t("nacos.nacosVisibleNamespacesTitle")');
|
||||
expect(source).toContain("openVisibleNacosNamespacesPicker");
|
||||
expect(source).toContain("api.nacosListNamespaces(draftId)");
|
||||
expect(source).toContain("showVisibleNacosNamespacesDialog");
|
||||
});
|
||||
});
|
||||
+3
-1
@@ -195,8 +195,10 @@ describe("nacosAdmin helpers", () => {
|
||||
|
||||
it("includes identifying fields in confirmations", () => {
|
||||
expect(buildNacosConfigDeleteConfirm({ namespace: "", dataId: "app.yaml", group: "DEFAULT_GROUP" })).toContain("dataId=app.yaml");
|
||||
const details = buildNacosInstanceConfirm({ serviceName: "DEFAULT_GROUP@@svc", groupName: "DEFAULT_GROUP" }, { ip: "127.0.0.1", port: 8080, enabled: true, metadata: null }, { enabled: false }, "", "public");
|
||||
const details = buildNacosInstanceConfirm({ serviceName: "DEFAULT_GROUP@@svc", groupName: "DEFAULT_GROUP" }, { ip: "127.0.0.1", port: 8080, clusterName: "blue", ephemeral: false, enabled: true, metadata: null }, { enabled: false }, "", "public");
|
||||
expect(details).toContain("serviceName=DEFAULT_GROUP@@svc");
|
||||
expect(details).toContain("cluster=blue");
|
||||
expect(details).toContain("ephemeral=false");
|
||||
expect(details).toContain("targetEnabled=false");
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { filterNacosNamespacesForSidebar, normalizeNacosNamespaceSelection, normalizeNacosNamespacesForDisplay } from "@/lib/nacos/nacosNamespaceVisibility";
|
||||
|
||||
const namespaces = [
|
||||
{ namespace: "", namespaceShowName: "public" },
|
||||
{ namespace: "dev", namespaceShowName: "开发" },
|
||||
{ namespace: "prod", namespaceShowName: "生产" },
|
||||
];
|
||||
|
||||
describe("filterNacosNamespacesForSidebar", () => {
|
||||
it("keeps all namespaces when no visibility filter is configured", () => {
|
||||
expect(filterNacosNamespacesForSidebar(namespaces, undefined)).toEqual(namespaces);
|
||||
});
|
||||
|
||||
it("filters by namespace id and preserves the public empty identifier", () => {
|
||||
expect(filterNacosNamespacesForSidebar(namespaces, ["", "prod"])).toEqual([namespaces[0], namespaces[2]]);
|
||||
});
|
||||
|
||||
it("matches a legacy empty public selection with a concrete public namespace", () => {
|
||||
const v3Namespaces = [{ namespace: "public", namespaceShowName: "public" }, namespaces[2]];
|
||||
expect(filterNacosNamespacesForSidebar(v3Namespaces, ["", "prod"])).toEqual(v3Namespaces);
|
||||
expect(normalizeNacosNamespaceSelection([""], v3Namespaces)).toEqual(["public"]);
|
||||
});
|
||||
|
||||
it("preserves the endpoint-specific public ID when normalizing selections", () => {
|
||||
expect(normalizeNacosNamespaceSelection(["public"], namespaces)).toEqual([""]);
|
||||
});
|
||||
|
||||
it("keeps only the concrete public namespace when both legacy forms are returned", () => {
|
||||
const duplicatePublic = [namespaces[0], { namespace: "public", namespaceShowName: "public" }, namespaces[1]];
|
||||
expect(normalizeNacosNamespacesForDisplay(duplicatePublic)).toEqual([duplicatePublic[1], duplicatePublic[2]]);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user