You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by kr...@apache.org on 2022/11/16 02:29:20 UTC
[incubator-streampark] branch dev updated: [Bug] front-end enum bug fixed (#2023)
This is an automated email from the ASF dual-hosted git repository.
kriszu 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 ca33876d0 [Bug] front-end enum bug fixed (#2023)
ca33876d0 is described below
commit ca33876d02b5080a5bb4bc1e843b1a0d0e126757
Author: benjobs <be...@apache.org>
AuthorDate: Wed Nov 16 10:29:13 2022 +0800
[Bug] front-end enum bug fixed (#2023)
---
.../streampark-console-service/pom.xml | 2 +-
.../console/base/mybatis/pager/MybatisPager.java | 27 +---------------------
.../streampark/console/base/util/WebUtils.java | 2 +-
.../streampark/console/core/enums/AlertType.java | 10 ++++----
.../console/core/enums/AlertTypeTest.java | 2 +-
.../src/enums/flinkEnum.ts | 8 ++++++-
.../src/views/flink/app/Add.vue | 10 ++++----
.../src/views/flink/app/EditFlink.vue | 3 ++-
.../src/views/flink/app/EditStreamPark.vue | 6 ++---
.../src/views/flink/app/components/AppConf.tsx | 12 +++++-----
.../flink/app/components/AppDetail/DetailTab.vue | 8 +++----
.../src/views/flink/app/hooks/useEditStreamPark.ts | 6 ++---
12 files changed, 39 insertions(+), 57 deletions(-)
diff --git a/streampark-console/streampark-console-service/pom.xml b/streampark-console/streampark-console-service/pom.xml
index a368fdac5..bd2e042c3 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -434,7 +434,7 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <arguments>install</arguments>
+ <arguments>install --ingore-scripts</arguments>
</configuration>
</execution>
<execution>
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
index 012d581e9..5adede711 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/pager/MybatisPager.java
@@ -21,7 +21,6 @@ import org.apache.streampark.console.base.domain.Constant;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.util.WebUtils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
@@ -40,11 +39,11 @@ public final class MybatisPager<T> {
Page<T> page = new Page<>();
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
- String sortField = WebUtils.camelToUnderscore(request.getSortField());
List<OrderItem> orderItems = new ArrayList<>(0);
if (StringUtils.isNotBlank(request.getSortField())
&& StringUtils.isNotBlank(request.getSortOrder())) {
+ String sortField = WebUtils.camelToUnderscore(request.getSortField());
if (StringUtils.equals(request.getSortOrder(), Constant.ORDER_DESC)) {
orderItems.add(OrderItem.desc(sortField));
} else {
@@ -65,28 +64,4 @@ public final class MybatisPager<T> {
return page;
}
- public static void handleWrapperSort(
- RestRequest request,
- QueryWrapper wrapper,
- String defaultSort,
- String defaultOrder) {
- String sortField = request.getSortField();
- if (StringUtils.isNotBlank(request.getSortField())
- && StringUtils.isNotBlank(request.getSortOrder())) {
- if (StringUtils.equals(request.getSortOrder(), Constant.ORDER_DESC)) {
- wrapper.orderByDesc(sortField);
- } else {
- wrapper.orderByAsc(sortField);
- }
- } else {
- if (StringUtils.isNotBlank(defaultSort)) {
- if (StringUtils.equals(defaultOrder, Constant.ORDER_DESC)) {
- wrapper.orderByDesc(defaultSort);
- } else {
- wrapper.orderByAsc(defaultSort);
- }
- }
- }
- }
-
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/WebUtils.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/WebUtils.java
index 7cf5d00bf..a08204784 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/WebUtils.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/WebUtils.java
@@ -76,7 +76,7 @@ public final class WebUtils {
* @return underscore
*/
public static String camelToUnderscore(String value) {
- if (StringUtils.isBlank(value)) {
+ if (StringUtils.isBlank(value) || value.contains("_")) {
return value;
}
String[] arr = StringUtils.splitByCharacterTypeCamelCase(value);
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertType.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertType.java
index 65e2c03de..d3dd6f58d 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertType.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/enums/AlertType.java
@@ -26,11 +26,11 @@ import java.util.List;
import java.util.Map;
public enum AlertType {
- email(1),
- dingTalk(2),
- weCom(4),
- httpCallback(8),
- lark(16);
+ EMAIL(1),
+ DING_TALK(2),
+ WE_COM(4),
+ HTTP_CALLBACK(8),
+ LARK(16);
private final Integer code;
private static Map<Integer, AlertType> cacheMap;
diff --git a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/enums/AlertTypeTest.java b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/enums/AlertTypeTest.java
index 0ac92eb08..a977a7232 100644
--- a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/enums/AlertTypeTest.java
+++ b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/enums/AlertTypeTest.java
@@ -31,7 +31,7 @@ class AlertTypeTest {
@Test
void encodeTest() {
- int level = AlertType.encode(Arrays.asList(AlertType.dingTalk, AlertType.email));
+ int level = AlertType.encode(Arrays.asList(AlertType.DING_TALK, AlertType.EMAIL));
System.out.println(level);
}
}
diff --git a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
index 28dfaf0f8..6a3ae1af6 100644
--- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -165,13 +165,19 @@ export enum ResourceFromEnum {
/** upload local jar */
UPLOAD = 2,
}
-export enum StrategyEnum {
+
+export enum UseStrategyEnum {
/** use existing */
USE_EXIST = 1,
/** reselect */
RESELECT = 2,
}
+export enum SavePointEnum {
+ CHECK_POINT = 1,
+ SAVE_POINT = 2
+}
+
export enum PipelineStepEnum {
UNKNOWN = 0,
WAITING = 1,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
index fbb627441..0f533b565 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
@@ -46,7 +46,7 @@
import UseSysHadoopConf from './components/UseSysHadoopConf.vue';
import { CreateParams } from '/@/api/flink/app/app.type';
import { decodeByBase64, encryptByBase64 } from '/@/utils/cipher';
- import { AppTypeEnum, ClusterStateEnum, JobTypeEnum } from '/@/enums/flinkEnum';
+ import { AppTypeEnum, ClusterStateEnum, JobTypeEnum, ResourceFromEnum } from '/@/enums/flinkEnum';
const FlinkSqlEditor = createAsyncComponent(() => import('./components/FlinkSql.vue'), {
loading: true,
@@ -177,7 +177,7 @@
async function handleSubmitCustomJob(values) {
handleCluster(values);
const params = {
- jobType: 1,
+ jobType: JobTypeEnum.JAR,
projectId: values.project || null,
module: values.module || null,
appType: values.appType,
@@ -187,9 +187,9 @@
const resourceFrom = values.resourceFrom;
if (resourceFrom != null) {
if (resourceFrom === 'csv') {
- params['resourceFrom'] = 1;
+ params['resourceFrom'] = ResourceFromEnum.CICD;
//streampark flink
- if (values.appType === '1') {
+ if (values.appType == AppTypeEnum.STREAMPARK_FLINK) {
const configVal = values['config'];
params['format'] = configVal.endsWith('.properties') ? 2 : 1;
if (values.configOverride == null) {
@@ -208,7 +208,7 @@
} else {
// from upload
Object.assign(params, {
- resourceFrom: 2,
+ resourceFrom: ResourceFromEnum.UPLOAD,
appType: AppTypeEnum.APACHE_FLINK,
jar: unref(uploadJar),
mainClass: values.mainClass,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
index b26059ace..64ae30f90 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
@@ -38,6 +38,7 @@
import ProgramArgs from './components/ProgramArgs.vue';
import VariableReview from './components/VariableReview.vue';
import { useDrawer } from '/@/components/Drawer';
+ import { ResourceFromEnum } from '/@/enums/flinkEnum';
const route = useRoute();
const { t } = useI18n();
@@ -173,7 +174,7 @@
}
const value = await handleGetApplication();
setFieldsValue(value);
- if (app.resourceFrom == 1) {
+ if (app.resourceFrom == ResourceFromEnum.CICD) {
jars.value = await fetchListJars({
id: app.projectId,
module: app.module,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
index e9533dff6..bfba6498e 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
@@ -48,7 +48,7 @@
import { useGo } from '/@/hooks/web/usePage';
import ProgramArgs from './components/ProgramArgs.vue';
import VariableReview from './components/VariableReview.vue';
- import { ClusterStateEnum, JobTypeEnum, StrategyEnum } from '/@/enums/flinkEnum';
+ import { ClusterStateEnum, JobTypeEnum, UseStrategyEnum } from '/@/enums/flinkEnum';
const route = useRoute();
const go = useGo();
@@ -232,7 +232,7 @@
async function handleSubmitCustomJob(values: Recordable) {
try {
const format =
- values.strategy == StrategyEnum.USE_EXIST
+ values.strategy == UseStrategyEnum.USE_EXIST
? app.format
: (values.config || '').endsWith('.properties')
? 2
@@ -255,7 +255,7 @@
values.flinkClusterId = cluster.id;
values.yarnSessionClusterId = cluster.clusterId;
}
- const configId = values.strategy == StrategyEnum.USE_EXIST ? app.configId : null;
+ const configId = values.strategy == UseStrategyEnum.USE_EXIST ? app.configId : null;
const params = {
id: app.id,
format: format,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppConf.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppConf.tsx
index 54097091b..e99dea77b 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppConf.tsx
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppConf.tsx
@@ -26,7 +26,7 @@ import { ApiTreeSelect } from '/@/components/Form';
import { fetchAppConf, fetchName } from '/@/api/flink/app/app';
import { SettingTwoTone } from '@ant-design/icons-vue';
import { fetchListConf } from '/@/api/flink/project';
-import { StrategyEnum } from '/@/enums/flinkEnum';
+import { UseStrategyEnum } from '/@/enums/flinkEnum';
export default defineComponent({
name: 'AppConf',
@@ -70,10 +70,10 @@ export default defineComponent({
value={unref(model).strategy}
onChange={(value: any) => (model.value.strategy = value)}
>
- <Select.Option value={StrategyEnum.USE_EXIST}>use existing</Select.Option>
- <Select.Option value={StrategyEnum.RESELECT}>reselect</Select.Option>
+ <Select.Option value={UseStrategyEnum.USE_EXIST}>use existing</Select.Option>
+ <Select.Option value={UseStrategyEnum.RESELECT}>reselect</Select.Option>
</Select>
- {unref(model).strategy == StrategyEnum.USE_EXIST && (
+ {unref(model).strategy == UseStrategyEnum.USE_EXIST && (
<Form.Item style="width: calc(75% - 75px);margin-left:10px;">
<Select
class="!w-full"
@@ -89,7 +89,7 @@ export default defineComponent({
</Select>
</Form.Item>
)}
- {unref(model).strategy == StrategyEnum.RESELECT && (
+ {unref(model).strategy == UseStrategyEnum.RESELECT && (
<Form.Item style="width: calc(75% - 60px)">
<ApiTreeSelect
class="!w-full"
@@ -105,7 +105,7 @@ export default defineComponent({
<Button
disabled={
- unref(model).strategy == StrategyEnum.USE_EXIST
+ unref(model).strategy == UseStrategyEnum.USE_EXIST
? false
: unref(model).config
? false
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppDetail/DetailTab.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppDetail/DetailTab.vue
index a8b42a238..10dab1c28 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppDetail/DetailTab.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppDetail/DetailTab.vue
@@ -48,7 +48,7 @@
import ExecOptionModal from './ExecOptionModal.vue';
import { useMessage } from '/@/hooks/web/useMessage';
import { useClipboard } from '@vueuse/core';
- import { AppTypeEnum, JobTypeEnum } from '/@/enums/flinkEnum';
+ import { AppTypeEnum, JobTypeEnum, SavePointEnum } from '/@/enums/flinkEnum';
const DescriptionItem = Descriptions.Item;
const TabPane = Tabs.TabPane;
@@ -266,7 +266,7 @@
</template>
</BasicTable>
</TabPane>
- <TabPane key="3" tab="Flink SQL" v-if="app.jobType === JobTypeEnum.JAR">
+ <TabPane key="3" tab="Flink SQL" v-if="app.jobType === JobTypeEnum.SQL">
<div class="sql-box syntax-true" ref="flinkSql" style="height: 600px"></div>
</TabPane>
<TabPane key="4" tab="Savepoints" v-if="tabConf.showSaveOption">
@@ -278,10 +278,10 @@
</template>
<template v-if="column.dataIndex == 'type'">
<div class="app_state">
- <Tag color="#0C7EF2" v-if="record['type'] === 1">
+ <Tag color="#0C7EF2" v-if="record['type'] === SavePointEnum.CHECK_POINT">
{{ t('flink.app.detail.detailTab.check') }}
</Tag>
- <Tag color="#52c41a" v-if="record['type'] === 2">
+ <Tag color="#52c41a" v-if="record['type'] === SavePointEnum.SAVE_POINT">
{{ t('flink.app.detail.detailTab.save') }}
</Tag>
</div>
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditStreamPark.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditStreamPark.ts
index ca3a52bfa..50a903bb6 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditStreamPark.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditStreamPark.ts
@@ -17,7 +17,7 @@
import { FormSchema } from '/@/components/Table';
import { computed, h, Ref, ref, unref } from 'vue';
import { executionModes } from '../data';
-import { ExecModeEnum, JobTypeEnum, StrategyEnum } from '/@/enums/flinkEnum';
+import { ExecModeEnum, JobTypeEnum, UseStrategyEnum } from '/@/enums/flinkEnum';
import { useCreateAndEditSchema } from './useCreateAndEditSchema';
import { renderSqlHistory } from './useFlinkRender';
import { Alert } from 'ant-design-vue';
@@ -172,8 +172,8 @@ export const useEditStreamParkSchema = (
defaultValue: [],
ifShow: ({ values }) => {
return (
- values.jobType != 2 &&
- values.strategy == StrategyEnum.USE_EXIST &&
+ values.jobType == JobTypeEnum.JAR &&
+ values.strategy == UseStrategyEnum.USE_EXIST &&
unref(configVersions).length > 1
);
},