Update Datatables

DataTables/AuditLogsDataTable.php

@@ -2,7 +2,10 @@
 
     namespace Modules\Logs\DataTables;
 
+    use Illuminate\Database\Eloquent\Builder as QueryBuilder;
     use Spatie\Activitylog\Models\Activity;
+    use Yajra\DataTables\EloquentDataTable;
+    use Yajra\DataTables\Html\Builder as HtmlBuilder;
     use Yajra\DataTables\Html\Column;
     use Yajra\DataTables\Services\DataTable;
 
@@ -11,19 +14,21 @@
         /**
          * Build DataTable class.
          *
-         * @param mixed $query Results from query() method.
+         * @param QueryBuilder $query Results from query() method.
          *
          * @return \Yajra\DataTables\DataTableAbstract
+         *
          */
-        public function dataTable($query)
+        public function dataTable(QueryBuilder $query)
+        : EloquentDataTable
         {
-            return datatables()
+            return (new EloquentDataTable($query))->rawColumns([
-                ->eloquent($query)
+                'description',
-                ->rawColumns(['description', 'properties', 'action'])
+                'properties',
-                ->editColumn('id', function (Activity $model) {
+                'action'
+            ])->editColumn('id', function (Activity $model) {
                 return $model->id;
-                })
+            })->editColumn('subject_id', function (Activity $model) {
-                ->editColumn('subject_id', function (Activity $model) {
                 if (!isset($model->subject)) {
                     return '';
                 }
@@ -33,19 +38,15 @@
                 }
 
                 return "-";//$model->subject->user()->first()->name;
-                })
+            })->editColumn('causer_id', function (Activity $model) {
-                ->editColumn('causer_id', function (Activity $model) {
                 return $model->causer ? $model->causer->name : __('System');
-                })
+            })->editColumn('properties', function (Activity $model) {
-                ->editColumn('properties', function (Activity $model) {
                 $content = $model->properties;
 
                 return view('logs::audit._details', compact('content'));
-                })
+            })->editColumn('created_at', function (Activity $model) {
-                ->editColumn('created_at', function (Activity $model) {
                 return $model->created_at->format('d M, Y H:i:s');
-                })
+            })->addColumn('action', function (Activity $model) {
-                ->addColumn('action', function (Activity $model) {
                 return view('logs::audit._action-menu', compact('model'));
             });
         }
@@ -58,6 +59,7 @@
          * @return \Illuminate\Database\Eloquent\Builder
          */
         public function query(Activity $model)
+        : QueryBuilder
         {
             return $model->newQuery();
         }
@@ -68,6 +70,7 @@
          * @return \Yajra\DataTables\Html\Builder
          */
         public function html()
+        : HtmlBuilder
         {
             return $this->builder()
                         ->setTableId('audit-log-table')
@@ -90,6 +93,7 @@
          * @return array
          */
         protected function getColumns()
+        : array
         {
             return [
                 Column::make('id')->title('Log ID'),

DataTables/SystemLogsDataTable.php

@@ -2,10 +2,14 @@
 
     namespace Modules\Logs\DataTables;
 
+    use Illuminate\Database\Eloquent\Builder as QueryBuilder;
     use Illuminate\Support\Collection;
     use Illuminate\Support\Str;
     use Jackiedo\LogReader\Exceptions\UnableToRetrieveLogFilesException;
     use Jackiedo\LogReader\LogReader;
+    use Spatie\Activitylog\Models\Activity;
+    use Yajra\DataTables\EloquentDataTable;
+    use Yajra\DataTables\Html\Builder as HtmlBuilder;
     use Yajra\DataTables\Html\Column;
     use Yajra\DataTables\Services\DataTable;
 
@@ -14,28 +18,25 @@
         /**
          * Build DataTable class.
          *
-         * @param mixed $query Results from query() method.
+         * @param QueryBuilder $query Results from query() method.
          *
          * @return \Yajra\DataTables\DataTableAbstract
          */
-        public function dataTable($query)
+        public function dataTable(QueryBuilder $query)
+        : EloquentDataTable
         {
-            return datatables()
+            return (new EloquentDataTable($query))->rawColumns([
-                ->collection($query)
+                'action',
-                ->rawColumns(['action', 'level'])
+                'level'
-                ->editColumn('id', function (Collection $model) {
+            ])->editColumn('id', function (Collection $model) {
                 return Str::limit($model->get('id'), 5, '');
-                })
+            })->editColumn('file_path', function (Collection $model) {
-                ->editColumn('file_path', function (Collection $model) {
                 return Str::limit($model->get('file_path'));
-                })
+            })->editColumn('message', function (Collection $model) {
-                ->editColumn('message', function (Collection $model) {
                 return Str::limit($model->get('context')->message, 95);
-                })
+            })->editColumn('date', function (Collection $model) {
-                ->editColumn('date', function (Collection $model) {
                 return $model->get('date')->format('d M, Y H:i:s');
-                })
+            })->editColumn('level', function (Collection $model) {
-                ->editColumn('level', function (Collection $model) {
                 $styles = [
                     'emergency' => 'danger',
                     'alert'     => 'warning',
@@ -53,13 +54,11 @@
                 $value = $model->get('level');
 
                 return '<div class="badge badge-light-' . $style . ' fw-bolder">' . $value . '</div>';
-                })
+            })->editColumn('context', function (Collection $model) {
-                ->editColumn('context', function (Collection $model) {
                 $content = $model->get('context');
 
                 return view('logs::system._details', compact('content'));
-                })
+            })->addColumn('action', function (Collection $model) {
-                ->addColumn('action', function (Collection $model) {
                 return view('logs::system._action-menu', compact('model'));
             });
         }
@@ -72,6 +71,7 @@
          * @return Collection
          */
         public function query(LogReader $model)
+        : QueryBuilder
         {
             $data = collect();
             $model->setLogPath(storage_path('logs'));
@@ -96,6 +96,7 @@
          * @return \Yajra\DataTables\Html\Builder
          */
         public function html()
+        : HtmlBuilder
         {
             return $this->builder()
                         ->setTableId('system-log-table')
@@ -115,6 +116,7 @@
          * @return array
          */
         protected function getColumns()
+        : array
         {
             return [
                 Column::make('id')->title('Log ID')->width(50),