Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/dashboard/src/locales/en-US/Agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down
2 changes: 2 additions & 0 deletions src/dashboard/src/locales/zh-CN/Agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -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。',
Expand Down
35 changes: 24 additions & 11 deletions src/dashboard/src/pages/Agent/Agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down