From bfb6b9c2bf712a7cc2d31b40b60bd626f713879c Mon Sep 17 00:00:00 2001
From: Luan Freitas <33601626+luanfreitasdev@users.noreply.github.com>
Date: Wed, 13 Mar 2024 19:05:03 -0300
Subject: [PATCH] [Fix] selecting a filter from select filter empties all
 filter select inputs (#1460)

* Reorder resolveFilters - Add computedDatasource

* Reorder resolveFilters - Add computedDatasource

* Make laravel stable
---
 .github/workflows/sqlite.yml                  |  7 +++-
 composer.json                                 |  2 +-
 .../bootstrap5/filters/select.blade.php       | 10 ++++-
 .../tailwind/filters/select.blade.php         | 10 ++++-
 .../views/components/inputs/select.blade.php  | 17 +++++++--
 src/Components/Filters/FilterSelect.php       |  9 +++++
 src/Concerns/Filter.php                       |  5 ++-
 src/DataSource/Builder.php                    |  7 +---
 src/PowerGridComponent.php                    |  4 +-
 src/ProcessDataSource.php                     |  4 +-
 tests/Feature/Filters/FilterSelectTest.php    | 38 ++++++++++++++++++-
 11 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/sqlite.yml b/.github/workflows/sqlite.yml
index 4feaf1ad..05165e31 100644
--- a/.github/workflows/sqlite.yml
+++ b/.github/workflows/sqlite.yml
@@ -24,6 +24,11 @@ jobs:
         exclude:
           - php: 8.1
             laravel: 11.*
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
         dependency-version: [ prefer-stable ]
 
     name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}
@@ -54,7 +59,7 @@ jobs:
 
       - name: Install Composer dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer install
 
       - name: Install openspout/openspout
diff --git a/composer.json b/composer.json
index 3d71b810..f360d818 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "PowerGrid generates Advanced Datatables using Laravel Livewire.",
   "homepage": "https://github.com/power-components/livewire-powergrid",
   "license": "MIT",
