improve front end hard code and back end check method

apache · Jan 7, 2024 · 5b90bdf · 5b90bdf
1 parent f2cd7f4
commit 5b90bdf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/streampark-common/src/main/java/org/apache/streampark/common/enums/FlinkEnvStatus.java b/streampark-common/src/main/java/org/apache/streampark/common/enums/FlinkEnvStatus.java
@@ -19,15 +19,19 @@
 
 /* the flink environment status */
 public enum FlinkEnvStatus {
+
   /* FLINK_HOME path invalid */
   INVALID(-1),
+
   /* this add/update operation are feasible */
   FEASIBLE(0),
+
   /* defined flink name repeated */
   NAME_REPEATED(1),
 
   /* dist Jar more than one */
   FLINK_DIST_REPEATED(2);
+
   private final int code;
 
   FlinkEnvStatus(int code) {

diff --git a/...ce/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java b/...ce/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
@@ -50,8 +50,6 @@ public class FlinkEnvServiceImpl extends ServiceImpl<FlinkEnvMapper, FlinkEnv>
    * two places will be checked: <br>
    * 1) name repeated <br>
    * 2) flink-dist repeated <br>
-   * -1) invalid path <br>
-   * 0) ok <br>
    */
   @Override
   public Integer check(FlinkEnv version) {
@@ -74,10 +72,8 @@ public Integer check(FlinkEnv version) {
         return FlinkEnvStatus.FLINK_DIST_REPEATED.getCode();
       }
     } else {
-
       return FlinkEnvStatus.INVALID.getCode();
     }
-
     return FlinkEnvStatus.FEASIBLE.getCode();
   }
 

diff --git a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -234,3 +234,10 @@ export enum AppExistsEnum {
   IN_KUBERNETES = 3,
   INVALID = 4,
 }
+
+export enum FlinkEvnEnum {
+  INVALID = -1,
+  FEASIBLE = 0,
+  NAME_REPEATED = 1,
+ FLINK_DIST_REPEATED = 2,
+}
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/home/components/Modal.vue b/streampark-console/streampark-console-webapp/src/views/flink/home/components/Modal.vue
@@ -29,7 +29,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { fetchCheckEnv, fetchFlinkCreate, fetchFlinkUpdate } from '/@/api/flink/flinkEnv';
-
+  import { FlinkEvnEnum } from '/@/enums/flinkEnum';
   const emit = defineEmits(['reload', 'register']);
   const versionId = ref<string | null>(null);
   const { t } = useI18n();
@@ -100,13 +100,13 @@
       flinkHome: formValue.flinkHome,
     });
     const checkResp = parseInt(resp.data);
-    if (checkResp != 0) {
+    if (checkResp !== FlinkEvnEnum.FEASIBLE) {
       // Environment detection is successful
-      if (checkResp == -1) {
+      if (checkResp === FlinkEvnEnum.INVALID) {
         Swal.fire('Failed', 'FLINK_HOME invalid path.', 'error');
-      } else if (checkResp == 1) {
+      } else if (checkResp === FlinkEvnEnum.NAME_REPEATED) {
         Swal.fire('Failed', t('setting.flinkHome.operateMessage.flinkNameIsUnique'), 'error');
-      } else if (checkResp == 2) {
+      } else if (checkResp === FlinkEvnEnum.FLINK_DIST_REPEATED) {
         Swal.fire(
           'Failed',
           'can no found flink-dist or found multiple flink-dist, FLINK_HOME error.',