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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new eec7633ca [INLONG-4274][Dashboard] Update the parameters to adapt the
manager module (#4275)
eec7633ca is described below
commit eec7633ca5f8f5349d58cc16834bd11e70b6c192
Author: healzhou <[email protected]>
AuthorDate: Fri May 20 15:46:47 2022 +0800
[INLONG-4274][Dashboard] Update the parameters to adapt the manager module
(#4275)
* [INLONG-4274][Dashboard] Update the parameters to adapt the manager module
* [INLONG-4274][Dashboard] Remove meExtInfo for inlong group
* [INLONG-4274][Dashboard] Add fields label and remove unused button for
test connection
---
.../AccessHelper/DataStorageEditor/DetailModal.tsx | 2 +-
.../AccessHelper/FieldsConfig/businessFields.tsx | 152 ++++++++++-----------
.../BusinessSelect/MyBusinessModal.tsx | 2 +-
.../ConsumeHelper/FieldsConfig/basicFields.tsx | 32 ++---
.../src/components/MetaData/StorageHive.tsx | 8 +-
.../src/components/MetaData/StorageIceberg.tsx | 8 +-
inlong-dashboard/src/locales/cn.json | 14 +-
inlong-dashboard/src/locales/en.json | 14 +-
.../src/pages/AccessCreate/Business/config.tsx | 11 +-
.../src/pages/AccessCreate/Business/index.tsx | 2 +-
.../src/pages/AccessCreate/DataStream/config.tsx | 6 +-
.../src/pages/AccessCreate/DataStream/index.tsx | 6 +-
inlong-dashboard/src/pages/AccessCreate/index.tsx | 10 +-
.../src/pages/AccessDashboard/config.tsx | 2 +-
.../AccessDetail/DataStream/StreamItemModal.tsx | 12 +-
.../src/pages/AccessDetail/DataStream/config.tsx | 18 +--
.../src/pages/AccessDetail/DataStream/index.tsx | 8 +-
.../src/pages/AccessDetail/Info/config.tsx | 45 +++---
.../src/pages/AccessDetail/Info/index.tsx | 5 -
.../src/pages/AccessDetail/common.d.ts | 2 +-
inlong-dashboard/src/pages/AccessDetail/index.tsx | 10 +-
.../src/pages/ApprovalDetail/AccessConfig.tsx | 20 +--
.../src/pages/ConsumeCreate/Info/config.tsx | 4 +-
.../src/pages/ConsumeCreate/Info/index.tsx | 2 +-
.../src/pages/ConsumeDashboard/config.tsx | 2 +-
.../src/pages/ConsumeDetail/Info/index.tsx | 4 +-
26 files changed, 189 insertions(+), 212 deletions(-)
diff --git
a/inlong-dashboard/src/components/AccessHelper/DataStorageEditor/DetailModal.tsx
b/inlong-dashboard/src/components/AccessHelper/DataStorageEditor/DetailModal.tsx
index 19b9b8a2e..51388023f 100644
---
a/inlong-dashboard/src/components/AccessHelper/DataStorageEditor/DetailModal.tsx
+++
b/inlong-dashboard/src/components/AccessHelper/DataStorageEditor/DetailModal.tsx
@@ -190,7 +190,7 @@ const Comp: React.FC<DetailModalProps> = ({
rules: [
{ required: true },
{
- pattern: /^[a-zA-Z][a-zA-Z0-9_]*$/,
+ pattern: /^[a-zA-Z][a-zA-Z0-9_-]*$/,
message: t('components.AccessHelper.StorageMetaData.SinkNameRule'),
},
],
diff --git
a/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
b/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
index 87c8ed72d..e07e7c7a1 100644
---
a/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
+++
b/inlong-dashboard/src/components/AccessHelper/FieldsConfig/businessFields.tsx
@@ -28,45 +28,36 @@ export default (
currentValues: Record<string, any> = {},
): FormItemProps[] => {
const fields: FormItemProps[] = [
- {
- type: 'text',
- label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.BusinessID'),
- name: 'inlongGroupId',
- initialValue: currentValues.inlongGroupId,
- },
- {
- type: 'text',
- label: 'TubeTopic',
- name: 'mqResourceObj',
- initialValue: currentValues.mqResourceObj,
- visible: values => values.middlewareType === 'TUBE',
- },
{
type: 'input',
- label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.BusinessEnglishName'),
- name: 'name',
+ label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.InlongGroupId'),
+ name: 'inlongGroupId',
props: {
maxLength: 32,
},
rules: [
{ required: true },
{
- pattern: /^[a-z_\d]+$/,
- message: i18n.t(
-
'components.AccessHelper.FieldsConfig.businessFields.BusinessEnglishNameRules',
- ),
+ pattern: /^[a-z_\-\d]+$/,
+ message:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.InlongGroupIdRules'),
},
],
- initialValue: currentValues.name,
+ initialValue: currentValues.inlongGroupId,
+ },
+ {
+ type: 'text',
+ label: currentValues.mqType === 'TUBE' ? 'Tube Topic' : 'Pulsar
Namespace',
+ name: 'mqResource',
+ initialValue: currentValues.mqResource,
},
{
type: 'input',
- label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.BusinessLabelName'),
- name: 'cnName',
+ label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.InlongGroupName'),
+ name: 'name',
props: {
maxLength: 32,
},
- initialValue: currentValues.cnName,
+ initialValue: currentValues.name,
},
{
type: <StaffSelect mode="multiple" currentUserClosable={false} />,
@@ -93,8 +84,8 @@ export default (
{
type: 'radio',
label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.MessageMiddleware'),
- name: 'middlewareType',
- initialValue: currentValues.middlewareType ?? 'TUBE',
+ name: 'mqType',
+ initialValue: currentValues.mqType ?? 'TUBE',
rules: [{ required: true }],
props: {
options: [
@@ -127,20 +118,20 @@ export default (
},
],
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'inputnumber',
- label: 'Topic Partition Nums',
- name: 'topicPartitionNum',
- initialValue: currentValues.topicPartitionNum ?? 3,
+ label:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.PartitionNum'),
+ name: 'partitionNum',
+ initialValue: currentValues.partitionNum ?? 3,
rules: [{ required: true }],
props: {
min: 1,
max: 20,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR' &&
values.queueModule === 'parallel',
+ visible: values => values.mqType === 'PULSAR' && values.queueModule ===
'parallel',
},
{
type: 'inputnumber',
@@ -153,7 +144,7 @@ export default (
min: 1,
precision: 0,
},
- visible: values => values.middlewareType === 'TUBE',
+ visible: values => values.mqType === 'TUBE',
},
{
type: 'inputnumber',
@@ -166,7 +157,7 @@ export default (
min: 1,
precision: 0,
},
- visible: values => values.middlewareType === 'TUBE',
+ visible: values => values.mqType === 'TUBE',
},
{
type: 'inputnumber',
@@ -179,7 +170,7 @@ export default (
min: 1,
precision: 0,
},
- visible: values => values.middlewareType === 'TUBE',
+ visible: values => values.mqType === 'TUBE',
},
{
type: 'inputnumber',
@@ -192,23 +183,22 @@ export default (
min: 1,
precision: 0,
},
- visible: values => values.middlewareType === 'TUBE',
+ visible: values => values.mqType === 'TUBE',
},
{
type: 'inputnumber',
label: 'ensemble',
- name: 'mqExtInfo.ensemble',
- initialValue: currentValues.mqExtInfo?.ensemble ?? 3,
+ name: 'ensemble',
+ initialValue: currentValues?.ensemble ?? 3,
suffix:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.EnsembleSuffix'),
extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.EnsembleExtra'),
rules: [
({ getFieldValue }) => ({
validator(_, val) {
if (val) {
- const writeQuorum = getFieldValue(['mqExtInfo', 'writeQuorum'])
|| 0;
- const ackQuorum = getFieldValue(['mqExtInfo', 'ackQuorum']) || 0;
- const ensemble = val;
- return ackQuorum <= writeQuorum && writeQuorum <= ensemble
+ const writeQuorum = getFieldValue(['writeQuorum']) || 0;
+ const ackQuorum = getFieldValue(['ackQuorum']) || 0;
+ return ackQuorum <= writeQuorum && writeQuorum <= val
? Promise.resolve()
: Promise.reject(new Error('Max match: ensemble ≥ write quorum
≥ ack quorum'));
}
@@ -221,13 +211,13 @@ export default (
max: 10,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'inputnumber',
- label: 'write quorum',
- name: 'mqExtInfo.writeQuorum',
- initialValue: currentValues.mqExtInfo?.writeQuorum ?? 3,
+ label: 'Write Quorum',
+ name: 'writeQuorum',
+ initialValue: currentValues?.writeQuorum ?? 3,
suffix:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.WriteQuorumSuffix'),
extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.WriteQuorumExtra'),
props: {
@@ -235,13 +225,13 @@ export default (
max: 10,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'inputnumber',
- label: 'ack quorum',
- name: 'mqExtInfo.ackQuorum',
- initialValue: currentValues.mqExtInfo?.ackQuorum ?? 2,
+ label: 'ACK Quorum',
+ name: 'ackQuorum',
+ initialValue: currentValues?.ackQuorum ?? 2,
suffix:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.AckQuorumSuffix'),
extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.AckQuorumExtra'),
props: {
@@ -249,26 +239,18 @@ export default (
max: 10,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'inputnumber',
- label: 'retention time',
- name: 'mqExtInfo.retentionTime',
- initialValue: currentValues.mqExtInfo?.retentionTime ?? 72,
+ label: 'Time To Live',
+ name: 'ttl',
+ initialValue: currentValues?.ttl ?? 24,
rules: [
({ getFieldValue }) => ({
validator(_, val) {
- const retentionSize = getFieldValue(['mqExtInfo',
'retentionSize']);
- if ((val === 0 && retentionSize > 0) || (val > 0 && retentionSize
=== 0)) {
- return Promise.reject(
- new Error(
- 'Can not: retentionTime=0,retentionSize>0 |
retentionTime>0,retentionSize=0',
- ),
- );
- }
if (val) {
- const unit = getFieldValue(['mqExtInfo', 'retentionTimeUnit']);
+ const unit = getFieldValue(['ttlUnit']);
const value = unit === 'hours' ? Math.ceil(val / 24) : val;
return value <= 14 ? Promise.resolve() : Promise.reject(new
Error('Max: 14 Days'));
}
@@ -278,8 +260,8 @@ export default (
],
suffix: {
type: 'select',
- name: 'mqExtInfo.retentionTimeUnit',
- initialValue: currentValues.rmqExtInfo?.etentionTimeUnit ?? 'hours',
+ name: 'ttlUnit',
+ initialValue: currentValues?.ttlUnit ?? 'hours',
props: {
options: [
{
@@ -293,23 +275,31 @@ export default (
],
},
},
- extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.RetentionTimeExtra'),
+ extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.TtlExtra'),
props: {
- min: -1,
+ min: 1,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'inputnumber',
- label: 'ttl',
- name: 'mqExtInfo.ttl',
- initialValue: currentValues.mqExtInfo?.ttl ?? 24,
+ label: 'Retention Time',
+ name: 'retentionTime',
+ initialValue: currentValues?.retentionTime ?? 72,
rules: [
({ getFieldValue }) => ({
validator(_, val) {
+ const retentionSize = getFieldValue(['retentionSize']);
+ if ((val === 0 && retentionSize > 0) || (val > 0 && retentionSize
=== 0)) {
+ return Promise.reject(
+ new Error(
+ 'Can not: retentionTime=0, retentionSize>0 |
retentionTime>0, retentionSize=0',
+ ),
+ );
+ }
if (val) {
- const unit = getFieldValue(['mqExtInfo', 'ttlUnit']);
+ const unit = getFieldValue(['retentionTimeUnit']);
const value = unit === 'hours' ? Math.ceil(val / 24) : val;
return value <= 14 ? Promise.resolve() : Promise.reject(new
Error('Max: 14 Days'));
}
@@ -319,8 +309,8 @@ export default (
],
suffix: {
type: 'select',
- name: 'mqExtInfo.ttlUnit',
- initialValue: currentValues.mqExtInfo?.ttlUnit ?? 'hours',
+ name: 'retentionTimeUnit',
+ initialValue: currentValues?.retentionTimeUnit ?? 'hours',
props: {
options: [
{
@@ -334,22 +324,22 @@ export default (
],
},
},
- extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.TtlExtra'),
+ extra:
i18n.t('components.AccessHelper.FieldsConfig.businessFields.RetentionTimeExtra'),
props: {
- min: 1,
+ min: -1,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'inputnumber',
- label: 'retention size',
- name: 'mqExtInfo.retentionSize',
- initialValue: currentValues.mqExtInfo?.retentionSize ?? -1,
+ label: 'Retention Size',
+ name: 'retentionSize',
+ initialValue: currentValues?.retentionSize ?? -1,
suffix: {
type: 'select',
- name: 'mqExtInfo.retentionSizeUnit',
- initialValue: currentValues.mqExtInfo?.retentionSizeUnit ?? 'MB',
+ name: 'retentionSizeUnit',
+ initialValue: currentValues?.retentionSizeUnit ?? 'MB',
props: {
options: [
{
@@ -372,7 +362,7 @@ export default (
min: -1,
precision: 0,
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
] as FormItemProps[];
diff --git
a/inlong-dashboard/src/components/ConsumeHelper/BusinessSelect/MyBusinessModal.tsx
b/inlong-dashboard/src/components/ConsumeHelper/BusinessSelect/MyBusinessModal.tsx
index 3f2ec09fa..f01e7b020 100644
---
a/inlong-dashboard/src/components/ConsumeHelper/BusinessSelect/MyBusinessModal.tsx
+++
b/inlong-dashboard/src/components/ConsumeHelper/BusinessSelect/MyBusinessModal.tsx
@@ -100,7 +100,7 @@ const Comp: React.FC<MyAccessModalProps> = ({ ...modalProps
}) => {
},
{
title:
t('components.ConsumeHelper.BusinessSelect.MyBusinessModal.BusinessName'),
- dataIndex: 'cnName',
+ dataIndex: 'name',
},
{
title:
t('components.ConsumeHelper.BusinessSelect.MyBusinessModal.Owners'),
diff --git
a/inlong-dashboard/src/components/ConsumeHelper/FieldsConfig/basicFields.tsx
b/inlong-dashboard/src/components/ConsumeHelper/FieldsConfig/basicFields.tsx
index ade158f1f..8f8d8c8bf 100644
--- a/inlong-dashboard/src/components/ConsumeHelper/FieldsConfig/basicFields.tsx
+++ b/inlong-dashboard/src/components/ConsumeHelper/FieldsConfig/basicFields.tsx
@@ -61,14 +61,14 @@ export default (
type: BusinessSelect,
label:
i18n.t('components.ConsumeHelper.FieldsConfig.basicFields.ConsumerTargetBusinessID'),
name: 'inlongGroupId',
- extraNames: ['middlewareType'],
+ extraNames: ['mqType'],
initialValue: currentValues.inlongGroupId,
rules: [{ required: true }],
props: {
style: { width: 500 },
onChange: (inlongGroupId, record) => ({
topic: undefined,
- middlewareType: record.middlewareType,
+ mqType: record.mqType,
}),
},
},
@@ -79,22 +79,22 @@ export default (
initialValue: currentValues.topic,
rules: [{ required: true }],
props: {
- mode: currentValues.middlewareType === 'PULSAR' ? 'multiple' : '',
+ mode: currentValues.mqType === 'PULSAR' ? 'multiple' : '',
options: {
requestService: `/group/getTopic/${currentValues.inlongGroupId}`,
requestParams: {
formatResult: result =>
- result.middlewareType === 'TUBE'
+ result.mqType === 'TUBE'
? [
{
- label: result.mqResourceObj,
- value: result.mqResourceObj,
+ label: result.mqResource,
+ value: result.mqResource,
},
]
- : result.dsTopicList?.map(item => ({
+ : result.streamTopics?.map(item => ({
...item,
- label: item.mqResourceObj,
- value: item.mqResourceObj,
+ label: item.mqResource,
+ value: item.mqResource,
})) || [],
},
},
@@ -119,7 +119,7 @@ export default (
],
},
rules: [{ required: true }],
- visible: values => !!values.middlewareType && values.middlewareType !==
'PULSAR',
+ visible: values => !!values.mqType && values.mqType !== 'PULSAR',
},
{
type: 'input',
@@ -129,12 +129,12 @@ export default (
extra:
i18n.t('components.ConsumeHelper.FieldsConfig.basicFields.DataStreamIDsHelp'),
rules: [{ required: true }],
style:
- currentValues.middlewareType === 'PULSAR'
+ currentValues.mqType === 'PULSAR'
? {
display: 'none',
}
: {},
- visible: values => values.middlewareType === 'PULSAR' ||
values.filterEnabled,
+ visible: values => values.mqType === 'PULSAR' || values.filterEnabled,
},
{
type: 'text',
@@ -160,7 +160,7 @@ export default (
},
],
},
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
{
type: 'input',
@@ -168,7 +168,7 @@ export default (
name: 'mqExtInfo.deadLetterTopic',
initialValue: currentValues.mqExtInfo?.deadLetterTopic,
rules: [{ required: true }],
- visible: values => values.mqExtInfo?.isDlq && values.middlewareType ===
'PULSAR',
+ visible: values => values.mqExtInfo?.isDlq && values.mqType === 'PULSAR',
},
{
type: 'radio',
@@ -188,7 +188,7 @@ export default (
},
],
},
- visible: values => values.mqExtInfo?.isDlq && values.middlewareType ===
'PULSAR',
+ visible: values => values.mqExtInfo?.isDlq && values.mqType === 'PULSAR',
},
{
type: 'input',
@@ -197,7 +197,7 @@ export default (
initialValue: currentValues.mqExtInfo?.retryLetterTopic,
rules: [{ required: true }],
visible: values =>
- values.mqExtInfo?.isDlq && values.mqExtInfo?.isRlq &&
values.middlewareType === 'PULSAR',
+ values.mqExtInfo?.isDlq && values.mqExtInfo?.isRlq && values.mqType
=== 'PULSAR',
},
] as FormItemProps[];
diff --git a/inlong-dashboard/src/components/MetaData/StorageHive.tsx
b/inlong-dashboard/src/components/MetaData/StorageHive.tsx
index eee1118a4..665946944 100644
--- a/inlong-dashboard/src/components/MetaData/StorageHive.tsx
+++ b/inlong-dashboard/src/components/MetaData/StorageHive.tsx
@@ -18,7 +18,7 @@
*/
import React from 'react';
-import { Button, message } from 'antd';
+// import { Button, message } from 'antd';
import {
getColsFromFields,
GetStorageColumnsType,
@@ -26,7 +26,7 @@ import {
} from '@/utils/metaData';
import { ColumnsType } from 'antd/es/table';
import EditableTable, { ColumnsItemProps } from '@/components/EditableTable';
-import request from '@/utils/request';
+// import request from '@/utils/request';
import i18n from '@/i18n';
import { excludeObject } from '@/utils';
import { sourceDataFields } from './SourceDataFields';
@@ -132,7 +132,7 @@ const getForm: GetStorageFormFieldsType = (
disabled: isEdit && [110, 130].includes(currentValues?.status),
style: { width: 500 },
},
- suffix: (
+ /*suffix: (
<Button
onClick={async () => {
const values = await form.validateFields(['username', 'password',
'jdbcUrl']);
@@ -152,7 +152,7 @@ const getForm: GetStorageFormFieldsType = (
>
{i18n.t('components.AccessHelper.StorageMetaData.Hive.ConnectionTest')}
</Button>
- ),
+ ),*/
},
{
type: 'input',
diff --git a/inlong-dashboard/src/components/MetaData/StorageIceberg.tsx
b/inlong-dashboard/src/components/MetaData/StorageIceberg.tsx
index 78e3bff44..7061295d5 100644
--- a/inlong-dashboard/src/components/MetaData/StorageIceberg.tsx
+++ b/inlong-dashboard/src/components/MetaData/StorageIceberg.tsx
@@ -29,8 +29,8 @@ import EditableTable from '@/components/EditableTable';
import { excludeObject } from '@/utils';
import TextSwitch from '@/components/TextSwitch';
import { sourceDataFields } from './SourceDataFields';
-import { Button, message } from 'antd';
-import request from '@/utils/request';
+// import { Button, message } from 'antd';
+// import request from '@/utils/request';
const icebergFieldTypes = [
'string',
@@ -182,7 +182,7 @@ const getForm: GetStorageFormFieldsType = (
disabled: isEdit && [110, 130].includes(currentValues?.status),
style: { width: 500 },
},
- suffix: (
+ /*suffix: (
<Button
onClick={async () => {
const values = await form.validateFields(['username', 'password',
'jdbcUrl']);
@@ -202,7 +202,7 @@ const getForm: GetStorageFormFieldsType = (
>
{i18n.t('components.AccessHelper.StorageMetaData.Hive.ConnectionTest')}
</Button>
- ),
+ ),*/
},
{
type: 'input',
diff --git a/inlong-dashboard/src/locales/cn.json
b/inlong-dashboard/src/locales/cn.json
index 99e5576c4..bd6ff71a0 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -36,7 +36,7 @@
"components.AccessHelper.DataSourceMetaData.Db.WhiteListHelp":
"多个白名单之间用英文逗号分隔，单个为正则表达式，比如：b1,b*",
"components.AccessHelper.DataStorageEditor.Editor.AddTo": "添加",
"components.AccessHelper.StorageMetaData.SinkName": "流向名称",
- "components.AccessHelper.StorageMetaData.SinkNameRule":
"以英文字母开头，只能包含英文字母、数字、下划线",
+ "components.AccessHelper.StorageMetaData.SinkNameRule":
"以英文字母开头，只能包含英文字母、数字、中划线、下划线",
"components.AccessHelper.StorageMetaData.Description": "流向描述",
"components.AccessHelper.StorageMetaData.SourceFieldName": "源字段名",
"components.AccessHelper.StorageMetaData.SourceFieldType": "源字段类型",
@@ -96,24 +96,24 @@
"components.AccessHelper.StorageMetaData.Iceberg.FieldType": "字段类型",
"components.AccessHelper.StorageMetaData.Iceberg.FieldDescription": "字段描述",
"components.AccessHelper.StorageMetaData.Iceberg.PartitionStrategy": "分区策略",
- "components.AccessHelper.FieldsConfig.businessFields.BusinessLabelName":
"Group 中文名称",
"components.AccessHelper.FieldsConfig.businessFields.Stripe/Second": "条/秒",
"components.AccessHelper.FieldsConfig.businessFields.MessageMiddleware":
"消息中间件",
"components.AccessHelper.FieldsConfig.businessFields.AccessSize": "按天接入大小",
"components.AccessHelper.FieldsConfig.businessFields.GB/Day": "GB/天",
- "components.AccessHelper.FieldsConfig.businessFields.BusinessID": "分组ID",
"components.AccessHelper.FieldsConfig.businessFields.BusinessIntroduction":
"分组描述",
"components.AccessHelper.FieldsConfig.businessFields.BusinessOwners":
"分组责任人",
"components.AccessHelper.FieldsConfig.businessFields.SingleStripMaximumLength":
"单条最大长度",
"components.AccessHelper.FieldsConfig.businessFields.thousand/day": "万条/天",
"components.AccessHelper.FieldsConfig.businessFields.AccessPeakPerSecond":
"每秒接入峰值",
- "components.AccessHelper.FieldsConfig.businessFields.BusinessEnglishName":
"分组英文名称",
-
"components.AccessHelper.FieldsConfig.businessFields.BusinessEnglishNameRules":
"仅限小写字⺟、数字和下划线",
+ "components.AccessHelper.FieldsConfig.businessFields.InlongGroupId": "分组ID",
+ "components.AccessHelper.FieldsConfig.businessFields.InlongGroupIdRules":
"仅限小写字⺟、数字和下划线",
+ "components.AccessHelper.FieldsConfig.businessFields.InlongGroupName":
"分组名称",
"components.AccessHelper.FieldsConfig.businessFields.NumberOfAccess":
"按天接入条数",
"components.AccessHelper.FieldsConfig.businessFields.BusinessOwnersExtra":
"分组责任人，可查看、修改分组信息",
"components.AccessHelper.FieldsConfig.businessFields.QueueModule": "队列模型",
"components.AccessHelper.FieldsConfig.businessFields.Parallel": "并行",
"components.AccessHelper.FieldsConfig.businessFields.Serial": "顺序",
+ "components.AccessHelper.FieldsConfig.businessFields.PartitionNum":
"Topic分区数",
"components.AccessHelper.FieldsConfig.businessFields.EnsembleSuffix": "节点数",
"components.AccessHelper.FieldsConfig.businessFields.EnsembleExtra":
"Topic保存到多少个节点，最高可配置10个",
"components.AccessHelper.FieldsConfig.businessFields.WriteQuorumSuffix":
"副本数",
@@ -260,7 +260,7 @@
"pages.AccessDetail.Business": "数据分组",
"pages.AccessDetail.DataStreams": "数据流",
"pages.AccessDetail.DataSources": "数据源",
- "pages.AccessDetail.DataStorages": "流向",
+ "pages.AccessDetail.DataStorages": "数据存储",
"pages.AccessDetail.BusinessDetail": "详情",
"pages.AccessDetail.Audit": "审计",
"pages.AccessDetail.Audit.DataStream": "数据流",
@@ -270,7 +270,7 @@
"pages.AccessDetail.Audit.Time": "时间",
"pages.AccessDetail.Audit.Receive": "接收成功",
"pages.AccessDetail.Audit.Send": "发送成功",
- "pages.ApprovalDetail.AccessConfig.DataStorages": "流向",
+ "pages.ApprovalDetail.AccessConfig.DataStorages": "数据存储",
"pages.ApprovalDetail.AccessConfig.ApprovalInformation": "审批信息",
"pages.ApprovalDetail.AccessConfig.DataFlowInformation": "数据流信息",
"pages.ApprovalDetail.AccessConfig.BasicInformation": "基础信息",
diff --git a/inlong-dashboard/src/locales/en.json
b/inlong-dashboard/src/locales/en.json
index 8c2d2b322..c61af47d4 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -36,7 +36,7 @@
"components.AccessHelper.DataSourceMetaData.Db.WhiteListHelp": "Multiple
whitelists are separated by commas, each of which is a regular expression, for
example b1,b*",
"components.AccessHelper.DataStorageEditor.Editor.AddTo": "Add",
"components.AccessHelper.StorageMetaData.SinkName": "SinkName",
- "components.AccessHelper.StorageMetaData.SinkNameRule": "At the beginning of
English letters, only English letters, numbers, and underscores",
+ "components.AccessHelper.StorageMetaData.SinkNameRule": "At the beginning of
English letters, only English letters, numbers, minus, and underscores",
"components.AccessHelper.StorageMetaData.Description": "SinkDescription",
"components.AccessHelper.StorageMetaData.SourceFieldName": "SourceFieldName",
"components.AccessHelper.StorageMetaData.SourceFieldType": "SourceFieldType",
@@ -96,24 +96,24 @@
"components.AccessHelper.StorageMetaData.Iceberg.FieldType": "FieldType",
"components.AccessHelper.StorageMetaData.Iceberg.FieldDescription":
"FieldDescription",
"components.AccessHelper.StorageMetaData.Iceberg.PartitionStrategy":
"PartitionStrategy",
- "components.AccessHelper.FieldsConfig.businessFields.BusinessLabelName":
"Group Label",
"components.AccessHelper.FieldsConfig.businessFields.Stripe/Second": "Stripe
/ S",
"components.AccessHelper.FieldsConfig.businessFields.MessageMiddleware":
"Middleware",
"components.AccessHelper.FieldsConfig.businessFields.AccessSize": "Access
Size",
"components.AccessHelper.FieldsConfig.businessFields.GB/Day": "GB / Day",
- "components.AccessHelper.FieldsConfig.businessFields.BusinessID": "Group ID",
"components.AccessHelper.FieldsConfig.businessFields.BusinessIntroduction":
"Description",
"components.AccessHelper.FieldsConfig.businessFields.BusinessOwners": "Group
Owners",
"components.AccessHelper.FieldsConfig.businessFields.SingleStripMaximumLength":
"Single Max Length",
"components.AccessHelper.FieldsConfig.businessFields.thousand/day": "Ten
Thousand / day",
"components.AccessHelper.FieldsConfig.businessFields.AccessPeakPerSecond":
"PeakRecords",
- "components.AccessHelper.FieldsConfig.businessFields.BusinessEnglishName":
"Group Name",
-
"components.AccessHelper.FieldsConfig.businessFields.BusinessEnglishNameRules":
"Only lowercase words, numbers and underscores",
+ "components.AccessHelper.FieldsConfig.businessFields.InlongGroupId": "Group
ID",
+ "components.AccessHelper.FieldsConfig.businessFields.InlongGroupIdRules":
"Only lowercase words, numbers and underscores",
+ "components.AccessHelper.FieldsConfig.businessFields.InlongGroupName":
"Group Name",
"components.AccessHelper.FieldsConfig.businessFields.NumberOfAccess":
"Number of Access",
"components.AccessHelper.FieldsConfig.businessFields.BusinessOwnersExtra":
"Group in charges, they can view, modify Group information",
"components.AccessHelper.FieldsConfig.businessFields.QueueModule": "Queue
Module",
"components.AccessHelper.FieldsConfig.businessFields.Parallel": "Parallel",
"components.AccessHelper.FieldsConfig.businessFields.Serial": "Serial",
+ "components.AccessHelper.FieldsConfig.businessFields.PartitionNum": "Topic
Part Nums",
"components.AccessHelper.FieldsConfig.businessFields.EnsembleSuffix":
"Number of nodes",
"components.AccessHelper.FieldsConfig.businessFields.EnsembleExtra": "How
many nodes are Topic saved to, up to 10 can be configured",
"components.AccessHelper.FieldsConfig.businessFields.WriteQuorumSuffix":
"Number of copies",
@@ -151,7 +151,7 @@
"components.AccessHelper.FieldsConfig.dataFields.VerticalLine": "Vertical
line (|)",
"components.AccessHelper.FieldsConfig.dataFields.File": "File",
"components.AccessHelper.FieldsConfig.dataFields.Autonomous": "Auto Push",
- "components.ConsumeHelper.BusinessSelect.MyBusinessModal.BusinessName":
"Group name",
+ "components.ConsumeHelper.BusinessSelect.MyBusinessModal.BusinessName":
"Group Name",
"components.ConsumeHelper.BusinessSelect.MyBusinessModal.Select": "Select",
"components.ConsumeHelper.BusinessSelect.MyBusinessModal.Owners": "Owners",
"components.ConsumeHelper.BusinessSelect.MyBusinessModal.MyAccessBusiness":
"My Data Streams Group",
@@ -204,7 +204,7 @@
"pages.AccessDashboard.config.WaitApproveCount": "WaitApproveCount",
"pages.AccessDashboard.config.Reject": "Reject",
"pages.AccessDashboard.config.GroupId": "Group ID",
- "pages.AccessDashboard.config.Name": "Name",
+ "pages.AccessDashboard.config.Name": "Group Name",
"pages.AccessDashboard.config.InCharges": "Owners",
"pages.AccessDashboard.config.ExecuteLog": "ExecuteLog",
"pages.AccessDashboard.status.Approved": "Approved",
diff --git a/inlong-dashboard/src/pages/AccessCreate/Business/config.tsx
b/inlong-dashboard/src/pages/AccessCreate/Business/config.tsx
index e8145affe..b5084f8de 100644
--- a/inlong-dashboard/src/pages/AccessCreate/Business/config.tsx
+++ b/inlong-dashboard/src/pages/AccessCreate/Business/config.tsx
@@ -32,9 +32,9 @@ export const getFormContent = ({ changedValues, isUpdate }) =>
</Divider>
),
},
- 'middlewareType',
+ 'mqType',
'queueModule',
- 'topicPartitionNum',
+ 'partitionNum',
{
type: (
<Divider orientation="left">
@@ -43,7 +43,6 @@ export const getFormContent = ({ changedValues, isUpdate }) =>
),
},
'name',
- 'cnName',
'inCharges',
'description',
{
@@ -52,7 +51,7 @@ export const getFormContent = ({ changedValues, isUpdate }) =>
{i18n.t('pages.AccessCreate.Business.config.AccessScale')}
</Divider>
),
- visible: values => values.middlewareType === 'TUBE',
+ visible: values => values.mqType === 'TUBE',
},
'dailyRecords',
'dailyStorage',
@@ -64,7 +63,7 @@ export const getFormContent = ({ changedValues, isUpdate }) =>
{i18n.t('components.AccessHelper.FieldsConfig.businessFields.DataCopyTitle')}
</Divider>
),
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
'mqExtInfo.ensemble',
'mqExtInfo.writeQuorum',
@@ -75,7 +74,7 @@ export const getFormContent = ({ changedValues, isUpdate }) =>
{i18n.t('components.AccessHelper.FieldsConfig.businessFields.DataStoragePeriodTitle')}
</Divider>
),
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
'mqExtInfo.retentionTime',
'mqExtInfo.ttl',
diff --git a/inlong-dashboard/src/pages/AccessCreate/Business/index.tsx
b/inlong-dashboard/src/pages/AccessCreate/Business/index.tsx
index 4ece938f3..0643903f7 100644
--- a/inlong-dashboard/src/pages/AccessCreate/Business/index.tsx
+++ b/inlong-dashboard/src/pages/AccessCreate/Business/index.tsx
@@ -63,7 +63,7 @@ const Comp = ({ inlongGroupId }: Props, ref) => {
followers: values.followers?.join(','),
mqExtInfo: {
...values.mqExtInfo,
- middlewareType: values.middlewareType,
+ mqType: values.mqType,
},
};
diff --git a/inlong-dashboard/src/pages/AccessCreate/DataStream/config.tsx
b/inlong-dashboard/src/pages/AccessCreate/DataStream/config.tsx
index f3dc20a11..e40000d76 100644
--- a/inlong-dashboard/src/pages/AccessCreate/DataStream/config.tsx
+++ b/inlong-dashboard/src/pages/AccessCreate/DataStream/config.tsx
@@ -23,7 +23,7 @@ import i18n from '@/i18n';
import { genBusinessFields, genDataFields } from '@/components/AccessHelper';
import { Storages } from '@/components/MetaData';
-export const genFormContent = (currentValues, inlongGroupId, middlewareType)
=> {
+export const genFormContent = (currentValues, inlongGroupId, mqType) => {
const extraParams = {
inlongGroupId: inlongGroupId,
};
@@ -73,7 +73,7 @@ export const genFormContent = (currentValues, inlongGroupId,
middlewareType) =>
{i18n.t('pages.AccessCreate.Business.config.AccessScale')}
</Divider>
),
- visible: middlewareType === 'PULSAR',
+ visible: mqType === 'PULSAR',
},
],
currentValues,
@@ -82,7 +82,7 @@ export const genFormContent = (currentValues, inlongGroupId,
middlewareType) =>
...genBusinessFields(['dailyRecords', 'dailyStorage', 'peakRecords',
'maxLength']).map(
item => ({
...item,
- visible: middlewareType === 'PULSAR',
+ visible: mqType === 'PULSAR',
}),
),
...genDataFields(
diff --git a/inlong-dashboard/src/pages/AccessCreate/DataStream/index.tsx
b/inlong-dashboard/src/pages/AccessCreate/DataStream/index.tsx
index 78f0e3754..ef756eb5a 100644
--- a/inlong-dashboard/src/pages/AccessCreate/DataStream/index.tsx
+++ b/inlong-dashboard/src/pages/AccessCreate/DataStream/index.tsx
@@ -28,10 +28,10 @@ import { valuesToData, dataToValues } from './helper';
export interface Props {
inlongGroupId: string;
- middlewareType: string;
+ mqType: string;
}
-const Comp = ({ inlongGroupId, middlewareType }: Props, ref) => {
+const Comp = ({ inlongGroupId, mqType }: Props, ref) => {
const [form] = Form.useForm();
const { t } = useTranslation();
@@ -148,7 +148,7 @@ const Comp = ({ inlongGroupId, middlewareType }: Props,
ref) => {
...realTimeValues.list?.[index],
},
inlongGroupId,
- middlewareType,
+ mqType,
).map(item => {
const obj = { ...item } as any;
if (obj.name) {
diff --git a/inlong-dashboard/src/pages/AccessCreate/index.tsx
b/inlong-dashboard/src/pages/AccessCreate/index.tsx
index ac8b03966..c5ee93220 100644
--- a/inlong-dashboard/src/pages/AccessCreate/index.tsx
+++ b/inlong-dashboard/src/pages/AccessCreate/index.tsx
@@ -45,11 +45,11 @@ const Create: React.FC = () => {
const businessRef = useRef(null);
const dataStreamRef = useRef(null);
- const [middlewareType, setMiddlewareType] = useState();
+ const [mqType, setMqType] = useState();
useRequest(`/group/get/${inlongGroupId}`, {
- ready: !!inlongGroupId && !middlewareType,
- onSuccess: result => setMiddlewareType(result.middlewareType),
+ ready: !!inlongGroupId && !mqType,
+ onSuccess: result => setMqType(result.mqType),
});
const steps = [
@@ -65,7 +65,7 @@ const Create: React.FC = () => {
<DataStream
ref={dataStreamRef}
inlongGroupId={inlongGroupId}
- middlewareType={middlewareType}
+ mqType={mqType}
/>
),
useCache: true,
@@ -80,7 +80,7 @@ const Create: React.FC = () => {
try {
const result = onOk && (await onOk());
if (current === 0) {
- setMiddlewareType(result.middlewareType);
+ setMqType(result.mqType);
setGroupId(result.inlongGroupId);
history.push({
search: `?inlongGroupId=${result.inlongGroupId}&step=1`,
diff --git a/inlong-dashboard/src/pages/AccessDashboard/config.tsx
b/inlong-dashboard/src/pages/AccessDashboard/config.tsx
index 4f836b4af..b1112f90d 100644
--- a/inlong-dashboard/src/pages/AccessDashboard/config.tsx
+++ b/inlong-dashboard/src/pages/AccessDashboard/config.tsx
@@ -84,7 +84,7 @@ export const getColumns = ({ onDelete, openModal }) => {
},
{
title: i18n.t('pages.AccessDashboard.config.Name'),
- dataIndex: 'cnName',
+ dataIndex: 'name',
},
{
title: i18n.t('pages.AccessDashboard.config.InCharges'),
diff --git
a/inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
b/inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
index ccc38ee33..a9454e54d 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
+++ b/inlong-dashboard/src/pages/AccessDetail/DataStream/StreamItemModal.tsx
@@ -31,10 +31,10 @@ import { pickObject } from '@/utils';
export interface Props extends ModalProps {
inlongGroupId: string;
record?: Record<string, any>;
- middlewareType: string;
+ mqType: string;
}
-export const genFormContent = (currentValues, inlongGroupId, middlewareType)
=> {
+export const genFormContent = (currentValues, inlongGroupId, mqType) => {
const extraParams = {
inlongGroupId,
};
@@ -67,7 +67,7 @@ export const genFormContent = (currentValues, inlongGroupId,
middlewareType) =>
{i18n.t('pages.AccessCreate.Business.config.AccessScale')}
</Divider>
),
- visible: middlewareType === 'PULSAR',
+ visible: mqType === 'PULSAR',
},
],
currentValues,
@@ -76,7 +76,7 @@ export const genFormContent = (currentValues, inlongGroupId,
middlewareType) =>
...genBusinessFields(['dailyRecords', 'dailyStorage', 'peakRecords',
'maxLength']).map(
item => ({
...item,
- visible: middlewareType === 'PULSAR',
+ visible: mqType === 'PULSAR',
}),
),
].map(item => {
@@ -90,7 +90,7 @@ export const genFormContent = (currentValues, inlongGroupId,
middlewareType) =>
});
};
-const Comp: React.FC<Props> = ({ inlongGroupId, record, middlewareType,
...modalProps }) => {
+const Comp: React.FC<Props> = ({ inlongGroupId, record, mqType, ...modalProps
}) => {
const [form] = useForm();
const onOk = async () => {
const values = {
@@ -131,7 +131,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId, record,
middlewareType, ...modal
<FormGenerator
labelCol={{ span: 4 }}
wrapperCol={{ span: 20 }}
- content={genFormContent(record, inlongGroupId, middlewareType)}
+ content={genFormContent(record, inlongGroupId, mqType)}
form={form}
useMaxWidth
/>
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStream/config.tsx
b/inlong-dashboard/src/pages/AccessDetail/DataStream/config.tsx
index dbc1ac69b..b0ae03a4e 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataStream/config.tsx
+++ b/inlong-dashboard/src/pages/AccessDetail/DataStream/config.tsx
@@ -33,7 +33,7 @@ export const getFilterFormContent = (defaultValues = {} as
any) => [
export const genExtraContent = ({
editingId,
record,
- middlewareType,
+ mqType,
onSave,
onCancel,
onEdit,
@@ -66,13 +66,7 @@ export const genExtraContent = ({
];
};
-export const genFormContent = (
- editingId,
- currentValues,
- inlongGroupId,
- readonly,
- middlewareType,
-) => {
+export const genFormContent = (editingId, currentValues, inlongGroupId,
readonly, mqType) => {
const extraParams = {
inlongGroupId,
useDataSourcesActionRequest: !!currentValues?.id,
@@ -95,8 +89,8 @@ export const genFormContent = (
{
label: 'Topic Name',
type: 'text',
- name: 'mqResourceObj',
- visible: middlewareType === 'PULSAR' && editingId !== true,
+ name: 'mqResource',
+ visible: mqType === 'PULSAR' && editingId !== true,
},
'name',
'description',
@@ -117,7 +111,7 @@ export const genFormContent = (
{i18n.t('pages.AccessCreate.Business.config.AccessScale')}
</Divider>
),
- visible: middlewareType === 'PULSAR',
+ visible: mqType === 'PULSAR',
},
],
currentValues,
@@ -126,7 +120,7 @@ export const genFormContent = (
...genBusinessFields(['dailyRecords', 'dailyStorage', 'peakRecords',
'maxLength']).map(
item => ({
...item,
- visible: middlewareType === 'PULSAR',
+ visible: mqType === 'PULSAR',
}),
),
// ...genDataFields(
diff --git a/inlong-dashboard/src/pages/AccessDetail/DataStream/index.tsx
b/inlong-dashboard/src/pages/AccessDetail/DataStream/index.tsx
index de16f4ce3..c8e14527c 100644
--- a/inlong-dashboard/src/pages/AccessDetail/DataStream/index.tsx
+++ b/inlong-dashboard/src/pages/AccessDetail/DataStream/index.tsx
@@ -34,7 +34,7 @@ import styles from './index.module.less';
type Props = CommonInterface;
-const Comp = ({ inlongGroupId, readonly, middlewareType }: Props, ref) => {
+const Comp = ({ inlongGroupId, readonly, mqType }: Props, ref) => {
const { t } = useTranslation();
const [form] = Form.useForm();
@@ -183,7 +183,7 @@ const Comp = ({ inlongGroupId, readonly, middlewareType }:
Props, ref) => {
const list = genExtraContent({
editingId,
record,
- middlewareType,
+ mqType,
onSave,
onEdit,
onCancel,
@@ -293,7 +293,7 @@ const Comp = ({ inlongGroupId, readonly, middlewareType }:
Props, ref) => {
{ ...realTimeValues.list?.[index] },
inlongGroupId,
readonly,
- middlewareType,
+ mqType,
).map(item => {
const obj = { ...item } as any;
if (obj.name) {
@@ -321,7 +321,7 @@ const Comp = ({ inlongGroupId, readonly, middlewareType }:
Props, ref) => {
<StreamItemModal
{...streamItemModal}
- middlewareType={middlewareType}
+ mqType={mqType}
onOk={async () => {
await getList();
setEditingId(false);
diff --git a/inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
b/inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
index 190d7e54c..401f0009a 100644
--- a/inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
+++ b/inlong-dashboard/src/pages/AccessDetail/Info/config.tsx
@@ -22,30 +22,29 @@ import { genBusinessFields } from
'@/components/AccessHelper';
export const getFormContent = ({ editing, initialValues, isCreate, isUpdate })
=> {
const keys = [
- 'middlewareType',
- !isCreate && 'inlongGroupId',
- !isCreate && 'mqResourceObj',
+ 'mqType',
+ 'queueModule',
+ 'partitionNum',
+ 'inlongGroupId',
+ !isCreate && 'mqResource',
'name',
- 'cnName',
'inCharges',
'description',
- 'queueModule',
- 'topicPartitionNum',
'dailyRecords',
'dailyStorage',
'peakRecords',
'maxLength',
- // 'mqExtInfo.ensemble',
- 'mqExtInfo.writeQuorum',
- 'mqExtInfo.ackQuorum',
- 'mqExtInfo.retentionTime',
- 'mqExtInfo.ttl',
- 'mqExtInfo.retentionSize',
+ // 'ensemble',
+ 'writeQuorum',
+ 'ackQuorum',
+ 'ttl',
+ 'retentionTime',
+ 'retentionSize',
].filter(Boolean);
return isCreate
? genBusinessFields(keys, initialValues).map(item => {
- if (item.name === 'name' && isUpdate) {
+ if (item.name === 'inlongGroupId' && isUpdate) {
return {
...item,
props: {
@@ -74,10 +73,10 @@ function transType(editing: boolean, conf, initialValues) {
const arr = [
{
name: [
- 'middlewareType',
+ 'mqType',
'queueModule',
- 'topicPartitionNum',
- 'name',
+ 'partitionNum',
+ 'inlongGroupId',
'dailyRecords',
'dailyStorage',
'peakRecords',
@@ -88,15 +87,15 @@ function transType(editing: boolean, conf, initialValues) {
},
{
name: [
- 'cnName',
+ 'name',
'description',
'inCharges',
- 'mqExtInfo.ensemble',
- 'mqExtInfo.writeQuorum',
- 'mqExtInfo.ackQuorum',
- 'mqExtInfo.retentionTime',
- 'mqExtInfo.ttl',
- 'mqExtInfo.retentionSize',
+ 'ensemble',
+ 'writeQuorum',
+ 'ackQuorum',
+ 'ttl',
+ 'retentionTime',
+ 'retentionSize',
],
as: 'text',
active: !editing,
diff --git a/inlong-dashboard/src/pages/AccessDetail/Info/index.tsx
b/inlong-dashboard/src/pages/AccessDetail/Info/index.tsx
index 4cf602b7d..d2cf67e45 100644
--- a/inlong-dashboard/src/pages/AccessDetail/Info/index.tsx
+++ b/inlong-dashboard/src/pages/AccessDetail/Info/index.tsx
@@ -59,11 +59,6 @@ const Comp = ({ inlongGroupId, readonly, isCreate }: Props,
ref) => {
...values,
inCharges: values.inCharges?.join(','),
followers: values.followers?.join(','),
- mqExtInfo: {
- ...data?.mqExtInfo,
- ...values.mqExtInfo,
- middlewareType: values.middlewareType,
- },
};
if (isUpdate) {
diff --git a/inlong-dashboard/src/pages/AccessDetail/common.d.ts
b/inlong-dashboard/src/pages/AccessDetail/common.d.ts
index 50cc69c59..390944148 100644
--- a/inlong-dashboard/src/pages/AccessDetail/common.d.ts
+++ b/inlong-dashboard/src/pages/AccessDetail/common.d.ts
@@ -19,7 +19,7 @@
export interface CommonInterface {
inlongGroupId: string;
- middlewareType: 'TUBE' | 'PULSAR';
+ mqType: 'TUBE' | 'PULSAR';
readonly?: boolean;
isCreate?: boolean;
ref?: React.RefObject<unknown>;
diff --git a/inlong-dashboard/src/pages/AccessDetail/index.tsx
b/inlong-dashboard/src/pages/AccessDetail/index.tsx
index ab9b5e14f..c098151ec 100644
--- a/inlong-dashboard/src/pages/AccessDetail/index.tsx
+++ b/inlong-dashboard/src/pages/AccessDetail/index.tsx
@@ -44,7 +44,7 @@ const Comp: React.FC = () => {
const [id, setId] = useState(groupId || '');
const childRef = useRef(null);
- const [middlewareType, setMiddlewareType] = useState();
+ const [mqType, setMqType] = useState();
const [isCreate] = useState(location.pathname.indexOf('/access/create') ===
0);
@@ -53,9 +53,9 @@ const Comp: React.FC = () => {
}, [current, addOpened, hasOpened]);
const { data } = useRequest(`/group/get/${id}`, {
- ready: !!id && !middlewareType,
+ ready: !!id && !mqType,
refreshDeps: [id],
- onSuccess: result => setMiddlewareType(result.middlewareType),
+ onSuccess: result => setMqType(result.mqType),
});
const isReadonly = useMemo(() => [0, 101, 102].includes(data?.status),
[data]);
@@ -100,7 +100,7 @@ const Comp: React.FC = () => {
try {
const result = onOk && (await onOk());
if (current === 0) {
- setMiddlewareType(result.middlewareType);
+ setMqType(result.mqType);
setId(result.inlongGroupId);
}
history.push({
@@ -190,7 +190,7 @@ const Comp: React.FC = () => {
<Content
inlongGroupId={id}
readonly={isReadonly}
- middlewareType={middlewareType}
+ mqType={mqType}
isCreate={isCreate}
ref={index === current ? childRef : null}
/>
diff --git a/inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
b/inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
index fc5f0f90a..7e4aaae77 100644
--- a/inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
+++ b/inlong-dashboard/src/pages/ApprovalDetail/AccessConfig.tsx
@@ -26,23 +26,23 @@ const getBusinessContent = initialValues => [
...genBusinessFields(
[
'inlongGroupId',
- 'cnName',
+ 'name',
'inCharges',
'description',
- 'middlewareType',
- 'mqResourceObj',
+ 'mqType',
+ 'mqResource',
'queueModule',
- 'topicPartitionNum',
+ 'partitionNum',
'dailyRecords',
'dailyStorage',
'peakRecords',
'maxLength',
- 'mqExtInfo.ensemble',
- 'mqExtInfo.writeQuorum',
- 'mqExtInfo.ackQuorum',
- 'mqExtInfo.retentionTime',
- 'mqExtInfo.ttl',
- 'mqExtInfo.retentionSize',
+ 'ensemble',
+ 'writeQuorum',
+ 'ackQuorum',
+ 'ttl',
+ 'retentionTime',
+ 'retentionSize',
],
initialValues,
).map(item => {
diff --git a/inlong-dashboard/src/pages/ConsumeCreate/Info/config.tsx
b/inlong-dashboard/src/pages/ConsumeCreate/Info/config.tsx
index ee05b7119..0c747eb7c 100644
--- a/inlong-dashboard/src/pages/ConsumeCreate/Info/config.tsx
+++ b/inlong-dashboard/src/pages/ConsumeCreate/Info/config.tsx
@@ -37,13 +37,13 @@ export const getFormContent = ({ changedValues }):
ReturnType<typeof genBasicFie
'filterEnabled',
{
type: <Divider orientation="left">DLQ</Divider>,
- visible: values => values.middlewareType === 'PULSAR',
+ visible: values => values.mqType === 'PULSAR',
},
'mqExtInfo.isDlq',
'mqExtInfo.deadLetterTopic',
{
type: <Divider orientation="left">RLQ</Divider>,
- visible: values => values.mqExtInfo?.isDlq && values.middlewareType
=== 'PULSAR',
+ visible: values => values.mqExtInfo?.isDlq && values.mqType ===
'PULSAR',
},
'mqExtInfo.isRlq',
'mqExtInfo.retryLetterTopic',
diff --git a/inlong-dashboard/src/pages/ConsumeCreate/Info/index.tsx
b/inlong-dashboard/src/pages/ConsumeCreate/Info/index.tsx
index 05ffbc8a6..4ceab172d 100644
--- a/inlong-dashboard/src/pages/ConsumeCreate/Info/index.tsx
+++ b/inlong-dashboard/src/pages/ConsumeCreate/Info/index.tsx
@@ -67,7 +67,7 @@ const Comp = ({ id }: Props, ref) => {
topic: Array.isArray(values.topic) ? values.topic.join(',') :
values.topic,
mqExtInfo: {
...values.mqExtInfo,
- middlewareType: values.middlewareType,
+ mqType: values.mqType,
},
};
diff --git a/inlong-dashboard/src/pages/ConsumeDashboard/config.tsx
b/inlong-dashboard/src/pages/ConsumeDashboard/config.tsx
index 364274c86..dddbd6369 100644
--- a/inlong-dashboard/src/pages/ConsumeDashboard/config.tsx
+++ b/inlong-dashboard/src/pages/ConsumeDashboard/config.tsx
@@ -115,7 +115,7 @@ export const getColumns = ({ onDelete }) => {
},
{
title: i18n.t('pages.ConsumeDashboard.config.Middleware'),
- dataIndex: 'middlewareType',
+ dataIndex: 'mqType',
width: 120,
},
{
diff --git a/inlong-dashboard/src/pages/ConsumeDetail/Info/index.tsx
b/inlong-dashboard/src/pages/ConsumeDetail/Info/index.tsx
index ad33508c7..7e4c28c87 100644
--- a/inlong-dashboard/src/pages/ConsumeDetail/Info/index.tsx
+++ b/inlong-dashboard/src/pages/ConsumeDetail/Info/index.tsx
@@ -56,10 +56,10 @@ const Comp: React.FC<Props> = ({ id, isActive, readonly,
extraRef }) => {
...values,
inCharges: values.inCharges.join(','),
consumerGroupId: values.consumerGroupName,
- middlewareType: values?.middlewareType || data?.middlewareType,
+ mqType: values?.mqType || data?.mqType,
mqExtInfo: {
...values.mqExtInfo,
- middlewareType: values.middlewareType,
+ mqType: values.mqType,
},
};
await request({
