Merge branch 'master' into flow-table-max-items

Changelog.md

@@ -5,11 +5,14 @@
 ### Features and Improvements
 
 - Increase default number of flows shown in the flow table - [#1027](https://github.com/PrefectHQ/ui/pull/1027)
+- Remove global max width on dashboard etc screens - [#1026](https://github.com/PrefectHQ/ui/pull/1026)
 - Route to task run page on timeline click - [#1024](https://github.com/PrefectHQ/ui/pull/1024)
 - Remove references to unused task attributes - [#1011](https://github.com/PrefectHQ/ui/pull/1011)
 
 ### Bugfixes
 
+- Remove parent query from task run page - [#1025](https://github.com/PrefectHQ/ui/pull/1025)
+- Fix issue where Skipped flow runs incorrectly displayed end_time and duration data - [#1030](https://github.com/PrefectHQ/ui/pull/1030)
 - Stop role reset in the team member invite dialog - [#1019](https://github.com/PrefectHQ/ui/pull/1019)
 
 ## 2021-08-18

src/components/NavTabBar.vue

@@ -88,7 +88,6 @@ export default {
       $vuetify.breakpoint.smAndDown ? 'tabs-hidden' : '',
       pageScrolled ? 'elevation-4' : ''
     ]"
-    style="max-width: 1440px;"
   >
     <v-tabs-slider color="blue"></v-tabs-slider>
     <template v-for="tb in mainTabs">

src/components/TimelineTooltip.vue

@@ -60,7 +60,13 @@ export default {
         </span>
       </div>
 
-      <div v-if="props.tooltip.data.start_time" class="text-subtitle-1">
+      <div
+        v-if="
+          props.tooltip.data.start_time &&
+            (props.tooltip.data.end_time || !props.tooltip.data.finished)
+        "
+        class="text-subtitle-1"
+      >
         Duration:
         <component
           :is="$options.components.DurationSpan"

src/layouts/SubPageNav.vue

@@ -57,8 +57,7 @@ export default {
         :class="{
           'justify-center': $vuetify.breakpoint.smAndDown
         }"
-        style="height: 64px;
-      max-width: 1440px;"
+        style="height: 64px;"
       >
         <v-col :sm="$slots['page-actions'] ? 6 : 12" class="d-flex align-end">
           <div class="mr-2">

src/layouts/TileLayout-Alternate.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid style="max-width: 1440px;" class="mx-auto pt-0 px-3 pb-12">
+  <v-sheet fluid color="transparent" class="mx-auto pt-0 px-3 pb-12">
     <v-row no-gutters>
       <v-col cols="12" md="4" class="py-0">
         <v-row v-if="$slots['col-1-tile-1']" class="justify-start">
@@ -87,5 +87,5 @@
         </v-row>
       </v-col>
     </v-row>
-  </v-container>
+  </v-sheet>
 </template>

src/layouts/TileLayout-Full.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-container style="max-width: 1440px;" class="pt-0 pb-12">
+  <v-sheet color="transparent" class="pt-0 pb-12">
     <v-row v-if="$slots['row-1-tile']" no-gutters>
       <v-col cols="12" class="pb-0">
         <v-row>
@@ -21,5 +21,5 @@
         </v-row>
       </v-col>
     </v-row>
-  </v-container>
+  </v-sheet>
 </template>

src/mixins/flowRunHistoryMixin.js

@@ -101,7 +101,7 @@ export const flowRunHistoryMixin = {
           let end = new Date(d.end_time),
             start = new Date(d.start_time)
           d.duration = end - start
-        } else if (d.start_time) {
+        } else if (d.start_time && notPastRunStates.includes(d.state)) {
           let now = new Date(),
             start = new Date(d.start_time)
           d.duration = now - start
@@ -113,11 +113,14 @@ export const flowRunHistoryMixin = {
         if (
           !d.end_time &&
           d.start_time &&
-          !notPastRunStates.includes(d.state)
+          !notPastRunStates.includes(d.state) &&
+          d.state !== 'Skipped'
         ) {
           d.end_time = new Date()
         }
 
+        d.finished = !notPastRunStates.includes(d.state)
+
         // We do the same for running flows without start_time
         if (!d.start_time && d.state == 'Running') {
           d.start_time = new Date()

src/pages/Agents/AgentPage.vue

@@ -168,7 +168,6 @@ export default {
     <v-tabs-items
       v-model="tab"
       class="px-6 mx-auto tabs-border-bottom tab-full-height"
-      style="max-width: 1440px;"
       :style="{
         'padding-top': $vuetify.breakpoint.smOnly ? '30px' : '80px'
       }"

src/pages/Dashboard/Dashboard.vue

@@ -276,9 +276,6 @@ export default {
     <v-tabs-items
       v-model="tab"
       class="px-6 mx-auto tabs-border-bottom tab-full-height"
-      style="
-        max-width: 1440px;
-      "
       :style="{
         'padding-top': $vuetify.breakpoint.smOnly ? '80px' : '130px'
       }"

src/pages/Flow/Flow.vue

@@ -322,7 +322,6 @@ export default {
       v-model="tab"
       v-if="flowGroup"
       class="px-6 mx-auto tabs-border-bottom tab-full-height"
-      style="max-width: 1440px;"
       :style="{
         'padding-top': $vuetify.breakpoint.smOnly ? '80px' : '130px'
       }"

src/pages/FlowRun/FlowRun.vue

@@ -305,7 +305,6 @@ export default {
       v-model="tab"
       class="px-6 mx-auto tabs-border-bottom tab-full-height"
       :style="{
-        'max-width': tab == 'chart' ? 'auto' : '1440px',
         'padding-top': $vuetify.breakpoint.smOnly ? '80px' : '130px'
       }"
       mandatory

src/pages/Task/Task.vue

@@ -225,7 +225,6 @@ export default {
     <v-tabs-items
       v-model="tab"
       class="px-6 mx-auto tabs-border-bottom tab-full-height"
-      style="max-width: 1440px;"
       :style="
         $vuetify.breakpoint.mdAndUp ? 'padding-top: 130px' : 'padding-top: 80px'
       "

src/pages/TaskRun/TaskRun.vue

@@ -188,18 +188,6 @@ export default {
       loadingKey: 'loading',
       pollInterval: 5000,
       update: data => data.task_run_by_pk || 'not-found'
-    },
-    parent: {
-      query: require('@/graphql/TaskRun/parent.gql'),
-      variables() {
-        return {
-          taskId: this.taskRun ? this.taskRun.task.id : null,
-          flowRunId: this.taskRun ? this.taskRun.flow_run.id : null
-        }
-      },
-      loadingKey: 'loading',
-      pollInterval: 5000,
-      update: data => (data.task_run ? data.task_run.length : null)
     }
   }
 }
@@ -276,7 +264,6 @@ export default {
     <v-tabs-items
       v-model="tab"
       class="px-6 mx-auto tabs-border-bottom tab-full-height"
-      style="max-width: 1440px;"
       :style="{
         'padding-top': $vuetify.breakpoint.smOnly ? '80px' : '130px'
       }"