fix delete cluste disable and deletedParameters in Parameter table

oceanbase · Dec 25, 2024 · 96d7508 · 96d7508
1 parent cd09566
commit 96d7508
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/ui/src/i18n/strings/en-US.json b/ui/src/i18n/strings/en-US.json
@@ -1247,5 +1247,6 @@
   "src.components.TopoComponent.2494A473": "Restart the server",
   "src.pages.Tenant.Detail.Overview.892E62C7": "Delete protection modified successfully",
   "src.pages.Tenant.Detail.Overview.EE772326": "Delete protection",
-  "src.pages.Overview.E15A1FED": "metrics-server has not been installed in the K8s cluster, and the usage of node resources cannot be obtained."
+  "src.pages.Overview.E15A1FED": "metrics-server has not been installed in the K8s cluster, and the usage of node resources cannot be obtained.",
+  "src.pages.Cluster.Detail.Overview.FF85D01F": "Unmanaged Successfully"
 }
diff --git a/ui/src/i18n/strings/zh-CN.json b/ui/src/i18n/strings/zh-CN.json
@@ -1269,5 +1269,6 @@
   "src.components.TopoComponent.2494A473": "重启server",
   "src.pages.Tenant.Detail.Overview.892E62C7": "修改删除保护已成功",
   "src.pages.Tenant.Detail.Overview.EE772326": "删除保护",
-  "src.pages.Overview.E15A1FED": "K8s 集群中尚未安装 metrics-server，无法获取节点资源用量"
+  "src.pages.Overview.E15A1FED": "K8s 集群中尚未安装 metrics-server，无法获取节点资源用量",
+  "src.pages.Cluster.Detail.Overview.FF85D01F": "解除托管已成功"
 }
diff --git a/ui/src/pages/Cluster/Detail/Overview/index.tsx b/ui/src/pages/Cluster/Detail/Overview/index.tsx
@@ -119,6 +119,23 @@ const ClusterOverview: React.FC = () => {
     },
   });
 
+  const { runAsync: patchOBCluster, loading: patchOBClusterloading } =
+    useRequest(obcluster.patchOBCluster, {
+      manual: true,
+      onSuccess: (res) => {
+        if (res.successful) {
+          message.success(
+            intl.formatMessage({
+              id: 'src.pages.Cluster.Detail.Overview.FF85D01F',
+              defaultMessage: '解除托管已成功',
+            }),
+          );
+          refresh();
+          clusterDetailRefresh();
+        }
+      },
+    });
+
   const handleDelete = async () => {
     const res = await deleteClusterReportWrap({ ns: ns!, name: name! });
     if (res.successful) {
@@ -189,6 +206,10 @@ const ClusterOverview: React.FC = () => {
       label: (
         <Button
           type="text"
+          disabled={
+            !isEmpty(clusterDetail) &&
+            (clusterDetail?.status !== 'running' || deletionProtection)
+          }
           onClick={() =>
             showDeleteConfirm({
               onOk: handleDelete,
@@ -262,7 +283,8 @@ const ClusterOverview: React.FC = () => {
     };
   };
 
-  const { parameters, storage, resource } = clusterDetail?.info || {};
+  const { parameters, storage, resource, deletionProtection } =
+    clusterDetail?.info || {};
 
   const resourceinit = [
     {
@@ -348,6 +370,7 @@ const ClusterOverview: React.FC = () => {
           })}
         </Tag>
       ),
+
       value: true,
     },
     {
@@ -359,6 +382,7 @@ const ClusterOverview: React.FC = () => {
           })}
         </Tag>
       ),
+
       value: false,
     },
   ];
@@ -438,6 +462,7 @@ const ClusterOverview: React.FC = () => {
           })}
         />
       ),
+
       dataIndex: 'accordance',
       width: 100,
       render: (text: boolean) => {
@@ -478,7 +503,15 @@ const ClusterOverview: React.FC = () => {
               })}
             </Button>
             {text && (
-              <Button type="link" onClick={() => {}}>
+              <Button
+                type="link"
+                loading={patchOBClusterloading}
+                onClick={() => {
+                  patchOBCluster(ns, name, {
+                    deletedParameters: [record.name],
+                  });
+                }}
+              >
                 {intl.formatMessage({
                   id: 'src.pages.Cluster.Detail.Overview.5FACF7C0',
                   defaultMessage: '解除托管',