change tables

Signed-off-by: Dieter Coopman <dieter@deltasolutions.be>

Author: dietercoopman

resources/views/user-ui/access.blade.php

@@ -1,4 +1,4 @@
-<div class="container mx-auto">
+<div class="container mx-auto" wire:ignore.self>
     <div class="grid grid-cols-2 rounded-md ">
         <div>
             <nav aria-label="Sidebar">

src/Http/Livewire/MenusTable.php

@@ -2,37 +2,42 @@
 
 namespace LLoadoutEnforce\Http\Livewire;
 
-
-use Mediconesystems\LivewireDatatables\Column;
-use Mediconesystems\LivewireDatatables\Http\Livewire\LivewireDatatable;
+use App\User;
+use Illuminate\Database\Eloquent\Builder;
 use LLoadoutEnforce\Models\Menu;
+use Rappasoft\LaravelLivewireTables\TableComponent;
+use Rappasoft\LaravelLivewireTables\Traits\HtmlComponents;
+use Rappasoft\LaravelLivewireTables\Views\Column;
 
-class MenusTable extends LivewireDatatable
+class MenusTable extends TableComponent
 {
+    use HtmlComponents;
 
-    public $exportable = true;
-
+    public $addRoute          = "menu";
+    public $clearSearchButton = true;
 
-    public function builder()
+    public function query(): Builder
     {
         return Menu::query();
     }
 
-
-    public function columns()
+    public function columns(): array
     {
+
         return [
-            Column::name('id')
-                ->label('ID')
+            Column::make('ID', 'id')
                 ->searchable()
-                ->linkTo('menu'),
-            Column::name('name')
-                ->label('name')
-                ->searchable(),
-            Column::name('route')
-                ->label('route')
+                ->sortable()
+                ->format(function (Menu $model) {
+                    return $this->linkRoute('menu', $model->id, $model->id);
+                }),
+            Column::make('Name', 'name')
                 ->searchable()
-
+                ->sortable(),
+            Column::make('Route', 'route')
+                ->searchable()
+                ->sortable(),
         ];
+
     }
 }

src/Http/Livewire/PermissionsTable.php

@@ -1,34 +1,40 @@
 <?php
-namespace LLoadoutEnforce\Http\Livewire;
 
+namespace LLoadoutEnforce\Http\Livewire;
 
+use App\User;
 use Spatie\Permission\Models\Permission;
-use Mediconesystems\LivewireDatatables\Column;
-use Mediconesystems\LivewireDatatables\Http\Livewire\LivewireDatatable;
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Rappasoft\LaravelLivewireTables\TableComponent;
+use Rappasoft\LaravelLivewireTables\Traits\HtmlComponents;
 
-class PermissionsTable extends LivewireDatatable
+class PermissionsTable extends TableComponent
 {
+    use HtmlComponents;
 
-    public $exportable = true;
+    public $addRoute          = "permission";
+    public $clearSearchButton = true;
 
-
-    public function builder()
+    public function query(): Builder
     {
         return Permission::query();
     }
 
-
-    public function columns()
+    public function columns(): array
     {
+
         return [
-            Column::name('id')
-                ->label('ID')
+            Column::make('ID', 'id')
                 ->searchable()
-                ->linkTo('permission'),
-            Column::name('name')
-                ->label('name')
+                ->sortable()
+                ->format(function (Permission $model) {
+                    return $this->linkRoute('permission', $model->id, $model->id);
+                }),
+            Column::make('Name', 'name')
                 ->searchable()
-
+                ->sortable(),
         ];
+
     }
 }

src/Http/Livewire/RolesTable.php

@@ -1,34 +1,40 @@
 <?php
-namespace LLoadoutEnforce\Http\Livewire;
 
+namespace LLoadoutEnforce\Http\Livewire;
 
+use App\User;
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\TableComponent;
+use Rappasoft\LaravelLivewireTables\Traits\HtmlComponents;
+use Rappasoft\LaravelLivewireTables\Views\Column;
 use Spatie\Permission\Models\Role;
-use Mediconesystems\LivewireDatatables\Column;
-use Mediconesystems\LivewireDatatables\Http\Livewire\LivewireDatatable;
 
-class RolesTable extends LivewireDatatable
+class RolesTable extends TableComponent
 {
+    use HtmlComponents;
 
-    public $exportable = true;
+    public $addRoute          = "role.edit";
+    public $clearSearchButton = true;
 
-
-    public function builder()
+    public function query(): Builder
     {
         return Role::query();
     }
 
-
-    public function columns()
+    public function columns(): array
     {
+
         return [
-            Column::name('id')
-                ->label('ID')
+            Column::make('ID', 'id')
                 ->searchable()
-                ->linkTo('role'),
-            Column::name('name')
-                ->label('name')
+                ->sortable()
+                ->format(function (Role $model) {
+                    return $this->linkRoute('role.edit', $model->id, $model->id);
+                }),
+            Column::make('Name', 'name')
                 ->searchable()
-
+                ->sortable(),
         ];
+
     }
 }

src/Http/Livewire/UsersTable.php

@@ -2,51 +2,42 @@
 
 namespace LLoadoutEnforce\Http\Livewire;
 
-
 use App\Models\User;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Mediconesystems\LivewireDatatables\Column;
-use Mediconesystems\LivewireDatatables\Http\Livewire\LivewireDatatable;
+use Illuminate\Database\Eloquent\Builder;
+use Rappasoft\LaravelLivewireTables\TableComponent;
+use Rappasoft\LaravelLivewireTables\Traits\HtmlComponents;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Spatie\Permission\Models\Role;
 
-class UsersTable extends LivewireDatatable
+class UsersTable extends TableComponent
 {
+    use HtmlComponents;
 
-    public $exportable = true;
-
+    public $addRoute          = "users.edit";
+    public $clearSearchButton = true;
 
-    public function builder()
+    public function query(): Builder
     {
         return User::query();
     }
 
-    public function roles(): BelongsToMany
+    public function columns(): array
     {
-        return $this->morphToMany(
-            config('permission.models.role'),
-            'model',
-            config('permission.table_names.model_has_roles'),
-            config('permission.column_names.model_morph_key'),
-            'role_id'
-        );
-    }
 
-
-    public function columns()
-    {
         return [
-            Column::name('id')
-                ->label('ID')
+            Column::make('ID', 'id')
                 ->searchable()
-                ->linkTo('user/detail'),
-            Column::name('name')
-                ->label('name')
-                ->searchable(),
-            Column::name('email')
-                ->label('email')
-                ->searchable(),
-//            Column::name('roles.name')
-//                ->label('role')
-
+                ->sortable()
+                ->format(function (User $model) {
+                    return $this->linkRoute('users.edit', $model->id, $model->id);
+                }),
+            Column::make('Name', 'name')
+                ->searchable()
+                ->sortable(),
+            Column::make('Email', 'email')
+                ->searchable()
+                ->sortable(),
         ];
+
     }
 }