diff --git a/inlong-dashboard/src/plugins/clusters/common/ClusterDefaultInfo.ts b/inlong-dashboard/src/plugins/clusters/common/ClusterDefaultInfo.ts index 2472dd905ba..d42f570bcd7 100644 --- a/inlong-dashboard/src/plugins/clusters/common/ClusterDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/clusters/common/ClusterDefaultInfo.ts @@ -118,6 +118,10 @@ export class ClusterDefaultInfo implements DataWithBackend, RenderRow, RenderLis @I18n('pages.Clusters.Description') description: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + version?: number; parse(data) { diff --git a/inlong-dashboard/src/plugins/consumes/common/ConsumeDefaultInfo.ts b/inlong-dashboard/src/plugins/consumes/common/ConsumeDefaultInfo.ts index c498379526a..ec8d474dd83 100644 --- a/inlong-dashboard/src/plugins/consumes/common/ConsumeDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/consumes/common/ConsumeDefaultInfo.ts @@ -191,6 +191,14 @@ export class ConsumeDefaultInfo implements DataWithBackend, RenderRow, RenderLis @I18n('pages.ConsumeDashboard.config.OperatingStatus') readonly lastConsumeStatus: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + parse(data) { return data; } diff --git a/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts b/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts index 2432e5d1482..b2ef6d18b09 100644 --- a/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/groups/common/GroupDefaultInfo.ts @@ -124,6 +124,14 @@ export class GroupDefaultInfo implements DataWithBackend, RenderRow, RenderList @I18n('basic.CreateTime') readonly createTime: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + parse(data) { return data; } diff --git a/inlong-dashboard/src/plugins/nodes/common/NodeDefaultInfo.ts b/inlong-dashboard/src/plugins/nodes/common/NodeDefaultInfo.ts index f8c74f3b70e..ffc40ce3951 100644 --- a/inlong-dashboard/src/plugins/nodes/common/NodeDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/nodes/common/NodeDefaultInfo.ts @@ -88,6 +88,14 @@ export class NodeDefaultInfo implements DataWithBackend, RenderRow, RenderList { @I18n('meta.Nodes.Description') description?: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + readonly version?: number; parse(data) { diff --git a/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts b/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts index 73969b82edb..9e986caea65 100644 --- a/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/sinks/common/SinkDefaultInfo.ts @@ -128,6 +128,14 @@ export class SinkDefaultInfo implements DataWithBackend, RenderRow, RenderList { @I18n('basic.Status') readonly status: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + parse(data) { return data; } diff --git a/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts b/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts index 1ea4fea74eb..2535baf95b2 100644 --- a/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts @@ -114,6 +114,14 @@ export class SourceDefaultInfo implements DataWithBackend, RenderRow, RenderList @I18n('basic.Status') readonly status: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + parse(data) { return data; } diff --git a/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts b/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts index 222d7d2c1f0..ef662638066 100644 --- a/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/streams/common/StreamDefaultInfo.ts @@ -75,6 +75,10 @@ export class StreamDefaultInfo implements DataWithBackend, RenderRow, RenderList @I18n('basic.Creator') readonly creator: string; + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + @ColumnDecorator() @I18n('basic.CreateTime') readonly createTime: string; diff --git a/inlong-dashboard/src/plugins/sync/common/SyncDefaultInfo.ts b/inlong-dashboard/src/plugins/sync/common/SyncDefaultInfo.ts index 0b33727ed02..8f6fd7ca779 100644 --- a/inlong-dashboard/src/plugins/sync/common/SyncDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/sync/common/SyncDefaultInfo.ts @@ -138,6 +138,14 @@ export class SyncDefaultInfo implements DataWithBackend, RenderRow, RenderList { @I18n('basic.CreateTime') readonly createTime: string; + @ColumnDecorator() + @I18n('basic.Creator') + readonly creator: string; + + @ColumnDecorator() + @I18n('basic.Modifier') + readonly modifier: string; + parse(data) { return data; } diff --git a/inlong-dashboard/src/ui/locales/cn.json b/inlong-dashboard/src/ui/locales/cn.json index bfa1c19ad21..b379bff8986 100644 --- a/inlong-dashboard/src/ui/locales/cn.json +++ b/inlong-dashboard/src/ui/locales/cn.json @@ -12,6 +12,7 @@ "basic.DeleteSuccess": "删除成功", "basic.Status": "状态", "basic.Creator": "创建人", + "basic.Modifier": "修改人", "basic.CreateTime": "创建时间", "basic.Yes": "是", "basic.No": "否", diff --git a/inlong-dashboard/src/ui/locales/en.json b/inlong-dashboard/src/ui/locales/en.json index 98423cd29f3..1c13caf9c12 100644 --- a/inlong-dashboard/src/ui/locales/en.json +++ b/inlong-dashboard/src/ui/locales/en.json @@ -12,6 +12,7 @@ "basic.DeleteSuccess": "Delete Success", "basic.Status": "Status", "basic.Creator": "Creator", + "basic.Modifier": "Modifier", "basic.CreateTime": "CreateTime", "basic.Yes": "Yes", "basic.No": "No", @@ -748,7 +749,7 @@ "pages.Clusters.TypeAll": "All", "pages.Clusters.Create": "Create", "pages.Clusters.Edit": "Edit", - "pages.Clusters.LastModifier": "LastModifier", + "pages.Clusters.LastModifier": "Last modifier", "pages.Clusters.Name": "Cluster Name", "pages.Clusters.Tag": "Cluster Tag", "pages.Clusters.InCharges": "Owners", @@ -760,7 +761,7 @@ "pages.Clusters.Node.Status": "Status", "pages.Clusters.Node.Status.Normal": "Normal", "pages.Clusters.Node.Status.Timeout": "Timeout", - "pages.Clusters.Node.LastModifier": "LastModifier", + "pages.Clusters.Node.LastModifier": "Last modifier", "pages.Clusters.Node.Create": "Create", "pages.Clusters.Node.IpRule": "Please enter the IP address correctly", "pages.Clusters.Node.PortRule": "Please enter the port address correctly", diff --git a/inlong-dashboard/src/ui/pages/ClusterTags/ClusterList.tsx b/inlong-dashboard/src/ui/pages/ClusterTags/ClusterList.tsx index 6e13308702b..e3d64e60eea 100644 --- a/inlong-dashboard/src/ui/pages/ClusterTags/ClusterList.tsx +++ b/inlong-dashboard/src/ui/pages/ClusterTags/ClusterList.tsx @@ -145,6 +145,16 @@ const Comp: React.FC = ({ clusterTag }) => { dataIndex: 'description', ellipsisMulti: 2, }, + { + title: i18n.t('basic.Creator'), + dataIndex: 'creator', + ellipsisMulti: 2, + }, + { + title: i18n.t('basic.Modifier'), + dataIndex: 'modifier', + ellipsisMulti: 2, + }, ]; return defaultColumns.concat([ diff --git a/inlong-dashboard/src/ui/pages/TenantManagement/config.tsx b/inlong-dashboard/src/ui/pages/TenantManagement/config.tsx index 6d65ba294ce..b8fffa8c25c 100644 --- a/inlong-dashboard/src/ui/pages/TenantManagement/config.tsx +++ b/inlong-dashboard/src/ui/pages/TenantManagement/config.tsx @@ -51,6 +51,10 @@ export const getColumns = ({ onEdit }) => { title: i18n.t('pages.Tenant.config.Creator'), dataIndex: 'creator', }, + { + title: i18n.t('basic.Modifier'), + dataIndex: 'modifier', + }, { title: i18n.t('pages.Tenant.config.CreateTime'), dataIndex: 'createTime', diff --git a/inlong-dashboard/src/ui/pages/UserManagement/config.tsx b/inlong-dashboard/src/ui/pages/UserManagement/config.tsx index 4b881299eaf..753c8a3286a 100644 --- a/inlong-dashboard/src/ui/pages/UserManagement/config.tsx +++ b/inlong-dashboard/src/ui/pages/UserManagement/config.tsx @@ -48,6 +48,10 @@ export const getColumns = ({ onEdit, onDelete }) => { title: i18n.t('pages.UserManagement.config.Creator'), dataIndex: 'creator', }, + { + title: i18n.t('basic.Modifier'), + dataIndex: 'modifier', + }, { title: i18n.t('pages.UserManagement.config.CreateTime'), dataIndex: 'createTime',