DataTables/SystemLogsDataTable.php

@@ -8,7 +8,6 @@
     use Jackiedo\LogReader\Exceptions\UnableToRetrieveLogFilesException;
     use Jackiedo\LogReader\LogReader;
     use Spatie\Activitylog\Models\Activity;
-    use Yajra\DataTables\CollectionDataTable;
     use Yajra\DataTables\EloquentDataTable;
     use Yajra\DataTables\Html\Builder as HtmlBuilder;
     use Yajra\DataTables\Html\Column;
@@ -23,10 +22,10 @@
          *
          * @return \Yajra\DataTables\DataTableAbstract
          */
-        public function dataTable(Collection $query)
+        public function dataTable(QueryBuilder $query)
-        : CollectionDataTable
+        : EloquentDataTable
         {
-            return (new CollectionDataTable($query))->rawColumns([
+            return (new EloquentDataTable($query))->rawColumns([
                 'action',
                 'level'
             ])->editColumn('id', function (Collection $model) {
@@ -72,13 +71,13 @@
          * @return Collection
          */
         public function query(LogReader $model)
-        : Collection
+        : QueryBuilder
         {
-
+            $data = collect();
             $model->setLogPath(storage_path('logs'));
 
             try {
-                $data = $model->get();
+                $data = $model->get()->merge($data);
             } catch (UnableToRetrieveLogFilesException $exception) {
                 echo $exception->getMessage();
                 exit;
@@ -88,7 +87,6 @@
                 return (collect($a))->only(['id', 'date', 'environment', 'level', 'file_path', 'context']);
             });
 
-
             return $data;
         }