converted getNestedResource to a non-static method

GuavaCZ · Jun 13, 2024 · 1b7049f · 1b7049f
1 parent 54e4236
commit 1b7049f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/Actions/NestedCreateAction.php b/src/Actions/NestedCreateAction.php
@@ -9,7 +9,7 @@ trait NestedCreateAction
 {
     protected function configureCreateAction(CreateAction $action): void
     {
-        $resource = static::getNestedResource();
+        $resource = $this->getNestedResource();
 
         /** @var Ancestor $ancestor */
         $ancestor = $resource::getAncestor();

diff --git a/src/Actions/NestedEditAction.php b/src/Actions/NestedEditAction.php
@@ -13,7 +13,7 @@ protected function configureEditAction(Tables\Actions\EditAction $action): void
         parent::configureEditAction($action);
 
         $action->url(
-            fn (Model $record) => static::getNestedResource($record)::getUrl(
+            fn (Model $record) => $this->getNestedResource($record)::getUrl(
                 'edit',
                 ['record' => $record],
             )

diff --git a/src/Actions/NestedViewAction.php b/src/Actions/NestedViewAction.php
@@ -13,7 +13,7 @@ protected function configureViewAction(Tables\Actions\ViewAction $action): void
         parent::configureViewAction($action);
 
         $action->url(
-            fn (Model $record) => static::getNestedResource($record)::getUrl(
+            fn (Model $record) => $this->getNestedResource($record)::getUrl(
                 'view',
                 ['record' => $record],
             )

diff --git a/src/Concerns/NestedRelationManager.php b/src/Concerns/NestedRelationManager.php
@@ -17,12 +17,12 @@ trait NestedRelationManager
     use NestedEditAction;
     use NestedViewAction;
 
-    public static function getNestedResource(?Model $record = null): string
+    public function getNestedResource(?Model $record = null): string
     {
         if (property_exists(static::class, 'nestedResource')) {
             return static::$nestedResource;
         }
 
-        return Filament::getModelResource($record ?? static::getRelationship()->getRelated());
+        return Filament::getModelResource($record ?? $this->getRelationship()->getRelated());
     }
 }
diff --git a/src/Pages/CreateRelatedRecord.php b/src/Pages/CreateRelatedRecord.php
@@ -84,7 +84,7 @@ public function getRecord(): Model
 
     protected function authorizeAccess(): void
     {
-        abort_unless(static::getNestedResource()::canCreate(), 403);
+        abort_unless($this->getNestedResource()::canCreate(), 403);
     }
 
     protected function fillForm(): void
@@ -183,7 +183,7 @@ protected function handleRecordCreation(array $data): Model
         }
 
         if (
-            static::getNestedResource($record)::isScopedToTenant() &&
+            $this->getNestedResource($record)::isScopedToTenant() &&
             ($tenant = Filament::getTenant())
         ) {
             return $this->associateRecordWithTenant($record, $tenant);
@@ -209,7 +209,7 @@ protected function associateRecordWithParent(Model $record, Model $owner)
 
     protected function associateRecordWithTenant(Model $record, Model $tenant): Model
     {
-        $relationship = static::getNestedResource($record)::getTenantRelationship($tenant);
+        $relationship = $this->getNestedResource($record)::getTenantRelationship($tenant);
 
         if ($relationship instanceof HasManyThrough) {
             $record->save();
@@ -284,7 +284,7 @@ public function form(Form $form): Form
      */
     protected function getForms(): array
     {
-        $resource = static::getNestedResource();
+        $resource = $this->getNestedResource();
 
         return [
             'form' => $this->form($resource::form(
@@ -303,13 +303,13 @@ public function getFormStatePath(): ?string
         return 'data';
     }
 
-    public static function getNestedResource(?Model $record = null): string
+    public function getNestedResource(?Model $record = null): string
     {
         if (property_exists(static::class, 'nestedResource')) {
             return static::$nestedResource;
         }
 
-        return Filament::getModelResource($record ?? static::getRelation()->getRelated());
+        return Filament::getModelResource($record ?? $this->getRelation()->getRelated());
     }
 
     public static function canCreateAnother(): bool
@@ -324,7 +324,7 @@ public static function disableCreateAnother(): void
 
     protected function getRedirectUrl(): string
     {
-        $resource = static::getNestedResource($this->getRecord());
+        $resource = $this->getNestedResource($this->getRecord());
 
         if ($resource::hasPage('view') && $resource::canView($this->getRecord())) {
             return $resource::getUrl('view', ['record' => $this->getRecord(), ...$this->getRedirectUrlParameters()]);