Merge pull request #691 from dodo920306/fix/show-delete-agent-successfully-without-checking-the-result

Fix deleteAgent API call message always succeeds

Author: yeasy

src/dashboard/src/locales/en-US/Agent.js

@@ -16,7 +16,9 @@ export default {
   'app.agent.form.delete.content': 'Confirm to delete the agent {name}?',
   'app.agent.form.release.content': 'Confirm to release the agent {name}?',
   'app.agent.delete.success': 'Delete Agent success.',
+  'app.agent.delete.fail': 'Delete Agent failed.',
   'app.agent.release.success': 'Release Agent success.',
+  'app.agent.release.fail': 'Release Agent failed.',
   'app.agent.listItem.organization': 'Organization',
   'app.agent.type': 'Type',
   'app.newAgent.error.ip': 'Please enter a valid IP address.For example:192.168.0.10.',

src/dashboard/src/locales/zh-CN/Agent.js

@@ -16,7 +16,9 @@ export default {
   'app.agent.form.delete.content': '确认删除代理 {name}?',
   'app.agent.form.release.content': '确认释放代理 {name}?',
   'app.agent.delete.success': '删除代理成功。',
+  'app.agent.delete.fail': '删除代理失败。',
   'app.agent.release.success': '释放代理成功.',
+  'app.agent.release.fail': '释放代理失败.',
   'app.agent.listItem.organization': '所属组织',
   'app.agent.type': '类型',
   'app.newAgent.error.ip': '请输入有效的IP地址。例如：192.168.0.10。',

src/dashboard/src/pages/Agent/Agent.js

@@ -227,20 +227,33 @@ class Agent extends PureComponent {
     this.handleModalVisible(true);
   };
 
-  deleteCallback = () => {
+  deleteCallback = res => {
     const { intl } = this.props;
     const userRole = getAuthority()[0];
-    const id = userRole === 'admin' ? 'app.agent.delete.success' : 'app.agent.release.success';
-    const defaultMessage =
-      userRole === 'admin' ? 'Delete agent success.' : 'Release agent success.';
+    if (res.status === 'successful') {
+      const id = userRole === 'admin' ? 'app.agent.delete.success' : 'app.agent.release.success';
+      const defaultMessage =
+        userRole === 'admin' ? 'Delete agent success.' : 'Release agent success.';
 
-    message.success(
-      intl.formatMessage({
-        id,
-        defaultMessage,
-      })
-    );
-    this.queryAgentList();
+      message.success(
+        intl.formatMessage({
+          id,
+          defaultMessage,
+        })
+      );
+      this.queryAgentList();
+    } else {
+      const id = userRole === 'admin' ? 'app.agent.delete.fail' : 'app.agent.release.fail';
+      const defaultMessage =
+        userRole === 'admin' ? 'Delete agent failed.' : 'Release agent failed.';
+
+      message.error(
+        intl.formatMessage({
+          id,
+          defaultMessage,
+        })
+      );
+    }
   };
 
   handleTableChange = page => {