You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/09/14 05:00:22 UTC
[incubator-streampark] branch fe updated: [Improve] FE enum improvement
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch fe
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/fe by this push:
new 578b6649d [Improve] FE enum improvement
578b6649d is described below
commit 578b6649dcd443ebfcc9ee4ec21ed17dc84fefe0
Author: benjobs <be...@gmail.com>
AuthorDate: Thu Sep 14 13:00:11 2023 +0800
[Improve] FE enum improvement
---
.../src/enums/flinkEnum.ts | 13 ------
.../src/locales/lang/en/flink/app.ts | 2 +-
.../src/views/flink/app/Add.vue | 14 +++---
.../flink/app/hooks/useCreateAndEditSchema.ts | 46 ++++---------------
.../src/views/flink/app/hooks/useCreateSchema.ts | 53 ++++++++++------------
5 files changed, 39 insertions(+), 89 deletions(-)
diff --git a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
index fff112457..1988fbce7 100644
--- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -170,12 +170,6 @@ export enum JobTypeEnum {
PYFLINK = 3,
}
-export enum JobTypeNameEnum {
- JAR = 'jar',
- SQL = 'sql',
- PYFLINK = 'pyflink',
-}
-
export enum ConfigTypeEnum {
/** yaml type */
YAML = 1,
@@ -203,13 +197,6 @@ export enum ResourceFromEnum {
UPLOAD = 2,
}
-export enum ResourceFromNameEnum {
- /** resource from cvs */
- CVS = 'cvs',
- /** upload local jar */
- UPLOAD = 'upload',
-}
-
export enum UseStrategyEnum {
/** use existing */
USE_EXIST = 1,
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
index f9fd462d6..618737a0b 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
@@ -204,7 +204,7 @@ export default {
},
addAppTips: {
developmentModePlaceholder: 'please select job type',
- developmentModeIsRequiredMessage: 'Job Type is required',
+ developmentModeIsRequiredMessage: 'Development Mode is required',
executionModePlaceholder: 'please select execution mode',
executionModeIsRequiredMessage: 'Execution Mode is required',
hadoopEnvInitMessage:
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 f313513d8..ebe3065cb 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
@@ -50,9 +50,7 @@
ClusterStateEnum,
ExecModeEnum,
JobTypeEnum,
- JobTypeNameEnum,
ResourceFromEnum,
- ResourceFromNameEnum,
} from '/@/enums/flinkEnum';
const FlinkSqlEditor = createAsyncComponent(() => import('./components/FlinkSql.vue'), {
@@ -176,7 +174,7 @@
});
}
const params = {
- jobType: values.jobType === JobTypeNameEnum.PYFLINK ? JobTypeEnum.PYFLINK : JobTypeEnum.JAR,
+ jobType: values.jobType,
projectId: values.project || null,
module: values.module || null,
dependency:
@@ -189,7 +187,7 @@
// common params...
const resourceFrom = values.resourceFrom;
if (resourceFrom) {
- if (resourceFrom === ResourceFromNameEnum.CVS) {
+ if (resourceFrom === ResourceFromEnum.CVS) {
params['resourceFrom'] = ResourceFromEnum.CVS;
//streampark flink
if (values.appType == AppTypeEnum.STREAMPARK_FLINK) {
@@ -239,7 +237,7 @@
}
let config = values.configOverride;
- if (config != null && config !== undefined && config.trim() != '') {
+ if (config != null && config.trim() != '') {
config = encryptByBase64(config);
} else {
config = null;
@@ -265,7 +263,7 @@
async function handleAppCreate(formValue: Recordable) {
try {
submitLoading.value = true;
- if (formValue.jobType === JobTypeNameEnum.SQL) {
+ if (formValue.jobType === JobTypeEnum.SQL) {
if (formValue.flinkSql == null || formValue.flinkSql.trim() === '') {
createMessage.warning(t('flink.app.editStreamPark.flinkSqlRequired'));
} else {
@@ -276,7 +274,7 @@
}
}
}
- if (formValue.jobType === JobTypeNameEnum.SQL) {
+ if (formValue.jobType === JobTypeEnum.SQL) {
handleSubmitSQL(formValue);
} else {
handleSubmitCustomJob(formValue);
@@ -290,7 +288,7 @@
const param = {};
for (const k in params) {
const v = params[k];
- if (v != null && v !== undefined) {
+ if (v != null) {
param[k] = v;
}
}
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
index efd420906..2b5bae38f 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
@@ -50,13 +50,7 @@ import { fetchFlinkEnv, fetchListFlinkEnv } from '/@/api/flink/setting/flinkEnv'
import { FlinkEnv } from '/@/api/flink/setting/types/flinkEnv.type';
import { AlertSetting } from '/@/api/flink/setting/types/alert.type';
import { FlinkCluster } from '/@/api/flink/setting/types/flinkCluster.type';
-import {
- AppTypeEnum,
- ClusterStateEnum,
- ExecModeEnum,
- JobTypeEnum,
- JobTypeNameEnum,
-} from '/@/enums/flinkEnum';
+import { AppTypeEnum, ClusterStateEnum, ExecModeEnum, JobTypeEnum } from '/@/enums/flinkEnum';
import { isK8sExecMode } from '../utils';
import { useI18n } from '/@/hooks/web/useI18n';
import { fetchCheckHadoop } from '/@/api/flink/setting';
@@ -119,13 +113,7 @@ export const useCreateAndEditSchema = (
label: 'Flink SQL',
component: 'Input',
slot: 'flinkSql',
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values?.jobType == JobTypeEnum.SQL;
- } else {
- return values?.jobType == JobTypeNameEnum.SQL;
- }
- },
+ ifShow: ({ values }) => values?.jobType == JobTypeEnum.SQL,
rules: [{ required: true, message: t('flink.app.addAppTips.flinkSqlIsRequiredMessage') }],
},
{
@@ -133,41 +121,23 @@ export const useCreateAndEditSchema = (
label: t('flink.app.resource'),
component: 'Select',
render: ({ model }) => renderStreamParkResource({ model, resources: unref(teamResource) }),
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values.jobType == JobTypeEnum.SQL;
- } else {
- return values?.jobType == JobTypeNameEnum.SQL;
- }
- },
+ ifShow: ({ values }) => values?.jobType == JobTypeEnum.SQL,
},
{
field: 'dependency',
label: t('flink.app.dependency'),
component: 'Input',
slot: 'dependency',
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values.jobType == JobTypeEnum.SQL || values.jobType == JobTypeEnum.PYFLINK;
- } else {
- return (
- values?.jobType == JobTypeNameEnum.SQL || values?.jobType == JobTypeNameEnum.PYFLINK
- );
- }
- },
+ ifShow: ({ values }) =>
+ values?.jobType == JobTypeEnum.SQL || values?.jobType == JobTypeEnum.PYFLINK,
},
{ field: 'configOverride', label: '', component: 'Input', show: false },
{
field: 'isSetConfig',
label: t('flink.app.appConf'),
component: 'Switch',
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values?.jobType == JobTypeEnum.SQL && !isK8sExecMode(values.executionMode);
- } else {
- return values?.jobType == JobTypeNameEnum.SQL && !isK8sExecMode(values.executionMode);
- }
- },
+ ifShow: ({ values }) =>
+ values?.jobType == JobTypeEnum.SQL && !isK8sExecMode(values.executionMode),
render({ model, field }) {
return renderIsSetConfig(model, field, registerConfDrawer, openConfDrawer);
},
@@ -516,7 +486,7 @@ export const useCreateAndEditSchema = (
component: 'InputTextArea',
defaultValue: '',
slot: 'args',
- ifShow: ({ values }) => (edit?.mode ? true : values.jobType !== JobTypeNameEnum.SQL),
+ ifShow: ({ values }) => (edit?.mode ? true : values.jobType !== JobTypeEnum.SQL),
},
{
field: 'description',
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts
index a660d427f..33e7d2ae9 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts
@@ -20,8 +20,8 @@ import {
AppTypeEnum,
ConfigTypeEnum,
ExecModeEnum,
- JobTypeNameEnum,
- ResourceFromNameEnum,
+ JobTypeEnum,
+ ResourceFromEnum,
} from '/@/enums/flinkEnum';
import { SvgIcon } from '/@/components/Icon';
@@ -42,21 +42,21 @@ const getJobTypeOptions = () => {
h(SvgIcon, { name: 'code', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Custom Code'),
]),
- value: JobTypeNameEnum.JAR,
+ value: JobTypeEnum.JAR,
},
{
label: h('div', {}, [
h(SvgIcon, { name: 'fql', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Flink SQL'),
]),
- value: JobTypeNameEnum.SQL,
+ value: JobTypeEnum.SQL,
},
{
label: h('div', {}, [
h(SvgIcon, { name: 'py', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Python Flink'),
]),
- value: JobTypeNameEnum.PYFLINK,
+ value: JobTypeEnum.PYFLINK,
},
];
};
@@ -107,16 +107,16 @@ export const useCreateSchema = (dependencyRef: Ref) => {
return {
placeholder: t('flink.app.addAppTips.developmentModePlaceholder'),
options: getJobTypeOptions(),
- onChange: (value: string) => {
- if (value === JobTypeNameEnum.SQL) {
+ onChange: (value: number) => {
+ if (value === JobTypeEnum.SQL) {
formModel.tableEnv = 1;
} else {
- formModel.resourceFrom = ResourceFromNameEnum.CVS;
+ formModel.resourceFrom = ResourceFromEnum.CVS;
}
},
};
},
- defaultValue: JobTypeNameEnum.SQL,
+ defaultValue: JobTypeEnum.SQL,
rules: [
{ required: true, message: t('flink.app.addAppTips.developmentModeIsRequiredMessage') },
],
@@ -130,7 +130,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
component: 'Select',
render: ({ model }) => renderResourceFrom(model),
rules: [{ required: true, message: t('flink.app.addAppTips.resourceFromMessage') }],
- show: ({ values }) => values?.jobType === JobTypeNameEnum.JAR,
+ show: ({ values }) => values?.jobType === JobTypeEnum.JAR,
},
{
field: 'uploadJobJar',
@@ -138,8 +138,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
component: 'Select',
render: ({ model }) => renderStreamParkJarApp({ model, resources: unref(teamResource) }),
ifShow: ({ values }) =>
- values?.jobType !== JobTypeNameEnum.SQL &&
- values?.resourceFrom == ResourceFromNameEnum.UPLOAD,
+ values?.jobType !== JobTypeEnum.SQL && values?.resourceFrom == ResourceFromEnum.UPLOAD,
},
{
field: 'mainClass',
@@ -147,8 +146,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
component: 'Input',
componentProps: { placeholder: t('flink.app.addAppTips.mainClassPlaceholder') },
ifShow: ({ values }) =>
- values?.jobType !== JobTypeNameEnum.SQL &&
- values?.resourceFrom == ResourceFromNameEnum.UPLOAD,
+ values?.jobType !== JobTypeEnum.SQL && values?.resourceFrom == ResourceFromEnum.UPLOAD,
rules: [{ required: true, message: t('flink.app.addAppTips.mainClassIsRequiredMessage') }],
},
{
@@ -176,8 +174,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
},
},
ifShow: ({ values }) =>
- values?.jobType != JobTypeNameEnum.SQL &&
- values.resourceFrom != ResourceFromNameEnum.UPLOAD,
+ values?.jobType != JobTypeEnum.SQL && values.resourceFrom != ResourceFromEnum.UPLOAD,
rules: [{ required: true, message: t('flink.app.addAppTips.projectIsRequiredMessage') }],
},
{
@@ -201,8 +198,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
ifShow: ({ values }) =>
- values?.jobType != JobTypeNameEnum.SQL &&
- values.resourceFrom != ResourceFromNameEnum.UPLOAD,
+ values?.jobType != JobTypeEnum.SQL && values.resourceFrom != ResourceFromEnum.UPLOAD,
rules: [{ required: true, message: t('flink.app.addAppTips.projectIsRequiredMessage') }],
},
{
@@ -213,10 +209,10 @@ export const useCreateSchema = (dependencyRef: Ref) => {
return {
placeholder: t('flink.app.addAppTips.appTypePlaceholder'),
options: [
- { label: 'StreamPark Flink', value: String(AppTypeEnum.STREAMPARK_FLINK) },
- { label: 'Apache Flink', value: String(AppTypeEnum.APACHE_FLINK) },
+ { label: 'StreamPark Flink', value: AppTypeEnum.STREAMPARK_FLINK },
+ { label: 'Apache Flink', value: AppTypeEnum.APACHE_FLINK },
],
- onChange: (value) => {
+ onChange: (value: number) => {
Object.assign(formModel, {
config: undefined,
jobName: undefined,
@@ -233,8 +229,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
ifShow: ({ values }) =>
- values?.jobType !== JobTypeNameEnum.SQL &&
- values?.resourceFrom !== ResourceFromNameEnum.UPLOAD,
+ values?.jobType !== JobTypeEnum.SQL && values?.resourceFrom !== ResourceFromEnum.UPLOAD,
dynamicRules: () => [
{ required: true, message: t('flink.app.addAppTips.appTypeIsRequiredMessage') },
],
@@ -259,8 +254,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
ifShow: ({ values }) =>
- values?.jobType != JobTypeNameEnum.SQL &&
- values?.resourceFrom != ResourceFromNameEnum.UPLOAD &&
+ values?.jobType != JobTypeEnum.SQL &&
+ values?.resourceFrom != ResourceFromEnum.UPLOAD &&
values.appType == String(AppTypeEnum.APACHE_FLINK),
rules: [{ required: true, message: t('flink.app.addAppTips.programJarIsRequiredMessage') }],
},
@@ -270,8 +265,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
component: 'Input',
componentProps: { placeholder: t('flink.app.addAppTips.mainClassPlaceholder') },
ifShow: ({ values }) =>
- values?.jobType != JobTypeNameEnum.SQL &&
- values?.resourceFrom != ResourceFromNameEnum.UPLOAD &&
+ values?.jobType != JobTypeEnum.SQL &&
+ values?.resourceFrom != ResourceFromEnum.UPLOAD &&
values.appType == String(AppTypeEnum.APACHE_FLINK),
rules: [{ required: true, message: t('flink.app.addAppTips.mainClassIsRequiredMessage') }],
},
@@ -297,8 +292,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
ifShow: ({ values }) =>
- values?.jobType != JobTypeNameEnum.SQL &&
- values?.resourceFrom != ResourceFromNameEnum.UPLOAD &&
+ values?.jobType != JobTypeEnum.SQL &&
+ values?.resourceFrom != ResourceFromEnum.UPLOAD &&
values.appType == String(AppTypeEnum.STREAMPARK_FLINK),
dynamicRules: () => [{ required: true, validator: handleCheckConfig }],
},