Merge branch 'hotfix-petrzpav' into main-0

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/).
 
+## [0.12.2] - 2025-04-25
+
+### Fixed
+
+- Fix empty data.
+
 ## [0.12.1] - 2025-04-25
 
 ### Fixed
@@ -300,6 +306,7 @@ _Stable release based on [0.1.0-rc.1]._
 
 - New changelog file.
 
+[0.12.2]: https://https://github.com/internetguru/laravel-model-browser/compare/v0.12.1...v0.12.2
 [0.12.1]: https://https://github.com/internetguru/laravel-model-browser/compare/v0.12.0...v0.12.1
 [0.12.0]: https://https://github.com/internetguru/laravel-model-browser/compare/v0.11.0...v0.12.0
 [0.12.0-rc.1]: https://github.com/internetguru/laravel-model-browser/releases/tag/v0.11.0

VERSION

@@ -1 +1 @@
-0.12.1
+0.12.2

src/Components/BaseModelBrowser.php

@@ -166,17 +166,17 @@ protected function getData(bool $paginate = true, bool $highlightMatches = true,
             ? $this->model::{$this->modelMethod}()
             : $this->model::query()->get();
 
+        if ($data->count() === 0) {
+            return $data;
+        }
+
         // Append missing attributes
         foreach ($this->viewAttributes as $attribute => $trans) {
             if (! isset($data[0]->{$attribute})) {
                 $data[0]->{$attribute} = null;
             }
         }
 
-        if ($data->count() === 0) {
-            return $data;
-        }
-
         if ($applyFormats) {
             $data = $this->format($data);
         }