fix: relationships always being requested by various methods

saade · Mar 20, 2024 · e928ee4 · e928ee4
1 parent 656dfc4
commit e928ee4
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 17 deletions.
diff --git a/src/Forms/Components/Actions/AddAction.php b/src/Forms/Components/Actions/AddAction.php
@@ -39,10 +39,18 @@ protected function setUp(): void
         );
 
         $this->form(
-            fn (Component $component, Form $form): ?Form => match ($component->hasModal()) {
-                true => $component->getForm($form)
-                    ->model($component->getRelatedModel()),
-                default => null,
+            function (Component $component, Form $form): ?Form {
+                if(! $component->hasModal()) {
+                    return null;
+                }
+
+                $form = $component->getForm($form);
+
+                if( $model = $component->getRelatedModel()) {
+                    $form->model($model);
+                }
+
+                return $form;
             }
         );
 

diff --git a/src/Forms/Components/Actions/AddChildAction.php b/src/Forms/Components/Actions/AddChildAction.php
@@ -39,15 +39,23 @@ protected function setUp(): void
         );
 
         $this->form(
-            fn (Component $component, Form $form): ?Form => match ($component->hasModal()) {
-                true => $component->getForm($form)
-                    ->model($component->getRelatedModel()),
-                default => null,
+            function (Component $component, Form $form): ?Form {
+                if(! $component->hasModal()) {
+                    return null;
+                }
+
+                $form = $component->getForm($form);
+
+                if( $model = $component->getRelatedModel()) {
+                    $form->model($model);
+                }
+
+                return $form;
             }
         );
 
         $this->action(function (Component $component, array $arguments): void {
-            $parentRecord = $component->getCachedExistingRecords()->get($arguments['cachedRecordKey']);
+            $parentRecord = $component->getRelatedModel() ? $component->getCachedExistingRecords()->get($arguments['cachedRecordKey']) : null;
 
             $this->process(function (Component $component, array $arguments, array $data): void {
                 $statePath = $component->getRelativeStatePath($arguments['statePath']);

diff --git a/src/Forms/Components/Actions/DeleteAction.php b/src/Forms/Components/Actions/DeleteAction.php
@@ -29,7 +29,7 @@ protected function setUp(): void
         $this->modalSubmitActionLabel(fn (): string => __('filament-adjacency-list::adjacency-list.actions.delete.modal.actions.confirm'));
 
         $this->action(function (Component $component, array $arguments): void {
-            $record = $component->getCachedExistingRecords()->get($arguments['cachedRecordKey']);
+            $record = $component->getRelatedModel() ? $component->getCachedExistingRecords()->get($arguments['cachedRecordKey']) : null;
 
             $this->process(function (Component $component, array $arguments): void {
                 $statePath = $component->getRelativeStatePath($arguments['statePath']);

diff --git a/src/Forms/Components/Actions/EditAction.php b/src/Forms/Components/Actions/EditAction.php
@@ -29,10 +29,15 @@ protected function setUp(): void
 
         $this->form(
             function (Component $component, Form $form, array $arguments): Form {
-                return $component
+                $form = $component
                     ->getForm($form)
-                    ->model($component->getCachedExistingRecords()->get($arguments['cachedRecordKey']))
                     ->statePath($arguments['statePath']);
+
+                if( $component->getRelatedModel()) {
+                    $form->model($component->getCachedExistingRecords()->get($arguments['cachedRecordKey']));
+                }
+
+                return $form;
             }
         );
 
@@ -43,7 +48,7 @@ function (Component $component, array $arguments): array {
         );
 
         $this->action(function (Component $component, array $arguments): void {
-            $record = $component->getCachedExistingRecords()->get($arguments['cachedRecordKey']);
+            $record = $component->getRelatedModel() ? $component->getCachedExistingRecords()->get($arguments['cachedRecordKey']) : null;
 
             $this->process(function (Component $component, array $arguments, array $data): void {
                 $statePath = $component->getRelativeStatePath($arguments['statePath']);

diff --git a/src/Forms/Components/Concerns/HasRelationship.php b/src/Forms/Components/Concerns/HasRelationship.php
@@ -289,15 +289,21 @@ public function getOrderColumn(): ?string
         return $this->evaluate($this->orderColumn);
     }
 
-    public function getRelationship(): HasMany | BelongsToMany
+    public function getRelationship(): HasMany | BelongsToMany | null
     {
+        $name = $this->getRelationshipName();
+
+        if (blank($name)) {
+            return null;
+        }
+
         if ($model = $this->getModelInstance()) {
             if (! in_array(HasRecursiveRelationships::class, class_uses($model))) {
                 throw new \Exception('The model ' . $model::class . ' must use the ' . HasRecursiveRelationships::class . ' trait.');
             }
         }
 
-        return $model->{$this->getRelationshipName()}();
+        return $model->{$name}();
     }
 
     public function getRelationshipName(): ?string
@@ -347,9 +353,9 @@ public function clearCachedExistingRecords(): void
         $this->cachedExistingRecords = null;
     }
 
-    public function getRelatedModel(): string
+    public function getRelatedModel(): ?string
     {
-        return $this->getRelationship()->getModel()::class;
+        return ($model = $this->getRelationship()?->getModel()) ? $model::class : null;
     }
 
     public function mutateRelationshipDataBeforeCreateUsing(?Closure $callback): static