Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature][scaleph-ui-react] update flink sql online editor #599

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
506df4c
fix: 添加tabs以及根据现有代码进行补全
Jul 22, 2023
0a4a678
fix: 添加代码补全
Jul 22, 2023
47c0b91
fix: 修改编辑器布局
Jul 25, 2023
5c47fda
feat: 添加国家化
Jul 27, 2023
0151f30
feat: 添加国际化
Jul 27, 2023
da6d139
fix: 添加执行结果
Jul 31, 2023
7feec18
fix: 添加表格点击事件
Jul 31, 2023
ef85290
fix: 修改查询结果
Jul 31, 2023
d815699
fix: 修改编辑器结果
Aug 1, 2023
5c20bab
fix: 修改执行结果样式
Aug 3, 2023
ca30f74
[Feature][scaleph-ui-react] add flink kubernetes job deploy form (#578)
kalencaya Jul 21, 2023
97b70e9
[Feature] Refactor flink-sql-gateway backend (#579)
LiuBodong Jul 23, 2023
64cd993
[Feature][scaleph-engine-flink-kubernetes] support additional depende…
kalencaya Jul 25, 2023
95f75d3
[Feature] Allow adding dependencies and catalog in sql-gateway (#581)
LiuBodong Jul 27, 2023
aa9eab9
[Feature][scaleph-engine-flink-kubernetes] support additional depende…
kalencaya Jul 30, 2023
042057f
[Feature][scaleph-engine-flink-kubernetes] support savepoint and rest…
kalencaya Aug 1, 2023
e4053b4
fix: Add left menu
Aug 8, 2023
bb3f0db
fix: 修改左侧树形结构
Aug 9, 2023
3723b32
fix: 添加请求成功提示
Aug 9, 2023
821b05d
fix: 隐藏搜索结果
Aug 12, 2023
b997d71
[Feature][scaleph-engine-flink-kubernetes] update flink savepoint ser…
kalencaya Aug 4, 2023
bf74cd4
[Bug][scaleph-engine-sql-gateway] fix sql gateway executeStatement er…
kalencaya Aug 4, 2023
ebce77c
Add jdbc and paimon support (#588)
LiuBodong Aug 5, 2023
43d9b38
[Feature][scaleph-engine-sql-gateway] add flink catalog implementions…
kalencaya Aug 6, 2023
8411d3c
[Feature] Make sql gateway operations cluster level. (#587)
LiuBodong Aug 7, 2023
96d7157
[Feature][scaleph-engine-sql-gateway] upgrade sakura-catalog to 1.0.1…
kalencaya Aug 7, 2023
c57c9bb
[Bugfix] Fix some bugs (#591)
LiuBodong Aug 8, 2023
02f0d6f
[Bugfix] Fix sql-gateway query result error (#592)
LiuBodong Aug 8, 2023
37d004f
[Bug][tools] fix sql error (#593)
kalencaya Aug 9, 2023
7216660
[Bugfix] Fix scaleph-api docker image error and reduce image size (#595)
LiuBodong Aug 10, 2023
497fd11
[Feature][Docker] add seatunnel connectors to scaleph-seatunnel image…
kalencaya Aug 11, 2023
a49ef07
[Bug][docker] fix scaleph-seatunnel dockefile error (#598)
kalencaya Aug 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ target/
.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
/node_modules

### STS ###
.apt_generated
Expand Down
5 changes: 5 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare module 'monaco-editor/esm/vs/basic-languages/sql/sql';
declare module 'monaco-editor/esm/vs/language/typescript/ts.worker.js';
declare module 'monaco-editor/esm/vs/editor/editor.worker.js';
declare module 'monaco-editor/esm/vs/language/sql/monaco.contribution'
declare module 'monaco-editor/esm/vs/editor/editor.worker'
173 changes: 173 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"dependencies": {
"monaco-editor": "^0.40.0",
"sql-formatter": "^12.2.4"
}
}
22 changes: 15 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
<module>scaleph-workflow</module>
<module>scaleph-datasource</module>
<module>scaleph-kubernetes</module>
<module>scaleph-catalog</module>

<module>scaleph-dist</module>
<module>scaleph-file-fetcher</module>
Expand Down Expand Up @@ -161,6 +160,9 @@
<protobuf.version>3.21.5</protobuf.version>
<netty.version>4.1.82.Final</netty.version>
<flink.version>1.17.1</flink.version>
<flink.base.version>1.17</flink.base.version>
<flink-jdbc.version>3.1.1</flink-jdbc.version>
<paimon.version>0.4.0-incubating</paimon.version>
<kubernetes.client.version>6.2.0</kubernetes.client.version>
<spring-cloud-openfeign.version>3.1.7</spring-cloud-openfeign.version>
<zjsonpatch.version>0.4.14</zjsonpatch.version>
Expand Down Expand Up @@ -249,11 +251,6 @@
<artifactId>scaleph-meta</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>scaleph-catalog</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>scaleph-project</artifactId>
Expand Down Expand Up @@ -551,10 +548,21 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_2.12</artifactId>
<artifactId>flink-table-planner-loader</artifactId>
<version>${flink.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc</artifactId>
<version>${flink-jdbc.version}-${flink.base.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-flink-1.17</artifactId>
<version>${paimon.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-kubernetes</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,38 @@ public ResponseEntity<ResponseVO> shutdown(@Valid @RequestBody WsFlinkKubernetes
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}

@Logging
@PostMapping("restart/{id}")
@Operation(summary = "重启 Job", description = "重启 Job")
public ResponseEntity<ResponseVO> restart(@PathVariable("id") Long id) throws Exception {
wsFlinkKubernetesJobInstanceService.restart(id);
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}

@Logging
@PostMapping("triggerSavepoint/{id}")
@Operation(summary = "为 Job 创建 savepoint", description = "为 Job 创建 savepoint")
public ResponseEntity<ResponseVO> triggerSavepoint(@PathVariable("id") Long id) throws Exception {
wsFlinkKubernetesJobInstanceService.triggerSavepoint(id);
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}

@Logging
@PostMapping("suspend/{id}")
@Operation(summary = "暂停 Job", description = "暂停 Job")
public ResponseEntity<ResponseVO> suspend(@PathVariable("id") Long id) throws Exception {
wsFlinkKubernetesJobInstanceService.suspend(id);
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}

@Logging
@PostMapping("resume/{id}")
@Operation(summary = "恢复 Job", description = "恢复 Job")
public ResponseEntity<ResponseVO> resume(@PathVariable("id") Long id) throws Exception {
wsFlinkKubernetesJobInstanceService.resume(id);
return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
}

@Logging
@GetMapping("instances")
@Operation(summary = "获取任务实例列表", description = "获取任务实例列表")
Expand Down
Loading
Loading