Merge pull request #1297 from lee-to/fix-issue-1294

fix: Issue (HasMany resource item)
moonshine-software · Oct 12, 2024 · a1c827c · a1c827c
2 parents 699cf28 + c7f777c
commit a1c827c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 12 deletions.
diff --git a/src/Buttons/HasManyButton.php b/src/Buttons/HasManyButton.php
@@ -21,7 +21,7 @@ public static function for(
         ?ActionButton $button = null,
     ): ActionButton {
         /** @var ModelResource $resource */
-        $resource = $field->getResource();
+        $resource = $field->getResource()->stopGettingItemFromUrl();
         $parentResource = moonshineRequest()->getResource();
         $parentPage = moonshineRequest()->getPage();
 

diff --git a/src/Fields/Relationships/HasMany.php b/src/Fields/Relationships/HasMany.php
@@ -277,7 +277,7 @@ protected function tablePreview(): TableBuilder
                 ->implode(';');
         }
 
-        $resource = $this->getResource();
+        $resource = $this->getResource()->stopGettingItemFromUrl();
 
         return TableBuilder::make(items: $items)
             ->fields($this->getFieldsOnPreview())
@@ -372,7 +372,7 @@ protected function tableValue(): MoonShineRenderable
 
     protected function getItemButtons(): array
     {
-        $resource = $this->getResource();
+        $resource = $this->getResource()->stopGettingItemFromUrl();
 
         $redirectAfter = $this->isAsync()
             ? ''

diff --git a/src/Fields/Relationships/HasOne.php b/src/Fields/Relationships/HasOne.php
@@ -85,7 +85,7 @@ protected function resolvePreview(): View|string
                 ->implode(';');
         }
 
-        $resource = $this->getResource();
+        $resource = $this->getResource()->stopGettingItemFromUrl();
 
         return TableBuilder::make(items: $items)
             ->fields($this->getFieldsOnPreview())
@@ -134,7 +134,7 @@ private function getFieldsOnPreview(): Closure
      */
     protected function resolveValue(): MoonShineRenderable
     {
-        $resource = $this->getResource();
+        $resource = $this->getResource()->stopGettingItemFromUrl();
 
         /** @var ModelResource $parentResource */
         $parentResource = moonshineRequest()->getResource();

diff --git a/src/Http/Controllers/RelationModelFieldController.php b/src/Http/Controllers/RelationModelFieldController.php
@@ -141,7 +141,8 @@ public function hasManyForm(RelationModelFieldRequest $request): string
         $resource = $field->getResource();
 
         $item = $resource
-            ->setItemID($request->input('_key', ''))
+            ->stopGettingItemFromUrl()
+            ->setItemID($request->input('_key'))
             ->getItemOrInstance();
 
         $update = $item->exists;

diff --git a/src/Traits/Resource/ResourceModelPolicy.php b/src/Traits/Resource/ResourceModelPolicy.php
@@ -43,9 +43,15 @@ public function can(string $ability): bool
         }
 
         $user = MoonShineAuth::guard()->user();
+        $item = $this->getModel();
 
-        $checkCustomRules = moonshine()->authorizationRules()
-            ->every(fn ($rule) => $rule($this, $user, $ability, $this->getItem() ?? $this->getModel()));
+        if (! in_array($ability, ['create', 'massDelete'])) {
+            $item = $this->getItemOrInstance();
+        }
+
+        $checkCustomRules = moonshine()
+            ->authorizationRules()
+            ->every(fn($rule) => $rule($this, $user, $ability, $item));
 
         if (! $checkCustomRules) {
             return false;
@@ -55,8 +61,7 @@ public function can(string $ability): bool
             return true;
         }
 
-        return Gate::forUser($user)
-            ->allows($ability, $this->getItem() ?? $this->getModel());
+        return Gate::forUser($user)->allows($ability, $item);
     }
 
     public function isWithPolicy(): bool

diff --git a/src/Traits/Resource/ResourceModelQuery.php b/src/Traits/Resource/ResourceModelQuery.php
@@ -48,11 +48,20 @@ trait ResourceModelQuery
 
     protected int|string|null $itemID = null;
 
+    protected bool $stopGettingItemFromUrl = false;
+
     protected array $parentRelations = [];
 
     // TODO 3.0 rename to saveQueryState
     protected bool $saveFilterState = false;
 
+    public function stopGettingItemFromUrl(): static
+    {
+        $this->stopGettingItemFromUrl = true;
+
+        return $this;
+    }
+
     public function setItemID(int|string|null $itemID): static
     {
         $this->itemID = $itemID;
@@ -62,11 +71,20 @@ public function setItemID(int|string|null $itemID): static
 
     public function getItemID(): int|string|null
     {
-        if ($this->itemID === '') {
+        // empty string is the value that stops the logic
+        if($this->itemID === '') {
+            return null;
+        }
+
+        if(!blank($this->itemID)) {
+            return $this->itemID;
+        }
+
+        if($this->stopGettingItemFromUrl) {
             return null;
         }
 
-        return $this->itemID ?? moonshineRequest()->getItemID();
+        return moonshineRequest()->getItemID();
     }
 
     /**