This is an automated email from the ASF dual-hosted git repository.
chengjie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 1557113b7 [Improve] add spark menu (#3969)
1557113b7 is described below
commit 1557113b72af00d0a7bf9d7727768aa2cf8dbc3c
Author: benjobs <[email protected]>
AuthorDate: Mon Aug 19 10:01:51 2024 +0800
[Improve] add spark menu (#3969)
---
.../apache/streampark/console/core/service/SettingService.java | 5 +++++
.../streampark/console/core/service/impl/SettingServiceImpl.java | 8 ++++++++
.../streampark-console-service/src/main/resources/db/data-h2.sql | 3 +++
.../src/components/SimpleMenu/src/SimpleSubMenu.vue | 2 +-
.../streampark-console-webapp/src/locales/lang/en/menu.ts | 4 ++++
.../streampark-console-webapp/src/locales/lang/zh-CN/menu.ts | 6 +++++-
6 files changed, 26 insertions(+), 2 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
index 1a39fa820..e2f309d8f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
@@ -22,6 +22,7 @@ import org.apache.streampark.console.core.bean.MavenConfig;
import org.apache.streampark.console.core.bean.ResponseResult;
import org.apache.streampark.console.core.bean.SenderEmail;
import org.apache.streampark.console.core.entity.Setting;
+import org.apache.streampark.console.core.enums.EngineTypeEnum;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -51,6 +52,8 @@ public interface SettingService extends IService<Setting> {
String KEY_INGRESS_MODE_DEFAULT = "ingress.mode.default";
+ String KEY_DEFAULT_ENGINE = "engine.default";
+
/**
* Retrieves the value of the setting associated with the specified key.
*
@@ -135,4 +138,6 @@ public interface SettingService extends IService<Setting> {
* @return Whether the update operation was successful
*/
boolean updateEmail(SenderEmail senderEmail);
+
+ EngineTypeEnum getEngine();
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
index 0ee24f259..a3a0b2b72 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
@@ -22,6 +22,7 @@ import org.apache.streampark.console.core.bean.MavenConfig;
import org.apache.streampark.console.core.bean.ResponseResult;
import org.apache.streampark.console.core.bean.SenderEmail;
import org.apache.streampark.console.core.entity.Setting;
+import org.apache.streampark.console.core.enums.EngineTypeEnum;
import org.apache.streampark.console.core.mapper.SettingMapper;
import org.apache.streampark.console.core.service.SettingService;
@@ -142,6 +143,13 @@ public class SettingServiceImpl extends
ServiceImpl<SettingMapper, Setting>
.getSettingValue();
}
+ @Override
+ public EngineTypeEnum getEngine() {
+ return EngineTypeEnum.valueOf(SETTINGS
+ .getOrDefault(SettingService.KEY_DEFAULT_ENGINE, emptySetting)
+ .getSettingValue().toUpperCase());
+ }
+
@Override
public ResponseResult checkDocker(DockerConfig dockerConfig) {
DockerClientConfig config =
DefaultDockerClientConfig.createDefaultConfigBuilder()
diff --git
a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
index 8bd14a6be..78f7538c9 100644
---
a/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
+++
b/streampark-console/streampark-console-service/src/main/resources/db/data-h2.sql
@@ -80,6 +80,9 @@ insert into `t_menu` values (110118, 110100, 'app sql
delete', null, null, 'sql:
insert into `t_menu` values (110301, 110300, 'cluster add',
'/flink/add_cluster', 'flink/cluster/Add', 'cluster:create', '', '0', 0, null,
now(), now());
insert into `t_menu` values (110302, 110300, 'cluster edit',
'/flink/edit_cluster', 'flink/cluster/Edit', 'cluster:update', '', '0', 0,
null, now(), now());
+insert into `t_menu` values (120100, 120000, 'spark.application',
'/spark/app', 'spark/app/View', null, null, '0', 1, 2, now(), now());
+insert into `t_menu` values (120200, 120000, 'spark.sparkHome', '/spark/home',
'spark/home/View', null, null, '0', 1, 3, now(), now());
+
insert into `t_menu` values (130100, 130000, 'resource.project',
'/resource/project', 'resource/project/View', null, 'github', '0', 1, 2, now(),
now());
insert into `t_menu` values (130200, 130000, 'resource.variable',
'/resource/variable', 'resource/variable/View', null, null, '0', 1, 3, now(),
now());
insert into `t_menu` values (130300, 130000, 'resource.upload',
'/resource/upload', 'resource/upload/View', null, null, '0', 1, 1, now(),
now());
diff --git
a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue
b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue
index d10e522ea..e0af2a31e 100644
---
a/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue
+++
b/streampark-console/streampark-console-webapp/src/components/SimpleMenu/src/SimpleSubMenu.vue
@@ -5,7 +5,6 @@
v-bind="$props"
:class="[getLevelClass, theme]"
>
- <SvgIcon v-if="item.path === '/spark'" name="spark" size="25" class="mr-2"
/>
<div v-if="collapsedShowTitle && getIsCollapseParent" class="mt-1
collapse-title">
{{ getI18nName }}
</div>
@@ -26,6 +25,7 @@
<span class="menu-down-svg">
<SvgIcon v-if="item.path === '/system'" name="management" size="25" />
<SvgIcon v-if="item.path === '/flink'" name="flink3" size="25" />
+ <SvgIcon v-if="item.path === '/spark'" name="spark" size="25"/>
<SvgIcon v-if="item.path === '/setting'" name="settings" size="25" />
<SvgIcon v-if="item.path === '/resource'" name="resource" size="25" />
</span>
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts
index 787d9356a..ee876c06d 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/menu.ts
@@ -34,6 +34,10 @@ export default {
flinkHome: 'Flink Home',
flinkCluster: 'Clusters',
},
+ spark: {
+ application: 'Applications',
+ sparkHome: 'Spark Home'
+ },
setting: {
menu: 'Settings',
system: 'Environments',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts
index 45bd9960c..fec0d8ac2 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/menu.ts
@@ -31,9 +31,13 @@ export default {
},
flink: {
application: '作业管理',
- flinkHome: 'Flink版本',
+ flinkHome: 'Flink 版本',
flinkCluster: '集群管理',
},
+ spark: {
+ application: '作业管理',
+ flinkHome: 'Spark 版本'
+ },
setting: {
menu: '设置中心',
system: '环境设置',
