v3.4.19 Development to Master (rappasoft#1934)

lrljoe · web-flow · commit e4c05a8664eb · 2024-09-08T23:05:13.000+01:00
## [v3.4.19] - 2024-09-08 ### Bug Fixes - Adjustment for Laravel 10 GH Workflows by @lrljoe in rappasoft#1933 - Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. by @lrljoe in rappasoft#1932 - Add button type to tailwind pagination blade template by @matzeschmitt in rappasoft#1928
diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.3]
-        laravel: [10]
+        laravel: [11]
         stability: [prefer-dist]
 
     name: PCOV - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
@@ -21,7 +21,7 @@ jobs:
 
     name: PULL PHP-${{ matrix.php }} - Laravel-10
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
@@ -48,7 +48,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
-          tools: phpunit:latest
+          tools: phpunit:9.6
           ini-values: memory_limit=512M
           coverage: none
         env:
@@ -84,7 +84,7 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run Unit Tests
-        run: php ./vendor/bin/paratest --no-coverage --processes=4
+        run: php ./vendor/bin/phpunit --no-coverage
 
 
   test-laravel11:
@@ -100,7 +100,7 @@ jobs:
 
     name: PULL PHP-${{ matrix.php }} - Laravel-11
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -22,7 +22,7 @@ jobs:
 
     name: PHP-${{ matrix.php }} - Laravel-10
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
@@ -49,7 +49,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
-          tools: phpunit:latest
+          tools: phpunit:9.6
           ini-values: memory_limit=512M
           coverage: none
         env:
@@ -101,7 +101,7 @@ jobs:
 
     name: PHP-${{ matrix.php }} - Laravel-11
     env:
-      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
+      extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
       extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## [v3.4.18] - 2024-09-04
+## [v3.4.19] - 2024-09-08
+### Bug Fixes
+- Adjustment for Laravel 10 GH Workflows by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1933
+- Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1932
+- Add button type to tailwind pagination blade template by @matzeschmitt in https://github.com/rappasoft/laravel-livewire-tables/pull/1928
+
+## [v3.4.18] - 2024-09-08
 ### New Features
 - Added translation to Polish by @meavric in https://github.com/rappasoft/laravel-livewire-tables/pull/1925
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,6 @@
          colors="false"
          cacheResult="false" 
          executionOrder="random" 
-         failOnWarning="false" 
          failOnRisky="false" 
          failOnEmptyTestSuite="false" 
          beStrictAboutOutputDuringTests="true" >
diff --git a/resources/views/specific/tailwind/pagination.blade.php b/resources/views/specific/tailwind/pagination.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
@@ -43,7 +43,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>
@@ -70,7 +70,7 @@
                                                     <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-gray-100 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
@@ -83,7 +83,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>
diff --git a/src/Views/Columns/ButtonGroupColumn.php b/src/Views/Columns/ButtonGroupColumn.php
@@ -20,7 +20,9 @@ public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
 
-        $this->label(fn () => null);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|\Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
diff --git a/src/Views/Columns/ImageColumn.php b/src/Views/Columns/ImageColumn.php
@@ -20,8 +20,10 @@ class ImageColumn extends Column
     public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
 
-        $this->label(fn () => null);
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
diff --git a/src/Views/Columns/LinkColumn.php b/src/Views/Columns/LinkColumn.php
@@ -22,7 +22,9 @@ public function __construct(string $title, ?string $from = null)
     {
         parent::__construct($title, $from);
 
-        $this->label(fn () => null);
+        if (! isset($from)) {
+            $this->label(fn () => null);
+        }
     }
 
     public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ public function __construct(string $title, ?string $from = null)`
`20`	`20`	`{`
`21`	`21`	`parent::__construct($title, $from);`
`22`	`22`
`23`		`- $this->label(fn () => null);`
	`23`	`+ if (! isset($from)) {`
	`24`	`+ $this->label(fn () => null);`
	`25`	`+ }`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`public function getContents(Model $row): null\|string\|\Illuminate\Support\HtmlString\|\Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException\|\Illuminate\Contracts\Foundation\Application\|\Illuminate\Contracts\View\Factory\|\Illuminate\Contracts\View\View`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,10 @@ class ImageColumn extends Column`
`20`	`20`	`public function __construct(string $title, ?string $from = null)`
`21`	`21`	`{`
`22`	`22`	`parent::__construct($title, $from);`
	`23`	`+ if (! isset($from)) {`
	`24`	`+ $this->label(fn () => null);`
	`25`	`+ }`
`23`	`26`
`24`		`- $this->label(fn () => null);`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`public function getContents(Model $row): null\|string\|\Illuminate\Support\HtmlString\|DataTableConfigurationException\|\Illuminate\Contracts\Foundation\Application\|\Illuminate\Contracts\View\Factory\|\Illuminate\Contracts\View\View`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ public function __construct(string $title, ?string $from = null)`
`22`	`22`	`{`
`23`	`23`	`parent::__construct($title, $from);`
`24`	`24`
`25`		`- $this->label(fn () => null);`
	`25`	`+ if (! isset($from)) {`
	`26`	`+ $this->label(fn () => null);`
	`27`	`+ }`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`public function getContents(Model $row): null\|string\|\Illuminate\Support\HtmlString\|DataTableConfigurationException\|\Illuminate\Contracts\Foundation\Application\|\Illuminate\Contracts\View\Factory\|\Illuminate\Contracts\View\View`