Merge pull request #1134 from PrefectHQ/issue-1110

Bugfix: Check for skipped state in task run table to fix endless duration
PrefectHQ · Dec 7, 2021 · 4f50491 · 4f50491
2 parents 59744c5 + a29c5a7
commit 4f50491
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 16 deletions.
diff --git a/src/pages/FlowRun/TaskRunTable-Tile.vue b/src/pages/FlowRun/TaskRunTable-Tile.vue
@@ -4,7 +4,9 @@ import moment from 'moment-timezone'
 import DurationSpan from '@/components/DurationSpan'
 import ResumeButton from '@/components/ResumeButton'
 import { formatTime } from '@/mixins/formatTimeMixin'
-import { FINISHED_STATES, STATE_NAMES } from '@/utils/states'
+import { STATE_NAMES } from '@/utils/states'
+import { calculateDuration } from '@/utils/states'
+
 export default {
   components: {
     CardTitle,
@@ -98,9 +100,7 @@ export default {
         return true
       }
     },
-    isFinished(state) {
-      return FINISHED_STATES.includes(state)
-    }
+    calculateDuration
   },
   apollo: {
     flowRun: {
@@ -279,11 +279,7 @@ export default {
             v-if="item.start_time"
             :start-time="item.start_time"
             :end-time="
-              item.end_time
-                ? item.end_time
-                : isFinished(item.state)
-                ? item.start_time
-                : null
+              calculateDuration(item.start_time, item.end_time, item.state)
             "
           />
           <span v-else>...</span>

diff --git a/src/pages/Task/TaskRunTable-Tile.vue b/src/pages/Task/TaskRunTable-Tile.vue
@@ -3,6 +3,7 @@ import CardTitle from '@/components/Card-Title'
 import { roundedOneAgo } from '@/utils/dateTime'
 import DurationSpan from '@/components/DurationSpan'
 import { formatTime } from '@/mixins/formatTimeMixin'
+import { calculateDuration } from '@/utils/states'
 
 export default {
   components: {
@@ -71,7 +72,9 @@ export default {
       return `%${this.searchTerm}%`
     }
   },
-  methods: {},
+  methods: {
+    calculateDuration
+  },
   apollo: {
     task: {
       query: require('@/graphql/Task/table-task-runs.gql'),
@@ -200,7 +203,9 @@ export default {
           <DurationSpan
             v-if="item.start_time"
             :start-time="item.start_time"
-            :end-time="item.end_time"
+            :end-time="
+              calculateDuration(item.start_time, item.end_time, item.state)
+            "
           />
           <span v-else>...</span>
         </template>

diff --git a/src/pages/TaskRun/Details-Tile.vue b/src/pages/TaskRun/Details-Tile.vue
@@ -2,7 +2,7 @@
 import CardTitle from '@/components/Card-Title'
 import DurationSpan from '@/components/DurationSpan'
 import { formatTime } from '@/mixins/formatTimeMixin'
-
+import { calculateDuration } from '@/utils/states'
 export default {
   filters: {
     typeClass: val => val.split('.').pop()
@@ -50,7 +50,8 @@ export default {
         this.copiedText = {}
         this.copiedText[text] = false
       }, 1000)
-    }
+    },
+    calculateDuration
   }
 }
 </script>
@@ -192,7 +193,13 @@ export default {
                 <DurationSpan
                   v-if="taskRun.start_time"
                   :start-time="taskRun.start_time"
-                  :end-time="taskRun.end_time"
+                  :end-time="
+                    calculateDuration(
+                      taskRun.start_time,
+                      taskRun.end_time,
+                      taskRun.state
+                    )
+                  "
                 />
                 <span v-else>
                   <v-skeleton-loader type="text"></v-skeleton-loader>

diff --git a/src/pages/TaskRun/MappedTaskRuns-Tile.vue b/src/pages/TaskRun/MappedTaskRuns-Tile.vue
@@ -2,6 +2,7 @@
 import CardTitle from '@/components/Card-Title'
 import DurationSpan from '@/components/DurationSpan'
 import { formatTime } from '@/mixins/formatTimeMixin'
+import { calculateDuration } from '@/utils/states'
 
 export default {
   components: {
@@ -75,7 +76,9 @@ export default {
       return `%${this.searchTerm}%`
     }
   },
-  methods: {},
+  methods: {
+    calculateDuration
+  },
   apollo: {
     taskRuns: {
       query: require('@/graphql/TaskRun/table-mapped-task-runs.gql'),
@@ -274,7 +277,9 @@ export default {
           <DurationSpan
             v-if="item.start_time"
             :start-time="item.start_time"
-            :end-time="item.end_time"
+            :end-time="
+              calculateDuration(item.start_time, item.end_time, item.state)
+            "
           />
           <span v-else>...</span>
         </template>

diff --git a/src/utils/states.js b/src/utils/states.js
@@ -106,6 +106,18 @@ export const FINISHED_STATES = [
   'Skipped'
 ]
 
+export function calculateDuration(startTime, endTime, state) {
+  if (endTime) {
+    return endTime
+  }
+
+  if (FINISHED_STATES.includes(state)) {
+    return startTime
+  }
+
+  return null
+}
+
 export default function(state) {
   return STATE_COLORS[state]
 }