diff --git a/src/components/collapse-container/index.tsx b/src/components/collapse-container/index.tsx index 286d991f..21fc862a 100644 --- a/src/components/collapse-container/index.tsx +++ b/src/components/collapse-container/index.tsx @@ -39,7 +39,7 @@ const useStyles = createStyles(({ css, token }) => { return { title: css` font-weight: 400; - height: 56px; + min-height: 56px; font-size: var(--font-size-base); display: flex; justify-content: space-between; diff --git a/src/locales/en-US/clusters.ts b/src/locales/en-US/clusters.ts index 99e497d7..634d21d0 100644 --- a/src/locales/en-US/clusters.ts +++ b/src/locales/en-US/clusters.ts @@ -62,7 +62,7 @@ export default { 'If device detection fails, try removing --env ROCM_SMI_LIB_PATH=/opt/hyhal/lib.', 'clusters.addworker.selectCluster': 'Select Cluster', 'clusters.addworker.selectCluster.tips': - 'For non-Docker clusters, please register clusters or manage worker pools from the Clusters page.', + 'For non-Docker clusters, please register clusters or manage worker pools from the Clusters page.', 'clusters.addworker.selectGPU': 'Select GPU Vendor', 'clusters.addworker.checkEnv': 'Check Environment', 'clusters.addworker.specifyArgs': 'Specify Arguments', @@ -116,7 +116,7 @@ export default { 'Specify the server URL accessible from your cloud provider.', 'clusters.form.setDefault': 'Set as Default', 'clusters.form.setDefault.tips': 'Default for deployment.', - 'clusters.addworker.noClusters': 'No available clusters', + 'clusters.addworker.noClusters': 'No available Docker clusters found', 'clusters.create.steps.complete.tips': 'Cluster created successfully!', 'clusters.create.steps.complete': 'Complete', 'clusters.create.steps.configure': 'Configure', diff --git a/src/locales/ja-JP/clusters.ts b/src/locales/ja-JP/clusters.ts index e2051e38..a2186d7b 100644 --- a/src/locales/ja-JP/clusters.ts +++ b/src/locales/ja-JP/clusters.ts @@ -62,7 +62,7 @@ export default { 'If device detection fails, try removing --env ROCM_SMI_LIB_PATH=/opt/hyhal/lib.', 'clusters.addworker.selectCluster': 'Select Cluster', 'clusters.addworker.selectCluster.tips': - 'For non-Docker clusters, please register clusters or manage worker pools from the Clusters page.', + 'For non-Docker clusters, please register clusters or manage worker pools from the Clusters page.', 'clusters.addworker.selectGPU': 'Select GPU Vendor', 'clusters.addworker.checkEnv': 'Check Environment', 'clusters.addworker.specifyArgs': 'Specify Arguments', @@ -116,7 +116,7 @@ export default { 'Specify the server URL accessible from your cloud provider.', 'clusters.form.setDefault': 'Set as Default', 'clusters.form.setDefault.tips': 'Default for deployment.', - 'clusters.addworker.noClusters': 'No available clusters', + 'clusters.addworker.noClusters': 'No available Docker clusters found', 'clusters.create.steps.complete.tips': 'Cluster created successfully!', 'clusters.create.steps.complete': 'Complete', 'clusters.create.steps.configure': 'Configure', @@ -180,7 +180,7 @@ export default { // 49. 'clusters.addworker.cambriconNotes': 'If the /usr/local/neuware directory does not exist, create a symbolic link to the Cambricon installation path: ln -s /path/to/neuware /usr/local/neuware.' // 50. 'clusters.addworker.hygonNotes-02': 'If device detection fails, try removing --env ROCM_SMI_LIB_PATH=/opt/hyhal/lib.', // 51. 'clusters.addworker.selectCluster': 'Select Cluster', -// 52. 'clusters.addworker.selectCluster.tips': 'For non-Docker clusters, please register clusters or manage worker pools from the Clusters page.', +// 52. 'clusters.addworker.selectCluster.tips': 'For non-Docker clusters, please register clusters or manage worker pools from the Clusters page.', // 53. 'clusters.addworker.selectGPU': 'Select GPU Vendor', // 54. 'clusters.addworker.checkEnv': 'Check Environment', // 55. 'clusters.addworker.specifyArgs': 'Specify Arguments', @@ -219,7 +219,7 @@ export default { // 84. 'clusters.form.setDefault.tips': 'Default for deployment', // 85. 'clusters.addworker.enterWorkerAddress': 'Enter worker external address', // 86. 'clusters.addworker.enterWorkerAddress.error': 'Please enter the worker external address.', -// 87. 'clusters.addworker.noClusters': 'No available clusters', +// 87. 'clusters.addworker.noClusters': 'No available Docker clusters found', // 88. 'clusters.create.steps.complete.tips': 'Cluster created successfully!', // 89. 'clusters.create.steps.complete': 'Complete', // 90. 'clusters.create.dockerTips1': 'Next, add worker to this cluster.', diff --git a/src/locales/ru-RU/clusters.ts b/src/locales/ru-RU/clusters.ts index bad6ab5d..7bec35bd 100644 --- a/src/locales/ru-RU/clusters.ts +++ b/src/locales/ru-RU/clusters.ts @@ -62,7 +62,7 @@ export default { 'Если не удается обнаружить устройства, попробуйте удалить --env ROCM_SMI_LIB_PATH=/opt/hyhal/lib.', 'clusters.addworker.selectCluster': 'Выбрать кластер', 'clusters.addworker.selectCluster.tips': - 'Для не-Docker кластеров, пожалуйста, регистрируйте кластеры или управляйте пулами воркеров на странице Кластеры.', + 'Для не-Docker кластеров, пожалуйста, регистрируйте кластеры или управляйте пулами воркеров на странице Кластеры.', 'clusters.addworker.selectGPU': 'Выбрать производителя GPU', 'clusters.addworker.checkEnv': 'Проверить окружение', 'clusters.addworker.specifyArgs': 'Указать аргументы', @@ -117,7 +117,7 @@ export default { 'clusters.form.setDefault': 'Установить по умолчанию', 'clusters.form.setDefault.tips': 'Использовать по умолчанию для развертывания.', - 'clusters.addworker.noClusters': 'No available clusters', + 'clusters.addworker.noClusters': 'No available Docker clusters found', 'clusters.create.steps.complete.tips': 'Cluster created successfully!', 'clusters.create.steps.complete': 'Complete', 'clusters.create.steps.configure': 'Configure', @@ -131,7 +131,7 @@ export default { // ========== To-Do: Translate Keys (Remove After Translation) ========== // 1. 'clusters.addworker.hygonNotes': `If /opt/hyhal or /opt/dtk does not exist, create symbolic links pointing to the corresponding Hygon installation paths, for example: ln -s /path/to/hyhal /opt/hyhal ln -s /path/to/dtk /opt/dtk.`, -// 2. 'clusters.addworker.noClusters': 'No available clusters', +// 2. 'clusters.addworker.noClusters': 'No available Docker clusters found', // 3. 'clusters.create.steps.complete.tips': 'Cluster created successfully!', // 4. 'clusters.create.steps.complete': 'Complete', // 5. 'clusters.create.dockerTips1': 'Next, add worker to this cluster.', diff --git a/src/locales/zh-CN/clusters.ts b/src/locales/zh-CN/clusters.ts index f513da93..e2dbaa7e 100644 --- a/src/locales/zh-CN/clusters.ts +++ b/src/locales/zh-CN/clusters.ts @@ -62,7 +62,7 @@ export default { '如果未能检测到设备，请尝试移除 --env ROCM_SMI_LIB_PATH=/opt/hyhal/lib。', 'clusters.addworker.selectCluster': '选择集群', 'clusters.addworker.selectCluster.tips': - '非 Docker 集群请前往集群页面注册集群或管理节点池。', + '非 Docker 集群请前往集群页面注册集群或管理节点池。', 'clusters.addworker.selectGPU': '选择 GPU 厂商', 'clusters.addworker.checkEnv': '检查环境', 'clusters.addworker.specifyArgs': '指定参数', @@ -113,7 +113,7 @@ export default { 'clusters.form.serverUrl.tips': '指定可从您的云服务提供商访问的服务器地址。', 'clusters.form.setDefault': '设为默认', 'clusters.form.setDefault.tips': '部署时的默认集群。', - 'clusters.addworker.noClusters': '无可用集群', + 'clusters.addworker.noClusters': '无可用的 Docker 集群', 'clusters.create.steps.complete.tips': '集群创建成功！', 'clusters.create.steps.complete': '完成', 'clusters.create.steps.configure': '配置', diff --git a/src/pages/cluster-management/cluster-create.tsx b/src/pages/cluster-management/cluster-create.tsx index 792a6ca1..14b44848 100644 --- a/src/pages/cluster-management/cluster-create.tsx +++ b/src/pages/cluster-management/cluster-create.tsx @@ -236,8 +236,12 @@ const ClusterCreate: React.FC<{ // add worker or cluster registration step const handleAddWorker = () => { + const currentTitle = + extraData.provider === ProviderValueMap.Docker + ? 'resources.button.create' + : 'clusters.button.register'; setIsAddWorkerStep(true); - setCurrentTitle?.(intl.formatMessage({ id: 'resources.button.create' })); + setCurrentTitle?.(intl.formatMessage({ id: currentTitle })); onNext(); }; diff --git a/src/pages/cluster-management/cluster-modal.tsx b/src/pages/cluster-management/cluster-modal.tsx index c08e7d91..bbe5788f 100644 --- a/src/pages/cluster-management/cluster-modal.tsx +++ b/src/pages/cluster-management/cluster-modal.tsx @@ -32,7 +32,7 @@ const ClusterModal: React.FC = ({ body: { paddingBlock: 0 }, - wrapper: { width: 700 } + wrapper: { width: 710 } }} footer={false} > diff --git a/src/pages/cluster-management/components/add-cluster.tsx b/src/pages/cluster-management/components/add-cluster.tsx index 4dbf28e8..78522c8c 100644 --- a/src/pages/cluster-management/components/add-cluster.tsx +++ b/src/pages/cluster-management/components/add-cluster.tsx @@ -52,7 +52,7 @@ const AddCluster: React.FC = ({ open={open} onCancel={handleCancel} onSubmit={handleSubmit} - width={700} + width={710} > = (props) => { {stepList.includes(StepNamesMap.SelectCluster) && ( )} - {stepList.includes(StepNamesMap.SelectCluster) && - !clusterList?.length && ( - } - message={intl.formatMessage({ - id: 'resources.worker.noCluster.tips' - })} - > - )} {/* render the steps only when there is at least one cluster available or cluster selection is not required */} {((clusterList && clusterList.length > 0) || !stepList.includes(StepNamesMap.SelectCluster)) && ( diff --git a/src/pages/cluster-management/components/add-worker/index.tsx b/src/pages/cluster-management/components/add-worker/index.tsx index a3e187e6..9ff7adb6 100644 --- a/src/pages/cluster-management/components/add-worker/index.tsx +++ b/src/pages/cluster-management/components/add-worker/index.tsx @@ -131,7 +131,7 @@ const AddWorker: React.FC = (props) => { body: { paddingBlock: 0 }, - wrapper: { width: 700 } + wrapper: { width: 710 } }} footer={false} > diff --git a/src/pages/cluster-management/components/add-worker/select-cluster.tsx b/src/pages/cluster-management/components/add-worker/select-cluster.tsx index 790aff9e..d5c83e93 100644 --- a/src/pages/cluster-management/components/add-worker/select-cluster.tsx +++ b/src/pages/cluster-management/components/add-worker/select-cluster.tsx @@ -50,11 +50,24 @@ const SelectCluster: React.FC = ({ disabled }) => { {stepIndex}.{' '} {intl.formatMessage({ id: 'clusters.addworker.selectCluster' })} - - {intl.formatMessage({ - id: 'clusters.addworker.selectCluster.tips' - })} - + + + } > diff --git a/src/pages/cluster-management/hooks/use-add-worker.tsx b/src/pages/cluster-management/hooks/use-add-worker.tsx index 33b63ba9..69d323e9 100644 --- a/src/pages/cluster-management/hooks/use-add-worker.tsx +++ b/src/pages/cluster-management/hooks/use-add-worker.tsx @@ -69,15 +69,29 @@ const useAddWorker = (props: { item.provider !== ProviderValueMap.Docker }; }) - .filter((item) => item.state === ClusterStatusValueMap.Ready); + .filter( + (item) => + item.state === ClusterStatusValueMap.Ready && + item.provider === ProviderValueMap.Docker + ); }, [clusterList]); + /** + * Add Worker only for Docker clusters, for k8s and digitalocean do something in the cluster list page. + * @param clusterList + * @param includeDigitalOcean + * @returns + */ const checkDefaultCluster = ( - clusterList: Global.BaseOption[] + clusterList: Global.BaseOption[], + includeDigitalOcean?: boolean ) => { // select default and ready cluster first, digitalocean no READY state let currentData = clusterList.find( - (item) => item.is_default && item.state === ClusterStatusValueMap.Ready + (item) => + item.is_default && + item.state === ClusterStatusValueMap.Ready && + item.provider === ProviderValueMap.Docker ); if (!currentData) {