v2.10.0

CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [2.10.0] - 2023-01-16
+
+### Added
+
+- Added support for MorphOne relationships - https://github.com/rappasoft/laravel-livewire-tables/pull/844
+- Added MultiSelectDropdownFilter - https://github.com/rappasoft/laravel-livewire-tables/pull/1011
+- FilterSlideDown - Ability to set Default to Open or Closed - https://github.com/rappasoft/laravel-livewire-tables/pull/1017
+
+### Changed
+
+- Updated EN translations - https://github.com/rappasoft/laravel-livewire-tables/pull/999
+- Updated ES translations - https://github.com/rappasoft/laravel-livewire-tables/pull/1000
+- Bulk Actions Simple Pagination fix & typo in toolbar.blade.php - https://github.com/rappasoft/laravel-livewire-tables/pull/1015
+
 ## [2.9.0] - 2022-12-21
 
 ### Added
@@ -705,7 +719,9 @@ Ground Up Rebuild
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.8.0...development
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.10.0...development
+[2.10.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.9.0...v2.10.0
+[2.9.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.8.0...v2.9.0
 [2.8.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.7.0...v2.8.0
 [2.7.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v2.5.0...v2.6.0

docs/columns/relationships.md

@@ -3,7 +3,7 @@ title: Relationships
 weight: 2
 ---
 
-Out of the box the columns support `hasOne` and `belongsTo` relationships for display, sorting, and searching. The component will automatically join the necessary tables.
+Out of the box the columns support `hasOne`, `belongsTo`, and `MorphOne` relationships for display, sorting, and searching. The component will automatically join the necessary tables.
 
 To call these relationships, just use the relationship dot-notation string as the field name:
 

docs/filters/applying-filters.md

@@ -47,7 +47,7 @@ You may wish to apply default filters i.e. current month on accessing the view i
 
 ```php
 public function mount() {
-    $this->setFilter('created_after', date('Y-m-d', strtotime('now -1 month'));
+    $this->setFilter('created_after', date('Y-m-d', strtotime('now -1 month')));
 }
 ```
 

docs/filters/available-methods.md

@@ -158,6 +158,31 @@ public function configure(): void
 }
 ```
 
+### setFilterSlideDownDefaultStatusEnabled
+
+Set the filter slide down to visible by default
+
+```php
+public function configure(): void
+{
+    // Shorthand for $this->setFilterSlideDownDefaultStatus(true)
+    $this->setFilterSlideDownDefaultStatusEnabled();
+}
+```
+
+### setFilterSlideDownDefaultStatusDisabled
+
+Set the filter slide down to collapsed by default
+
+```php
+public function configure(): void
+{
+    // Shorthand for $this->setFilterSlideDownDefaultStatus(false)
+    $this->setFilterSlideDownDefaultStatusDisabled();
+}
+```
+
+
 ----
 
 ## Filter Methods

docs/filters/creating-filters.md

@@ -61,10 +61,15 @@ public function filters(): array
                     25 => 'Type Y',
                     26 => 'Type Z',
                 ],
-            ]),
+            ])
+            ->setFirstOption('All Tags'),
     ];
 }
 ```
+To set a defualt "All" option at the start of the dropdown, you can do so by utilising the 
+```
+->SetFirstOption('NAME')
+```
 
 ## Multi-select Filters
 
@@ -89,6 +94,30 @@ public function filters(): array
 }
 ```
 
+## Multi-select dropdown Filters
+
+Multi-select dropdown filters are a simple dropdown list. The user can select multiple options from the list. There is also an 'All' option that will select all values
+
+```php
+use Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter;
+
+public function filters(): array
+{
+    return [
+        SelectFilter::make('Tags')
+            ->options(
+                Tag::query()
+                    ->orderBy('name')
+                    ->get()
+                    ->keyBy('id')
+                    ->map(fn($tag) => $tag->name)
+                    ->toArray()
+            )
+            ->setFirstOption('All Tags'),
+    ];
+}
+```
+
 ## Date Filters
 
 Date filters are HTML date elements.

resources/lang/en.json

@@ -1,5 +1,6 @@
 {
     "All": "All",
+    "All Columns": "All Columns",
     "Applied Filters": "Applied Filters",
     "Applied Sorting": "Applied Sorting",
     "Bulk Actions": "Bulk Actions",

resources/lang/es.json

@@ -1,5 +1,6 @@
 {
     "All": "Todo",
+    "All Columns": "Todas las columnas",
     "Applied Filters": "Filtros Aplicados",
     "Applied Sorting": "Ordenamineto Aplicado",
     "Bulk Actions": "Acciones Masivas",

resources/views/components/table/tr/bulk-actions.blade.php

@@ -8,6 +8,7 @@
         $colspan = $component->getColspanCount();
         $selected = $component->getSelectedCount();
         $selectAll = $component->selectAllIsEnabled();
+        $simplePagination = ($component->paginationMethod == "simple") ? true : false;
     @endphp
 
     @if ($theme === 'tailwind')
@@ -20,7 +21,7 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white"
                     <div wire:key="all-selected-{{ $table }}">
                         <span>
                             @lang('You are currently selecting all')
-                            <strong>{{ number_format($rows->total()) }}</strong>
+                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
                             @lang('rows').
                         </span>
 
@@ -39,7 +40,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                             @lang('You have selected')
                             <strong>{{ $selected }}</strong>
                             @lang('rows, do you want to select all')
-                            <strong>{{ number_format($rows->total()) }}</strong>?
+                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
                         </span>
 
                         <button
@@ -72,7 +73,7 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium
                     <div wire:key="all-selected-{{ $table }}">
                         <span>
                             @lang('You are currently selecting all')
-                            <strong>{{ number_format($rows->total()) }}</strong>
+                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
                             @lang('rows').
                         </span>
 
@@ -91,7 +92,7 @@ class="btn btn-primary btn-sm"
                             @lang('You have selected')
                             <strong>{{ $selected }}</strong>
                             @lang('rows, do you want to select all')
-                            <strong>{{ number_format($rows->total()) }}</strong>?
+                            @if(!$simplePagination) <strong>{{ number_format($rows->total()) }}</strong> @endif
                         </span>
 
                         <button

resources/views/components/tools/filters/multi-select-dropdown.blade.php

@@ -0,0 +1,51 @@
+@php
+    $theme = $component->getTheme();
+@endphp
+
+@if ($theme === 'tailwind')
+    <div class="rounded-md shadow-sm">
+        <select multiple
+            wire:model.stop="{{ $component->getTableName() }}.filters.{{ $filter->getKey() }}"
+            wire:key="{{ $component->getTableName() }}-filter-{{ $filter->getKey() }}"
+            id="{{ $component->getTableName() }}-filter-{{ $filter->getKey() }}"
+            class="block w-full transition duration-150 ease-in-out border-gray-300 rounded-md shadow-sm 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"
+        >
+        @if ($filter->getFirstOption() != "")
+             <option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
+        @endif
+            @foreach($filter->getOptions() as $key => $value)
+                @if (is_iterable($value))
+                    <optgroup label="{{ $key }}">
+                        @foreach ($value as $optionKey => $optionValue)
+                            <option value="{{ $optionKey }}">{{ $optionValue }}</option>
+                        @endforeach
+                    </optgroup>
+                @else
+                    <option value="{{ $key }}">{{ $value }}</option>
+                @endif
+            @endforeach
+        </select>
+    </div>
+@elseif ($theme === 'bootstrap-4' || $theme === 'bootstrap-5')
+    <select multiple
+        wire:model.stop="{{ $component->getTableName() }}.filters.{{ $filter->getKey() }}"
+        wire:key="{{ $component->getTableName() }}-filter-{{ $filter->getKey() }}"
+        id="{{ $component->getTableName() }}-filter-{{ $filter->getKey() }}"
+        class="{{ $theme === 'bootstrap-4' ? 'form-control' : 'form-select' }}"
+    >
+    @if ($filter->getFirstOption() != "")
+        <option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
+    @endif
+        @foreach($filter->getOptions() as $key => $value)
+            @if (is_iterable($value))
+                <optgroup label="{{ $key }}">
+                    @foreach ($value as $optionKey => $optionValue)
+                        <option value="{{ $optionKey }}">{{ $optionValue }}</option>
+                    @endforeach
+                </optgroup>
+            @else
+                <option value="{{ $key }}">{{ $value }}</option>
+            @endif
+        @endforeach
+    </select>
+@endif

resources/views/components/tools/toolbar.blade.php

@@ -843,7 +843,7 @@ class="form-select"
             @endif
 
             @if ($component->hasConfigurableAreaFor('toolbar-right-end'))
-                @include($component->getConfigurableAreaFor('toolbar-right-end'), $component->getParametersForConfigurableArea('toolbar-righ-end'))
+                @include($component->getConfigurableAreaFor('toolbar-right-end'), $component->getParametersForConfigurableArea('toolbar-right-end'))
             @endif
         </div>
     </div>

resources/views/components/wrapper.blade.php

@@ -13,7 +13,7 @@
     @endif
 
     @if ($component->isFilterLayoutSlideDown())
-        x-data="{ filtersOpen: false }"
+        wire:ignore.self x-data="{ filtersOpen: $wire.filterSlideDownDefaultVisible }"
     @endif
 >
      @include('livewire-tables::includes.debug')

src/Traits/Configuration/FilterConfiguration.php

@@ -137,4 +137,36 @@ public function setFilterLayoutSlideDown(): self
 
         return $this;
     }
+
+    /**
+     * @param  bool $status
+     *
+     * @return $this
+     */
+    public function setFilterSlideDownDefaultStatus(bool $status): self
+    {
+        $this->filterSlideDownDefaultVisible = $status;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setFilterSlideDownDefaultStatusDisabled(): self
+    {
+        $this->setFilterSlideDownDefaultStatus(false);
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setFilterSlideDownDefaultStatusEnabled(): self
+    {
+        $this->setFilterSlideDownDefaultStatus(true);
+
+        return $this;
+    }
 }

src/Traits/Helpers/FilterHelpers.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Rappasoft\LaravelLivewireTables\Views\Filter;
+use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter;
 use Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter;
 
 trait FilterHelpers
@@ -38,6 +39,21 @@ public function filtersVisibilityIsDisabled(): bool
         return $this->getFiltersVisibilityStatus() === false;
     }
 
+    public function getFilterSlideDownDefaultStatus(): bool
+    {
+        return $this->filterSlideDownDefaultVisible;
+    }
+
+    public function filtersSlideDownIsDefaultVisible(): bool
+    {
+        return $this->getFilterSlideDownDefaultStatus() === true;
+    }
+
+    public function filtersSlideDownIsDefaultHidden(): bool
+    {
+        return $this->getFilterSlideDownDefaultStatus() === false;
+    }
+
     public function getFilterPillsStatus(): bool
     {
         return $this->filterPillsStatus;
@@ -91,7 +107,7 @@ public function selectAllFilterOptions(string $filterKey): void
     {
         $filter = $this->getFilterByKey($filterKey);
 
-        if (! $filter instanceof MultiSelectFilter) {
+        if (! $filter instanceof MultiSelectFilter && ! $filter instanceof MultiSelectDropdownFilter) {
             return;
         }
 
@@ -175,7 +191,7 @@ public function resetFilter($filter): void
         if (! $filter instanceof Filter) {
             $filter = $this->getFilterByKey($filter);
         }
-        
+
         $this->setFilter($filter->getKey(), $filter->getDefaultValue());
     }
 

src/Traits/WithData.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait WithData
@@ -77,6 +78,7 @@ protected function joinRelation(Column $column): Builder
             $model = $lastQuery->getRelation($relationPart);
 
             switch (true) {
+                case $model instanceof MorphOne:
                 case $model instanceof HasOne:
                     $table = $model->getRelated()->getTable();
                     $foreign = $model->getQualifiedForeignKeyName();
@@ -139,7 +141,7 @@ protected function getTableForColumn(Column $column): ?string
         foreach ($column->getRelations() as $relationPart) {
             $model = $lastQuery->getRelation($relationPart);
 
-            if ($model instanceof HasOne || $model instanceof BelongsTo) {
+            if ($model instanceof HasOne || $model instanceof BelongsTo || $model instanceof MorphOne) {
                 $table = $model->getRelated()->getTable();
             }
 

src/Traits/WithFilters.php

@@ -14,6 +14,7 @@ trait WithFilters
     public bool $filtersStatus = true;
     public bool $filtersVisibilityStatus = true;
     public bool $filterPillsStatus = true;
+    public bool $filterSlideDownDefaultVisible = false;
     public string $filterLayout = 'popover';
 
     public function filters(): array