fix: minor

moonshine-software · Sep 18, 2024 · e36ee10 · e36ee10
1 parent 1c33aec
commit e36ee10
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Laravel/src/Traits/Resource/ResourceQuery.php b/src/Laravel/src/Traits/Resource/ResourceQuery.php
@@ -100,6 +100,10 @@ public function isItemExists(): bool
      */
     public function getItem(): mixed
     {
+        if (!is_null($this->item)) {
+            return $this->item;
+        }
+
         if (is_null($this->getItemID())) {
             return null;
         }
@@ -114,6 +118,10 @@ public function getItem(): mixed
      */
     public function getItemOrInstance(): mixed
     {
+        if (!is_null($this->item)) {
+            return $this->item;
+        }
+
         if (is_null($this->getItemID())) {
             return $this->getDataInstance();
         }
@@ -128,6 +136,10 @@ public function getItemOrInstance(): mixed
      */
     public function getItemOrFail(): mixed
     {
+        if (!is_null($this->item)) {
+            return $this->item;
+        }
+
         return $this->itemOr(
             fn () => $this->findItem(orFail: true)
         );

diff --git a/tests/Feature/Controllers/CrudControllerTest.php b/tests/Feature/Controllers/CrudControllerTest.php
@@ -159,7 +159,10 @@ function storeResource(ModelResource $resource, $saveData)
         $resource->getRoute('crud.store'),
         $saveData
     )
-        ->assertRedirect();
+        ->assertRedirect()
+        ->assertRedirectContains(
+            str_replace('5', '', $resource->getFormPageUrl(5))
+        );
 
     return Item::query()->where('name', 'Test name storeData')->first();
 }