Merge pull request #4 from laravel-workflow/fix/dashboard

Fix dashboard ordering

Author: rmcdaniel

app/Http/Controllers/WorkflowsController.php

@@ -9,13 +9,15 @@ class WorkflowsController extends Controller
 {
     public function completed() {
         return StoredWorkflow::whereStatus('completed')
+            ->orderByDesc('id')
             ->paginate(50);
     }
 
     public function failed() {
         return StoredWorkflow::whereStatus('failed')
+            ->orderByDesc('id')
             ->paginate(50);
-    }
+        }
 
     public function running() {
         return StoredWorkflow::whereIn('status', [
@@ -24,6 +26,7 @@ public function running() {
                 'running',
                 'waiting',
             ])
+            ->orderByDesc('id')
             ->paginate(50);
     }
 
@@ -32,14 +35,16 @@ public function show($id) {
 
         $flow->exceptions = $flow->exceptions->map(function ($exception) {
             $unserialized = unserialize($exception->exception);
-            $file = new SplFileObject($unserialized->getFile());
-            $file->seek($unserialized->getLine() - 4);
-            for ($line = 0; $line < 7; ++$line) {
-                $exception->code .= $file->current();
-                $file->next();
-                if ($file->eof()) break;
+            if (is_object($unserialized) && method_exists($unserialized, 'getFile')) {
+                $file = new SplFileObject($unserialized->getFile());
+                $file->seek($unserialized->getLine() - 4);
+                for ($line = 0; $line < 7; ++$line) {
+                    $exception->code .= $file->current();
+                    $file->next();
+                    if ($file->eof()) break;
+                }
+                $exception->code = rtrim($exception->code);    
             }
-            $exception->code = rtrim($exception->code);
             return $exception;
         });
 

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=8ac2ac0fcdb0b0cf7ee244d2a0e393eb",
+    "/app.js": "/app.js?id=2cc20d4b72226021ffad651f80cc7963",
     "/app-dark.css": "/app-dark.css?id=f522096d329c54701f099916e0416c38",
     "/app.css": "/app.css?id=768ca5ff3a1358fcfb02f40296b64d0b",
     "/img/favicon.png": "/img/favicon.png?id=7c006241b093796d6abfa3049df93a59",

public/app.js

@@ -16,11 +16,11 @@
             {{ timestamp(flow.created_at) }}
         </td>
 
-        <td v-if="$route.params.type=='completed'" class="table-fit">
+        <td v-if="$route.params.type=='completed' || $route.params.type=='failed'" class="table-fit">
             {{ timestamp(flow.updated_at) }}
         </td>
 
-        <td v-if="$route.params.type=='completed'" class="table-fit">
+        <td v-if="$route.params.type=='completed' || $route.params.type=='failed'" class="table-fit">
             <span>{{ duration(flow.created_at, flow.updated_at) }}</span>
         </td>
     </tr>

public/mix-manifest.json

@@ -79,7 +79,7 @@
             </div>
         </div>
 
-        <div class="card mt-4" v-if="ready">
+        <div class="card mt-4" v-if="ready && flow.logs && flow.logs.length">
             <div class="card-header d-flex align-items-center justify-content-between">
                 <h5>Timeline</h5>
 
@@ -93,7 +93,7 @@
             </div>
         </div>
 
-        <div class="card mt-4" v-if="ready">
+        <div class="card mt-4" v-if="ready && flow.logs && flow.logs.length">
             <div class="card-header d-flex align-items-center justify-content-between">
                 <h5>Activities</h5>
 
@@ -123,7 +123,7 @@
             </div>
         </div>
 
-        <div class="card mt-4" v-if="ready">
+        <div class="card mt-4" v-if="ready && flow.exceptions && flow.exceptions.length">
             <div class="card-header d-flex align-items-center justify-content-between">
                 <h5>Exceptions</h5>
 
@@ -145,9 +145,10 @@
                         <template v-for="exception in flow.exceptions">
                             <tr>
                                 <td>{{ exception.class }}</td>
-                                <td><button title="View Exception" class="btn btn-outline-primary ml-auto"
+                                <td v-if="exception.code"><button title="View Exception" class="btn btn-outline-primary ml-auto"
                                         data-toggle="collapse" :href="'#collapse' + exception.id" aria-expanded="false"
                                         :aria-controls="'collapse' + exception.id">View</button></td>
+                                <td v-else>-</td>
                                 <td>{{ timestamp(exception.created_at) }}</td>
                             </tr>
                             <tr :id="'collapse' + exception.id" class="collapse">
@@ -237,6 +238,7 @@ export default {
                         }
                         if (seriesIndex === 1) {
                             let exception = phpunserialize(this.flow.exceptions[dataPointIndex].exception)
+                            if (typeof exception !== 'object') return '';
                             exception.__constructor = this.flow.exceptions[dataPointIndex].exception.split('"')[1]
 
                             return '<div style="padding: 1em">' +

resources/js/screens/flows/flow-row.vue

@@ -168,7 +168,7 @@
                 <tr>
                     <th>Flow</th>
                     <th v-if="$route.params.type=='running'" class="text-right">Started At</th>
-                    <th v-if="$route.params.type=='completed'">Started At</th>
+                    <th v-if="$route.params.type=='completed' || $route.params.type=='failed'">Started At</th>
                     <th v-if="$route.params.type=='completed'">Completed At</th>
                     <th v-if="$route.params.type=='failed'">Failed At</th>
                     <th v-if="$route.params.type=='completed' || $route.params.type=='failed'" class="text-right">Duration</th>