Update TasksList to display last run date

influxdata · Feb 12, 2019 · 0ec0ca7 · 0ec0ca7
1 parent 7200ab8
commit 0ec0ca7
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/ui/src/tasks/components/TaskRow.tsx b/ui/src/tasks/components/TaskRow.tsx
@@ -71,6 +71,7 @@ export class TaskRow extends PureComponent<Props & WithRouterProps> {
           />
         </IndexList.Cell>
         <IndexList.Cell>{this.schedule}</IndexList.Cell>
+        <IndexList.Cell>{task.latestCompleted}</IndexList.Cell>
         <IndexList.Cell alignment={Alignment.Right} revealOnHover={true}>
           <ComponentSpacer align={Alignment.Right}>
             <Button

diff --git a/ui/src/tasks/components/TasksList.tsx b/ui/src/tasks/components/TasksList.tsx
@@ -63,6 +63,7 @@ export default class TasksList extends PureComponent<Props, State> {
       'status',
       'every',
       'organization.name',
+      'latestCompleted',
     ]
 
     return (
@@ -71,7 +72,7 @@ export default class TasksList extends PureComponent<Props, State> {
           <IndexList.Header>
             <IndexList.HeaderCell
               columnName="Name"
-              width="55%"
+              width="45%"
               sortKey={headerKeys[0]}
               sort={sortKey === headerKeys[0] ? sortDirection : Sort.None}
               onClick={this.handleClickColumn}
@@ -97,6 +98,13 @@ export default class TasksList extends PureComponent<Props, State> {
               sort={sortKey === headerKeys[2] ? sortDirection : Sort.None}
               onClick={this.handleClickColumn}
             />
+            <IndexList.HeaderCell
+              columnName="Last Completed"
+              width="10%"
+              sortKey={headerKeys[2]}
+              sort={sortKey === headerKeys[2] ? sortDirection : Sort.None}
+              onClick={this.handleClickColumn}
+            />
             <IndexList.HeaderCell columnName="" width="10%" />
           </IndexList.Header>
           <IndexList.Body
@@ -107,7 +115,7 @@ export default class TasksList extends PureComponent<Props, State> {
                 totalCount={totalCount}
               />
             }
-            columnCount={5}
+            columnCount={6}
           >
             {this.sortedRows}
           </IndexList.Body>

diff --git a/ui/src/tasks/components/__snapshots__/TaskRow.test.tsx.snap b/ui/src/tasks/components/__snapshots__/TaskRow.test.tsx.snap
@@ -57,6 +57,10 @@ exports[`Tasks.Components.TaskRow renders 1`] = `
   >
     2 0 * * *
   </IndexListRowCell>
+  <IndexListRowCell
+    alignment="left"
+    revealOnHover={false}
+  />
   <IndexListRowCell
     alignment="right"
     revealOnHover={true}

diff --git a/ui/src/tasks/components/__snapshots__/TasksList.test.tsx.snap b/ui/src/tasks/components/__snapshots__/TasksList.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`TasksList rendering renders 1`] = `
         onClick={[Function]}
         sort="none"
         sortKey="name"
-        width="55%"
+        width="45%"
       />
       <IndexListHeaderCell
         alignment="left"
@@ -36,14 +36,22 @@ exports[`TasksList rendering renders 1`] = `
         sortKey="every"
         width="15%"
       />
+      <IndexListHeaderCell
+        alignment="left"
+        columnName="Last Completed"
+        onClick={[Function]}
+        sort="none"
+        sortKey="every"
+        width="10%"
+      />
       <IndexListHeaderCell
         alignment="left"
         columnName=""
         width="10%"
       />
     </IndexListHeader>
     <IndexListBody
-      columnCount={5}
+      columnCount={6}
       emptyState={
         <EmptyTasksLists
           onCreate={[Function]}

diff --git a/ui/src/tasks/containers/__snapshots__/TasksPage.test.tsx.snap b/ui/src/tasks/containers/__snapshots__/TasksPage.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`TasksList rendering renders 1`] = `
         onClick={[Function]}
         sort="none"
         sortKey="name"
-        width="55%"
+        width="45%"
       />
       <IndexListHeaderCell
         alignment="left"
@@ -36,14 +36,22 @@ exports[`TasksList rendering renders 1`] = `
         sortKey="every"
         width="15%"
       />
+      <IndexListHeaderCell
+        alignment="left"
+        columnName="Last Completed"
+        onClick={[Function]}
+        sort="none"
+        sortKey="every"
+        width="10%"
+      />
       <IndexListHeaderCell
         alignment="left"
         columnName=""
         width="10%"
       />
     </IndexListHeader>
     <IndexListBody
-      columnCount={5}
+      columnCount={6}
       emptyState={
         <EmptyTasksLists
           onCreate={[Function]}