fix(nacos): allow overriding target group when copying configs

This commit is contained in:
Melody Ruch authored and GitHub committed 2026-08-15 18:56:34 +08:00
1 parent d782667b22
commit bdf5f6a87c
14 files changed
+163 -9

No files matched your search

@@ -1244,7 +1244,7 @@ async function exportConfigArchive(scope: NacosConfigSelectionScope) {
const batchTransferRequest = shallowRef<NacosConfigTransferRequest | null>(null);
async function previewBatch(payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; policy: NacosConflictPolicy }) {
async function previewBatch(payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; targetGroup: string; policy: NacosConflictPolicy }) {
batchLoading.value = true;
batchError.value = "";
batchPreview.value = null;
@@ -1260,6 +1260,7 @@ async function previewBatch(payload: { scope: NacosConfigSelectionScope; targetC
targetConnectionId: payload.targetConnectionId,
source: buildConfigSelector(payload.scope),
targetNamespace: payload.targetNamespace,
targetGroup: payload.targetGroup || undefined,
conflictPolicy: payload.policy,
};
batchTransferRequest.value = req;
@@ -1272,7 +1273,7 @@ async function previewBatch(payload: { scope: NacosConfigSelectionScope; targetC
}
}
async function applyBatch(payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; policy: NacosConflictPolicy }) {
async function applyBatch(payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; targetGroup: string; policy: NacosConflictPolicy }) {
if (batchLoading.value || batchReport.value || !batchPreview.value) return;
if (payload.policy === "OVERWRITE" && !window.confirm(t("nacos.overwriteConfirm"))) return;
const targetConnectionId = batchMode.value === "import" ? props.connectionId : payload.targetConnectionId;
@@ -37,8 +37,8 @@ const emit = defineEmits<{
chooseFile: [];
reset: [];
targetConnectionChange: [connectionId: string];
preview: [payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; policy: NacosConflictPolicy }];
apply: [payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; policy: NacosConflictPolicy }];
preview: [payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; targetGroup: string; policy: NacosConflictPolicy }];
apply: [payload: { scope: NacosConfigSelectionScope; targetConnectionId: string; targetNamespace: string; targetGroup: string; policy: NacosConflictPolicy }];
export: [scope: NacosConfigSelectionScope];
}>();
@@ -46,6 +46,7 @@ const { t } = useI18n();
const scope = ref<NacosConfigSelectionScope>("selected");
const policy = ref<NacosConflictPolicy>("ABORT");
const targetNamespace = ref("");
const targetGroup = ref("");
const titleKey = computed(() => `nacos.batch${props.mode[0].toUpperCase()}${props.mode.slice(1)}Title`);
const descriptionKey = computed(() => `nacos.batch${props.mode[0].toUpperCase()}${props.mode.slice(1)}Description`);
@@ -116,6 +117,7 @@ watch(
if (!open) return;
scope.value = props.selectedCount ? "selected" : "filtered";
policy.value = "ABORT";
targetGroup.value = "";
resetTargetNamespace();
},
{ immediate: true },
@@ -202,6 +204,10 @@ watch(targetNamespaces, () => {
</select>
</div>
</div>
<div class="space-y-2">
<div class="text-sm font-medium">{{ t("nacos.targetGroup") }}</div>
<input v-model="targetGroup" type="text" class="h-10 w-full rounded-md border border-input bg-background px-3 text-sm" :disabled="loading" :placeholder="t('nacos.targetGroupPlaceholder')" @change="emit('reset')" />
</div>
<p class="text-xs text-muted-foreground">{{ t("nacos.copyKeepsSource") }}</p>
</div>
@@ -279,11 +285,11 @@ watch(targetNamespaces, () => {
{{ t("nacos.exportZip") }}
</Button>
<template v-else>
<Button v-if="!preview" :disabled="loading || !canContinue" @click="emit('preview', { scope, targetConnectionId, targetNamespace: selectedTargetNamespace, policy })">
<Button v-if="!preview" :disabled="loading || !canContinue" @click="emit('preview', { scope, targetConnectionId, targetNamespace: selectedTargetNamespace, targetGroup: targetGroup.trim(), policy })">
<Loader2 v-if="loading" class="mr-2 h-4 w-4 animate-spin" />
{{ t("nacos.preview") }}
</Button>
<Button v-else :variant="policy === 'OVERWRITE' ? 'destructive' : 'default'" :disabled="loading || hasPreviewBlockingErrors" @click="emit('apply', { scope, targetConnectionId, targetNamespace: selectedTargetNamespace, policy })">
<Button v-else :variant="policy === 'OVERWRITE' ? 'destructive' : 'default'" :disabled="loading || hasPreviewBlockingErrors" @click="emit('apply', { scope, targetConnectionId, targetNamespace: selectedTargetNamespace, targetGroup: targetGroup.trim(), policy })">
<Loader2 v-if="loading" class="mr-2 h-4 w-4 animate-spin" />
{{ t("nacos.apply") }}
</Button>
@@ -73,6 +73,27 @@ describe("NacosConfigBatchDialog cross-connection sync", () => {
scope: "selected",
targetConnectionId: "remote",
targetNamespace: "shared",
targetGroup: "",
policy: "ABORT",
});
});
it("includes a trimmed target group override in the preview payload when provided", async () => {
const { onPreview } = await mountDialog("remote");
const groupInput = document.body.querySelector("input[type=text]") as HTMLInputElement;
groupInput.value = " TARGET_GROUP ";
groupInput.dispatchEvent(new Event("input"));
await nextTick();
Array.from(document.body.querySelectorAll("button"))
.find((button) => button.textContent?.includes("Preview"))
?.click();
await nextTick();
expect(onPreview).toHaveBeenCalledWith({
scope: "selected",
targetConnectionId: "remote",
targetNamespace: "shared",
targetGroup: "TARGET_GROUP",
policy: "ABORT",
});
});
@@ -100,6 +121,7 @@ describe("NacosConfigBatchDialog cross-connection sync", () => {
scope: "selected",
targetConnectionId: "remote",
targetNamespace: "",
targetGroup: "",
policy: "ABORT",
});
});