add edas cluster operations & fix inline form wrap issue (#840) (#841)

* fix(cmp): add operations for edas * fix(dop): fix inline form wrap issue Co-authored-by: 戣蓦 <mcdaddychen@126.com>
erda-project · Aug 4, 2021 · 13c7a85 · 13c7a85
1 parent 20be714
commit 13c7a85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/shell/app/modules/cmp/pages/cluster-manage/cluster-list.tsx b/shell/app/modules/cmp/pages/cluster-manage/cluster-list.tsx
@@ -226,15 +226,24 @@ const ClusterList = ({ dataSource, onEdit }: IProps) => {
       },
     };
     const clusterOpsMap = {
-      edas: [edit, deleteClusterCall],
+      edas: [
+        edit,
+        deleteClusterCall,
+        ...insertWhen(get(clusterDetail, 'basic.manageType.value') === 'agent', [showRegisterCommand]),
+        ...insertWhen(['initialize error', 'unknown'].includes(get(clusterDetail, 'basic.clusterStatus.value')), [
+          retryInit,
+        ]),
+      ],
       k8s: [
         addMachine,
         addCloudMachines,
         edit,
         upgrade,
         deleteClusterCall,
         ...insertWhen(get(clusterDetail, 'basic.manageType.value') === 'agent', [showRegisterCommand]),
-        ...insertWhen(get(clusterDetail, 'basic.clusterStatus.value') === 'initialize error', [retryInit]),
+        ...insertWhen(['initialize error', 'unknown'].includes(get(clusterDetail, 'basic.clusterStatus.value')), [
+          retryInit,
+        ]),
       ],
       'alicloud-cs': [addMachine, addCloudMachines, edit, upgrade, deleteClusterCall],
       'alicloud-cs-managed': [addMachine, addCloudMachines, edit, upgrade, deleteClusterCall],

diff --git a/shell/app/styles/antd-extension.scss b/shell/app/styles/antd-extension.scss
@@ -118,7 +118,7 @@ $border-style: 1px solid $color-border;
 }
 
 .ant-form-inline {
-  flex-wrap: nowrap;
+  flex-wrap: nowrap !important;
 }
 
 div.ant-modal-body {