Merge pull request #617 from rappasoft/develop

v1.22.0

Author: rappasoft

CHANGELOG.md

@@ -34,6 +34,6 @@ public function myBulkAction()
     $this->resetSearch(); // Remove the search query
     $this->resetSorts(); // Remove the sorts
     $this->resetBulk(); // Clear the selected rows
-    $this->resetPage(); // Go back to page 1
+    $this->resetPage($this->pageName()); // Go back to page 1
 }
 ```

docs/bulk-actions/resetting-after-bulk-actions.md

@@ -7,7 +7,7 @@ Creating filters is not required, and the filters box will be hidden if none are
 
 To create filters, you return an array of `Filter` class objects from the `filters()` method.
 
-The current types of filters are: `select`, `multiSelect`, and `date`.
+The current types of filters are: `select`, `multiSelect`, `date`, and `datetime` (for supported browsers).
 
 There are two steps to making a filter:
 
@@ -49,7 +49,7 @@ public function filters(): array
                 'tag2' => 'Tags 2',
                 'tag3' => 'Tags 3',
                 'tag4' => 'Tags 4',
-            ]),     
+            ]),
     ];
 }
 ```

docs/filters/creating-filters.md

@@ -53,3 +53,21 @@ public function redirectToModel(string $name, array $parameters = [], $absolute
 ```
 
 Now the blank space of the row should have its action, while your links go to their own action.
+
+## Working with `wire:click` on rows
+
+You can add the row-level Livewire clicks by utilizing the following method.
+
+```php
+public function getTableRowWireClick($row): ?string
+{
+    return "doSomething(" . $row->id . ")";
+}
+
+public function doSomething($id)
+{
+    // ...
+}
+```
+
+If you state both `getTableRowUrl` & `getTableRowWireClick`, the URL will supersede when a non-null value is supplied.

docs/rows/clickable-rows.md

@@ -5,11 +5,11 @@
     "Bulk Actions": "إجراءات",
     "Clear": "مسح",
     "Filters": "التصفيات",
-    "Remove filter option": "خذف خيار التصفيه",
-    "Remove sort option": "خذف خيار الترتيب",
+    "Remove filter option": "حذف خيار التصفية",
+    "Remove sort option": "حذف خيار الترتيب",
     "Search": "بحث",
     "Select All": "تحديد الكل",
-    "Showing": "إستعراض",
+    "Showing": "استعراض",
     "Unselect All": "إلغاء تحديد الكل",
     "You are currently selecting all": "أنت الآن تختار الكل",
     "You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
@@ -18,5 +18,5 @@
     "results": "النتائج",
     "rows": "صفوف",
     "rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
-    "to": "إلي"
+    "to": "إلى"
 }

resources/lang/ar.json

@@ -1,14 +1,14 @@
 {
     "All": "Todo",
     "Applied Filters": "Filtros Aplicados",
-    "Applied Sorting": "Ordenamineto Aplicado",
+    "Applied Sorting": "Ordenamiento Aplicado",
     "Bulk Actions": "Acciones Masivas",
     "Clear": "Borrar",
     "Columns": "Columnas",
-    "Done Reordering": "Reordenación finalizada",
+    "Done Reordering": "Reordenamiento finalizado",
     "Filters": "Filtros",
     "Remove filter option": "Remover opción de filtro",
-    "Remove sort option": "Remover opción de ordenamineto",
+    "Remove sort option": "Remover opción de ordenamiento",
     "Search": "Buscar",
     "Select All": "Seleccionar todo",
     "Showing": "Mostrando",

resources/lang/es.json

@@ -0,0 +1,11 @@
+<div class="mb-3 mb-md-0 input-group">
+    <input
+        wire:model="filters.{{ $key }}"
+        wire:key="filter-{{ $key }}"
+        id="filter-{{ $key }}"
+        type="datetime-local"
+        @if(isset($filter->options['min']) && strlen($filter->options['min'])) min="{{ $filter->options['min'] }}" @endif
+        @if(isset($filter->options['max']) && strlen($filter->options['max'])) max="{{ $filter->options['max'] }}" @endif
+        class="form-control"
+    />
+</div>

resources/views/bootstrap-4/includes/filter-type-datetime.blade.php

@@ -42,6 +42,8 @@ class="dropdown-menu w-100 mt-md-3"
                                 @include('livewire-tables::bootstrap-4.includes.filter-type-multiselect')
                             @elseif($filter->isDate())
                                 @include('livewire-tables::bootstrap-4.includes.filter-type-date')
+                            @elseif($filter->isDatetime())
+                                @include('livewire-tables::bootstrap-4.includes.filter-type-datetime')
                             @endif
                         </div>
                     @endforeach

resources/views/bootstrap-4/includes/filters.blade.php

@@ -98,6 +98,7 @@
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
                 :target="method_exists($this, 'getTableRowUrlTarget') ? $this->getTableRowUrlTarget($row) : '_self'"
+                :wireclick="method_exists($this, 'getTableRowWireClick') ? $this->getTableRowWireClick($row) : ''"
                 :class="method_exists($this, 'setTableRowClass') ? ' ' . $this->setTableRowClass($row) : ''"
                 :id="method_exists($this, 'setTableRowId') ? $this->setTableRowId($row) : ''"
                 :customAttributes="method_exists($this, 'setTableRowAttributes') ? $this->setTableRowAttributes($row) : []"

resources/views/bootstrap-4/includes/table.blade.php

@@ -0,0 +1,11 @@
+<div class="flex rounded-md shadow-sm mt-1">
+    <input
+        wire:model="filters.{{ $key }}"
+        wire:key="filter-{{ $key }}"
+        id="filter-{{ $key }}"
+        type="datetime-local"
+        @if(isset($filter->options['min']) && strlen($filter->options['min'])) min="{{ $filter->options['min'] }}" @endif
+        @if(isset($filter->options['max']) && strlen($filter->options['max'])) max="{{ $filter->options['max'] }}" @endif
+        class="form-control"
+    />
+</div>

resources/views/bootstrap-5/includes/filter-type-datetime.blade.php

@@ -42,6 +42,8 @@ class="dropdown-menu w-100"
                                 @include('livewire-tables::bootstrap-5.includes.filter-type-multiselect')
                             @elseif($filter->isDate())
                                 @include('livewire-tables::bootstrap-5.includes.filter-type-date')
+                            @elseif($filter->isDatetime())
+                                @include('livewire-tables::bootstrap-5.includes.filter-type-datetime')
                             @endif
                         </div>
                     @endforeach

resources/views/bootstrap-5/includes/filters.blade.php

@@ -99,6 +99,7 @@ class="form-check-input"
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
                 :target="method_exists($this, 'getTableRowUrlTarget') ? $this->getTableRowUrlTarget($row) : '_self'"
+                :wireclick="method_exists($this, 'getTableRowWireClick') ? $this->getTableRowWireClick($row) : ''"
                 :class="method_exists($this, 'setTableRowClass') ? ' ' . $this->setTableRowClass($row) : ''"
                 :id="method_exists($this, 'setTableRowId') ? $this->setTableRowId($row) : ''"
                 :customAttributes="method_exists($this, 'setTableRowAttributes') ? $this->setTableRowAttributes($row) : []"

resources/views/bootstrap-5/includes/table.blade.php

@@ -1,4 +1,4 @@
-@props(['url' => null, 'target' => '_self', 'reordering' => false, 'customAttributes' => []])
+@props(['url' => null, 'wireclick' => null, 'target' => '_self', 'reordering' => false, 'customAttributes' => []])
 
 @if (!$reordering && (method_exists($attributes, 'has') ? $attributes->has('wire:sortable.item') : array_key_exists('wire:sortable.item', $attributes->getAttributes())))
     @php
@@ -7,10 +7,12 @@
 @endif
 
 <tr
-    {{ $attributes->merge($customAttributes)->merge(['class' => $url ? 'cursor-pointer' : '']) }}
+    {{ $attributes->merge($customAttributes)->merge(['class' => ($url || $wireclick) ? 'cursor-pointer' : '']) }}
 
     @if ($url)
         onclick="window.open('{{ $url }}', '{{ $target }}')"
+    @elseif ($wireclick)
+        wire:click="{{ $wireclick }}"
     @endif
 >
     {{ $slot }}

resources/views/tailwind/components/table/row.blade.php

@@ -0,0 +1,11 @@
+<div class="flex rounded-md shadow-sm mt-1">
+    <input
+        wire:model.stop="filters.{{ $key }}"
+        wire:key="filter-{{ $key }}"
+        id="filter-{{ $key }}"
+        type="datetime-local"
+        @if(isset($filter->options['min']) && strlen($filter->options['min'])) min="{{ $filter->options['min'] }}" @endif
+        @if(isset($filter->options['max']) && strlen($filter->options['max'])) max="{{ $filter->options['max'] }}" @endif
+        class="block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:text-white dark:border-gray-600"
+    />
+</div>

resources/views/tailwind/includes/filter-type-datetime.blade.php

@@ -62,6 +62,8 @@ class="block text-sm font-medium leading-5 text-gray-700 dark:text-white">
                                 @include('livewire-tables::tailwind.includes.filter-type-multiselect')
                             @elseif($filter->isDate())
                                 @include('livewire-tables::tailwind.includes.filter-type-date')
+                            @elseif($filter->isDatetime())
+                                @include('livewire-tables::tailwind.includes.filter-type-datetime')    
                             @endif
                         </div>
                     </div>

resources/views/tailwind/includes/filters.blade.php

@@ -10,15 +10,15 @@
                             {!! __('pagination.previous') !!}
                         </span>
                     @else
-                        <button wire:click="previousPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
+                        <button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
                             {!! __('pagination.previous') !!}
                         </button>
                     @endif
                 </span>
 
                 <span>
                     @if ($paginator->hasMorePages())
-                        <button wire:click="nextPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
+                        <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600">
                             {!! __('pagination.next') !!}
                         </button>
                     @else
@@ -55,7 +55,7 @@
                                     </span>
                                 </span>
                             @else
-                                <button wire:click="previousPage('{{ $paginator->getPageName() }}')" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.previous') }}">
+                                <button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="prev" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.previous') }}">
                                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                         <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
                                     </svg>
@@ -81,7 +81,7 @@
                                                 <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-500 dark:text-white dark:border-gray-500">{{ $page }}</span>
                                             </span>
                                         @else
-                                            <button wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
+                                            <button type="button" wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
                                                 {{ $page }}
                                             </button>
                                         @endif
@@ -93,7 +93,7 @@
                         <span>
                             {{-- Next Page Link --}}
                             @if ($paginator->hasMorePages())
-                                <button wire:click="nextPage('{{ $paginator->getPageName() }}')" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.next') }}">
+                                <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" rel="next" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:border-gray-600 dark:hover:bg-gray-600" aria-label="{{ __('pagination.next') }}">
                                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                                         <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
                                     </svg>

resources/views/tailwind/includes/partials/pagination.blade.php

@@ -101,6 +101,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
                 :target="method_exists($this, 'getTableRowUrlTarget') ? $this->getTableRowUrlTarget($row) : '_self'"
+                :wireclick="method_exists($this, 'getTableRowWireClick') ? $this->getTableRowWireClick($row) : ''"
                 :class="
                     ($index % 2 === 0 ?
                     'bg-white dark:bg-gray-700 dark:text-white' . (method_exists($this, 'getTableRowUrl') ? ' hover:bg-gray-100' : '') :

resources/views/tailwind/includes/table.blade.php

@@ -3,6 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use Livewire\Commands\ComponentParser;
@@ -141,8 +142,8 @@ public function classContents(): string
             $template = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'table-with-model.stub');
 
             $contents = str_replace(
-                ['[namespace]', '[class]', '[model]', '[model_import]'],
-                [$this->parser->classNamespace(), $this->parser->className(), $this->model, $this->getModelImport()],
+                ['[namespace]', '[class]', '[model]', '[model_import]', '[columns]'],
+                [$this->parser->classNamespace(), $this->parser->className(), $this->model, $this->getModelImport(), $this->generateColumns($this->getModelImport())],
                 $template
             );
         } else {
@@ -204,4 +205,40 @@ public function getModelImport(): string
 
         return 'App\Models\\' . $this->model;
     }
+
+    /**
+     * @param string $modelName
+     * @return string
+     * @throws Exception
+     */
+    private function generateColumns(string $modelName): string
+    {
+        $model = new $modelName();
+
+        if ($model instanceof Model === false) {
+            throw new \Exception('Invalid model given.');
+        }
+
+        $getFillable = array_merge(
+            [$model->getKeyName()],
+            $model->getFillable(),
+            ['created_at', 'updated_at']
+        );
+
+        $columns = "[\n";
+
+        foreach ($getFillable as $field) {
+            if (in_array($field, $model->getHidden())) {
+                continue;
+            }
+
+            $title = Str::of($field)->replace('_', ' ')->ucfirst();
+
+            $columns .= '            Column::make("' . $title . '", "' . $field . '")' . "\n" . '                ->sortable(),' . "\n";
+        }
+
+        $columns .= "        ]";
+
+        return $columns;
+    }
 }