From c703cdec2c04c401320d3d1815c10f56ffc8660d Mon Sep 17 00:00:00 2001 From: codex Date: Sat, 31 Oct 2026 03:35:41 +0800 Subject: [PATCH] feat(admin): group compute nodes by region --- web/public/cloud/admin.css | 270 +++++++++++++++++- web/public/cloud/admin.js | 170 +++++++++-- .../views/venix/admin/hosts/index.tpl | 22 +- web/resources/views/venix/layout_assets.tpl | 2 +- web/tests/AdminHostRegionUiContractTest.php | 54 ++++ 5 files changed, 484 insertions(+), 34 deletions(-) create mode 100644 web/tests/AdminHostRegionUiContractTest.php diff --git a/web/public/cloud/admin.css b/web/public/cloud/admin.css index f92c7e38..7f5df5f5 100644 --- a/web/public/cloud/admin.css +++ b/web/public/cloud/admin.css @@ -611,17 +611,227 @@ text-align: center; } +.cloud-admin-host-summary { + display: grid; + grid-template-columns: repeat(5, minmax(0, 1fr)); + gap: 12px; + margin-bottom: 16px; +} + +.cloud-admin-host-summary-card { + min-width: 0; + display: flex; + align-items: center; + gap: 12px; + padding: 15px 16px; + border: 1px solid #e2eaf2; + border-radius: 10px; + background: #fff; + box-shadow: 0 7px 24px rgba(0, 8, 26, 0.04); +} + +.cloud-admin-host-summary-card > div, +.cloud-admin-host-summary-card span, +.cloud-admin-host-summary-card strong { + display: block; +} + +.cloud-admin-host-summary-card > div > span { + color: #7b899c; + font-size: 12px; + font-weight: 800; +} + +.cloud-admin-host-summary-card strong { + margin-top: 2px; + color: #12233d; + font-size: 23px; + font-weight: 900; + line-height: 1; +} + +.cloud-admin-host-summary-icon { + flex: 0 0 38px; + width: 38px; + height: 38px; + display: grid !important; + place-items: center; + border-radius: 10px; + color: #078f79; + background: rgba(20, 184, 166, 0.1); + font-size: 20px; +} + +.cloud-admin-host-filters { + display: grid; + gap: 9px; + margin-bottom: 14px; +} + +.cloud-admin-host-search { + position: relative; + display: block; +} + +.cloud-admin-host-search > i { + position: absolute; + z-index: 1; + top: 50%; + left: 12px; + color: #8290a3; + transform: translateY(-50%); +} + +.cloud-admin-host-search .form-control { + padding-left: 36px; +} + .cloud-admin-host-list { max-height: 520px; overflow-y: auto; padding-right: 3px; } +.cloud-admin-host-region { + overflow: hidden; + border: 1px solid #dfe8f1; + border-radius: 10px; + background: #fff; +} + +.cloud-admin-host-region + .cloud-admin-host-region { + margin-top: 10px; +} + +.cloud-admin-host-region-head { + min-height: 60px; + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + padding: 12px 14px; + cursor: pointer; + list-style: none; + background: #f7fafc; +} + +.cloud-admin-host-region-head::-webkit-details-marker { + display: none; +} + +.cloud-admin-host-region-head::after { + content: "\F0140"; + flex: 0 0 auto; + color: #8492a6; + font-family: "Material Design Icons"; + font-size: 20px; + transition: transform 0.18s ease; +} + +.cloud-admin-host-region[open] > .cloud-admin-host-region-head::after { + transform: rotate(180deg); +} + +.cloud-admin-host-region-identity, +.cloud-admin-host-region-meta, +.cloud-admin-host-statuses, +.cloud-admin-host-metrics, +.cloud-admin-host-region-capacity { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 6px 9px; +} + +.cloud-admin-host-region-identity { + min-width: 0; + color: #162844; + font-size: 15px; + font-weight: 900; +} + +.cloud-admin-host-region-flag { + font-size: 21px; +} + +.cloud-admin-host-region-meta { + margin-left: auto; + color: #75849a; + font-size: 11px; + font-weight: 800; +} + +.cloud-admin-host-region-capacity { + padding: 9px 14px; + border-top: 1px solid #e8eef4; + border-bottom: 1px solid #e8eef4; + color: #687990; + background: #fbfcfe; + font-size: 11px; + font-weight: 800; +} + +.cloud-admin-host-region-nodes { + display: grid; + gap: 10px; + padding: 12px; +} + +.cloud-admin-host-node { + display: grid; + gap: 8px; +} + +.cloud-admin-host-node + .cloud-admin-host-node { + padding-top: 10px; + border-top: 1px solid #edf1f5; +} + +.cloud-admin-host-node-actions { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 7px; +} + +.cloud-admin-host-badge { + display: inline-flex; + align-items: center; + width: fit-content; + padding: 3px 7px; + border-radius: 999px; + font-size: 10px; + font-weight: 900; + line-height: 1.3; +} + +.cloud-admin-host-badge.is-success { + color: #08785b; + background: rgba(93, 216, 158, 0.16); +} + +.cloud-admin-host-badge.is-warning { + color: #9a5b00; + background: rgba(239, 177, 0, 0.17); +} + +.cloud-admin-host-badge.is-muted { + color: #66758b; + background: #eef2f6; +} + +.cloud-admin-host-empty { + margin: 0; + padding: 26px 14px; + color: #7c8ba0; + text-align: center; +} + .cloud-admin .cloud-admin-host { position: relative; width: 100%; min-height: 64px; - display: block; + display: grid; + gap: 8px; margin: 0; padding: 12px 42px 12px 14px; border: 1px solid #dce5ef; @@ -657,6 +867,32 @@ font-weight: 900; } +.cloud-admin-host-heading, +.cloud-admin-host-path, +.cloud-admin-host-metrics { + display: block; +} + +.cloud-admin-host-heading small { + display: block; + margin-top: 2px; + color: #8694a7; + font-size: 11px; + font-weight: 800; +} + +.cloud-admin-host-path, +.cloud-admin-host-metrics { + color: #66768c; + font-size: 11px; + font-weight: 800; +} + +.cloud-admin .cloud-admin-host[aria-current="true"] { + border-color: rgba(24, 168, 127, 0.58); + box-shadow: 0 0 0 3px rgba(24, 168, 127, 0.09); +} + .cloud-admin .cloud-admin-host .text-muted { font-size: 13px; font-weight: 700; @@ -1008,6 +1244,12 @@ resize: vertical; } +@media (max-width: 1199.98px) { + .cloud-admin-host-summary { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } +} + @media (max-width: 991.98px) { .cloud-admin-grid, .cloud-admin-host-layout, @@ -1028,6 +1270,32 @@ } @media (max-width: 767.98px) { + .cloud-admin-host-summary { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + + .cloud-admin-host-summary-card { + padding: 13px; + } + + .cloud-admin-host-summary-card strong { + font-size: 20px; + } + + .cloud-admin-host-summary-icon { + width: 34px; + height: 34px; + flex-basis: 34px; + } + + .cloud-admin-host-region-head { + align-items: flex-start; + } + + .cloud-admin-host-region-meta { + justify-content: flex-end; + } + .cloud-admin-page-head { align-items: stretch !important; flex-direction: column !important; diff --git a/web/public/cloud/admin.js b/web/public/cloud/admin.js index 0b83eef8..4cf5033c 100644 --- a/web/public/cloud/admin.js +++ b/web/public/cloud/admin.js @@ -14,7 +14,7 @@ const { const root = document.querySelector('[data-cloud-admin]'); const byId = id => document.getElementById(id); -const state = { csrf: window.ADMIN_CSRF_TOKEN || '', hosts: [], selectedHost: '', busy: false, epoch: 0, storageBusy: false, storageOpener: null, storageScroll: null, storageObserver: null, schedulingBusy: false, schedulingOpener: null, schedulingScroll: null, networkPoolBusy: false, networkPoolOpener: null, networkPoolScroll: null, networkPoolPayload: null, networkPoolEpoch: 0, networkPoolHostId: '', vpcTransportBusy: false, vpcTransportOpener: null, vpcTransportScroll: null, vpcTransportHostId: '', vpcTransportCandidates: [], taskObservers: new Set() }; +const state = { csrf: window.ADMIN_CSRF_TOKEN || '', hosts: [], hostRegions: [], hostSummary: {}, expandedHostRegions: new Set(), hostRegionsInitialized: false, selectedHost: '', busy: false, epoch: 0, storageBusy: false, storageOpener: null, storageScroll: null, storageObserver: null, schedulingBusy: false, schedulingOpener: null, schedulingScroll: null, networkPoolBusy: false, networkPoolOpener: null, networkPoolScroll: null, networkPoolPayload: null, networkPoolEpoch: 0, networkPoolHostId: '', vpcTransportBusy: false, vpcTransportOpener: null, vpcTransportScroll: null, vpcTransportHostId: '', vpcTransportCandidates: [], taskObservers: new Set() }; // Permission state is rendered by the server on the page. API endpoints keep // the authoritative authorization check; this only controls the UI affordances. const canManage = root?.dataset.canManage === '1'; @@ -75,7 +75,21 @@ function uploadApi(path, file, onProgress) { } function formList(value) { return String(value || '').split(/[\s,]+/).filter(Boolean); } function profile(host) { return { ...host, ...(host.profile || host.config || {}) }; } -async function loadHosts() { state.hosts = collection(await api('/api/v1/admin/hosts'), 'hosts').map(profile); return state.hosts; } +async function loadHosts() { + const payload = await api('/api/v1/admin/hosts'); + state.hosts = collection(payload, 'hosts').map(profile); + state.hostRegions = collection(payload, 'regions').map(region => ({ ...region, hosts: collection(region, 'hosts').map(profile) })); + state.hostSummary = payload?.summary && typeof payload.summary === 'object' ? payload.summary : {}; + if (!state.hostRegionsInitialized) { + const first = state.hostRegions[0]; + if (first) state.expandedHostRegions.add(hostRegionKey(first)); + for (const region of state.hostRegions) { + if (Number(region?.summary?.attention_hosts || 0) > 0) state.expandedHostRegions.add(hostRegionKey(region)); + } + state.hostRegionsInitialized = true; + } + return state.hosts; +} async function loadUserIsoSettings() { const settings = await api('/api/v1/admin/user-iso/settings'); byId('user-iso-enabled').checked = settings?.enabled === true; @@ -132,28 +146,134 @@ function fillHost(host) { warning.textContent = network ? '' : `原网络接入“${h.default_network || '未配置'}”需要重新配置。请先核实该宿主机实际使用的网桥或 libvirt 网络,再选择类型并填写名称;不会自动改为 br0。已有实例或任务占用的地址池需要受控迁移。`; byId('host-enabled').checked = h.enabled !== false; byId('host-form-error').textContent = ''; } +function hostRegionKey(region) { return region?.id === null || region?.id === undefined ? 'unclassified' : `region:${region.id}`; } +function agentLabel(value) { return ({ ready: 'Agent 已就绪', pending: 'Agent 待验证', failed: 'Agent 测试失败', disabled: 'Agent 已停用', unconfigured: 'Agent 未配置' })[value] || 'Agent 状态未知'; } +function hostStateBadge(label, tone) { return element('span', `cloud-admin-host-badge is-${tone}`, label); } +function renderHostSummary() { + const summary = byId('host-summary'); + if (!summary) return; + const data = state.hostSummary || {}; + const items = [ + ['map-marker-radius-outline', '地区', data.regions_total || 0], + ['server-network', '计算节点', data.hosts_total || 0], + ['check-decagram-outline', '可调度', data.placement_ready_hosts || 0], + ['timer-sand', '正在排空', data.scheduler_draining || 0], + ['alert-circle-outline', '需要处理', data.attention_hosts || 0], + ]; + summary.replaceChildren(...items.map(([icon, label, value]) => { + const card = element('article', 'cloud-admin-host-summary-card'); + const copy = element('div'); copy.append(element('span', '', label), element('strong', '', value)); + const badge = element('span', 'cloud-admin-host-summary-icon'); badge.innerHTML = ``; + card.append(badge, copy); return card; + })); +} +function syncHostRegionFilter() { + const select = byId('host-region-filter'); + if (!select) return; + const selected = select.value; + select.replaceChildren(new Option('全部地区', '')); + for (const region of state.hostRegions) { + const value = region.id === null || region.id === undefined ? 'unclassified' : String(region.id); + const count = Number(region?.summary?.hosts_total || collection(region, 'hosts').length); + select.append(new Option(`${region.country_flag || '🌐'} ${region.name || '未分类节点'}(${count})`, value)); + } + select.value = Array.from(select.options).some(option => option.value === selected) ? selected : ''; +} +function hostMatchesFilter(host, search, regionValue, stateValue) { + const placement = host?.placement || {}; + const regionId = placement.region_id === null || placement.region_id === undefined ? 'unclassified' : String(placement.region_id); + if (regionValue && regionId !== regionValue) return false; + if (stateValue === 'ready' && host?.readiness?.placement_ready !== true) return false; + if (stateValue === 'attention' && host?.needs_attention !== true) return false; + if (['active', 'draining', 'disabled'].includes(stateValue) && host.scheduler_state !== stateValue) return false; + if (!search) return true; + return [host.name, host.id, host.region, host.country_code, placement.region_name, placement.line_name, placement.pool_name] + .some(value => String(value || '').toLocaleLowerCase().includes(search)); +} +function renderHostNode(host) { + const row = element('article', 'cloud-admin-host-node'); + const button = element('button', 'cloud-admin-host'); + button.type = 'button'; + button.dataset.hostId = String(host.id); + button.setAttribute('aria-label', `配置计算节点 ${host.name || host.id}`); + if (String(state.selectedHost) === String(host.id)) button.setAttribute('aria-current', 'true'); + const heading = element('span', 'cloud-admin-host-heading'); + heading.append(element('strong', '', host.name || `计算节点 ${host.id}`), element('small', '', `#${host.id} · ${host?.location?.physical_label || host.region || '物理位置未设置'}`)); + const status = element('span', 'cloud-admin-host-statuses'); + status.append( + hostStateBadge(agentLabel(host?.agent?.state), host?.agent?.ready ? 'success' : 'warning'), + hostStateBadge(host.enabled ? '服务启用' : '服务停用', host.enabled ? 'success' : 'muted'), + hostStateBadge(schedulerLabel(host.scheduler_state), host.scheduler_state === 'active' ? 'success' : host.scheduler_state === 'draining' ? 'warning' : 'muted') + ); + const path = element('span', 'cloud-admin-host-path', [host?.placement?.line_name, host?.placement?.pool_name].filter(Boolean).join(' · ') || '尚未选择资源池'); + const capacity = host?.capacity || {}; + const metrics = element('span', 'cloud-admin-host-metrics'); + metrics.append( + element('span', '', `实例 ${Number(capacity?.instances?.allocated || 0)}`), + element('span', '', `CPU ${Number(capacity?.cpu?.allocated || 0)}/${Number(capacity?.cpu?.configured || 0)} 核`), + element('span', '', `公网 IP ${Number(capacity?.ip?.available || 0)}/${Number(capacity?.ip?.total || 0)}`) + ); + button.append(heading, status, path, metrics); + button.addEventListener('click', async () => { + if (state.busy) return; + try { + state.selectedHost = String(host.id); + fillHost(profile(await api(`/api/v1/admin/hosts/${encodeURIComponent(host.id)}`))); + renderHosts(); + notice('已读取计算节点配置。Agent 地址和密钥请在“Agent API”页面维护。'); + } catch (error) { notice(error.message, true); } + }); + const actions = element('div', 'cloud-admin-host-node-actions'); + const scheduling = element('button', 'btn btn-outline-primary btn-sm', '调度与容量'); + scheduling.type = 'button'; scheduling.addEventListener('click', () => openHostScheduling(host.id, scheduling)); + const networkPools = element('button', 'btn btn-outline-primary btn-sm', '公网地址池'); + networkPools.type = 'button'; networkPools.addEventListener('click', () => openHostNetworkPools(host.id, networkPools)); + const vpcTransport = element('button', 'btn btn-outline-primary btn-sm', 'VPC 私网传输'); + vpcTransport.type = 'button'; vpcTransport.addEventListener('click', () => openHostVpcTransport(host.id, vpcTransport)); + actions.append(scheduling, networkPools, vpcTransport); + if (canManage) { + const storage = element('button', 'btn btn-outline-primary btn-sm', '存储目录'); + storage.type = 'button'; storage.addEventListener('click', () => openHostStorage(host.id, storage)); actions.append(storage); + } + row.append(button, actions); + return row; +} function renderHosts() { - const list = byId('host-list'); list.replaceChildren(); if (!state.hosts.length) list.append(element('p', 'text-muted', '暂无宿主机。')); - for (const host of state.hosts) { - const row = element('div', 'd-grid gap-2'); - const button = element('button', 'btn btn-light cloud-admin-host'); - button.type = 'button'; - button.append(element('strong', '', host.name || `宿主机 ${host.id}`), element('div', 'text-muted', `${host.region || '地区未设置'} · #${host.id} · ${host.enabled ? '连接启用' : '连接停用'} · ${schedulerLabel(host.scheduler_state)}`)); - button.addEventListener('click', async () => { if (state.busy) return; try { fillHost(profile(await api(`/api/v1/admin/hosts/${encodeURIComponent(host.id)}`))); notice('已读取宿主机面板配置。Agent 地址和密钥请在“Agent API”页面维护。'); } catch (error) { notice(error.message, true); } }); - const actions = element('div', 'd-grid gap-2'); - const scheduling = element('button', 'btn btn-outline-primary btn-sm', '资源池与调度策略'); - scheduling.type = 'button'; scheduling.addEventListener('click', () => openHostScheduling(host.id, scheduling)); - const networkPools = element('button', 'btn btn-outline-primary btn-sm', '公网地址池'); - networkPools.type = 'button'; networkPools.addEventListener('click', () => openHostNetworkPools(host.id, networkPools)); - const vpcTransport = element('button', 'btn btn-outline-primary btn-sm', 'VPC 私网传输'); - vpcTransport.type = 'button'; vpcTransport.addEventListener('click', () => openHostVpcTransport(host.id, vpcTransport)); - actions.append(scheduling, networkPools, vpcTransport); - if (canManage) { - const storage = element('button', 'btn btn-outline-primary btn-sm', '存储目录'); - storage.type = 'button'; storage.addEventListener('click', () => openHostStorage(host.id, storage)); actions.append(storage); - } - row.append(button, actions); list.append(row); + renderHostSummary(); syncHostRegionFilter(); + const list = byId('host-list'); list.replaceChildren(); + if (!state.hosts.length) { list.append(element('p', 'cloud-admin-host-empty', '暂无计算节点。')); return; } + const search = String(byId('host-search')?.value || '').trim().toLocaleLowerCase(); + const regionValue = String(byId('host-region-filter')?.value || ''); + const stateValue = String(byId('host-state-filter')?.value || ''); + let visible = 0; + for (const region of state.hostRegions) { + const hosts = collection(region, 'hosts').filter(host => hostMatchesFilter(host, search, regionValue, stateValue)); + if (!hosts.length) continue; + visible += hosts.length; + const key = hostRegionKey(region); + const group = element('details', 'cloud-admin-host-region'); + group.open = search !== '' || regionValue !== '' || stateValue !== '' || state.expandedHostRegions.has(key); + group.addEventListener('toggle', () => group.open ? state.expandedHostRegions.add(key) : state.expandedHostRegions.delete(key)); + const header = element('summary', 'cloud-admin-host-region-head'); + const identity = element('span', 'cloud-admin-host-region-identity'); + identity.append(element('span', 'cloud-admin-host-region-flag', region.country_flag || '🌐'), element('span', '', region.name || '未分类节点')); + const meta = element('span', 'cloud-admin-host-region-meta'); + const attention = Number(region?.summary?.attention_hosts || 0); + meta.append(element('span', '', `${hosts.length} 台节点`), element('span', '', `${Number(region?.summary?.agent_ready_hosts || 0)} 台 Agent 就绪`)); + if (attention > 0) meta.append(hostStateBadge(`${attention} 项需处理`, 'warning')); + header.append(identity, meta); + const capacity = region?.capacity || {}; + const overview = element('div', 'cloud-admin-host-region-capacity'); + overview.append( + element('span', '', `CPU ${Number(capacity?.cpu?.allocated || 0)}/${Number(capacity?.cpu?.configured || 0)} 核`), + element('span', '', `内存 ${Number(capacity?.memory?.allocated || 0)}/${Number(capacity?.memory?.configured || 0)} MiB`), + element('span', '', `公网 IP ${Number(capacity?.ip?.available || 0)}/${Number(capacity?.ip?.total || 0)}`) + ); + const nodes = element('div', 'cloud-admin-host-region-nodes'); + nodes.append(...hosts.map(renderHostNode)); + group.append(header, overview, nodes); list.append(group); } + if (visible === 0) list.append(element('p', 'cloud-admin-host-empty', '没有符合当前筛选条件的计算节点。')); } const storageFields = { managed_directory: 'host-storage-managed', template_directory: 'host-storage-template', @@ -662,8 +782,9 @@ async function saveHost(event) { state.busy = true; byId('host-save').disabled = true; notice('正在保存宿主机面板配置…'); try { const result = await api(`/api/v1/admin/hosts${id ? '/' + encodeURIComponent(id) : ''}`, { method: id ? 'PUT' : 'POST', body }); + state.selectedHost = result?.id ? String(result.id) : ''; await loadHosts(); renderHosts(); fillHost(result?.id ? profile(result) : null); - notice('宿主机配置已保存。网络接入变更后请前往 Agent API 重新测试,再启用调度。'); + notice('计算节点配置已保存。网络接入变更后请前往 Agent API 重新测试,再启用调度。'); } catch (error) { byId('host-form-error').textContent = error.message; notice(error.message, true); } finally { state.busy = false; byId('host-save').disabled = !canManage; } @@ -1274,7 +1395,8 @@ async function initialize() { try { const session = await api('/api/v1/session'); state.csrf = session.csrf_token || state.csrf; if (!session.admin) throw new Error('需要管理员权限。'); if (!state.csrf) throw new Error('会话令牌缺失,请重新登录。'); if (root.dataset.cloudAdmin === 'hosts') { await Promise.all([loadHosts(), loadUserIsoSettings()]); renderHosts(); fillHost(null); - byId('host-new').addEventListener('click', () => fillHost(null)); byId('host-form').addEventListener('submit', saveHost); byId('user-iso-settings-form').addEventListener('submit', saveUserIsoSettings); + byId('host-new').addEventListener('click', () => { state.selectedHost = ''; fillHost(null); renderHosts(); }); byId('host-form').addEventListener('submit', saveHost); byId('user-iso-settings-form').addEventListener('submit', saveUserIsoSettings); + byId('host-search').addEventListener('input', renderHosts); byId('host-region-filter').addEventListener('change', renderHosts); byId('host-state-filter').addEventListener('change', renderHosts); byId('host-network-type').addEventListener('change', updateHostNetworkControls); byId('host-storage-form').addEventListener('submit', saveHostStorage); byId('host-storage-close').addEventListener('click', closeHostStorage); const storageDrawer = byId('host-storage-drawer'); storageDrawer.addEventListener('cancel', event => { event.preventDefault(); closeHostStorage(); }); storageDrawer.addEventListener('click', event => { if (event.target === storageDrawer) closeHostStorage(); }); diff --git a/web/resources/views/venix/admin/hosts/index.tpl b/web/resources/views/venix/admin/hosts/index.tpl index 453da968..c785e80b 100644 --- a/web/resources/views/venix/admin/hosts/index.tpl +++ b/web/resources/views/venix/admin/hosts/index.tpl @@ -1,4 +1,4 @@ -{assign var=admin_title value='宿主机设置'} +{assign var=admin_title value='计算节点'} {assign var=admin_active value='hosts'} {include file='admin/static_header.tpl'} @@ -7,14 +7,18 @@

Infrastructure

-

宿主机设置

-

管理计算节点连接、存储目录和公网网络配置。

+

计算节点

+

按销售地区查看计算节点状态、调度容量和网络资源。

正在加载…

+ Agent API +
+
+
@@ -45,12 +49,14 @@
-

Hosts

-
宿主机列表
+

Regions

+
地区与节点
- +
+
+ + +
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 932ee1b4..bfbedf49 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026103014' scope='global'} +{assign var=venix_asset_version value='2026103101' scope='global'} diff --git a/web/tests/AdminHostRegionUiContractTest.php b/web/tests/AdminHostRegionUiContractTest.php new file mode 100644 index 00000000..de47c0cf --- /dev/null +++ b/web/tests/AdminHostRegionUiContractTest.php @@ -0,0 +1,54 @@ +计算节点') + && str_contains($template, '>Agent API'), + 'Compute-node page is missing its summary, filters or primary actions.'); + +$assert(str_contains($script, 'state.hostRegions = collection(payload, \'regions\')') + && str_contains($script, 'state.hostSummary = payload?.summary') + && str_contains($script, 'function hostRegionKey(') + && str_contains($script, "element('details', 'cloud-admin-host-region')") + && str_contains($script, 'function hostMatchesFilter(') + && str_contains($script, "host?.readiness?.placement_ready") + && str_contains($script, "host?.needs_attention") + && str_contains($script, "host.enabled ? '服务启用' : '服务停用'") + && str_contains($script, 'agentLabel(host?.agent?.state)') + && str_contains($script, 'schedulerLabel(host.scheduler_state)'), + 'Region rendering must keep Agent, service and scheduling state separate.'); + +$assert(str_contains($styles, '.cloud-admin-host-summary') + && str_contains($styles, '.cloud-admin-host-region') + && str_contains($styles, '.cloud-admin-host-node') + && str_contains($styles, '.cloud-admin-host-badge.is-success') + && str_contains($styles, '@media (max-width: 767.98px)'), + 'Compute-node region layout is missing desktop or responsive styles.'); + +$assert(preg_match("/venix_asset_version value='([0-9]+)'/", $assets, + $match) === 1 && (int) $match[1] >= 2026103101, + 'Compute-node region UI changes require a new shared asset version.'); + +echo "Administrator compute-node region UI contracts passed.\n";