From cb1633874bbdc89e44f143b0e1ec3397791a61ec Mon Sep 17 00:00:00 2001 From: kalencaya <1942460489@qq.com> Date: Fri, 15 Dec 2023 22:25:35 +0800 Subject: [PATCH] [Bug][scaleph-ui-react] fix webui error (#663) * fix: seatunnel version error * fix: flink kubernetes job update error * fix: elasticsearch source connector drawer error * prepare 2.0.1 release --- README.md | 2 +- .../Dag/steps/sink/sink-rocketmq-step.tsx | 4 +- .../source/source-elasticsearch-step.tsx | 53 +++++++++++-------- .../Workspace/Kubernetes/Job/JobForm.tsx | 5 +- .../docker/deploy/scaleph/docker-compose.yml | 6 +-- 5 files changed, 40 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index e8ae7ec50..d2763a229 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Scaleph is driven by personal interest and evolves actively through faithful dev ### data integration * Web-ui click-and-drag data integration ways backended by Apache SeaTunnel(incubating) -* Support 2.3.2 V2 out-of-the-box connectors and transforms +* Support 2.3.3 V2 out-of-the-box connectors and transforms * DataSource management ### data develop diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/sink/sink-rocketmq-step.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/sink/sink-rocketmq-step.tsx index e27e3b94e..909f69b9a 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/sink/sink-rocketmq-step.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/sink/sink-rocketmq-step.tsx @@ -8,13 +8,13 @@ import {RocketMQParams, STEP_ATTR_TYPE} from '../../constant'; import {WsDiJobService} from '@/services/project/WsDiJobService'; import { ProForm, - ProFormDependency, ProFormDigit, + ProFormDependency, + ProFormDigit, ProFormGroup, ProFormSelect, ProFormSwitch, ProFormText } from '@ant-design/pro-components'; -import FieldItem from "@/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/fields"; const SinkRocketMQStepForm: React.FC< ModalFormProps<{ diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/source/source-elasticsearch-step.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/source/source-elasticsearch-step.tsx index 4734cbcdc..a459c0856 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/source/source-elasticsearch-step.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/DI/DiJobFlow/Dag/steps/source/source-elasticsearch-step.tsx @@ -10,7 +10,7 @@ import { ProFormTextArea } from '@ant-design/pro-components'; import {NsGraph} from '@antv/xflow'; -import {Form, message, Modal} from 'antd'; +import {Button, Drawer, Form, message} from 'antd'; import {useEffect} from 'react'; import {getIntl, getLocale} from 'umi'; import {ElasticsearchParams, SchemaParams, STEP_ATTR_TYPE} from '../../constant'; @@ -33,31 +33,38 @@ const SourceElasticsearchStepForm: React.FC { - form.validateFields().then((values) => { - let map: Map = new Map(); - map.set(STEP_ATTR_TYPE.jobId, jobInfo.id); - map.set(STEP_ATTR_TYPE.jobGraph, JSON.stringify(jobGraph)); - map.set(STEP_ATTR_TYPE.stepCode, nodeInfo.id); - StepSchemaService.formatEsSource(values) - StepSchemaService.formatSchema(values); - map.set(STEP_ATTR_TYPE.stepAttrs, values); - WsDiJobService.saveStepAttr(map).then((resp) => { - if (resp.success) { - message.success(intl.formatMessage({id: 'app.common.operate.success'})); - onCancel(); - onOK ? onOK(values) : null; - } - }); - }); - }} + onClose={onCancel} + extra={ + + } > - + ); }; diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Job/JobForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Job/JobForm.tsx index c4addc6ef..9777b08d9 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Job/JobForm.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Job/JobForm.tsx @@ -39,6 +39,8 @@ const FlinkKubernetesJobForm: React.FC> = ( const [form] = Form.useForm(); const projectId = localStorage.getItem(WORKSPACE_CONF.projectId); + console.log('FlinkKubernetesJobForm', data) + return ( > = ( id: data?.id, name: data?.name, executionMode: data?.executionMode?.value, - flinkDeploymentMode: data?.flinkDeploymentMode?.value, + deploymentKind: data?.deploymentKind?.value, flinkDeploymentId: data?.flinkDeployment?.id, flinkSessionClusterId: data?.flinkSessionCluster?.id, type: data?.type?.value, flinkArtifactJarId: data?.flinkArtifactJar?.id, flinkArtifactSqlId: data?.flinkArtifactSql?.id, + wsDiJobId: data?.wsDiJob?.id, remark: data?.remark }} > diff --git a/tools/docker/deploy/scaleph/docker-compose.yml b/tools/docker/deploy/scaleph/docker-compose.yml index 4b213b871..1c87ec832 100644 --- a/tools/docker/deploy/scaleph/docker-compose.yml +++ b/tools/docker/deploy/scaleph/docker-compose.yml @@ -17,7 +17,7 @@ services: scaleph-api: - image: ghcr.io/flowerfine/scaleph/scaleph-api:latest + image: ghcr.io/flowerfine/scaleph/scaleph-api:2.0.1 container_name: scaleph-api depends_on: mysql: @@ -39,7 +39,7 @@ services: - scaleph scaleph-ui-react: - image: ghcr.io/flowerfine/scaleph/scaleph-ui-react:latest + image: ghcr.io/flowerfine/scaleph/scaleph-ui-react:2.0.1 container_name: scaleph-ui-react depends_on: scaleph-api: @@ -52,7 +52,7 @@ services: - scaleph mysql: - image: ghcr.io/flowerfine/scaleph/mysql:latest + image: ghcr.io/flowerfine/scaleph/mysql:2.0.1 container_name: mysql environment: - TZ=Asia/Shanghai