15012: Don't show Completed processes as Cancelled when priority=0.
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Thu, 23 Jan 2020 21:03:07 +0000 (18:03 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Thu, 23 Jan 2020 21:03:07 +0000 (18:03 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

src/store/processes/process.ts

index 400d77cfc88ee38942e46a5a1a6692e5a9ee82a2..e5b2c8403cc77d5e8aaeb6b961a59d46a8b27b70 100644 (file)
@@ -90,6 +90,9 @@ export const getProcessStatus = ({ containerRequest, container }: Process): Proc
         case containerRequest.state === ContainerRequestState.UNCOMMITTED:
             return ProcessStatus.DRAFT;
 
         case containerRequest.state === ContainerRequestState.UNCOMMITTED:
             return ProcessStatus.DRAFT;
 
+        case container && container.state === ContainerState.COMPLETE && container.exitCode === 0:
+            return ProcessStatus.COMPLETED;
+
         case containerRequest.priority === 0:
         case container && container.state === ContainerState.CANCELLED:
             return ProcessStatus.CANCELLED;
         case containerRequest.priority === 0:
         case container && container.state === ContainerState.CANCELLED:
             return ProcessStatus.CANCELLED;
@@ -103,9 +106,6 @@ export const getProcessStatus = ({ containerRequest, container }: Process): Proc
         case container && container.state === ContainerState.RUNNING:
             return ProcessStatus.RUNNING;
 
         case container && container.state === ContainerState.RUNNING:
             return ProcessStatus.RUNNING;
 
-        case container && container.state === ContainerState.COMPLETE && container.exitCode === 0:
-            return ProcessStatus.COMPLETED;
-
         case container && container.state === ContainerState.COMPLETE && container.exitCode !== 0:
             return ProcessStatus.FAILED;
 
         case container && container.state === ContainerState.COMPLETE && container.exitCode !== 0:
             return ProcessStatus.FAILED;