From a3002ce450b62146bf8cd15df7d40055cf06e81e Mon Sep 17 00:00:00 2001 From: jialin Date: Mon, 22 Sep 2025 14:49:25 +0800 Subject: [PATCH] chore: worker resource info adjust --- .../cluster-management/config/providers.ts | 4 +- .../resources/hooks/use-worker-columns.tsx | 87 +++++++++++++------ 2 files changed, 61 insertions(+), 30 deletions(-) diff --git a/src/pages/cluster-management/config/providers.ts b/src/pages/cluster-management/config/providers.ts index 6c50889c..cef21e12 100644 --- a/src/pages/cluster-management/config/providers.ts +++ b/src/pages/cluster-management/config/providers.ts @@ -42,7 +42,7 @@ export default [ value: ProviderValueMap.AliCloud, key: ProviderValueMap.AliCloud, icon: icons.AliCloud, - description: 'Comming soon', + description: 'Coming soon', group: 'clusters.create.provider.cloud' }, { @@ -52,7 +52,7 @@ export default [ value: ProviderValueMap.TencentCloud, key: ProviderValueMap.TencentCloud, icon: icons.TencentCloud, - description: 'Comming soon', + description: 'Coming soon', group: 'clusters.create.provider.cloud' } ]; diff --git a/src/pages/resources/hooks/use-worker-columns.tsx b/src/pages/resources/hooks/use-worker-columns.tsx index c414f734..e98e9030 100644 --- a/src/pages/resources/hooks/use-worker-columns.tsx +++ b/src/pages/resources/hooks/use-worker-columns.tsx @@ -17,7 +17,7 @@ import { Tooltip } from 'antd'; import { ColumnsType } from 'antd/lib/table'; import _ from 'lodash'; import { useMemo } from 'react'; -import { WorkerStatusMapValue, status } from '../config'; +import { status, WorkerStatusMap, WorkerStatusMapValue } from '../config'; import { Filesystem, GPUDeviceItem, ListItem } from '../config/types'; const ActionList = [ @@ -179,6 +179,18 @@ const StorageCell = ({ files }: { files: Filesystem[] }) => { ); }; +const statusAvailable = (record: ListItem) => { + return ( + WorkerStatusMap.provisioned !== record.state && + WorkerStatusMap.provisioning !== record.state && + record.status + ); +}; + +const HolderStatus = () => { + return N/A; +}; + const useWorkerColumns = ({ clusterData, loadend, @@ -249,49 +261,68 @@ const useWorkerColumns = ({ { title: 'CPU', dataIndex: 'cpu', - render: (text: string, record) => ( - - ) + render: (text: string, record) => + statusAvailable(record) ? ( + + ) : ( + + ) }, { title: intl.formatMessage({ id: 'resources.table.memory' }), dataIndex: 'memory', - render: (_, record) => ( - - } - /> - ) + render: (_, record) => + statusAvailable(record) ? ( + + } + /> + ) : ( + + ) }, { title: 'GPU', dataIndex: 'gpu', - render: (_, record) => + render: (_, record) => + statusAvailable(record) ? ( + + ) : ( + + ) }, { title: intl.formatMessage({ id: 'resources.table.vram' }), dataIndex: 'vram', - render: (_, record, rIndex) => ( - - ) + render: (_, record, rIndex) => + statusAvailable(record) ? ( + + ) : ( + + ) }, { title: intl.formatMessage({ id: 'resources.table.disk' }), dataIndex: 'storage', - render: (_, record) => + render: (_, record) => + statusAvailable(record) ? ( + + ) : ( + + ) }, { title: intl.formatMessage({ id: 'common.table.operation' }),