Merge pull request #419 from awcodes/fix/column-relationship-query-again

Fix: tweaks relationship query for cuartor column
awcodes · Jan 12, 2024 · ccb90a9 · ccb90a9
2 parents c9d2409 + 1e8539c
commit ccb90a9
Showing 1 changed file with 4 additions and 33 deletions.
diff --git a/src/Components/Tables/CuratorColumn.php b/src/Components/Tables/CuratorColumn.php
@@ -57,49 +57,20 @@ public function applyEagerLoading(EloquentBuilder|Relation $query): EloquentBuil
     {
         $model = $query->getModel();
 
-        if ($model instanceof Media || is_subclass_of(Media::class, $model)) {
+        if (!$this->queriesRelationships($query->getModel())) {
             return $query;
         }
 
-        if (str($this->getName())->contains('.')) {
-            if (!$this->queriesRelationships($query->getModel())) {
-                return $query;
-            }
-
-            $relationshipName = $this->getRelationshipName();
-        } else {
+        if ($model instanceof Media || is_subclass_of(Media::class, $model)) {
             return $query;
         }
 
+        $relationshipName = $this->getRelationshipName();
+
         if (array_key_exists($relationshipName, $query->getEagerLoads())) {
             return $query;
         }
 
         return $query->with([$relationshipName]);
     }
-
-    public function getRelationship(Model $record, ?string $name = null): ?Relation
-    {
-        $relationship = null;
-
-        if (str($this->getName())->contains('.')) {
-            foreach (explode('.', $name ?? $this->getRelationshipName()) as $nestedRelationshipName) {
-                if (!$record->isRelation($nestedRelationshipName)) {
-                    $relationship = null;
-
-                    break;
-                }
-
-                $relationship = $record->{$nestedRelationshipName}();
-                $record = $relationship->getRelated();
-            }
-        } else {
-            $nestedRelationshipName = $name ?? $this->getRelationshipName();
-            if ($record->isRelation($nestedRelationshipName)) {
-                $relationship = $record->{$nestedRelationshipName}();
-            }
-        }
-
-        return $relationship;
-    }
 }