addjusted UI for the status change

sterlp · Dec 28, 2024 · 893dd85 · 893dd85
1 parent fa37b5b
commit 893dd85
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -145,6 +145,9 @@ public class ExampleApplication {
 
 - http://localhost:8080/task-ui
 
+## Schedulers
+![Schedulers](screenshots/schedulers-screen.png)
+
 ## Triggers
 ![Triggers](screenshots/triggers-screen.png)
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -115,8 +115,7 @@
                     <classPatterns>
                         <pattern>org.sterl.spring.persistent_tasks.api.**</pattern>
                     </classPatterns>
-                    <outputFile>
-                        ../spring-persistent-tasks-ui/src/server-api.d.ts</outputFile>
+                    <outputFile>../ui/src/server-api.d.ts</outputFile>
                     <outputKind>module</outputKind>
                 </configuration>
             </plugin>

diff --git a/db/src/main/resources/spring-persistent-tasks/db/pt-changelog-v1.xml b/db/src/main/resources/spring-persistent-tasks/db/pt-changelog-v1.xml
@@ -47,7 +47,7 @@
             <column computed="false" name="running_duration_in_ms" type="bigint" />
             <column computed="false" name="start_time" type="${offsetdatetime.type}" />
             <column computed="false" name="state" type="${binary.type}" />
-            <column computed="false" name="status" type="varchar(20)">
+            <column computed="false" name="status" type="varchar(20)" defaultValue="WAITING">
                 <constraints nullable="false" />
             </column>
             <column computed="false" name="last_ping" type="${offsetdatetime.type}" />

diff --git a/screenshots/schedulers-screen.png b/screenshots/schedulers-screen.png
diff --git a/ui/pom.xml b/ui/pom.xml
@@ -18,6 +18,11 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.sterl.spring</groupId>
+            <artifactId>spring-persistent-tasks-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/ui/src/server-api.d.ts b/ui/src/server-api.d.ts
@@ -94,4 +94,4 @@ export interface Serializable {
 export interface Consumer<T> {
 }
 
-export type TriggerStatus = "NEW" | "RUNNING" | "SUCCESS" | "FAILED" | "CANCELED";
+export type TriggerStatus = "WAITING" | "RUNNING" | "SUCCESS" | "FAILED" | "CANCELED";
diff --git a/ui/src/trigger/views/trigger-staus.view.tsx b/ui/src/trigger/views/trigger-staus.view.tsx
@@ -7,14 +7,16 @@ interface Props {
 const TriggerStatusView = ({ data }: Props) => {
     if (!data) return undefined;
 
-    if (data.status === "SUCCESS") return <Badge bg="success">SUCCESS</Badge>;
-    if (data.status === "RUNNING") return <Badge>RUNNING</Badge>;
-    if (data.status === "FAILED") return <Badge bg="danger">FAILED</Badge>;
+    if (data.status === "SUCCESS") return <Badge bg="success">Success</Badge>;
+    if (data.status === "FAILED") return <Badge bg="danger">Failed</Badge>;
+    if (data.status === "RUNNING") return <Badge>Running</Badge>;
 
-    if (data.end != null && data.status === "NEW") {
-        return <Badge bg="warning">RETRY</Badge>;
+    if (data.executionCount > 0 && data.status === "WAITING") {
+        return <Badge bg="warning">Retry</Badge>;
     }
-    if (data.status === "NEW") return <Badge bg="secondary">WAITING</Badge>;
+    if (data.status === "WAITING") return <Badge bg="secondary">Wating</Badge>;
+    if (data.status === "CANCELED")
+        return <Badge bg="secondary">Canceled</Badge>;
 
     return <Badge>{data.status}</Badge>;
 };