You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2021/11/27 08:58:21 UTC
[incubator-inlong] branch master updated: [INLONG-1836] Audit support pulsar (#1845)
This is an automated email from the ASF dual-hosted git repository.
healchow 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 ce60afa [INLONG-1836] Audit support pulsar (#1845)
ce60afa is described below
commit ce60afaf5aa867f8efd2b73ea388f81fba271e31
Author: Daniel <le...@outlook.com>
AuthorDate: Sat Nov 27 16:58:17 2021 +0800
[INLONG-1836] Audit support pulsar (#1845)
---
.../src/pages/ApprovalDetail/AccessConfig.tsx | 8 +++
.../src/pages/ApprovalDetail/ConsumeConfig.tsx | 57 +++++++++++++---------
2 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/inlong-website/src/pages/ApprovalDetail/AccessConfig.tsx b/inlong-website/src/pages/ApprovalDetail/AccessConfig.tsx
index 6384c8c..8805ad4 100644
--- a/inlong-website/src/pages/ApprovalDetail/AccessConfig.tsx
+++ b/inlong-website/src/pages/ApprovalDetail/AccessConfig.tsx
@@ -31,10 +31,18 @@ const getBusinessContent = initialValues => [
'description',
'middlewareType',
'mqResourceObj',
+ 'queueModule',
+ 'topicPartitionNum',
'dailyRecords',
'dailyStorage',
'peakRecords',
'maxLength',
+ 'mqExtInfo.ensemble',
+ 'mqExtInfo.writeQuorum',
+ 'mqExtInfo.ackQuorum',
+ 'mqExtInfo.retentionTime',
+ 'mqExtInfo.ttl',
+ 'mqExtInfo.retentionSize',
],
initialValues,
).map(item => {
diff --git a/inlong-website/src/pages/ApprovalDetail/ConsumeConfig.tsx b/inlong-website/src/pages/ApprovalDetail/ConsumeConfig.tsx
index 10bad57..5a85eee 100644
--- a/inlong-website/src/pages/ApprovalDetail/ConsumeConfig.tsx
+++ b/inlong-website/src/pages/ApprovalDetail/ConsumeConfig.tsx
@@ -23,25 +23,30 @@ import i18n from '@/i18n';
import { genBasicFields } from '@/components/ConsumeHelper';
const getConsumerContent = initialValues => {
- return [
- {
- type: 'text',
- label: i18n.t('pages.ApprovalDetail.ConsumeConfig.ConsumerGroup'),
- name: 'consumerGroupId',
- initialValue: initialValues.consumerGroupId,
- },
- ...genBasicFields(
- ['inCharges', 'masterUrl', 'inlongGroupId'],
- { middlewareType: initialValues.middlewareType },
- initialValues,
- ),
- {
- type: 'text',
- label: 'Topic',
- name: 'topic',
- initialValue: initialValues.topic,
- },
- ].map(item => {
+ return genBasicFields(
+ [
+ {
+ type: 'text',
+ label: i18n.t('pages.ApprovalDetail.ConsumeConfig.ConsumerGroup'),
+ name: 'consumerGroupId',
+ initialValue: initialValues.consumerGroupId,
+ },
+ 'inCharges',
+ 'masterUrl',
+ 'inlongGroupId',
+ 'mqExtInfo.isDlq',
+ 'mqExtInfo.deadLetterTopic',
+ 'mqExtInfo.isRlq',
+ 'mqExtInfo.retryLetterTopic',
+ {
+ type: 'text',
+ label: 'Topic',
+ name: 'topic',
+ initialValue: initialValues.topic,
+ },
+ ],
+ initialValues,
+ ).map(item => {
const obj = { ...item };
if (typeof obj.suffix !== 'string') {
delete obj.suffix;
@@ -68,7 +73,11 @@ export const getFormContent = (
) => {
const array = [
{
- type: <Divider orientation="left">基础信息</Divider>,
+ type: (
+ <Divider orientation="left">
+ {i18n.t('pages.ApprovalDetail.ConsumeConfig.BasicInfo')}
+ </Divider>
+ ),
},
...(getConsumerContent(formData.consumptionInfo) || []),
];
@@ -78,7 +87,7 @@ export const getFormContent = (
? [
{
type: 'input',
- label: '消费组',
+ label: i18n.t('pages.ApprovalDetail.ConsumeConfig.ConsumerGroup'),
name: ['form', 'consumerGroupId'],
initialValue: formData.consumptionInfo?.consumerGroupId,
rules: [{ required: true }],
@@ -93,7 +102,11 @@ export const getFormContent = (
? array
: array.concat([
{
- type: <Divider orientation="left">审批信息</Divider>,
+ type: (
+ <Divider orientation="left">
+ {i18n.t('pages.ApprovalDetail.ConsumeConfig.ApprovalInfo')}
+ </Divider>
+ ),
},
...extraForm,
...suffixContent,