refactor: update seatunnel 2.3.5 feishu connectors

flowerfine · May 10, 2024 · c8eb121 · c8eb121
1 parent 1f7fe61
commit c8eb121
Show file tree

Hide file tree

Showing 7 changed files with 419 additions and 433 deletions.
diff --git a/...n/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeProperties.java b/...n/java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeProperties.java
@@ -52,6 +52,15 @@ public enum FakeProperties {
             .addValidator(Validators.POSITIVE_INTEGER_VALIDATOR)
             .validateAndBuild();
 
+    public static final PropertyDescriptor<JsonNode> ROWS = new PropertyDescriptor.Builder<JsonNode>()
+            .name("rows")
+            .description(
+                    "The row list of fake data output per degree of parallelism")
+            .type(PropertyType.OBJECT)
+            .parser(Parsers.JSON_PARSER)
+            .addValidator(Validators.NON_BLANK_VALIDATOR)
+            .validateAndBuild();
+
     public static final PropertyDescriptor<Integer> SPLIT_NUM = new PropertyDescriptor.Builder<Integer>()
             .name("split.num")
             .description("the number of splits generated by the enumerator for each degree of parallelism")
@@ -106,15 +115,6 @@ public enum FakeProperties {
             .addValidator(Validators.POSITIVE_INTEGER_VALIDATOR)
             .validateAndBuild();
 
-    public static final PropertyDescriptor<JsonNode> ROWS = new PropertyDescriptor.Builder<JsonNode>()
-            .name("rows")
-            .description(
-                    "The row list of fake data output per degree of parallelism")
-            .type(PropertyType.OBJECT)
-            .parser(Parsers.JSON_PARSER)
-            .addValidator(Validators.NON_BLANK_VALIDATOR)
-            .validateAndBuild();
-
     public static final PropertyDescriptor<String> STRING_FAKE_MODE = new PropertyDescriptor.Builder()
             .name("string.fake.mode")
             .description("The fake mode of generating string data")

diff --git a/...java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeSourcePlugin.java b/...java/cn/sliew/scaleph/plugin/seatunnel/flink/connectors/fake/source/FakeSourcePlugin.java
@@ -43,13 +43,13 @@ public FakeSourcePlugin() {
         props.add(TABLES_CONFIGS);
         props.add(SCHEMA);
         props.add(ROW_NUM);
+        props.add(ROWS);
         props.add(SPLIT_NUM);
         props.add(SPLIT_READ_INTERVAL);
         props.add(MAP_SIZE);
         props.add(ARRAY_SIZE);
         props.add(BYTES_SIZE);
         props.add(STRING_SIZE);
-        props.add(ROWS);
 
         props.add(STRING_FAKE_MODE);
         props.add(STRING_TEMPLATE);

diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -319,9 +319,8 @@ export default {
 
   // feishu
   'pages.project.di.step.feishu.url': '飞书机器人URL',
-  'pages.project.di.step.feishu.headers': 'Header',
-  'pages.project.di.step.feishu.header': 'header',
-  'pages.project.di.step.feishu.value': 'value',
+  'pages.project.di.step.feishu.headers': 'Headers',
+  'pages.project.di.step.feishu.headers.tooltip': 'Http 请求 Headers',
 
   // dingtalk
   'pages.project.di.step.dingtalk.url': '钉钉机器人URL',

diff --git a/.../pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/constant.tsx b/.../pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/constant.tsx
@@ -239,10 +239,7 @@ export const WeChatParams = {
 
 export const FeishuParams = {
   url: 'url',
-  headerArray: 'headerArray',
   headers: 'headers',
-  header: 'header',
-  headerValue: 'headerValue'
 };
 
 export const DingTalkParams = {

diff --git a/...ct/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-email-step.tsx b/...ct/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-email-step.tsx
@@ -83,9 +83,7 @@ const SinkEmailStepForm: React.FC<ModalFormProps<Node>> = ({data, visible, onVis
                           <ProFormGroup>
                             <ProFormTextArea
                               name={EmailParams.emailAuthorizationCode}
-                              label={intl.formatMessage({
-                                id: 'pages.project.di.step.email.emailAuthorizationCode',
-                              })}
+                              label={intl.formatMessage({id: 'pages.project.di.step.email.emailAuthorizationCode'})}
                               rules={[{required: true}]}
                             />
                           </ProFormGroup>

diff --git a/...t/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-feishu-step.tsx b/...t/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/sink/sink-feishu-step.tsx
@@ -1,11 +1,14 @@
 import React, {useEffect} from 'react';
 import {Form} from 'antd';
-import {DrawerForm, ProFormGroup, ProFormList, ProFormText} from '@ant-design/pro-components';
+import {InfoCircleOutlined} from "@ant-design/icons";
+import {DrawerForm, ProFormGroup, ProFormText} from '@ant-design/pro-components';
 import {getIntl, getLocale} from "@umijs/max";
 import {Node, XFlow} from '@antv/xflow';
 import {ModalFormProps} from '@/typings';
 import {FeishuParams, STEP_ATTR_TYPE} from '../constant';
 import {StepSchemaService} from "../helper";
+import CommonConfigItem
+  from "@/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/steps/common/config/commonConfig";
 
 const SinkFeishuStepForm: React.FC<ModalFormProps<Node>> = ({data, visible, onVisibleChange, onOK}) => {
   const intl = getIntl(getLocale());
@@ -32,7 +35,7 @@ const SinkFeishuStepForm: React.FC<ModalFormProps<Node>> = ({data, visible, onVi
         }}
         onFinish={(values) => {
           if (onOK) {
-            StepSchemaService.formatHeader(values);
+            StepSchemaService.formatCommonConfig(values, FeishuParams.headers, FeishuParams.headers);
             onOK(values)
             return Promise.resolve(true)
           }
@@ -50,28 +53,17 @@ const SinkFeishuStepForm: React.FC<ModalFormProps<Node>> = ({data, visible, onVi
           label={intl.formatMessage({id: 'pages.project.di.step.feishu.url'})}
           rules={[{required: true}]}
         />
-        <ProFormList
-          name={FeishuParams.headerArray}
-          label={intl.formatMessage({id: 'pages.project.di.step.feishu.headers'})}
-          copyIconProps={false}
-          creatorButtonProps={{
-            creatorButtonText: intl.formatMessage({id: 'pages.project.di.step.feishu.header'}),
-            type: 'text',
+        <ProFormGroup
+          title={intl.formatMessage({id: 'pages.project.di.step.feishu.headers'})}
+          tooltip={{
+            title: intl.formatMessage({id: 'pages.project.di.step.feishu.headers.tooltip'}),
+            icon: <InfoCircleOutlined/>,
           }}
+          collapsible={true}
+          defaultCollapsed={true}
         >
-          <ProFormGroup>
-            <ProFormText
-              name={FeishuParams.header}
-              label={intl.formatMessage({id: 'pages.project.di.step.feishu.header'})}
-              colProps={{span: 10, offset: 1}}
-            />
-            <ProFormText
-              name={FeishuParams.headerValue}
-              label={intl.formatMessage({id: 'pages.project.di.step.feishu.value'})}
-              colProps={{span: 10, offset: 1}}
-            />
-          </ProFormGroup>
-        </ProFormList>
+          <CommonConfigItem data={FeishuParams.headers}/>
+        </ProFormGroup>
       </DrawerForm>
     </XFlow>
   );