[feature] refresh task list on manual execute

- refresh task list to reflect any changes when a task is executed manually from dashboard

Author: lroggen

resources/assets/js/app.js

@@ -4,6 +4,7 @@ import moment from 'moment';
 import UIkit from 'uikit';
 import Icons from 'uikit/dist/js/uikit-icons';
 import UIKitAlert from './components/UiKitAlert.vue';
+import TaskRow from './tasks/components/TaskRow.vue';
 import TaskType from './tasks/components/TaskType.vue';
 import TaskOutput from './tasks/components/TaskOutput.vue';
 import StatusButton from './tasks/components/StatusButton.vue';
@@ -53,6 +54,7 @@ new Vue({
     'import-button': ImportButton,
     'task-type' : TaskType,
     'task-output' : TaskOutput,
+    'task-row': TaskRow,
     'click-to-close' : ClickToClose,
     'command-list' : CommandList
   },

resources/assets/js/tasks/components/ExecuteButton.vue

@@ -47,10 +47,11 @@
             .then(response => {
               this.task = response.data;
               this.running = false;
+              this.$emit('taskExecuted', this.task);
             })
       }
     },
     mounted() {
     }
   }
-</script>
+</script>

resources/assets/js/tasks/components/TaskRow.vue

@@ -0,0 +1,80 @@
+<template>
+    <tr :class="task.is_active ? '' : 'uk-text-danger'">
+        <td>
+            <a :href="showHref">
+                {{ description }}
+            </a>
+            <span class="uk-float-right uk-hidden@s uk-text-muted">Command</span>
+        </td>
+        <td>
+            {{ task.average_runtime ? averageDurationInSeconds : 0 }} seconds
+            <span class="uk-float-right uk-hidden@s uk-text-muted">Avg. Runtime</span>
+        </td>
+        <td>
+            {{ task.last_result ? lastRunDate : 'N/A' }}
+            <span class="uk-float-right uk-hidden@s uk-text-muted">Last Run</span>
+        </td>
+        <td>
+            {{task.upcoming}}
+            <span class="uk-float-right uk-hidden@s uk-text-muted">Next Run</span>
+        </td>
+        <td class="uk-text-center@m">
+            <execute-button
+                :data-task="task"
+                :url="executeHref"
+                v-on:taskExecuted="refreshTask"
+                icon-name="play"
+                button-class="uk-button-link"
+            />
+        </td>
+    </tr>
+</template>
+
+<script>
+    import moment from 'moment'
+    import ExecuteButton from './ExecuteButton'
+
+    export default {
+        components: {
+            ExecuteButton
+        },
+
+        props: {
+            dataTask: {},
+        },
+
+        data() {
+            return {
+                task: this.dataTask
+            }
+        },
+
+        computed: {
+            description() {
+                return this.task.description.substring(0,29);
+            },
+
+            averageDurationInSeconds() {
+                return this.task.average_runtime > 0 ? (this.task.average_runtime / 1000).toFixed(2) : 0;
+            },
+
+            lastRunDate() {
+                return moment(this.task.last_result.ran_at).format('YYYY-MM-DD hh:mm:ss');
+            },
+
+            showHref() {
+                return this.$attrs.showhref;
+            },
+
+            executeHref() {
+                return this.$attrs.executehref;
+            }
+        },
+
+        methods: {
+            refreshTask(task) {
+                this.task = task;
+            }
+        }
+    }
+</script>

resources/views/tasks/index.blade.php

@@ -30,35 +30,10 @@
         </thead>
         <tbody>
             @forelse($tasks as $task)
-                <tr class="{{$task->is_active ?: 'uk-text-danger'}}">
-                    <td>
-                        <a href="{{route('totem.task.view', $task)}}">
-                            {{str_limit($task->description, 30)}}
-                        </a>
-                        <span class="uk-float-right uk-hidden@s uk-text-muted">Command</span>
-                    </td>
-                    <td>
-                        {{ number_format(  $task->averageRuntime / 1000 , 2 ) }} seconds
-                        <span class="uk-float-right uk-hidden@s uk-text-muted">Avg. Runtime</span>
-                    </td>
-                    @if($last = $task->lastResult)
-                        <td>
-                            {{$last->ran_at->toDateTimeString()}}
-                            <span class="uk-float-right uk-hidden@s uk-text-muted">Last Run</span>
-                        </td>
-                    @else
-                        <td>
-                            N/A
-                            <span class="uk-float-right uk-hidden@s uk-text-muted">Last Run</span>
-                        </td>
-                    @endif
-                    <td>
-                        {{$task->upcoming}}
-                        <span class="uk-float-right uk-hidden@s uk-text-muted">Next Run</span>
-                    </td>
-                    <td class="uk-text-center@m">
-                        <execute-button :data-task="{{$task}}" url="{{route('totem.task.execute', $task)}}" icon-name="play" button-class="uk-button-link"></execute-button>
-                    </td>
+                <tr is="task-row"
+                    :data-task="{{$task}}"
+                    showHref="{{route('totem.task.view', $task)}}"
+                    executeHref="{{route('totem.task.execute', $task)}}">
                 </tr>
             @empty
                 <tr>

src/Http/Controllers/ExecuteTasksController.php

@@ -2,6 +2,7 @@
 
 namespace Studio\Totem\Http\Controllers;
 
+use Studio\Totem\Task;
 use Studio\Totem\Contracts\TaskInterface;
 
 class ExecuteTasksController extends Controller
@@ -29,6 +30,6 @@ public function index($task)
     {
         $this->tasks->execute($task);
 
-        return redirect()->back();
+        return Task::find($task->id);
     }
 }

src/Task.php

@@ -43,6 +43,8 @@ class Task extends TotemModel
     protected $appends = [
         'activated',
         'upcoming',
+        'last_result',
+        'average_runtime',
     ];
 
     /**