fix: Issue filters with enum

Issue #1486
moonshine-software · Jan 20, 2025 · 6c3bd4f · 6c3bd4f
1 parent 6e2641c
commit 6c3bd4f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/Laravel/src/Applies/Filters/SelectModelApply.php b/src/Laravel/src/Applies/Filters/SelectModelApply.php
@@ -20,10 +20,12 @@ public function apply(FieldContract $field): Closure
     {
         return static function (Builder $query) use ($field): void {
             if (filled($field->getRequestValue())) {
+                $values = $field->getRequestValue();
+
                 $query->when(
                     $field->isMultiple(),
-                    static fn (Builder $q) => $q->whereIn($field->getColumn(), $field->getRequestValue()),
-                    static fn (Builder $q) => $q->where($field->getColumn(), $field->getRequestValue()),
+                    static fn (Builder $q) => $q->whereIn($field->getColumn(), \is_string($values) ? explode(',', $values) : $values),
+                    static fn (Builder $q) => $q->where($field->getColumn(), $values),
                 );
             }
         };

diff --git a/src/Laravel/src/Fields/Relationships/BelongsToMany.php b/src/Laravel/src/Fields/Relationships/BelongsToMany.php
@@ -251,7 +251,7 @@ protected function resolveValue(): mixed
             $this->memoizeValues = $this->getRelation()
                 ?->getRelated()
                 ?->newQuery()
-                ?->findMany($this->toValue()) ?? EloquentCollection::make();
+                ?->findMany(array_keys($this->toValue()->toArray())) ?? EloquentCollection::make();
         }
 
         if ($this->isSelectMode()) {

diff --git a/src/Laravel/src/MoonShineEndpoints.php b/src/Laravel/src/MoonShineEndpoints.php
@@ -178,6 +178,7 @@ public function withRelation(
             'resourceItem' => $resourceItem,
             '_parent_field' => $parentField,
             '_relation' => $relation,
+            '_no_items_query' => true,
         ]);
     }
 }
diff --git a/src/Laravel/src/Pages/Crud/IndexPage.php b/src/Laravel/src/Pages/Crud/IndexPage.php
@@ -257,6 +257,10 @@ protected function getItemsComponent(iterable $items, Fields $fields): Component
      */
     protected function getItemsComponents(): array
     {
+        if(request()->has('_no_items_query')) {
+            return [];
+        }
+
         $this->getResource()->setQueryParams(
             request()->only($this->getResource()->getQueryParamsKeys())
         );