Skip to content

Commit 9198a6f

Browse files
kalencayawangqi
and
wangqi
authored
[Feature][scaleph-ui-react] update monaco loader.js (#749)
* feature: update prometheus operator 部署 * feature: update prometheus operator 部署 * feature: update prometheus operator values * feature: upgrade seatunnel to 2.3.6 * feature: upgrade seatunnel to 2.3.6 * fix: update monaco load --------- Co-authored-by: wangqi <[email protected]>
1 parent 253ce47 commit 9198a6f

File tree

14 files changed

+153
-78
lines changed

14 files changed

+153
-78
lines changed

.github/workflows/release-manual-docker-seatunnel.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ on:
2222
seatunnelVersion:
2323
description: 'seatunnel version'
2424
required: true
25-
default: '2.3.5'
25+
default: '2.3.6'
2626
type: choice
2727
options:
28-
- 2.3.5
28+
- 2.3.6
2929
flinkVersion:
3030
description: 'flink version'
3131
required: true

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Scaleph is driven by personal interest and evolves actively through faithful dev
1313
* Data Integration
1414
* Web-ui click-and-drag data integration ways backended by [Apache SeaTunnel](https://seatunnel.apache.org/) on Flink engine.
1515

16-
* Support the latest 2.3.5 V2 out-of-the-box connectors and transforms.
16+
* Support the latest 2.3.6 V2 out-of-the-box connectors and transforms.
1717

1818
* DataSource management.
1919

scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/resource/handler/FlinkImageMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public enum FlinkImageMapping {
3838
SQL_1_17(FlinkJobType.SQL, OperatorFlinkVersion.v1_17, FlinkVersionMapping.V_1_17, "ghcr.io/flowerfine/scaleph-sql-template:1.17"),
3939
SQL_1_18(FlinkJobType.SQL, OperatorFlinkVersion.v1_18, FlinkVersionMapping.V_1_18, "ghcr.io/flowerfine/scaleph-sql-template:1.18"),
4040

41-
SEATUNNEL_1_16(FlinkJobType.SEATUNNEL, OperatorFlinkVersion.v1_16, FlinkVersionMapping.V_1_16, "ghcr.io/flowerfine/scaleph-seatunnel:2.3.5-flink-1.16"),
41+
SEATUNNEL_1_16(FlinkJobType.SEATUNNEL, OperatorFlinkVersion.v1_16, FlinkVersionMapping.V_1_16, "ghcr.io/flowerfine/scaleph-seatunnel:2.3.6-flink-1.16"),
4242
FLINK_CDC_1_18(FlinkJobType.FLINK_CDC, OperatorFlinkVersion.v1_18, FlinkVersionMapping.V_1_18, "ghcr.io/flowerfine/scaleph-flink-cdc:3.0.0-flink-1.18"),
4343
;
4444

scaleph-common/src/main/java/cn/sliew/scaleph/common/dict/seatunnel/SeaTunnelPluginName.java

+14
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ public enum SeaTunnelPluginName implements DictInstance {
3636
SLACK("SlackSink", "Slack"),
3737
HTTP("Http", "Http"),
3838
FEISHU("Feishu", "Feishu"),
39+
40+
@Deprecated
3941
WECHAT("WeChat", "WeChat"),
42+
4043
DINGTALK("DingTalk", "DingTalk"),
4144
MYHOURS("MyHours", "MyHours"),
4245
LEMLIST("Lemlist", "Lemlist"),
@@ -56,13 +59,15 @@ public enum SeaTunnelPluginName implements DictInstance {
5659
OSS_FILE("OssFile", "OssFile"),
5760
OSS_JINDO_FILE("OssJindoFile", "OssJindoFile"),
5861
COS_FILE("CosFile", "CosFile"),
62+
OBS_FILE("ObsFile", "ObsFile"),
5963

6064
KAFKA("Kafka", "Kafka"),
6165
PULSAR("Pulsar", "Pulsar"),
6266
ROCKETMQ("Rocketmq", "RocketMQ"),
6367
DATAHUB("DataHub", "DataHub"),
6468
AMAZON_SQS("AmazonSqs", "AmazonSQS"),
6569
RABBITMQ("RabbitMQ", "RabbitMQ"),
70+
ACTIVEMQ("ActiveMQ", "ActiveMQ"),
6671

6772
JDBC("Jdbc", "Jdbc"),
6873
REDIS("Redis", "Redis"),
@@ -93,11 +98,17 @@ public enum SeaTunnelPluginName implements DictInstance {
9398
MAXCOMPUTE("Maxcompute", "MaxCompute"),
9499
HBASE("Hbase", "Hbase"),
95100
KUDU("Kudu", "Kudu"),
101+
DRUID("Druid", "Druid"),
102+
96103
IOTDB("IoTDB", "IoTDB"),
97104
OPENMLDB("OpenMldb", "OpenMldb"),
98105
NEO4J("Neo4j", "Neo4j"),
99106
INFLUXDB("InfluxDB", "InfluxDB"),
100107
TDENGINE("TDengine", "TDengine"),
108+
SLS("Sls", "Sls"),
109+
110+
MILVUS("Milvus", "Milvus"),
111+
WEB3J("Web3j", "Web3j"),
101112

102113
SENTRY("Sentry", "Sentry"),
103114
GOOGLE_SHEETS("GoogleSheets", "GoogleSheets"),
@@ -109,6 +120,9 @@ public enum SeaTunnelPluginName implements DictInstance {
109120
REPLACE("Replace", "Replace"),
110121
SPLIT("Split", "Split"),
111122
SQL("Sql", "Sql"),
123+
JSON_PATH("JsonPath", "JsonPath"),
124+
DYNAMIC_COMPILE("DynamicCompile", "DynamicCompile"),
125+
LLM("LLM", "LLM"),
112126
;
113127

114128
@JsonCreator

scaleph-common/src/main/java/cn/sliew/scaleph/common/dict/seatunnel/SeaTunnelVersion.java

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public enum SeaTunnelVersion implements DictInstance {
3131
V_2_3_3("2.3.3", "2.3.3"),
3232
V_2_3_4("2.3.4", "2.3.4"),
3333
V_2_3_5("2.3.5", "2.3.5"),
34+
V_2_3_6("2.3.6", "2.3.6"),
3435
;
3536

3637
@JsonCreator

scaleph-ui-react/src/pages/Project/Workspace/DataDevelop/Flink/SQL/CodeEditor/Editor/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import { Button, message } from 'antd';
33
import { useIntl, useModel, useLocation } from '@umijs/max';
4-
import { Editor } from '@monaco-editor/react';
4+
import Editor, {loader, useMonaco} from '@monaco-editor/react';
55
import { language } from 'monaco-editor/esm/vs/basic-languages/sql/sql';
66
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
77
import * as sqlFormatter from 'sql-formatter';
@@ -25,6 +25,7 @@ const CodeEditor: React.FC = () => {
2525
const { setExecutionData } = useModel('executionResult'); //存储执行结果
2626

2727
useEffect(() => {
28+
loader.config({monaco})
2829
setSqlScript(flinkArtifactSql?.script);
2930
const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
3031
(async () => {

scaleph-ui-react/src/pages/Project/Workspace/DataDevelop/Flink/SQL/CodeEditor/EditorRightResult/EditorRightResultTable.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {Editor} from '@monaco-editor/react';
2-
import {Button, message, Modal, Table, Typography} from 'antd';
31
import React, {useEffect, useMemo, useState} from 'react';
2+
import {Button, message, Modal, Table, Typography} from 'antd';
3+
import Editor, {loader, useMonaco} from "@monaco-editor/react";
4+
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
45
import styles from './index.less';
56

67
interface IViewTableCellData {
@@ -16,6 +17,7 @@ const EditorRightResultTable: React.FC = ({result, lastOneData, verticalSplitSiz
1617
// const heightTable = useRef()
1718

1819
useEffect(() => {
20+
loader.config({monaco})
1921
const data = result?.columns?.map((item: any) => ({
2022
dataType: item?.dataType,
2123
name: item?.columnName,

scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/FlinkCDC/Steps/New/YamlStepForm.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, {useEffect, useRef} from "react";
22
import {ProCard} from "@ant-design/pro-components";
3-
import {useIntl, connect} from "@umijs/max";
4-
import Editor, {Monaco, useMonaco} from "@monaco-editor/react";
3+
import {connect, useIntl} from "@umijs/max";
4+
import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react";
55

66
const DataIntegrationFlinkCDCStepYaml: React.FC = (props: any) => {
77
const intl = useIntl();
@@ -11,6 +11,9 @@ const DataIntegrationFlinkCDCStepYaml: React.FC = (props: any) => {
1111
useEffect(() => {
1212
// do conditional chaining
1313
monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
14+
if (monaco) {
15+
loader.config({monaco})
16+
}
1417
}, [monaco]);
1518

1619
const handleEditorDidMount = (editor, monaco: Monaco) => {

scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/seatunnel.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, {useEffect, useRef, useState} from 'react';
22
import {Drawer} from "antd";
3-
import Editor, {useMonaco} from "@monaco-editor/react";
3+
import Editor, {loader, useMonaco} from "@monaco-editor/react";
4+
import * as monaco from "monaco-editor";
45
import {ModalFormProps} from "@/typings";
56
import {WsArtifactSeaTunnel} from "@/services/project/typings";
67
import {WsArtifactSeaTunnelService} from "@/services/project/WsArtifactSeaTunnelService";
@@ -20,6 +21,7 @@ const SeaTunnelConfModal: React.FC<ModalFormProps<WsArtifactSeaTunnel>> = ({
2021
monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
2122
// or make sure that it exists by other ways
2223
if (monaco) {
24+
loader.config({ monaco })
2325
// console.log("here is the monaco instance:", monaco);
2426
}
2527
}, [monaco]);

scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/canvas-node.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const SeaTunnelConnectorDagNode = ({node}: { node: Node }) => {
6464
>
6565
<Popover title={<div>
6666
<Typography.Text>{node.data.label}</Typography.Text>
67-
<a href="https://seatunnel.apache.org/docs/2.3.5/about/" target="_blank">
67+
<a href="https://seatunnel.apache.org/docs/2.3.6/about/" target="_blank">
6868
<Button shape="default" type="link" icon={<InfoCircleOutlined/>}/>
6969
</a>
7070
</div>}

scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceStatusYaml.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {useEffect, useRef} from "react";
2-
import Editor, {Monaco, useMonaco} from "@monaco-editor/react";
2+
import Editor, {Monaco, loader, useMonaco} from "@monaco-editor/react";
33
import {Props} from '@/app.d';
44
import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
55
import {connect} from "umi";
@@ -11,6 +11,9 @@ const DorisInstanceDetailYAMLStatus: React.FC<Props<WsFlinkKubernetesTemplate>>
1111
useEffect(() => {
1212
// do conditional chaining
1313
monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
14+
if (monaco) {
15+
loader.config({monaco})
16+
}
1417
}, [monaco]);
1518

1619
const handleEditorDidMount = (editor, monaco: Monaco) => {

tools/docker/build/scaleph-seatunnel/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG FLINK_VERSION=1.16
1818
ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
1919
FROM $BASE_RELEASE_IMAGE as release
2020

21-
ARG SEATUNNEL_VERSION=2.3.5
21+
ARG SEATUNNEL_VERSION=2.3.6
2222
ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
2323

2424
ENV SEATUNNEL_HOME=/opt/seatunnel

tools/docker/mysql/init.d/scaleph-ws-mysql.sql

+7-7
Original file line numberDiff line numberDiff line change
@@ -176,25 +176,25 @@ create table ws_artifact_seatunnel
176176
) engine = innodb comment 'artifact seatunnel';
177177
INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current,
178178
creator, editor)
179-
VALUES (1, 4, 'seatunnel', '1.16.3', '2.3.5', 1, 1, 'sys', 'sys');
179+
VALUES (1, 4, 'seatunnel', '1.16.3', '2.3.6', 1, 1, 'sys', 'sys');
180180
INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current,
181181
creator, editor)
182-
VALUES (2, 5, 'seatunnel', '1.16.3', '2.3.5', 2, 1, 'sys', 'sys');
182+
VALUES (2, 5, 'seatunnel', '1.16.3', '2.3.6', 2, 1, 'sys', 'sys');
183183
INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current,
184184
creator, editor)
185-
VALUES (3, 11, 'seatunnel', '1.16.3', '2.3.5', 8, 1, 'sys', 'sys');
185+
VALUES (3, 11, 'seatunnel', '1.16.3', '2.3.6', 8, 1, 'sys', 'sys');
186186
INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current,
187187
creator, editor)
188-
VALUES (4, 12, 'seatunnel', '1.16.3', '2.3.5', 9, '1', 'sys', 'sys');
188+
VALUES (4, 12, 'seatunnel', '1.16.3', '2.3.6', 9, '1', 'sys', 'sys');
189189
INSERT INTO `ws_artifact_seatunnel`(`id`, `artifact_id`, `seatunnel_engine`, `flink_version`, `seatunnel_version`,
190190
`dag_id`, `current`, `creator`, `editor`)
191-
VALUES (5, 13, 'seatunnel', '1.16.3', '2.3.5', 10, '1', 'sys', 'sys');
191+
VALUES (5, 13, 'seatunnel', '1.16.3', '2.3.6', 10, '1', 'sys', 'sys');
192192
INSERT INTO `ws_artifact_seatunnel`(`id`, `artifact_id`, `seatunnel_engine`, `flink_version`, `seatunnel_version`,
193193
`dag_id`, `current`, `creator`, `editor`)
194-
VALUES (6, 14, 'seatunnel', '1.16.3', '2.3.5', 11, '1', 'sys', 'sys');
194+
VALUES (6, 14, 'seatunnel', '1.16.3', '2.3.6', 11, '1', 'sys', 'sys');
195195
INSERT INTO `ws_artifact_seatunnel`(`id`, `artifact_id`, `seatunnel_engine`, `flink_version`, `seatunnel_version`,
196196
`dag_id`, `current`, `creator`, `editor`)
197-
VALUES (7, 15, 'seatunnel', '1.16.3', '2.3.5', 12, '1', 'sys', 'sys');
197+
VALUES (7, 15, 'seatunnel', '1.16.3', '2.3.6', 12, '1', 'sys', 'sys');
198198

199199
DROP TABLE IF EXISTS ws_flink_kubernetes_template;
200200
CREATE TABLE ws_flink_kubernetes_template

0 commit comments

Comments
 (0)