fix: Fix devops bugs (#4299)

* fix: Fix workspace devops list page bugs (#4924) * locale: fix devops locales Signed-off-by: yazhou <[email protected]> * fix: fix devops cluster options Signed-off-by: yazhou <[email protected]> * fix: Fix devops list modal and styles Signed-off-by: yazhou <[email protected]> --------- Signed-off-by: yazhou <[email protected]> * locale: update locales (#4935) Signed-off-by: yazhou <[email protected]> --------- Signed-off-by: yazhou <[email protected]>
kubesphere · Sep 19, 2024 · 17eb255 · 17eb255
1 parent edc6058
commit 17eb255
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/locales/en/custom.js b/locales/en/custom.js
@@ -541,4 +541,5 @@ module.exports = {
     'Observer of the DevOps project, capable of viewing the running status of pipelines',
   DEVOPS_PROJECT_DESC:
     "DevOps projects are used to group resources for management and to control different users' resource management permissions.",
+  PLEASE_SELECT_CLUSTER: 'Please select a cluster',
 };
diff --git a/locales/es/custom.js b/locales/es/custom.js
@@ -541,4 +541,5 @@ module.exports = {
     'Observer of the DevOps project, capable of viewing the running status of pipelines',
   DEVOPS_PROJECT_DESC:
     "DevOps projects are used to group resources for management and to control different users' resource management permissions.",
+  PLEASE_SELECT_CLUSTER: 'Please select a cluster',
 };
diff --git a/locales/tc/custom.js b/locales/tc/custom.js
@@ -541,4 +541,5 @@ module.exports = {
     'Observer of the DevOps project, capable of viewing the running status of pipelines',
   DEVOPS_PROJECT_DESC:
     "DevOps projects are used to group resources for management and to control different users' resource management permissions.",
+  PLEASE_SELECT_CLUSTER: '請選擇集群',
 };
diff --git a/locales/zh/custom.js b/locales/zh/custom.js
@@ -461,7 +461,7 @@ module.exports = {
   pipeline_developer: 'DevOps 业务的开发者，可以进行流水线的触发以及查看',
   pipeline_reporter: 'DevOps 业务的观察者，可以查看流水线的运行情况',
   DEVOPS_PROJECT_DESC: 'DevOps 业务用于对资源进行分组管理以及控制不同用户的资源管理权限。',
-
+  PLEASE_SELECT_CLUSTER: '请选择集群',
   // 应用介绍
   NO_DOCUMENT_DESC: '未发现应用介绍。',
   DOCUMENTATION: '应用介绍',

diff --git a/packages/console/src/pages/workspaces/containers/Devops/ClusterSelect.tsx b/packages/console/src/pages/workspaces/containers/Devops/ClusterSelect.tsx
@@ -56,8 +56,9 @@ const useWorkspaceClusterSelect = (initParams: ProjectSelectInitValue = {}) => {
 
   // select first
   React.useEffect(() => {
-    if (!cluster && clusterList?.filter(i => !i.disabled)?.length) {
-      setCluster(first(clusterList)?.name);
+    const clusters = clusterList?.filter(i => !i.disabled) ?? [];
+    if (!cluster && clusters.length) {
+      setCluster(first(clusters)?.name);
     }
   }, [clusterList]);
 

diff --git a/packages/console/src/pages/workspaces/containers/Devops/index.tsx b/packages/console/src/pages/workspaces/containers/Devops/index.tsx
@@ -10,23 +10,21 @@ import {
   FormattedDevops,
   getDisplayName,
   getLocalTime,
-  PodsStore,
   StatusIndicator,
   tableState2Query,
   useBatchActions,
-  useCacheStore,
   useCommonActions,
   useItemActions,
   useTableActions,
   useUrlSearchParamsStatus,
   useV3action,
 } from '@ks-console/shared';
+import { Banner, BannerTip, Card, DataTable } from '@kubed/components';
+import { Pen, StrategyGroup, Trash } from '@kubed/icons';
 import { ColumnDef, Table } from '@tanstack/react-table';
 import * as React from 'react';
 import { useParams } from 'react-router-dom';
 import useWorkspaceClusterSelect from './ClusterSelect';
-import { Pen, StrategyGroup, Trash } from '@kubed/icons';
-import { Banner, BannerTip, Card, DataTable, notify } from '@kubed/components';
 
 const module = devopsStore.module;
 
@@ -45,7 +43,7 @@ const Devops = () => {
   const { cluster } = params;
   const { state, setState } = useUrlSearchParamsStatus([]);
 
-  const { open: openV3Modal } = useV3action();
+  const { open: openV3Modal, render } = useV3action();
 
   const commonParams = {
     cluster: cluster,
@@ -90,7 +88,7 @@ const Devops = () => {
             v3Module: 'devopsStore',
             ...commonParams,
             detail: record,
-            v3StoreParams: '',
+            v3StoreParams: {},
             action: 'devops.edit',
             success: () => {
               refetch();
@@ -299,7 +297,7 @@ const Devops = () => {
           if (!cluster) {
             return {
               image: <StrategyGroup size={40} />,
-              description: t('PLEASE_SELECT_CLUSTER_OR_PROJECT'),
+              description: t('PLEASE_SELECT_CLUSTER'),
             };
           }
           return {
@@ -316,18 +314,18 @@ const Devops = () => {
 
   const banner = {
     icon: <StrategyGroup />,
-    title: t('DEVOPS.DEVOPS_PROJECT_PL'),
-    description: t('DEVOPS.DEVOPS_DESCRIPTION'),
+    title: t('DEVOPS_PROJECT_PL'),
+    description: t('DEVOPS_DESCRIPTION'),
   };
 
   const tips = [
     {
-      title: t('DEVOPS.DEVOPS_TIP_GITOPS_Q'),
+      title: t('DEVOPS_TIP_GITOPS_Q'),
       description: t('DEVOPS_TIP_GITOPS_A'),
     },
     {
-      title: t('DEVOPS.DEVOPS_TIP_TYPE_Q'),
-      description: t('DEVOPS.DEVOPS_TIP_TYPE_A'),
+      title: t('DEVOPS_TIP_TYPE_Q'),
+      description: t('DEVOPS_TIP_TYPE_A'),
     },
   ];
 
@@ -343,6 +341,7 @@ const Devops = () => {
       <Card padding={0}>
         <DataTable.DataTable table={table} />
       </Card>
+      {render()}
     </>
   );
 };

diff --git a/packages/core/src/components/GlobalStyles/index.tsx b/packages/core/src/components/GlobalStyles/index.tsx
@@ -147,6 +147,15 @@ const GlobalStyles = createGlobalStyle`
       visibility: visible;
     }
   }
+  .kube-table {
+    td.table-cell {
+      word-break: break-word;
+
+      .field-label {
+        max-width: 350px;
+      }
+     }
+  }
 `;
 
 export default GlobalStyles;