Fix listing filters

statamic-rad-pack · Dec 20, 2024 · bf3568a · bf3568a
1 parent 7822e57
commit bf3568a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
@@ -24,7 +24,7 @@
                             <field-filter
                                 ref="fieldFilter"
                                 :config="fieldFilter"
-                                :values="activeFilters.fields || {}"
+                                :values="activeFilters['runway-fields'] || {}"
                                 :badges="fieldFilterBadges"
                                 @changed="$emit('changed', {handle: 'runway-fields', values: $event})"
                                 @cleared="creating = false"

diff --git a/resources/js/components/resources/Listing.vue b/resources/js/components/resources/Listing.vue
@@ -59,6 +59,7 @@
 
                     <div>
                         <data-list-filters
+                            ref="filters"
                             :filters="filters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"

diff --git a/src/Scopes/Fields.php b/src/Scopes/Fields.php
@@ -20,8 +20,10 @@ public function visibleTo($key): bool
     public function apply($query, $values): void
     {
         $this->getFields()
-            ->filter(fn (Field $field, string $handle) => Arr::has($values, $handle))
-            ->each(function (Field $field, string $handle) use ($query, $values) {
+            ->filter(function ($field, $handle) use ($values) {
+                return isset($values[$handle]);
+            })
+            ->each(function ($field, $handle) use ($query, $values) {
                 $filter = $field->fieldtype()->filter();
                 $values = $filter->fields()->addValues($values[$handle])->process()->values();
                 $filter->apply($query, $handle, $values);