From 149313e8580f21b18f8cdfca0f56547dbd508930 Mon Sep 17 00:00:00 2001 From: samaradel Date: Mon, 30 Jun 2025 15:32:46 +0300 Subject: [PATCH 1/5] Fix subdomains name duplicates --- .../src/components/manage_gateway_dialog.vue | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue index f26561d14c..73ff969882 100644 --- a/packages/playground/src/components/manage_gateway_dialog.vue +++ b/packages/playground/src/components/manage_gateway_dialog.vue @@ -8,9 +8,7 @@ @update:model-value="$emit('close')" > - + Domains List Add new domain @@ -35,9 +33,7 @@ - - Failed Domains - + Failed Domains
  • @@ -110,7 +106,7 @@ - + @@ -155,9 +151,7 @@ @@ -184,9 +176,7 @@ - - Cancel - + Cancel net.value === selectedIPAddress.value)?.title === NetworkInterfaces.WireGuard; }); watch(selectedK8SNodeName, getSupportedNetworks, { deep: true }); + + watch(dialogVisible, newValue => { + if (newValue) { + suggestName(); + } + }); + const tableHeaders = ref([ { title: "Name", key: "name" }, { title: "Contract ID", key: "contractId" }, From 4f187f44ad55974b4a9b7dc50e52f10051edcae3 Mon Sep 17 00:00:00 2001 From: samaradel Date: Mon, 30 Jun 2025 15:38:11 +0300 Subject: [PATCH 2/5] Update the subdomain name when tab changes --- packages/playground/src/components/manage_gateway_dialog.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue index 73ff969882..98365ae18f 100644 --- a/packages/playground/src/components/manage_gateway_dialog.vue +++ b/packages/playground/src/components/manage_gateway_dialog.vue @@ -295,8 +295,8 @@ export default { }); watch(selectedK8SNodeName, getSupportedNetworks, { deep: true }); - watch(dialogVisible, newValue => { - if (newValue) { + watch(gatewayTab, newValue => { + if (newValue === 1) { suggestName(); } }); From 975c119fce741cf660a4e88f6c7b40fe6e7f1fe5 Mon Sep 17 00:00:00 2001 From: samaradel Date: Mon, 30 Jun 2025 15:53:43 +0300 Subject: [PATCH 3/5] Refactor the watch when dialog fire and when the tab change --- .../playground/src/components/manage_gateway_dialog.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue index 98365ae18f..88d09e8682 100644 --- a/packages/playground/src/components/manage_gateway_dialog.vue +++ b/packages/playground/src/components/manage_gateway_dialog.vue @@ -295,8 +295,11 @@ export default { }); watch(selectedK8SNodeName, getSupportedNetworks, { deep: true }); - watch(gatewayTab, newValue => { - if (newValue === 1) { + watch([dialogVisible, gatewayTab], ([newDialogVisible, newGatewayTab], [oldDialogVisible, oldGatewayTab]) => { + const dialogJustOpened = newDialogVisible && !oldDialogVisible; + const switchedToAddTab = newGatewayTab === 1 && oldGatewayTab !== 1; + + if (dialogJustOpened || switchedToAddTab) { suggestName(); } }); From bc904db1ca5165beb529ab968388e0aa76fea866 Mon Sep 17 00:00:00 2001 From: samaradel Date: Wed, 2 Jul 2025 11:26:41 +0300 Subject: [PATCH 4/5] Append random suffix to the subdomain name --- packages/playground/src/components/manage_gateway_dialog.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue index 88d09e8682..a63f850696 100644 --- a/packages/playground/src/components/manage_gateway_dialog.vue +++ b/packages/playground/src/components/manage_gateway_dialog.vue @@ -501,7 +501,8 @@ export default { grid.config.twinId; prefix.value = oldPrefix.value + props.vm.name; } - subdomain.value = generateName({ prefix: prefix.value }, 4).toLowerCase(); + const randomSuffix = generateName({}, 2); + subdomain.value = `${prefix.value}${randomSuffix}`.toLowerCase(); } const subdomainRules = [ From 846d2cfa54a15099ea1454a146dd0b815aeb9e33 Mon Sep 17 00:00:00 2001 From: samaradel Date: Mon, 7 Jul 2025 13:13:32 +0300 Subject: [PATCH 5/5] Replace the watcher with event approach --- .../src/components/manage_gateway_dialog.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue index a63f850696..0d05d95229 100644 --- a/packages/playground/src/components/manage_gateway_dialog.vue +++ b/packages/playground/src/components/manage_gateway_dialog.vue @@ -9,7 +9,14 @@ > - + Domains List Add new domain @@ -295,14 +302,11 @@ export default { }); watch(selectedK8SNodeName, getSupportedNetworks, { deep: true }); - watch([dialogVisible, gatewayTab], ([newDialogVisible, newGatewayTab], [oldDialogVisible, oldGatewayTab]) => { - const dialogJustOpened = newDialogVisible && !oldDialogVisible; - const switchedToAddTab = newGatewayTab === 1 && oldGatewayTab !== 1; - - if (dialogJustOpened || switchedToAddTab) { + function onTabChange(newTab: unknown) { + if (newTab === 1) { suggestName(); } - }); + } const tableHeaders = ref([ { title: "Name", key: "name" }, @@ -546,6 +550,7 @@ export default { getSupportedNetworks, formatDomainName, onBack, + onTabChange, getDomainNode, tableHeaders, subdomainRules,