feat(admin): connect resource summaries to exact filters

go
codex 2 weeks ago
parent 5169bec830
commit df554680a5

@ -30,12 +30,17 @@ final class CloudAdminResourceService
$view = is_string($requested) && in_array($requested, self::VIEWS, true)
? $requested : 'topology';
$catalog = self::catalog();
$focus = is_string($query['focus'] ?? null) ? $query['focus'] : 'all';
if (!in_array($focus, ['all', 'ready_pools', 'hosts', 'ready_hosts', 'cpu', 'ip'], true)) {
$focus = 'all';
}
$reservationPage = $view === 'reservations'
? self::reservations($query)
: self::emptyReservationPage();
return array_merge($catalog, [
return array_merge($catalog, self::capacitySelection($catalog, $focus), [
'view' => $view,
'focus' => $focus,
'line_feature_enabled' => CloudNetworkLineFeature::enabled(),
'country_options' => CloudCountryCatalog::options(),
'reservations' => $reservationPage,
@ -48,6 +53,21 @@ final class CloudAdminResourceService
return ['network_lines_enabled' => CloudNetworkLineFeature::enabled()];
}
/** Select from the exact projection used to compute the summary cards. */
private static function capacitySelection(array $catalog, string $focus): array
{
return [
'capacity_pools' => array_values(array_filter($catalog['pools'],
static fn (array $pool): bool => match ($focus) {
'ready_pools' => $pool['effective_state'] === 'ready',
'cpu', 'ip' => (int) $pool['placement_capacity'][$focus]['free'] > 0,
default => true,
})),
'capacity_hosts' => array_values(array_filter($catalog['hosts'],
static fn (array $host): bool => $focus !== 'ready_hosts' || $host['placement_ready'])),
];
}
public static function saveSettings(array $body): array
{
$enabled = filter_var($body['network_lines_enabled'] ?? null,
@ -597,6 +617,7 @@ final class CloudAdminResourceService
}
}
$poolRows = [];
$hostRows = [];
foreach ($pools as $pool) {
$poolId = (int) $pool->id;
$line = $lineById[(int) $pool->line_id] ?? null;
@ -703,6 +724,13 @@ final class CloudAdminResourceService
if ($hostBaseReady && $capacityReady) {
$health['placement_ready_host_count']++;
}
$hostRows[] = [
'id' => $hostId,
'name' => (string) $host->name,
'pool_name' => (string) $pool->name,
'region_name' => (string) ($region->name ?? ''),
'placement_ready' => $hostBaseReady && $capacityReady,
];
}
$held = 0;
$uncertain = 0;
@ -841,6 +869,7 @@ final class CloudAdminResourceService
}
return [
'hosts' => $hostRows,
'summary' => self::summary($regionRows, $lineRows, $poolRows),
'topology' => self::topology(
$regionRows, $lineRows, $poolRows, $lineFeatureEnabled

@ -304,13 +304,29 @@ function applyResourceFilters(form) {
if (!row.hidden) visibleRows++;
}
const tableEmpty = root?.querySelector('tr[data-resource-filter-empty]');
if (tableEmpty) tableEmpty.hidden = visibleRows !== 0;
if (tableEmpty) tableEmpty.hidden = visibleRows !== 0
|| Boolean(root?.querySelector('[data-resource-empty-row]'));
}
for (const form of root?.querySelectorAll('[data-resource-local-filter]') || []) {
const params = new URLSearchParams(window.location.search);
const search = form.querySelector('[data-resource-search]');
const issues = form.querySelector('[data-resource-only-issues]');
if (search) search.value = params.get('resource_q') || '';
if (issues) issues.checked = params.get('resource_issues') === '1';
const changed = () => {
applyResourceFilters(form);
const url = new URL(window.location.href);
if (search?.value.trim()) url.searchParams.set('resource_q', search.value.trim());
else url.searchParams.delete('resource_q');
if (issues?.checked) url.searchParams.set('resource_issues', '1');
else url.searchParams.delete('resource_issues');
window.history.replaceState(window.history.state, '', url);
};
form.addEventListener('submit', event => event.preventDefault());
form.addEventListener('input', () => applyResourceFilters(form));
form.addEventListener('change', () => applyResourceFilters(form));
form.addEventListener('input', changed);
form.addEventListener('change', changed);
applyResourceFilters(form);
}
function showReservation(id, opener) {

@ -11,6 +11,7 @@
{if !$resource_page}
{assign var=resource_page value=['view'=>'topology','line_feature_enabled'=>false,'summary'=>['regions_total'=>0,'lines_total'=>0,'pools_total'=>0,'placement_ready_pools'=>0,'hosts_total'=>0,'placement_ready_hosts'=>0,'held_reservations'=>0,'uncertain_reservations'=>0],'country_options'=>[],'topology'=>[],'regions'=>[],'lines'=>[],'pools'=>[],'reservations'=>['items'=>[],'filters'=>['state'=>'','pool_id'=>'','q'=>''],'pagination'=>['page'=>1,'per_page'=>20,'total'=>0,'total_pages'=>1,'from'=>0,'to'=>0]] ]}
{/if}
{if !$resource_page.focus}{assign var=resource_focus value='all'}{else}{assign var=resource_focus value=$resource_page.focus}{/if}
<main data-admin-resources data-resource-view="{$resource_page.view|escape}">
<div class="py-3 d-flex align-items-sm-center flex-sm-row flex-column gap-3">
@ -30,10 +31,10 @@
{if $resource_page.view == 'topology'}
<section class="row g-3 mb-3 admin-billing-summary" aria-label="资源拓扑摘要">
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">地区</h2><strong class="admin-stat-value">{$resource_page.summary.regions_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">{if $resource_page.line_feature_enabled}{$resource_page.summary.lines_total|default:0|escape} 条线路{else}使用系统默认线路{/if}</p></div></div></article></div>
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">基础就绪资源池</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_pools|default:0|escape} / {$resource_page.summary.pools_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">套餐与镜像尚需下单校验</p></div></div></article></div>
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">基础就绪节点</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_hosts|default:0|escape} / {$resource_page.summary.hosts_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">Agent、存储、网络和容量均就绪</p></div></div></article></div>
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">异常保留</h2><strong class="admin-stat-value">{$resource_page.summary.uncertain_reservations|default:0|escape}</strong><p class="text-muted fs-12 mb-0">占用中 {$resource_page.summary.held_reservations|default:0|escape} 条</p></div></div></article></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=topology"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">地区</h2><strong class="admin-stat-value">{$resource_page.summary.regions_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">{if $resource_page.line_feature_enabled}{$resource_page.summary.lines_total|default:0|escape} 条线路{else}使用系统默认线路{/if}</p></div></div></a></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=capacity&amp;focus=ready_pools"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">基础就绪资源池</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_pools|default:0|escape} / {$resource_page.summary.pools_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">套餐与镜像尚需下单校验</p></div></div></a></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=capacity&amp;focus=ready_hosts"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">基础就绪节点</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_hosts|default:0|escape} / {$resource_page.summary.hosts_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">Agent、存储、网络和容量均就绪</p></div></div></a></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=reservations&amp;state=uncertain"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">异常保留</h2><strong class="admin-stat-value">{$resource_page.summary.uncertain_reservations|default:0|escape}</strong><p class="text-muted fs-12 mb-0">占用中 {$resource_page.summary.held_reservations|default:0|escape} 条</p></div></div></a></div>
</section>
<section class="card mb-3" aria-labelledby="resource-topology-settings-title">
@ -92,17 +93,27 @@
</section>
{elseif $resource_page.view == 'capacity'}
<section class="row g-3 mb-3 admin-billing-summary" aria-label="容量与健康摘要">
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">计算资源池</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_pools|default:0|escape} / {$resource_page.summary.pools_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">基础就绪 / 总数</p></div></div></article></div>
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">计算节点</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_hosts|default:0|escape} / {$resource_page.summary.hosts_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">基础就绪 / 总数</p></div></div></article></div>
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">CPU 可用</h2><strong class="admin-stat-value">{$resource_page.summary.placement_capacity.cpu.free|default:0|escape}</strong><p class="text-muted fs-12 mb-0">共 {$resource_page.summary.capacity.cpu.configured|default:0|escape} 核已配置</p></div></div></article></div>
<div class="col-6 col-xl-3"><article class="card admin-stat-card"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">公网 IP 可用</h2><strong class="admin-stat-value">{$resource_page.summary.placement_capacity.ip.free|default:0|escape}</strong><p class="text-muted fs-12 mb-0">共 {$resource_page.summary.capacity.ip.total|default:0|escape} 个已登记</p></div></div></article></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=capacity&amp;focus=ready_pools"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">计算资源池</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_pools|default:0|escape} / {$resource_page.summary.pools_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">基础就绪 / 总数</p></div></div></a></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=capacity&amp;focus=ready_hosts"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">计算节点</h2><strong class="admin-stat-value">{$resource_page.summary.placement_ready_hosts|default:0|escape} / {$resource_page.summary.hosts_total|default:0|escape}</strong><p class="text-muted fs-12 mb-0">基础就绪 / 总数</p></div></div></a></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=capacity&amp;focus=cpu"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">CPU 可用</h2><strong class="admin-stat-value">{$resource_page.summary.placement_capacity.cpu.free|default:0|escape}</strong><p class="text-muted fs-12 mb-0">共 {$resource_page.summary.capacity.cpu.configured|default:0|escape} 核已配置</p></div></div></a></div>
<div class="col-6 col-xl-3"><a class="card admin-stat-card text-reset text-decoration-none" href="/admin/resources?view=capacity&amp;focus=ip"><div class="card-body"><div><h2 class="text-muted fs-14 fw-normal mb-1">公网 IP 可用</h2><strong class="admin-stat-value">{$resource_page.summary.placement_capacity.ip.free|default:0|escape}</strong><p class="text-muted fs-12 mb-0">共 {$resource_page.summary.capacity.ip.total|default:0|escape} 个已登记</p></div></div></a></div>
</section>
<section class="card" aria-labelledby="resource-capacity-title">
<div class="card-body pb-0 d-flex justify-content-between align-items-center gap-2 flex-wrap">
<span class="text-muted fs-13">当前显示:{if $resource_focus == 'ready_pools'}基础就绪资源池{elseif $resource_focus == 'ready_hosts'}基础就绪节点{elseif $resource_focus == 'hosts'}全部计算节点{elseif $resource_focus == 'cpu'}有可用 CPU 的资源池{elseif $resource_focus == 'ip'}有可用公网 IP 的资源池{else}全部资源池{/if}</span>
<div class="d-flex gap-2"><a class="btn btn-light btn-sm" href="/admin/resources?view=capacity&amp;focus=hosts">全部节点</a><a class="btn btn-light btn-sm" href="/admin/resources?view=capacity">清空筛选</a></div>
</div>
<div class="card-header admin-resource-section-header"><div><h2 class="h5 card-title mb-1" id="resource-capacity-title">容量与健康</h2><span class="text-muted fs-13">基础就绪只表示 Agent、存储、网络和容量已通过;具体套餐与镜像在下单时继续校验。</span></div><a class="btn btn-light btn-sm" href="/admin/hosts">配置计算节点</a></div>
<div class="card-body">
<form class="admin-resource-local-filter" data-resource-local-filter novalidate><label><span class="visually-hidden">搜索计算资源池</span><i class="mdi mdi-magnify" aria-hidden="true"></i><input class="form-control" type="search" data-resource-search placeholder="搜索地区、线路或资源池" autocomplete="off"></label><label class="form-check form-switch mb-0"><input class="form-check-input" type="checkbox" data-resource-only-issues><span class="form-check-label">仅显示异常</span></label></form>
{if $resource_focus == 'hosts' || $resource_focus == 'ready_hosts'}
<div class="admin-resource-table-wrap"><table class="table table-hover align-middle mb-0 admin-resource-responsive-table"><caption class="visually-hidden">计算节点基础条件</caption><thead><tr><th>计算节点</th><th>地区与资源池</th><th>基础条件</th></tr></thead><tbody>
{foreach $resource_page.capacity_hosts as $host}<tr data-resource-capacity-row data-resource-effective-state="{if $host.placement_ready}ready{else}unavailable{/if}" data-resource-search-index="{$host.name|escape} {$host.id|escape} {$host.region_name|escape} {$host.pool_name|escape}"><td data-label="计算节点"><strong>{$host.name|escape}</strong><span class="admin-resource-cell-note">ID {$host.id|escape}</span></td><td data-label="地区与资源池">{$host.region_name|escape} · {$host.pool_name|escape}</td><td data-label="基础条件">{if $host.placement_ready}<span class="admin-resource-state is-ready">基础就绪</span>{else}<span class="admin-resource-state is-unavailable">未就绪</span>{/if}</td></tr>{foreachelse}<tr data-resource-empty-row><td colspan="3" class="text-muted text-center py-4">没有符合条件的计算节点。</td></tr>{/foreach}
<tr data-resource-filter-empty hidden><td colspan="3" class="text-muted text-center py-4">没有符合搜索条件的计算节点。</td></tr>
</tbody></table></div>
{else}
<div class="admin-resource-table-wrap"><table class="table table-hover align-middle mb-0 admin-resource-responsive-table"><caption class="visually-hidden">计算资源池容量与健康</caption><thead><tr><th>位置与资源池</th><th>基础就绪节点</th><th>CPU</th><th>内存</th><th>磁盘</th><th>公网 IP</th><th>健康状态</th></tr></thead><tbody>
{foreach $resource_page.pools as $pool}<tr data-resource-capacity-row data-resource-effective-state="{$pool.effective_state|escape}" data-resource-search-index="{$pool.region_name|escape} {$pool.line_name|escape} {$pool.name|escape} {$pool.code|escape}">
{foreach $resource_page.capacity_pools as $pool}<tr data-resource-capacity-row data-resource-effective-state="{$pool.effective_state|escape}" data-resource-search-index="{$pool.region_name|escape} {$pool.line_name|escape} {$pool.name|escape} {$pool.code|escape}">
<td data-label="位置与资源池"><span class="admin-checkout-user"><strong>{$pool.name|escape}</strong><span>{$pool.region_name|escape}{if $resource_page.line_feature_enabled} · {$pool.line_name|escape}{/if}</span></span></td>
<td data-label="基础就绪节点"><strong>{$pool.health.placement_ready_host_count|default:0|escape} / {$pool.health.host_count|default:0|escape}</strong><span class="admin-resource-cell-note">Agent {$pool.health.agent_ready_host_count|default:0|escape} · 存储 {$pool.health.storage_ready_host_count|default:0|escape} · 网络 {$pool.health.network_ready_host_count|default:0|escape}</span></td>
<td data-label="CPU"><strong>{$pool.placement_capacity.cpu.free|default:0|escape} 核</strong><span class="admin-resource-cell-note">配置 {$pool.capacity.cpu.configured|default:0|escape} · 可分配 {$pool.capacity.cpu.allocatable|default:0|escape}</span></td>
@ -113,6 +124,7 @@
</tr>{foreachelse}<tr data-resource-empty-row><td colspan="7" class="text-center text-muted py-4">尚未建立计算资源池。</td></tr>{/foreach}
<tr data-resource-filter-empty hidden><td colspan="7" class="text-center text-muted py-4">没有符合条件的计算资源池。</td></tr>
</tbody></table></div>
{/if}
</div>
</section>
{else}

@ -1,2 +1,2 @@
{* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *}
{assign var=venix_asset_version value='2026103129' scope='global'}
{assign var=venix_asset_version value='2026103130' scope='global'}

@ -73,6 +73,20 @@ $assert(str_contains($source, '$isNew = !$region->exists;')
'Hidden-line mode must serialize on the feature row, then atomically create or backfill an active default line for every region.');
$reflection = new ReflectionClass(CloudAdminResourceService::class);
$selection = $reflection->getMethod('capacitySelection');
$catalog = ['pools' => [
['id' => 1, 'effective_state' => 'ready',
'placement_capacity' => ['cpu' => ['free' => 4], 'ip' => ['free' => 0]]],
['id' => 2, 'effective_state' => 'blocked',
'placement_capacity' => ['cpu' => ['free' => 0], 'ip' => ['free' => 2]]],
], 'hosts' => [['id' => 10, 'placement_ready' => true],
['id' => 11, 'placement_ready' => false]]];
$assert(array_column($selection->invoke(null, $catalog, 'ready_pools')['capacity_pools'], 'id') === [1]
&& array_column($selection->invoke(null, $catalog, 'ready_hosts')['capacity_hosts'], 'id') === [10]
&& count($selection->invoke(null, $catalog, 'hosts')['capacity_hosts']) === 2
&& array_column($selection->invoke(null, $catalog, 'cpu')['capacity_pools'], 'id') === [1]
&& array_column($selection->invoke(null, $catalog, 'ip')['capacity_pools'], 'id') === [2],
'Summary shortcuts must use placement readiness and usable capacity, not generic online status.');
$entityCode = $reflection->getMethod('entityCode');
$newModel = (object) ['exists' => false, 'code' => ''];
$generated = $entityCode->invoke(null, [], $newModel, 'region', '东京', 32,

Loading…
Cancel
Save