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'] }} > - @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) - @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)