-  "minimum-stability": "dev",
+  "minimum-stability": "stable",
   "prefer-stable": true,
   "authors": [
     {
diff --git a/resources/views/components/frameworks/bootstrap5/filters/select.blade.php b/resources/views/components/frameworks/bootstrap5/filters/select.blade.php
index 0784f8be..9b212db7 100644
--- a/resources/views/components/frameworks/bootstrap5/filters/select.blade.php
+++ b/resources/views/components/frameworks/bootstrap5/filters/select.blade.php
@@ -35,7 +35,15 @@ class="{{ $filterClasses }}"
             {{ $defaultAttributes['selectAttributes'] }}
         >
             <option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
-            @foreach (data_get($filter, 'dataSource') as $key => $item)
+
+            @php
+                $computedDatasource = data_get($filter, 'computedDatasource');
+                $dataSource = filled($computedDatasource)
+                    ? $this->{$computedDatasource}
+                    : data_get($filter, 'dataSource');
+            @endphp
+
+            @foreach ($dataSource as $key => $item)
                 <option
                     wire:key="select-{{ $tableName }}-{{ $key }}"
                     value="{{ $item[data_get($filter, 'optionValue')] }}"
diff --git a/resources/views/components/frameworks/tailwind/filters/select.blade.php b/resources/views/components/frameworks/tailwind/filters/select.blade.php
index 8129b535..f9373342 100644
--- a/resources/views/components/frameworks/tailwind/filters/select.blade.php
+++ b/resources/views/components/frameworks/tailwind/filters/select.blade.php
@@ -40,7 +40,15 @@ class="{{ $filterClasses }}"
                 {{ $defaultAttributes['selectAttributes'] }}
             >
                 <option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
-                @foreach (data_get($filter, 'dataSource') as $key => $item)
+
+                @php
+                    $computedDatasource = data_get($filter, 'computedDatasource');
+                    $dataSource = filled($computedDatasource)
+                        ? $this->{$computedDatasource}
+                        : data_get($filter, 'dataSource');
+                @endphp
+
+                @foreach ($dataSource as $key => $item)
                     <option
                         wire:key="select-{{ $tableName }}-{{ $key }}"
                         value="{{ $item[data_get($filter, 'optionValue')] }}"
diff --git a/resources/views/components/inputs/select.blade.php b/resources/views/components/inputs/select.blade.php
index f9f5c668..2dbdb7aa 100644
--- a/resources/views/components/inputs/select.blade.php
+++ b/resources/views/components/inputs/select.blade.php
@@ -13,10 +13,19 @@
     $collection = collect();
 
     if (filled(data_get($filter, 'dataSource'))) {
-        $collection = collect(data_get($filter, 'dataSource'))->transform(function (array|\Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model $entry) use ($filter) {
-            if (is_array($entry)) {
-                $entry = collect($entry);
-            }
+        $collection = collect(data_get($filter, 'dataSource'))
+            ->transform(function (array|\Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model $entry) use ($filter) {
+                if (is_array($entry)) {
+                    $entry = collect($entry);
+                }
+            return $entry->only([data_get($filter, 'optionValue'), data_get($filter, 'optionLabel')]);
+        });
+    } elseif (filled(data_get($filter, 'computedDatasource'))) {
+        $collection = collect(data_get($filter, 'computedDatasource'))
+            ->transform(function (array|\Illuminate\Support\Collection|\Illuminate\Database\Eloquent\Model $entry) use ($filter) {
+                if (is_array($entry)) {
+                    $entry = collect($entry);
+                }
             return $entry->only([data_get($filter, 'optionValue'), data_get($filter, 'optionLabel')]);
         });
     }
diff --git a/src/Components/Filters/FilterSelect.php b/src/Components/Filters/FilterSelect.php
index 495c4c98..c9bd5745 100644
--- a/src/Components/Filters/FilterSelect.php
+++ b/src/Components/Filters/FilterSelect.php
@@ -17,6 +17,8 @@ class FilterSelect extends FilterBase
 
     public array $depends = [];
 
+    public string $computedDatasource = '';
+
     public function depends(array $fields): FilterSelect
     {
         $this->depends = $fields;
@@ -31,6 +33,13 @@ public function dataSource(Collection|array|\Closure $collection): FilterSelect
         return $this;
     }
 
+    public function computedDatasource(string $computedDatasource): FilterSelect
+    {
+        $this->computedDatasource = $computedDatasource;
+
+        return $this;
+    }
+
     public function optionValue(string $value): FilterSelect
     {
         $this->optionValue = $value;
diff --git a/src/Concerns/Filter.php b/src/Concerns/Filter.php
index 00da9947..2bbca1af 100644
--- a/src/Concerns/Filter.php
+++ b/src/Concerns/Filter.php
@@ -300,9 +300,10 @@ private function resolveFilters(): void
 
                     data_set($column, 'filters', (array) $filter);
 
-                    if (isset($this->filters[data_get($filter, 'field')])
+                    if (isset($this->filters[data_get($filter, 'key')])
                         && in_array(data_get($filter, 'field'), array_keys($this->filters[data_get($filter, 'key')]))
-                        && array_values($this->filters[data_get($filter, 'key')])) {
+                        && array_values($this->filters[data_get($filter, 'key')])
+                        && !in_array(data_get($filter, 'field'), array_column($this->enabledFilters, 'field'))) {
                         $this->enabledFilters[] = [
                             'field' => data_get($filter, 'field'),
                             'label' => data_get($column, 'title'),
diff --git a/src/DataSource/Builder.php b/src/DataSource/Builder.php
index 25aaa984..db49b91c 100644
--- a/src/DataSource/Builder.php
+++ b/src/DataSource/Builder.php
@@ -133,11 +133,8 @@ public function filterContains(): Builder
             $search = strtolower($search);
 
             $this->query = $this->query->where(function (EloquentBuilder|QueryBuilder $query) use ($search) {
-                if ($query instanceof QueryBuilder) {
-                    $modelTable = $query->from;
-                } else {
-                    $modelTable = $query->getModel()->getTable();
-                }
+                /** @var string $modelTable */
+                $modelTable = $query instanceof QueryBuilder ? $query->from : $query->getModel()->getTable();
 
                 $columnList = $this->getColumnList($modelTable);
 
diff --git a/src/PowerGridComponent.php b/src/PowerGridComponent.php
index e16cdb53..d2ddda2c 100644
--- a/src/PowerGridComponent.php
+++ b/src/PowerGridComponent.php
@@ -119,8 +119,6 @@ public function mount(): void
         $this->resolveTotalRow();
 
         $this->restoreState();
-
-        $this->resolveFilters();
     }
 
     public function fetchDatasource(): void
@@ -318,6 +316,8 @@ public function render(): Application|Factory|View
         /** @phpstan-ignore-next-line */
         $this->totalCurrentPage = method_exists($data, 'items') ? count($data->items()) : $data->count();
 
+        $this->resolveFilters();
+
         return $this->renderView($data);
     }
 }
diff --git a/src/ProcessDataSource.php b/src/ProcessDataSource.php
index 1ba8db0e..a7e50c58 100644
--- a/src/ProcessDataSource.php
+++ b/src/ProcessDataSource.php
@@ -322,7 +322,9 @@ private static function processBatch(BaseCollection $collection, PowerGridCompon
     protected function setCurrentTable(EloquentBuilder|array|BaseCollection|MorphToMany|Collection|QueryBuilder|null $datasource): void
     {
         if ($datasource instanceof QueryBuilder) {
-            $this->component->currentTable = $datasource->from;
+            /** @var string $from */
+            $from                          = $datasource->from;
+            $this->component->currentTable = $from;
 
             return;
         }
diff --git a/tests/Feature/Filters/FilterSelectTest.php b/tests/Feature/Filters/FilterSelectTest.php
index bb960f68..b538a5f7 100644
--- a/tests/Feature/Filters/FilterSelectTest.php
+++ b/tests/Feature/Filters/FilterSelectTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\{Builder, Collection};
 use PowerComponents\LivewirePowerGrid\Facades\Filter;
 use PowerComponents\LivewirePowerGrid\Tests\Concerns\Models\Category;
 
@@ -74,8 +74,28 @@ public function filters(): array
     }
 };
 
+$computedDatasource = new class () extends DishTableBase {
+    public int $dishId;
+
+    #[\Livewire\Attributes\Computed]
+    public function getAllCategories(): Collection
+    {
+        return Category::all();
+    }
+
+    public function filters(): array
+    {
+        return [
+            Filter::select('category_name', 'category_id')
+                ->computedDatasource('getAllCategories')
+                ->optionValue('id')
+                ->optionLabel('name'),
+        ];
+    }
+};
+
 it('property filter using custom builder', function (string $component, object $params) {
-    $component = livewire($component)
+    livewire($component)
         ->call($params->theme)
         ->set('filters', filterSelect('category_id', 1))
         ->assertSee('Pastel de Nata')
@@ -87,6 +107,20 @@ public function filters(): array
         'bootstrap -> id' => [$customBuilder::class, (object) ['theme' => 'bootstrap', 'field' => 'id']],
     ]);
 
+it('property filter using computed datasource', function (string $component, object $params) {
+    livewire($component)
+        ->call($params->theme)
+        ->assertSee('Pastel de Nata')
+        ->set('filters', filterSelect('category_id', 1))
+        ->assertSee('Almôndegas ao Sugo')
+        ->assertDontSee('Pastel de Nata');
+    ;
+})->group('filters', 'filterSelect')
+    ->with([
+        'tailwind -> id'  => [$computedDatasource::class, (object) ['theme' => 'tailwind', 'field' => 'id']],
+        'bootstrap -> id' => [$computedDatasource::class, (object) ['theme' => 'bootstrap', 'field' => 'id']],
+    ]);
+
 it('property filter using custom collection', function (string $component) {
     livewire($component)
         ->set('filters', filterSelect('id', 2))