wip

conedevelopment · Nov 23, 2023 · c3617a1 · c3617a1
1 parent 5aedd4b
commit c3617a1
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 5 deletions.
diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
@@ -201,7 +201,7 @@ public function isNullable(): bool
     }
 
     /**
-     * Set the searachable attribute.
+     * {@inheritdoc}
      */
     public function searchable(bool|Closure $value = true, array $columns = ['id']): static
     {
@@ -218,6 +218,18 @@ public function getSearchableColumns(): array
         return $this->searchableColumns;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isSearchable(): bool
+    {
+        if ($this->isSubResource()) {
+            return false;
+        }
+
+        return parent::isSearchable();
+    }
+
     /**
      * Set the sortable attribute.
      */
@@ -236,6 +248,18 @@ public function getSortableColumn(): string
         return $this->sortableColumn;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isSortable(): bool
+    {
+        if ($this->isSubResource()) {
+            return false;
+        }
+
+        return parent::isSortable();
+    }
+
     /**
      * Set the display resolver.
      */

diff --git a/src/Fields/URL.php b/src/Fields/URL.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Cone\Root\Fields;
+
+use Closure;
+
+class URL extends Text
+{
+    /**
+     * Create a new field instance.
+     */
+    public function __construct(string $label, Closure|string $modelAttribute = null)
+    {
+        parent::__construct($label, $modelAttribute);
+
+        $this->type('url');
+    }
+}
diff --git a/src/Filters/Sort.php b/src/Filters/Sort.php
@@ -8,6 +8,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\Relation as EloquentRelation;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Http\Request;
 
 class Sort extends Filter
@@ -53,11 +54,12 @@ public function apply(Request $request, Builder $query, mixed $value): Builder
         $relation = EloquentRelation::noConstraints(static function () use ($query, $value): EloquentRelation {
             $relation = call_user_func([$query->getModel(), $value['by']]);
 
-            $key = $relation instanceof BelongsTo
-                ? $relation->getQualifiedOwnerKeyName()
-                : $relation->getQualifiedParentKeyName();
+            $key = match (true) {
+                $relation instanceof BelongsTo => $relation->getQualifiedOwnerKeyName(),
+                default => $relation->getQualifiedParentKeyName(),
+            };
 
-            return $relation->whereField($relation->getQualifiedForeignKeyName(), '=', $key);
+            return $relation->whereColumn($relation->getQualifiedForeignKeyName(), $key);
         });
 
         return $query->orderBy(