From 3a9bf17d7ebb3aa30efca27b6d54c7b957084104 Mon Sep 17 00:00:00 2001 From: jialin Date: Tue, 23 Sep 2025 11:10:17 +0800 Subject: [PATCH] chore: update worker, cluster status value --- src/pages/cluster-management/config/index.ts | 44 ++----------------- src/pages/cluster-management/config/types.ts | 1 + .../hooks/use-pools-columns.tsx | 4 +- src/pages/resources/config/index.ts | 6 +-- .../resources/hooks/use-worker-columns.tsx | 2 +- 5 files changed, 10 insertions(+), 47 deletions(-) diff --git a/src/pages/cluster-management/config/index.ts b/src/pages/cluster-management/config/index.ts index 9b312dcb..220e951d 100644 --- a/src/pages/cluster-management/config/index.ts +++ b/src/pages/cluster-management/config/index.ts @@ -6,19 +6,19 @@ import React from 'react'; export const ClusterStatusValueMap = { Provisioning: 0, Ready: 3, - ProvisionedNotReady: 1 + Provisioned: 1 }; export const ClusterStatusLabelMap = { [ClusterStatusValueMap.Provisioning]: 'Provisioning', [ClusterStatusValueMap.Ready]: 'Ready', - [ClusterStatusValueMap.ProvisionedNotReady]: 'Provisioned Not Ready' + [ClusterStatusValueMap.Provisioned]: 'Provisioned' }; export const ClusterStatus: Record = { [ClusterStatusValueMap.Provisioning]: StatusMaps.transitioning, [ClusterStatusValueMap.Ready]: StatusMaps.success, - [ClusterStatusValueMap.ProvisionedNotReady]: StatusMaps.error + [ClusterStatusValueMap.Provisioned]: StatusMaps.transitioning }; export const ProviderValueMap = { @@ -186,44 +186,6 @@ export const clusterActionList = [ } ]; -export const regionList: { - label: string; - datacenter: string; - value: string; - icon: string; -}[] = [ - { label: 'New York', datacenter: 'Datacenter 1', value: 'nyc1', icon: '🇺🇸' }, - { label: 'New York', datacenter: 'Datacenter 2', value: 'nyc2', icon: '🇺🇸' }, - { label: 'New York', datacenter: 'Datacenter 3', value: 'nyc3', icon: '🇺🇸' }, - { label: 'Toronto', datacenter: 'Datacenter 1', value: 'tor1', icon: '🇨🇦' }, - { - label: 'San Francisco', - datacenter: 'Datacenter 1', - value: 'sfo1', - icon: '🇺🇸' - }, - { - label: 'San Francisco', - datacenter: 'Datacenter 2', - value: 'sfo2', - icon: '🇺🇸' - }, - { - label: 'San Francisco', - datacenter: 'Datacenter 3', - value: 'sfo3', - icon: '🇺🇸' - }, - { label: 'Atlanta', datacenter: 'Datacenter 1', value: 'atl1', icon: '🇺🇸' }, - { label: 'Singapore', datacenter: 'Datacenter 1', value: 'sgp1', icon: '🇸🇬' }, - { label: 'Bangalore', datacenter: 'Datacenter 1', value: 'blr1', icon: '🇮🇳' }, - { label: 'London', datacenter: 'Datacenter 1', value: 'lon1', icon: '🇬🇧' }, - { label: 'Amsterdam', datacenter: 'Datacenter 2', value: 'ams2', icon: '🇳🇱' }, - { label: 'Amsterdam', datacenter: 'Datacenter 3', value: 'ams3', icon: '🇳🇱' }, - { label: 'Frankfurt', datacenter: 'Datacenter 1', value: 'fra1', icon: '🇩🇪' }, - { label: 'Sydney', datacenter: 'Datacenter 1', value: 'syd1', icon: '🇦🇺' } -]; - export const CloudOptionItems = [ { label: 'Volumes', diff --git a/src/pages/cluster-management/config/types.ts b/src/pages/cluster-management/config/types.ts index 7a183443..0f806d8a 100644 --- a/src/pages/cluster-management/config/types.ts +++ b/src/pages/cluster-management/config/types.ts @@ -39,6 +39,7 @@ export interface NodePoolListItem extends NodePoolFormData { instance_type: string; replicas: number; workers: number; + ready_workers?: number; batch_size: number; labels: Record; cloud_options: Record; diff --git a/src/pages/cluster-management/hooks/use-pools-columns.tsx b/src/pages/cluster-management/hooks/use-pools-columns.tsx index c50580b9..a8310b31 100644 --- a/src/pages/cluster-management/hooks/use-pools-columns.tsx +++ b/src/pages/cluster-management/hooks/use-pools-columns.tsx @@ -135,7 +135,7 @@ const usePoolsColumns = ( }, render: (text: string, record: ListItem) => ( - {record.workers} / {record.replicas} + {record.ready_workers} / {record.replicas} ) }, @@ -158,7 +158,7 @@ const usePoolsColumns = ( // }, { title: intl.formatMessage({ id: 'common.table.createTime' }), - dataIndex: 'create_at', + dataIndex: 'created_at', key: 'created_at', span: 4, showSorterTootip: false, diff --git a/src/pages/resources/config/index.ts b/src/pages/resources/config/index.ts index f84b7041..1fc97f67 100644 --- a/src/pages/resources/config/index.ts +++ b/src/pages/resources/config/index.ts @@ -9,7 +9,7 @@ export const WorkerStatusMap = { deleting: 'deleting', error: 'error', pending: 'pending', - provisioned: 'provisioned' + initializing: 'initializing' }; export const WorkerStatusMapValue = { @@ -19,7 +19,7 @@ export const WorkerStatusMapValue = { [WorkerStatusMap.provisioning]: 'Provisioning', [WorkerStatusMap.deleting]: 'Deleting', [WorkerStatusMap.error]: 'Error', - [WorkerStatusMap.provisioned]: 'Provisioned', + [WorkerStatusMap.initializing]: 'Initializing', [WorkerStatusMap.pending]: 'Pending' }; @@ -31,7 +31,7 @@ export const status: any = { [WorkerStatusMap.deleting]: StatusMaps.transitioning, [WorkerStatusMap.error]: StatusMaps.error, [WorkerStatusMap.pending]: StatusMaps.transitioning, - [WorkerStatusMap.provisioned]: StatusMaps.transitioning + [WorkerStatusMap.initializing]: StatusMaps.transitioning }; export const addWorkerGuide: Record = { diff --git a/src/pages/resources/hooks/use-worker-columns.tsx b/src/pages/resources/hooks/use-worker-columns.tsx index e98e9030..9f811932 100644 --- a/src/pages/resources/hooks/use-worker-columns.tsx +++ b/src/pages/resources/hooks/use-worker-columns.tsx @@ -181,7 +181,7 @@ const StorageCell = ({ files }: { files: Filesystem[] }) => { const statusAvailable = (record: ListItem) => { return ( - WorkerStatusMap.provisioned !== record.state && + WorkerStatusMap.initializing !== record.state && WorkerStatusMap.provisioning !== record.state && record.status );