diff --git a/web/public/cloud/admin-instance-detail.js b/web/public/cloud/admin-instance-detail.js index b493a6b2..f6f99e58 100644 --- a/web/public/cloud/admin-instance-detail.js +++ b/web/public/cloud/admin-instance-detail.js @@ -81,7 +81,7 @@ export function createAdminInstanceDetail({ loadBackups, cancelBackups, onSelectionChange, - onPublicIpChange, + onPublicNetworkChange, onCopy, } = {}) { if (typeof byId !== 'function' || typeof read !== 'function') { @@ -184,8 +184,12 @@ export function createAdminInstanceDetail({ const link = safeLink(vm.detail_url, ''); if (link instanceof HTMLAnchorElement) { control.href = link.href; control.hidden = false; } } - onPublicIpChange?.(vm.id, - vm.public_ipv4, vm.public_ipv4_cidr); + onPublicNetworkChange?.(vm.id, { + public_ipv4: vm.public_ipv4, + public_ipv4_cidr: vm.public_ipv4_cidr, + public_ipv6: vm.public_ipv6, + public_ipv6_cidr: vm.public_ipv6_cidr, + }); } async function refresh(id = state.id) { diff --git a/web/public/cloud/admin-instance-directory.js b/web/public/cloud/admin-instance-directory.js index ce65a5be..7240cd70 100644 --- a/web/public/cloud/admin-instance-directory.js +++ b/web/public/cloud/admin-instance-directory.js @@ -318,21 +318,29 @@ export function createAdminInstanceDirectory({ } } - function updatePublicIp(id, publicIp, publicIpCidr = '') { + function updatePublicNetwork(id, publicNetwork = {}) { + const ipv4 = String(publicNetwork.public_ipv4 || ''); + const ipv4Cidr = String(publicNetwork.public_ipv4_cidr || ''); + const ipv6 = String(publicNetwork.public_ipv6 || ''); + const ipv6Cidr = String(publicNetwork.public_ipv6_cidr || ''); const item = state.items.find(entry => String(entry.id) === String(id)); if (item) { - item.public_ip = publicIp; - item.public_ip_cidr = publicIpCidr; - item.public_ipv4 = publicIp; - item.public_ipv4_cidr = publicIpCidr; + item.public_ip = ipv4; + item.public_ip_cidr = ipv4Cidr; + item.public_ipv4 = ipv4; + item.public_ipv4_cidr = ipv4Cidr; + item.public_ipv6 = ipv6; + item.public_ipv6_cidr = ipv6Cidr; } const rowNode = Array.from(byId('instances-body').rows) .find(node => node.dataset.instanceId === String(id)); - const ipNode = rowNode?.querySelector('[data-address-family="4"]'); - if (!ipNode) return; - ipNode.replaceChildren(el('small', 'text-muted', 'IPv4'), - el('span', 'admin-mono', text(publicIp, '未记录'))); - if (publicIp) ipNode.append(copyButton(publicIp, '复制公网 IPv4')); + for (const [family, value] of [[4, ipv4], [6, ipv6]]) { + const ipNode = rowNode?.querySelector(`[data-address-family="${family}"]`); + if (!ipNode) continue; + ipNode.replaceChildren(el('small', 'text-muted', `IPv${family}`), + el('span', 'admin-mono', text(value, '未记录'))); + if (value) ipNode.append(copyButton(value, `复制公网 IPv${family}`)); + } } const handlers = { @@ -412,5 +420,5 @@ export function createAdminInstanceDirectory({ window.removeEventListener('pageshow', handlers.pageshow); } - return Object.freeze({ start, reload, updatePublicIp, dispose }); + return Object.freeze({ start, reload, updatePublicNetwork, dispose }); } diff --git a/web/public/cloud/admin-instances.js b/web/public/cloud/admin-instances.js index 2db7e35e..5052db13 100644 --- a/web/public/cloud/admin-instances.js +++ b/web/public/cloud/admin-instances.js @@ -82,8 +82,8 @@ if (root) { cancelConfiguration: reason => configuration.cancel(reason), loadBackups: (id, force = false) => { void backups.load(id, force); }, cancelBackups: reason => backups.cancel(reason), - onPublicIpChange: (id, publicIp, publicIpCidr) => { - directory.updatePublicIp(id, publicIp, publicIpCidr); + onPublicNetworkChange: (id, publicNetwork) => { + directory.updatePublicNetwork(id, publicNetwork); }, onCopy: value => { void copy(value); }, }); diff --git a/web/tests/CloudDualStackInstanceUiContractTest.php b/web/tests/CloudDualStackInstanceUiContractTest.php index 332a3b03..666630a9 100644 --- a/web/tests/CloudDualStackInstanceUiContractTest.php +++ b/web/tests/CloudDualStackInstanceUiContractTest.php @@ -23,6 +23,8 @@ $runtimeJs = $read('public/cloud/runtime.js'); $styles = $read('public/cloud/styles.css'); $adminTemplate = $read('resources/views/venix/admin/cloud/instances.tpl'); $adminJs = $read('public/cloud/admin-instance-detail.js'); +$adminEntryJs = $read('public/cloud/admin-instances.js'); +$adminDirectoryJs = $read('public/cloud/admin-instance-directory.js'); $vpcTemplate = $read('resources/views/venix/cloud/pages/vpcs.tpl'); $vpcJs = $read('public/cloud/vpcs.js'); $ticketUser = $read('resources/views/venix/user/ticket_view.tpl'); @@ -65,6 +67,17 @@ $assert(str_contains($adminTemplate, '公网 IPv4') && str_contains($adminJs, "['公网 IPv4'") && str_contains($adminJs, "['公网 IPv6'"), 'The administrator list/detail does not render dual-stack public addresses.'); +$assert(str_contains($adminJs, 'onPublicNetworkChange?.(vm.id') + && str_contains($adminJs, 'public_ipv6_cidr: vm.public_ipv6_cidr') + && str_contains($adminEntryJs, + 'directory.updatePublicNetwork(id, publicNetwork)') + && str_contains($adminDirectoryJs, + 'function updatePublicNetwork(id, publicNetwork = {})') + && str_contains($adminDirectoryJs, + 'item.public_ipv6_cidr = ipv6Cidr') + && str_contains($adminDirectoryJs, + 'for (const [family, value] of [[4, ipv4], [6, ipv6]])'), + 'Refreshing the administrator drawer does not update both address families in the list.'); $assert(str_contains($vpcTemplate, '公网 IPv4') && str_contains($vpcTemplate, '公网 IPv6') && str_contains($vpcJs, 'publicIpv6'),