This is an automated email from the ASF dual-hosted git repository.

gongzhongqiang 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 519632f4b [Improve] Restore mode minor improvement (#2971)
519632f4b is described below

commit 519632f4bd6a9a872277757f7abc5dca42df2d1b
Author: benjobs <[email protected]>
AuthorDate: Thu Aug 24 17:57:59 2023 +0800

    [Improve] Restore mode minor improvement (#2971)
    
    Co-authored-by: benjobs <[email protected]>
---
 .../java/org/apache/streampark/common/enums/RestoreMode.java |  4 ++--
 .../console/core/controller/ApplicationController.java       |  2 +-
 .../streampark-console-webapp/src/enums/flinkEnum.ts         |  4 ++--
 .../src/views/flink/app/hooks/useFlinkRender.tsx             | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/streampark-common/src/main/java/org/apache/streampark/common/enums/RestoreMode.java
 
b/streampark-common/src/main/java/org/apache/streampark/common/enums/RestoreMode.java
index 75ecf5b4d..29cd210cb 100644
--- 
a/streampark-common/src/main/java/org/apache/streampark/common/enums/RestoreMode.java
+++ 
b/streampark-common/src/main/java/org/apache/streampark/common/enums/RestoreMode.java
@@ -21,8 +21,8 @@ import java.io.Serializable;
 import java.util.Arrays;
 
 public enum RestoreMode implements Serializable {
-  CLAIM(1),
-  NO_CLAIM(2),
+  NO_CLAIM(1),
+  CLAIM(2),
   LEGACY(3);
 
   public static final String RESTORE_MODE = "execution.savepoint-restore-mode";
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
index f692de2c6..6a3e18a6b 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
@@ -425,7 +425,7 @@ public class ApplicationController {
     } else if (pathPart == null) {
       error =
           "The path to store the checkpoint data in is null. Please specify a 
directory path for the checkpoint data.";
-    } else if (pathPart.length() == 0 || "/".equals(pathPart)) {
+    } else if (pathPart.isEmpty() || "/".equals(pathPart)) {
       error = "Cannot use the root directory for checkpoints.";
     }
     if (error != null) {
diff --git 
a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts 
b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
index 2ed2b1eb6..c7c232125 100644
--- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -236,7 +236,7 @@ export enum FailoverStrategyEnum {
 }
 
 export enum RestoreModeEnum {
-  CLAIM = 1,
-  NO_CLAIM = 2,
+  NO_CLAIM = 1,
+  CLAIM = 2,
   LEGACY = 3,
 }
diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
 
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
index 4075a89bf..d5b461822 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
@@ -617,16 +617,16 @@ export const renderFlinkAppRestoreMode = ({ model, field 
}: RenderCallbackParams
         onChange={(value) => (model[field] = value)}
         placeholder="Please select restore mode"
       >
-        <Select.Option key="claim" value={RestoreModeEnum.CLAIM}>
-          <Tag color="#13c2c2" style=";margin-left: 5px;" size="small">
-            CLAIM
-          </Tag>
-        </Select.Option>
         <Select.Option key="no_claim" value={RestoreModeEnum.NO_CLAIM}>
-          <Tag color="#2db7f5" style=";margin-left: 5px;" size="small">
+          <Tag color="gray" style=";margin-left: 5px;" size="small">
             NO_CLAIM
           </Tag>
         </Select.Option>
+        <Select.Option key="claim" value={RestoreModeEnum.CLAIM}>
+          <Tag color="#108ee9" style=";margin-left: 5px;" size="small">
+            CLAIM
+          </Tag>
+        </Select.Option>
         <Select.Option key="legacy" value={RestoreModeEnum.LEGACY}>
           <Tag color="#8E50FF" style=";margin-left: 5px;" size="small">
             LEGACY

Reply via email to