From 75a795ab72c19d9f72ec1f77f1f1c46527fbd102 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 3 Jan 2021 19:02:50 +0000
Subject: [PATCH] Made a couple of fixes during testing

- Updated audit table so long entity names did not squish everything
  else.
- Added filtering to view service popular list so that recycle binned
  items did not cause issues.
---
 app/Actions/ViewService.php              | 7 ++++++-
 resources/views/settings/audit.blade.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Actions/ViewService.php b/app/Actions/ViewService.php
index ec57cdb76..51a60d96e 100644
--- a/app/Actions/ViewService.php
+++ b/app/Actions/ViewService.php
@@ -74,7 +74,12 @@ class ViewService
             $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
         }
 
-        return $query->with('viewable')->skip($skipCount)->take($count)->get()->pluck('viewable');
+        return $query->with('viewable')
+            ->skip($skipCount)
+            ->take($count)
+            ->get()
+            ->pluck('viewable')
+            ->filter();
     }
 
     /**
diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index 1996e1c21..c52390f73 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -63,7 +63,7 @@
                         @include('partials.table-user', ['user' => $activity->user, 'user_id' => $activity->user_id])
                     </td>
                     <td>{{ $activity->type }}</td>
-                    <td>
+                    <td width="40%">
                         @if($activity->entity)
                             <a href="{{ $activity->entity->getUrl() }}" class="table-entity-item">
                                 <span role="presentation" class="icon text-{{$activity->entity->getType()}}">@icon($activity->entity->getType())</span>