chore: merge cluster menu to resource

This commit is contained in:
jialin
2026-06-03 18:28:31 +08:00
committed by jialin
parent f055453889
commit 8e31b71668
12 changed files with 49 additions and 69 deletions
+18 -33
View File
@@ -291,6 +291,16 @@ const baseRoutes = [
path: '/resources',
redirect: '/resources/workers'
},
{
name: 'clusters',
path: '/resources/clusters/list',
key: 'clusters',
icon: 'icon-cluster2-outline',
selectedIcon: 'icon-cluster2-filled',
defaultIcon: 'icon-cluster2-outline',
component: './cluster-management/clusters',
subMenu: ['/resources/clusters/detail', '/resources/clusters/create']
},
{
name: 'workers',
path: '/resources/workers',
@@ -308,50 +318,25 @@ const baseRoutes = [
selectedIcon: 'icon-gpu-filled',
defaultIcon: 'icon-gpu1',
component: './resources/components/gpus'
}
]
},
{
name: 'clusterManagement',
path: '/cluster-management',
key: 'clusterManagement',
access: 'canSeeOrgAdmin',
routes: [
{
path: '/cluster-management',
redirect: '/cluster-management/clusters/list'
},
{
name: 'clusters',
path: '/cluster-management/clusters/list',
key: 'clusters',
icon: 'icon-cluster2-outline',
selectedIcon: 'icon-cluster2-filled',
defaultIcon: 'icon-cluster2-outline',
component: './cluster-management/clusters',
subMenu: [
'/cluster-management/clusters/detail',
'/cluster-management/clusters/create'
]
name: 'credentials',
path: '/resources/credentials',
key: 'credentials',
icon: 'icon-credential-outline',
selectedIcon: 'icon-credential-filled',
defaultIcon: 'icon-credential-outline',
component: './cluster-management/credentials'
},
{
name: 'clusterDetail',
path: '/cluster-management/clusters/detail',
path: '/resources/clusters/detail',
key: 'clusterDetail',
icon: 'icon-cluster2-outline',
selectedIcon: 'icon-cluster2-filled',
defaultIcon: 'icon-cluster2-outline',
hideInMenu: true,
component: './cluster-management/cluster-detail'
},
{
name: 'credentials',
path: '/cluster-management/credentials',
key: 'credentials',
icon: 'icon-credential-outline',
selectedIcon: 'icon-credential-filled',
defaultIcon: 'icon-credential-outline',
component: './cluster-management/credentials'
}
]
},
+3 -3
View File
@@ -68,9 +68,9 @@ const NO_CONTAINER_PAGES = [
const CHECK_RESOURCE_PATH = [
'/resources/workers',
'/cluster-management/clusters/list',
'/cluster-management/credentials',
'/cluster-management/clusters/create'
'/resources/clusters/list',
'/resources/credentials',
'/resources/clusters/create'
];
type NewRoute = IRoute & {
+4 -5
View File
@@ -38,11 +38,10 @@ export default {
'menu.billingAndUsage': 'Billing & Usage',
'menu.billingAndUsage.usage': 'Usage',
'menu.404': '404',
'menu.clusterManagement': 'Cluster Management',
'menu.clusterManagement.clusters': 'Clusters',
'menu.clusterManagement.credentials': 'Cloud Credentials',
'menu.clusterManagement.clusterDetail': 'Cluster Detail',
'menu.clusterManagement.clusterCreate': 'Create Cluster',
'menu.resources.clusters': 'Clusters',
'menu.resources.credentials': 'Cloud Credentials',
'menu.resources.clusterDetail': 'Cluster Detail',
'menu.resources.clusterCreate': 'Create Cluster',
'menu.models.backendsList': 'Inference Backends',
'menu.gpuService': 'GPU Service',
'menu.gpuService.instances': 'GPU Instances',
+4 -5
View File
@@ -37,12 +37,11 @@ export default {
'menu.accessControl': 'Access Control',
'menu.accessControl.apikeys': 'API Keys',
'menu.accessControl.users': 'Users',
'menu.clusterManagement': 'Cluster Management',
'menu.clusterManagement.clusters': 'Clusters',
'menu.clusterManagement.credentials': 'Cloud Credentials',
'menu.resources.clusters': 'Clusters',
'menu.resources.credentials': 'Cloud Credentials',
'menu.models.userModels': 'My Models',
'menu.clusterManagement.clusterDetail': 'Cluster Detail',
'menu.clusterManagement.clusterCreate': 'Create Cluster',
'menu.resources.clusterDetail': 'Cluster Detail',
'menu.resources.clusterCreate': 'Create Cluster',
'menu.models.backendsList': 'Inference Backends',
'menu.gpuService': 'GPU Service',
'menu.gpuService.instances': 'GPU Instances',
+4 -5
View File
@@ -36,12 +36,11 @@ export default {
'menu.accessControl': 'Управление доступом',
'menu.accessControl.apikeys': 'API Ключи',
'menu.accessControl.users': 'Пользователи',
'menu.clusterManagement': 'Управление кластерами',
'menu.clusterManagement.clusters': 'Кластеры',
'menu.clusterManagement.credentials': 'Облачные аккаунты',
'menu.resources.clusters': 'Кластеры',
'menu.resources.credentials': 'Облачные аккаунты',
'menu.models.userModels': 'Мои модели',
'menu.clusterManagement.clusterDetail': 'Детали кластера',
'menu.clusterManagement.clusterCreate': 'Создать кластер',
'menu.resources.clusterDetail': 'Детали кластера',
'menu.resources.clusterCreate': 'Создать кластер',
'menu.models.backendsList': 'Бэкенды запуска',
'menu.settings': 'Settings',
'menu.gpuService': 'GPU Service',
+4 -5
View File
@@ -36,11 +36,10 @@ export default {
'menu.billingAndUsage': 'Faturalandırma ve Kullanım',
'menu.billingAndUsage.usage': 'Kullanım',
'menu.404': '404',
'menu.clusterManagement': 'Küme Yönetimi',
'menu.clusterManagement.clusters': 'Kümeler',
'menu.clusterManagement.credentials': 'Bulut Kimlik Bilgileri',
'menu.clusterManagement.clusterDetail': 'Küme Detayı',
'menu.clusterManagement.clusterCreate': 'Küme Oluştur',
'menu.resources.clusters': 'Kümeler',
'menu.resources.credentials': 'Bulut Kimlik Bilgileri',
'menu.resources.clusterDetail': 'Küme Detayı',
'menu.resources.clusterCreate': 'Küme Oluştur',
'menu.models.backendsList': 'Çıkarım Altyapıları',
'menu.models.instances': 'Instances',
'menu.settings': 'Settings',
+4 -5
View File
@@ -38,11 +38,10 @@ export default {
'menu.accessControl': '访问控制',
'menu.accessControl.apikeys': 'API 密钥',
'menu.accessControl.users': '用户',
'menu.clusterManagement': '集群管理',
'menu.clusterManagement.clusters': '集群',
'menu.clusterManagement.credentials': '云凭证',
'menu.clusterManagement.clusterDetail': '集群详情',
'menu.clusterManagement.clusterCreate': '创建集群',
'menu.resources.clusters': '集群',
'menu.resources.credentials': '云凭证',
'menu.resources.clusterDetail': '集群详情',
'menu.resources.clusterCreate': '创建集群',
'menu.models.backendsList': '推理后端',
'menu.gpuService': 'GPU 服务',
'menu.gpuService.instances': 'GPU 实例',
+2 -2
View File
@@ -271,7 +271,7 @@ const Clusters: React.FC = () => {
const handleOnCell = useMemoizedFn((record: ClusterListItem, dataIndex) => {
if (dataIndex === 'name') {
navigate(
`/cluster-management/clusters/detail?id=${record.id}&name=${record.name}&page=clusters`
`/resources/clusters/detail?id=${record.id}&name=${record.name}&page=clusters`
);
}
});
@@ -461,7 +461,7 @@ const Clusters: React.FC = () => {
<DeleteModal ref={modalRef}></DeleteModal>
<ClusterModal
title={intl.formatMessage({
id: 'menu.clusterManagement.clusterCreate'
id: 'menu.resources.clusterCreate'
})}
open={clusterModalStatus.open}
providerHint={pendingProviderHint}
@@ -53,7 +53,7 @@ const NotFoundCredentialContent: React.FC = () => {
};
return (
<Link to={'/cluster-management/credentials'} onClick={handleOnClick}>
<Link to={'/resources/credentials'} onClick={handleOnClick}>
{intl.formatMessage({ id: 'clusters.button.addCredential' })}
</Link>
);
@@ -104,7 +104,7 @@ export default function useAddResource(options?: { onCreated?: () => void }) {
firstAddCluster: true
});
navigate(`/cluster-management/clusters/list`);
navigate(`/resources/clusters/list`);
return;
}
@@ -113,7 +113,7 @@ export default function useAddResource(options?: { onCreated?: () => void }) {
firstAddWorker: true,
firstAddCluster: false
});
navigate(`/cluster-management/clusters/list`);
navigate(`/resources/clusters/list`);
}
};
+1 -1
View File
@@ -41,7 +41,7 @@ const GPUService: React.FC = () => {
firstAddCluster: true,
providerHint: ProviderValueMap.Kubernetes
});
navigate('/cluster-management/clusters/list');
navigate('/resources/clusters/list');
};
const {
@@ -52,7 +52,7 @@ const useNoResourceResult = (props: {
firstAddCluster: true
});
navigate(`/cluster-management/clusters/list`);
navigate(`/resources/clusters/list`);
return;
}
@@ -61,7 +61,7 @@ const useNoResourceResult = (props: {
firstAddWorker: true,
firstAddCluster: false
});
navigate(`/cluster-management/clusters/list`);
navigate(`/resources/clusters/list`);
}
});