Merge branch 'staging'

Author: petrzpav

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] - 2025-06-20
+
+_Stable release based on [1.2.0-rc.1]._
+
+## [1.2.0-rc.1] - 2025-06-20
+
 ## [1.1.2] - 2025-06-11
 
 ### Fixed
@@ -357,6 +363,8 @@ _Stable release based on [0.1.0-rc.1]._
 
 - New changelog file.
 
+[1.2.0]: https://https://github.com/internetguru/laravel-model-browser/compare/v1.1.2...v1.2.0
+[1.2.0-rc.1]: https://github.com/internetguru/laravel-model-browser/releases/tag/v1.1.2
 [1.1.2]: https://https://github.com/internetguru/laravel-model-browser/compare/v1.1.1...v1.1.2
 [1.1.1]: https://https://github.com/internetguru/laravel-model-browser/compare/v1.1.0...v1.1.1
 [1.1.0]: https://https://github.com/internetguru/laravel-model-browser/compare/v1.0.3...v1.1.0

VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

resources/views/livewire/table.blade.php

@@ -26,7 +26,9 @@ class="table-wrapper"
     >
 
         <div class="d-flex justify-content-end alig-items-center gap-3 m-3">
-            <x-model-browser::filter :$filter :$viewAttributes />
+            @if (!empty ($this->filterAttributes))
+                <x-model-browser::filter :$filter :$viewAttributes />
+            @endif
             <div class="mt-3">
                 <x-model-browser::fullscreen-button />
             </div>

src/Components/BaseModelBrowser.php

@@ -21,7 +21,7 @@ class BaseModelBrowser extends Component
 
     public const PER_PAGE_MIN = 3;
     public const PER_PAGE_MAX = 150;
-    public const PER_PAGE_DEFAULT = 50;
+    public const PER_PAGE_DEFAULT = 20;
 
     #[Locked]
     public string $model;
@@ -177,33 +177,37 @@ protected function getData(bool $paginate = true, bool $highlightMatches = true,
             }
         }
 
-        if ($applyFormats) {
+        $applyFormatsOnAll = ! empty($this->filterAttributes) || $this->enableSort;
+
+        if ($applyFormats && $applyFormatsOnAll) {
             $data = $this->format($data);
         }
 
-        if ($this->filter) {
+        if (! empty($this->filterAttributes) && $this->filter) {
             $data = $this->applyFilter($data);
         }
 
-        // Multi-column sort
-        $sort = $this->sort;
-        foreach ($this->defaultSort as $attribute => $direction) {
-            if (! isset($sort[$attribute])) {
-                $sort[$attribute] = $direction;
+        if ($this->enableSort) {
+            // Multi-column sort
+            $sort = $this->sort;
+            foreach ($this->defaultSort as $attribute => $direction) {
+                if (! isset($sort[$attribute])) {
+                    $sort[$attribute] = $direction;
+                }
             }
-        }
-        if (! empty($sort)) {
-            $sortByArg = [];
-            foreach ($sort as $attribute => $direction) {
-                if (is_callable($this->sortComparators[$attribute][$direction] ?? null)) {
-                    $sortByArg[] = Closure::fromCallable($this->sortComparators[$attribute][$direction]);
-                } else {
-                    $sortByArg[] = fn ($a, $b) => $direction === 'desc'
-                        ? str($this->itemValueStripped($b, $attribute))->ascii() <=> str($this->itemValueStripped($a, $attribute))->ascii()
-                        : str($this->itemValueStripped($a, $attribute))->ascii() <=> str($this->itemValueStripped($b, $attribute))->ascii();
+            if (! empty($sort)) {
+                $sortByArg = [];
+                foreach ($sort as $attribute => $direction) {
+                    if (is_callable($this->sortComparators[$attribute][$direction] ?? null)) {
+                        $sortByArg[] = Closure::fromCallable($this->sortComparators[$attribute][$direction]);
+                    } else {
+                        $sortByArg[] = fn ($a, $b) => $direction === 'desc'
+                            ? str($this->itemValueStripped($b, $attribute))->ascii() <=> str($this->itemValueStripped($a, $attribute))->ascii()
+                            : str($this->itemValueStripped($a, $attribute))->ascii() <=> str($this->itemValueStripped($b, $attribute))->ascii();
+                    }
                 }
+                $data = $data->sortBy($sortByArg);
             }
-            $data = $data->sortBy($sortByArg);
         }
 
         // Paginate manually if required
@@ -222,6 +226,17 @@ protected function getData(bool $paginate = true, bool $highlightMatches = true,
             }
         }
 
+        if ($applyFormats && ! $applyFormatsOnAll) {
+            // Apply formats only to the current page if not applied on all
+            if ($paginate) {
+                $data->setCollection(
+                    $this->format($data->getCollection())
+                );
+            } else {
+                $data = $this->format($data);
+            }
+        }
+
         if ($highlightMatches) {
             $highlightedColumns = $this->filterColumn == 'all' ? $this->filterAttributes : [$this->filterColumn];
             if ($paginate) {