This is an automated email from the ASF dual-hosted git repository.
leezng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 98b473b3f [INLONG-4876][Dashboard] Added prompt information on tag
modification and deletion (#4879)
98b473b3f is described below
commit 98b473b3fdf79409bf81a6feac0502dacf594b25
Author: Daniel <[email protected]>
AuthorDate: Wed Jul 6 10:05:10 2022 +0800
[INLONG-4876][Dashboard] Added prompt information on tag modification and
deletion (#4879)
* feat: Added prompt information on tag modification and deletion.
* chore: change description
---
inlong-dashboard/src/locales/cn.json | 4 +++-
inlong-dashboard/src/locales/en.json | 4 +++-
inlong-dashboard/src/pages/ClusterTags/TagDetailModal.tsx | 1 +
inlong-dashboard/src/pages/ClusterTags/index.tsx | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/inlong-dashboard/src/locales/cn.json
b/inlong-dashboard/src/locales/cn.json
index 4a88bbec7..49b983377 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -7,7 +7,7 @@
"basic.Cancel": "取消",
"basic.Create": "新建",
"basic.Delete": "删除",
- "basic.DeleteConfirm": "确认删除吗",
+ "basic.DeleteConfirm": "确认删除吗?",
"basic.DeleteSuccess": "删除成功",
"basic.Status": "状态",
"basic.CreateTime": "创建时间",
@@ -380,6 +380,8 @@
"pages.ClusterTags.Modifier": "最后修改人",
"pages.ClusterTags.BindCluster": "绑定集群",
"pages.ClusterTags.DelCluster": "移除",
+ "pages.ClusterTags.DelConfirm": "删除集群标签，会同时删除关联的集群，且需确保此标签没有被 InlongGroup
所使用",
+ "pages.ClusterTags.NameEditHelp": "修改集群标签，会同时修改关联的集群，且需确保此标签没有被 InlongGroup
所使用",
"pages.Datasources.status.Success": "正常",
"pages.Datasources.status.Error": "失败",
"pages.Datasources.status.Deleted": "已删除",
diff --git a/inlong-dashboard/src/locales/en.json
b/inlong-dashboard/src/locales/en.json
index 9e3c02d25..3e94ce517 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -7,7 +7,7 @@
"basic.Cancel": "Cancel",
"basic.Create": "Create",
"basic.Delete": "Delete",
- "basic.DeleteConfirm": "Are you sure to delete",
+ "basic.DeleteConfirm": "Are you sure to delete?",
"basic.DeleteSuccess": "Delete Success",
"basic.Status": "Status",
"basic.CreateTime": "CreateTime",
@@ -380,6 +380,8 @@
"pages.ClusterTags.Modifier": "Modifier",
"pages.ClusterTags.BindCluster": "BindCluster",
"pages.ClusterTags.DelCluster": "Remove",
+ "pages.ClusterTags.DelConfirm": "Deleting a cluster label will delete the
associated cluster at the same time, and make sure that this label is not used
by InlongGroup",
+ "pages.ClusterTags.NameEditHelp": "Modifying a cluster label will delete the
associated cluster at the same time, and make sure that this label is not used
by InlongGroup",
"pages.Datasources.status.Success": "Success",
"pages.Datasources.status.Error": "Error",
"pages.Datasources.status.Deleted": "Deleted",
diff --git a/inlong-dashboard/src/pages/ClusterTags/TagDetailModal.tsx
b/inlong-dashboard/src/pages/ClusterTags/TagDetailModal.tsx
index d53c583ab..1790faed7 100644
--- a/inlong-dashboard/src/pages/ClusterTags/TagDetailModal.tsx
+++ b/inlong-dashboard/src/pages/ClusterTags/TagDetailModal.tsx
@@ -85,6 +85,7 @@ const TagDetailModal: React.FC<TagDetailModalProps> = ({ id,
...modalProps }) =>
label: i18n.t('pages.ClusterTags.Name'),
name: 'clusterTag',
rules: [{ required: true }],
+ tooltip: i18n.t('pages.ClusterTags.NameEditHelp'),
},
{
type: <StaffSelect mode="multiple" currentUserClosable={false} />,
diff --git a/inlong-dashboard/src/pages/ClusterTags/index.tsx
b/inlong-dashboard/src/pages/ClusterTags/index.tsx
index 0280196af..eec066fd8 100644
--- a/inlong-dashboard/src/pages/ClusterTags/index.tsx
+++ b/inlong-dashboard/src/pages/ClusterTags/index.tsx
@@ -79,6 +79,7 @@ const Comp: React.FC = () => {
({ id }) => {
Modal.confirm({
title: i18n.t('basic.DeleteConfirm'),
+ content: i18n.t('pages.ClusterTags.DelConfirm'),
onOk: async () => {
await request({
url: `/cluster/tag/delete/${id}`,
