From b61d71fb57ba492c3cdaee58ff01132fcc9c28ac Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Tue, 18 Apr 2023 15:06:20 -0400
Subject: [PATCH 01/34] Our listing filters UI got minimalized a step too far.
 splitting the difference here.

---
 resources/css/elements/badges.css             |  4 ++--
 .../js/components/data-list/FilterPresets.vue |  2 +-
 resources/js/components/data-list/Filters.vue |  4 ++--
 .../js/components/data-list/HasFilters.js     | 22 -------------------
 resources/js/components/data-list/Search.vue  |  2 +-
 resources/js/components/entries/Listing.vue   | 21 ++++++------------
 .../View/Composers/JavascriptComposer.php     |  1 -
 7 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/resources/css/elements/badges.css b/resources/css/elements/badges.css
index 490f1bca1f1..e9c978e7133 100644
--- a/resources/css/elements/badges.css
+++ b/resources/css/elements/badges.css
@@ -27,7 +27,7 @@
 }
 
 .filter-badge {
-    @apply text-2xs text-gray-800 bg-white border flex items-center rounded-full;
+    @apply text-2xs text-gray-800 bg-white border border-dashed border-gray-600 flex items-center rounded-full;
     height: 1.625rem;
     padding-left: 10px;
 
@@ -44,6 +44,6 @@
     }
 
     &.filter-badge-control {
-        @apply bg-gray-200 border border-gray-500 border-dashed hover:border-gray-600 hover:bg-gray-300;
+        @apply bg-gray-100 border border-solid rounded-full border-gray-500 hover:border-gray-600 hover:bg-gray-200;
     }
 }
diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index 10682e621e8..74686aba8e0 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="pr-2">
+    <div class="pt-2 pr-2">
         <div class="flex flex-wrap items-center">
 
             <button class="pill-tab mr-1" :class="{ 'active': ! activePreset }" @click="viewAll" v-text="__('All')" />
diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 5431484fc59..042454e1d3c 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="w-full" v-if="isFiltering || isSearching">
-        <div class="flex flex-wrap px-3 border-b pt-2">
+    <div class="shadow-inner bg-gray-300">
+        <div class="flex items-center flex-wrap px-3 border-b pt-2">
 
             <!-- Field filter (requires custom selection UI) -->
             <popover v-if="fieldFilter" placement="bottom-start" :stop-propagation="false" @closed="fieldFilterClosed">
diff --git a/resources/js/components/data-list/HasFilters.js b/resources/js/components/data-list/HasFilters.js
index bc0895395ec..2a230e4f44d 100644
--- a/resources/js/components/data-list/HasFilters.js
+++ b/resources/js/components/data-list/HasFilters.js
@@ -7,8 +7,6 @@ export default {
             activePreset: null,
             activePresetPayload: {},
             searchQuery: '',
-            showFilters: this.$config.get('alwaysShowFilters'),
-            alwaysShowFilters: this.$config.get('alwaysShowFilters'),
         }
     },
 
@@ -101,30 +99,10 @@ export default {
             this.activePreset = null;
             this.activePresetPayload = {};
             this.searchQuery = '';
-            this.showFilters = false;
             this.activeFilters = {};
             this.activeFilterBadges = {};
         },
 
-        filtersHide() {
-            this.showFilters = false;
-            this.searchQuery = '';
-        },
-
-        filtersShow() {
-            this.showFilters = true;
-        },
-
-        handleShowFilters() {
-            this.showFilters = true;
-
-            this.$nextTick(function () {
-                if (this.$refs.search) {
-                    this.$refs.search.focus();
-                }
-            });
-        },
-
         unselectAllItems() {
             if (this.$refs.dataList) {
                 this.$refs.dataList.clearSelections();
diff --git a/resources/js/components/data-list/Search.vue b/resources/js/components/data-list/Search.vue
index 84041781a0e..0650d434867 100644
--- a/resources/js/components/data-list/Search.vue
+++ b/resources/js/components/data-list/Search.vue
@@ -7,7 +7,7 @@
         @input="emitEvent"
         @keyup.esc="reset"
         autofocus
-        class="input-text flex-1 bg-white text-sm">
+        class="input-text flex-1 bg-white text-sm focus:border-blue-300 outline-0">
 </template>
 
 <script>
diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index c5bb8faabd6..e85263d6063 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -16,11 +16,10 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card overflow-hidden p-0 relative">
-                    <div class="flex items-center justify-between p-2 text-sm border-b">
+                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
                             ref="presets"
-                            v-show="alwaysShowFilters || ! showFilters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
                             :active-filters="activeFilters"
@@ -29,23 +28,17 @@
                             :search-query="searchQuery"
                             @selected="selectPreset"
                             @reset="filtersReset"
-                            @hide-filters="filtersHide"
-                            @show-filters="filtersShow"
                         />
 
-                        <data-list-search class="h-8" v-if="showFilters" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                        <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
 
-                        <div class="flex ml-2 space-x-2">
-                            <button class="btn btn-sm" v-text="__('Cancel')" v-show="! alwaysShowFilters && showFilters" @click="filtersHide" />
-                            <button class="btn btn-sm" v-text="__('Save')" v-show="showFilters && isDirty" @click="$refs.presets.savePreset()" />
-                            <button class="btn flex items-center btn-sm w-12" @click="handleShowFilters" v-if="! showFilters" v-tooltip="__('Show Filter Controls (F)')">
-                                <svg-icon name="light/search" class="w-4 h-4" />
-                                <svg-icon name="light/filter-lines" class="w-4 h-4" />
-                            </button>
+                        <div class="flex space-x-2 mt-2">
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="filtersReset" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
-                    <div v-show="!reordering && showFilters">
+                    <div v-show="!reordering">
                         <data-list-filters
                             ref="filters"
                             :filters="filters"
@@ -55,7 +48,7 @@
                             :active-filter-badges="activeFilterBadges"
                             :active-count="activeFilterCount"
                             :search-query="searchQuery"
-                            :is-searching="showFilters"
+                            :is-searching="true"
                             :saves-presets="true"
                             :preferences-prefix="preferencesPrefix"
                             @filter-changed="filterChanged"
diff --git a/src/Http/View/Composers/JavascriptComposer.php b/src/Http/View/Composers/JavascriptComposer.php
index 97d29588ee8..e3e44f790c8 100644
--- a/src/Http/View/Composers/JavascriptComposer.php
+++ b/src/Http/View/Composers/JavascriptComposer.php
@@ -61,7 +61,6 @@ private function protectedVariables()
             'user' => $this->user($user),
             'paginationSize' => config('statamic.cp.pagination_size'),
             'paginationSizeOptions' => config('statamic.cp.pagination_size_options'),
-            'alwaysShowFilters' => config('statamic.cp.always_show_filters'),
             'sites' => $this->sites(),
             'selectedSite' => Site::selected()->handle(),
             'preloadableFieldtypes' => FieldtypeRepository::preloadable()->keys(),

From eeb37694dfcfe26bafd72a136fd71d656a5d5c95 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 18 Apr 2023 15:08:49 -0400
Subject: [PATCH 02/34] Revert "Remove `$pinned` property from filters in php."

This reverts commit bd16164ea7ec375655a7a5eb64dd32b2a44aa852.
---
 src/Query/Scopes/Filter.php         | 2 ++
 src/Query/Scopes/Filters/Site.php   | 2 ++
 src/Query/Scopes/Filters/Status.php | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/Query/Scopes/Filter.php b/src/Query/Scopes/Filter.php
index 0d50d997918..4a3c685861d 100644
--- a/src/Query/Scopes/Filter.php
+++ b/src/Query/Scopes/Filter.php
@@ -11,6 +11,7 @@ abstract class Filter extends Scope implements Arrayable
     use HasTitle, HasFields;
 
     protected $context = [];
+    protected $pinned = false;
 
     public function visibleTo($key)
     {
@@ -58,6 +59,7 @@ public function toArray()
             'handle' => $this->handle(),
             'title' => $this->title(),
             'extra' => $this->extra(),
+            'pinned' => $this->pinned(),
             'auto_apply' => $this->autoApply(),
             'fields' => $this->fields()->toPublishArray(),
             'meta' => $this->fields()->meta(),
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index ceb3368517c..5e5ad092108 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -7,6 +7,8 @@
 
 class Site extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Site');
diff --git a/src/Query/Scopes/Filters/Status.php b/src/Query/Scopes/Filters/Status.php
index ff0688d8ddb..d0ab3c540aa 100644
--- a/src/Query/Scopes/Filters/Status.php
+++ b/src/Query/Scopes/Filters/Status.php
@@ -7,6 +7,8 @@
 
 class Status extends Filter
 {
+    public $pinned = true;
+
     public static function title()
     {
         return __('Status');

From faca7fa862cd842017b7f4a12ee5fa569eb24c57 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 18 Apr 2023 15:09:28 -0400
Subject: [PATCH 03/34] Revert "Remove `$pinned` property from new filter
 stub."

This reverts commit 7a5f75f6450c455e14cdc2060bf9c1b5b08c25e9.
---
 src/Console/Commands/stubs/filter.php.stub | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Console/Commands/stubs/filter.php.stub b/src/Console/Commands/stubs/filter.php.stub
index 170767bfc3d..c8c669807fa 100644
--- a/src/Console/Commands/stubs/filter.php.stub
+++ b/src/Console/Commands/stubs/filter.php.stub
@@ -6,6 +6,13 @@ use Statamic\Query\Scopes\Filter;
 
 class DummyClass extends Filter
 {
+    /**
+     * Pin the filter.
+     *
+     * @var bool
+     */
+    public $pinned = false;
+
     /**
      * Define the filter's title.
      *

From 985140e8fcd8756c8b807fd7a7b2987443b2c736 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 19 Apr 2023 10:35:53 -0400
Subject: [PATCH 04/34] =?UTF-8?q?Field=20filter=20popover=20doesn=E2=80=99?=
 =?UTF-8?q?t=20deal=20with=20standard=20filters.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/data-list/Filters.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 042454e1d3c..8215b70d125 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -22,16 +22,6 @@
                                 @cleared="creating = false"
                                 @closed="closePopover"
                             />
-                            <data-list-filter
-                                v-for="filter in standardFilters"
-                                v-if="creating === filter.handle"
-                                :key="filter.handle"
-                                :filter="filter"
-                                :values="activeFilters[filter.handle]"
-                                @changed="$emit('filter-changed', {handle: filter.handle, values: $event})"
-                                @cleared="creating = false"
-                                @closed="closePopover"
-                            />
                         </div>
                     </div>
                 </template>

From c1e298aa63798c715621e001f7506f12cbed8534 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 19 Apr 2023 10:37:10 -0400
Subject: [PATCH 05/34] Make fields filter pinned by default.

---
 src/Query/Scopes/Filters/Fields.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Query/Scopes/Filters/Fields.php b/src/Query/Scopes/Filters/Fields.php
index 3de57154fcd..e1f01190938 100644
--- a/src/Query/Scopes/Filters/Fields.php
+++ b/src/Query/Scopes/Filters/Fields.php
@@ -11,6 +11,8 @@
 
 class Fields extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Field');

From f169fc8d18a7cf3b3cd8712840a500dd28d8085a Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 19 Apr 2023 11:26:31 -0400
Subject: [PATCH 06/34] Finish bringing back unpinned filters to new UX.

---
 resources/js/components/data-list/Filters.vue | 62 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 8215b70d125..58f4f6930ab 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -27,8 +27,8 @@
                 </template>
             </popover>
 
-            <!-- Standard non-field filters -->
-            <popover v-if="standardFilters.length" v-for="filter in standardFilters" :key="filter.handle" placement="bottom-start" :stop-propagation="false">
+            <!-- Pinned non-field filters -->
+            <popover v-if="pinnedFilters.length" v-for="filter in pinnedFilters" :key="filter.handle" placement="bottom-start" :stop-propagation="false">
                 <template slot="trigger">
                     <button class="filter-badge filter-badge-control mr-2 mb-2">
                         {{ filter.title }}
@@ -48,6 +48,42 @@
                 </template>
             </popover>
 
+            <!-- Unpinned non-field filters -->
+            <popover v-if="unpinnedFilters.length" placement="bottom-start" :stop-propagation="false">
+                <template slot="trigger">
+                    <button class="filter-badge filter-badge-control mr-2 mb-2" @click="resetFilterPopover">
+                        {{ __('Filter') }}
+                        <svg-icon name="micro/chevron-down-xs" class="w-2 h-2 mx-2" />
+                    </button>
+                </template>
+                <template #default="{ close: closePopover }">
+                    <div class="filter-fields w-64">
+                        <h6 v-text="creatingFilterHeader" class="p-3 pb-0" />
+                        <div v-if="showUnpinnedFilterSelection" class="p-3 pt-1">
+                            <button
+                                v-for="filter in unpinnedFilters"
+                                :key="filter.handle"
+                                v-text="filter.title"
+                                class="btn w-full mt-1"
+                                @click="creating = filter.handle"
+                            />
+                        </div>
+                        <div v-else>
+                            <data-list-filter
+                                v-for="filter in unpinnedFilters"
+                                v-if="creating === filter.handle"
+                                :key="filter.handle"
+                                :filter="filter"
+                                :values="activeFilters[filter.handle]"
+                                @changed="$emit('filter-changed', {handle: filter.handle, values: $event})"
+                                @cleared="creating = false"
+                                @closed="closePopover"
+                            />
+                        </div>
+                    </div>
+                </template>
+            </popover>
+
             <!-- Active filter badges -->
             <div class="filter-badge mr-2 mb-2" v-for="(badge, handle) in fieldFilterBadges">
                 <span>{{ badge }}</span>
@@ -122,6 +158,28 @@ export default {
             return this.filters.filter(filter => filter.handle !== 'fields');
         },
 
+        pinnedFilters() {
+            return this.standardFilters.filter(filter => filter.pinned);
+        },
+
+        unpinnedFilters() {
+            return this.standardFilters.filter(filter => ! filter.pinned);
+        },
+
+        creatingFilter() {
+            return _.find(this.unpinnedFilters, filter => filter.handle === this.creating);
+        },
+
+        creatingFilterHeader() {
+            let text = data_get(this.creatingFilter, 'title', 'Filter where');
+
+            return __(text) + ':';
+        },
+
+        showUnpinnedFilterSelection() {
+            return ! this.creating;
+        },
+
         fieldFilterBadges() {
             return data_get(this.activeFilterBadges, 'fields', {});
         },

From aceced6d03bbd634a006611cb3de7d044ab183b7 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 19 Apr 2023 11:40:09 -0400
Subject: [PATCH 07/34] Nit.

---
 resources/js/components/data-list/Filters.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 58f4f6930ab..65f7310cd62 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -27,7 +27,7 @@
                 </template>
             </popover>
 
-            <!-- Pinned non-field filters -->
+            <!-- Standard pinned filters -->
             <popover v-if="pinnedFilters.length" v-for="filter in pinnedFilters" :key="filter.handle" placement="bottom-start" :stop-propagation="false">
                 <template slot="trigger">
                     <button class="filter-badge filter-badge-control mr-2 mb-2">
@@ -48,7 +48,7 @@
                 </template>
             </popover>
 
-            <!-- Unpinned non-field filters -->
+            <!-- Standard unpinned filters -->
             <popover v-if="unpinnedFilters.length" placement="bottom-start" :stop-propagation="false">
                 <template slot="trigger">
                     <button class="filter-badge filter-badge-control mr-2 mb-2" @click="resetFilterPopover">

From 30e4f79053a3da0edd5302ec159b7090b325e85c Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 24 Apr 2023 11:07:49 -0400
Subject: [PATCH 08/34] Pin `Blueprint` filter by default.

---
 src/Query/Scopes/Filters/Blueprint.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Query/Scopes/Filters/Blueprint.php b/src/Query/Scopes/Filters/Blueprint.php
index 112469ed2ba..c049530cfce 100644
--- a/src/Query/Scopes/Filters/Blueprint.php
+++ b/src/Query/Scopes/Filters/Blueprint.php
@@ -9,6 +9,8 @@
 
 class Blueprint extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Blueprint');

From 5beb48b949b1ca43f350fd2cb409bf8696861f4e Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 24 Apr 2023 11:11:09 -0400
Subject: [PATCH 09/34] Pin User `Role` and `Group` filters by default (for
 when we circle back to that listing).

---
 src/Query/Scopes/Filters/UserGroup.php | 2 ++
 src/Query/Scopes/Filters/UserRole.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Query/Scopes/Filters/UserGroup.php b/src/Query/Scopes/Filters/UserGroup.php
index 360b34c1d1d..022d96b2fe7 100644
--- a/src/Query/Scopes/Filters/UserGroup.php
+++ b/src/Query/Scopes/Filters/UserGroup.php
@@ -7,6 +7,8 @@
 
 class UserGroup extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Group');
diff --git a/src/Query/Scopes/Filters/UserRole.php b/src/Query/Scopes/Filters/UserRole.php
index 71a3a77a490..18e4e8aea80 100644
--- a/src/Query/Scopes/Filters/UserRole.php
+++ b/src/Query/Scopes/Filters/UserRole.php
@@ -7,6 +7,8 @@
 
 class UserRole extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Role');

From 48d925a5f6d2fe53bed06a90d05a633ba58dd2f8 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 24 Apr 2023 11:13:47 -0400
Subject: [PATCH 10/34] Pin `Collection` filter by default (only visible in
 `entries` fieldtype stack when there are multiple collections configured).

---
 src/Query/Scopes/Filters/Collection.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Query/Scopes/Filters/Collection.php b/src/Query/Scopes/Filters/Collection.php
index 57f1bf154e1..ddfa4cf9b04 100644
--- a/src/Query/Scopes/Filters/Collection.php
+++ b/src/Query/Scopes/Filters/Collection.php
@@ -7,6 +7,8 @@
 
 class Collection extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Collection');

From 56571cc7199605ba3c4495f132aca3776cee634c Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Mon, 24 Apr 2023 16:03:22 -0400
Subject: [PATCH 11/34] Make consistent with dynamically generated filter
 popovers.

---
 resources/js/components/data-list/FieldFilter.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/data-list/FieldFilter.vue b/resources/js/components/data-list/FieldFilter.vue
index e3f52cb0789..20b4c7544bc 100644
--- a/resources/js/components/data-list/FieldFilter.vue
+++ b/resources/js/components/data-list/FieldFilter.vue
@@ -1,11 +1,11 @@
 <template>
     <div>
         <div v-if="hasAvailableFieldFilters">
-            <div class="flex flex-col p-4">
+            <div class="flex flex-col p-3">
 
                 <v-select
                     ref="fieldSelect"
-                    :placeholder="__('Select field')"
+                    :placeholder="__('Field')"
                     :options="fieldOptions"
                     :reduce="option => option.value"
                     :value="field"

From 736b8cf7a88085c53b85b0e2d98a060890c8e0d8 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 25 Apr 2023 17:03:09 -0400
Subject: [PATCH 12/34] Add filter preset dropdowns.

---
 .../js/components/data-list/FilterPresets.vue      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index 74686aba8e0..ce502e4e443 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -7,9 +7,17 @@
             <template v-for="(preset, handle) in presets">
                 <button class="pill-tab active mr-1" v-if="handle === activePreset">
                     {{ preset.display }}
-                    <button class="opacity-50 hover:opacity-100" @click="showDeleteModal = true">
-                        <span class="w-2 h-2 ml-2 mr-1">&times;</span>
-                    </button>
+                    <dropdown-list class="ml-2" placement="bottom-start">
+                        <template v-slot:trigger>
+                            <button class="opacity-50 hover:opacity-100">
+                                <svg-icon name="micro/chevron-down-xs" class="w-2 h-2" />
+                            </button>
+                        </template>
+                        <dropdown-item :text="__('Duplicate')" @click="duplicatePreset(handle)" />
+                        <dropdown-item :text="__('Rename')" @click="renamePreset(handle)" />
+                        <div class="divider" />
+                        <dropdown-item :text="__('Delete')" class="warning" @click="deletePreset(handle)" />
+                    </dropdown-list>
                 </button>
                 <button class="pill-tab mr-1" v-else @click="viewPreset(handle)">
                     {{ preset.display }}

From e50288d671e5848f10b987f878a8a1aad2072275 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 25 Apr 2023 18:51:30 -0400
Subject: [PATCH 13/34] Use new methods.

---
 resources/js/components/data-list/FilterPresets.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index ce502e4e443..e56eff77bc7 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -13,10 +13,10 @@
                                 <svg-icon name="micro/chevron-down-xs" class="w-2 h-2" />
                             </button>
                         </template>
-                        <dropdown-item :text="__('Duplicate')" @click="duplicatePreset(handle)" />
-                        <dropdown-item :text="__('Rename')" @click="renamePreset(handle)" />
+                        <dropdown-item :text="__('Duplicate')" @click="createPreset" />
+                        <dropdown-item :text="__('Rename')" @click="renamePreset" />
                         <div class="divider" />
-                        <dropdown-item :text="__('Delete')" class="warning" @click="deletePreset(handle)" />
+                        <dropdown-item :text="__('Delete')" class="warning" @click="deletePreset" />
                     </dropdown-list>
                 </button>
                 <button class="pill-tab mr-1" v-else @click="viewPreset(handle)">
@@ -24,7 +24,7 @@
                 </button>
             </template>
 
-            <button class="pill-tab" @click="createNewEmptyPreset" >
+            <button class="pill-tab" @click="createPreset" >
                 <svg-icon name="add" class="w-3 h-3"/>
             </button>
         </div>

From 75bb23b56eb3f1d8ae437dce1e6e1fa453a52574 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 25 Apr 2023 18:51:49 -0400
Subject: [PATCH 14/34] Rename preset gets its own modal.

---
 .../js/components/data-list/FilterPresets.vue | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index e56eff77bc7..cf61a725fdb 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -30,13 +30,23 @@
         </div>
 
         <confirmation-modal
-            :buttonText="__('Save')"
+            v-if="showCreateModal"
             :title="__('Create New View')"
-            v-if="showSaveModal"
-            @cancel="showSaveModal = false"
-            @confirm="handleSavePreset"
+            :buttonText="__('Create')"
+            @cancel="showCreateModal = false"
+            @confirm="savePreset(savingPresetSlug)"
         >
-            <text-input :focus="true" v-model="savingPresetName" @keydown.enter="handleSavePreset" />
+            <text-input :focus="true" v-model="savingPresetName" @keydown.enter="savePreset(savingPresetSlug)" />
+        </confirmation-modal>
+
+        <confirmation-modal
+            v-if="showRenameModal"
+            :title="__('Rename View')"
+            :buttonText="__('Rename')"
+            @cancel="showRenameModal = false"
+            @confirm="savePreset()"
+        >
+            <text-input :focus="true" v-model="savingPresetName" @keydown.enter="savePreset()" />
         </confirmation-modal>
 
         <confirmation-modal
@@ -66,8 +76,9 @@ export default {
     data() {
         return {
             presets: [],
+            showCreateModal: false,
+            showRenameModal: false,
             showDeleteModal: false,
-            showSaveModal: false,
             savingPresetName: null,
             test: 'hello!'
         }

From 327e7efb47852ce4577f198cb1c8512734d8ab89 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 25 Apr 2023 18:52:14 -0400
Subject: [PATCH 15/34] Simplify and rework preset action methods.

---
 .../js/components/data-list/FilterPresets.vue | 93 ++++++++++---------
 1 file changed, 51 insertions(+), 42 deletions(-)

diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index cf61a725fdb..9eee1de4c47 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -99,6 +99,10 @@ export default {
 
             return payload;
         },
+
+        savingPresetSlug() {
+            return this.$slugify(this.savingPresetName, '_');
+        },
     },
 
     created() {
@@ -117,69 +121,74 @@ export default {
             this.viewPreset(handle)
         },
 
-        deletePreset() {
-            this.$preferences.remove(`${this.preferencesKey}.${this.activePreset}`)
-                .then(response => {
-                    this.$emit('deleted', this.activePreset);
-                    this.$toast.success(__('View deleted'));
-                    this.showDeleteModal = false;
-                    this.refreshPresets();
-                })
-                .catch(error => {
-                    this.$toast.error(__('Unable to delete view'));
-                    this.showDeleteModal = false;
-                });
+        refreshPresets() {
+            this.getPresets();
+            this.viewAll();
         },
 
-        savePreset() {
-            if (!this.activePreset) {
-                this.showSaveModal = true;
-                return;
-            }
+        refreshPreset() {
+            this.setPreset(this.activePreset);
+        },
 
-            this.handleSavePreset();
+        viewAll() {
+            this.$emit('reset');
         },
 
-        createNewEmptyPreset() {
+        viewPreset(handle) {
+            this.$emit('selected', handle, this.presets[handle]);
+        },
+
+        createPreset() {
             this.savingPresetName = null;
-            this.showSaveModal = true;
+            this.showCreateModal = true;
         },
 
-        handleSavePreset() {
-            let presetHandle = this.activePreset || this.$slugify(this.savingPresetName, '_');
+        renamePreset() {
+            this.savingPresetName = this.activePresetPayload.display;
+            this.showRenameModal = true;
+        },
+
+        savePreset(handle) {
+            let presetHandle = handle || this.activePreset;
+
+            if (! presetHandle) {
+                this.showCreateModal = true;
+                return;
+            }
 
             this.$preferences.set(`${this.preferencesKey}.${presetHandle}`, this.presetPreferencesPayload)
                 .then(response => {
                     this.$toast.success(__('View saved'));
-                    this.showSaveModal = false;
-                    this.getPresets();
-                    this.viewPreset(presetHandle);
-                    this.hasActiveFilters ? this.refreshPreset() : this.$emit('show-filters');
+                    this.showCreateModal = false;
+                    this.showRenameModal = false;
+                    this.setPreset(presetHandle);
                 })
                 .catch(error => {
                     this.$toast.error(__('Unable to save view'));
-                    this.showSaveModal = false;
+                    this.showCreateModal = false;
+                    this.showRenameModal = false;
                 });
         },
 
-        refreshPresets() {
-            this.getPresets();
-            this.viewAll();
-        },
-
-        refreshPreset() {
-            this.getPresets();
-            this.$emit('hide-filters');
-            this.viewPreset(this.activePreset);
-        },
+        deletePreset() {
+            if (! this.showDeleteModal) {
+                this.showDeleteModal = true;
+                return;
+            }
 
-        viewAll() {
-            this.$emit('reset');
+            this.$preferences.remove(`${this.preferencesKey}.${this.activePreset}`)
+                .then(response => {
+                    this.$emit('deleted', this.activePreset);
+                    this.$toast.success(__('View deleted'));
+                    this.showDeleteModal = false;
+                    this.refreshPresets();
+                })
+                .catch(error => {
+                    this.$toast.error(__('Unable to delete view'));
+                    this.showDeleteModal = false;
+                });
         },
 
-        viewPreset(handle) {
-            this.$emit('selected', handle, this.presets[handle]);
-        },
     },
 
 }

From 8d0bbcb6eea2342fc2c253a5ea3bb21eb0013097 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 25 Apr 2023 18:56:06 -0400
Subject: [PATCH 16/34] HItting reset button in listing should refresh current
 preset, not reset all.

---
 resources/js/components/entries/Listing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index e85263d6063..16413d637f9 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -33,7 +33,7 @@
                         <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
 
                         <div class="flex space-x-2 mt-2">
-                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="filtersReset" />
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
                             <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>

From 6a15d41e421e289914843f30e211b028257b1b23 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 10:13:09 -0400
Subject: [PATCH 17/34] Fix 'Reset' button when 'All' is selected.

---
 resources/js/components/data-list/FilterPresets.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index 9eee1de4c47..f74d24ec29a 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -127,7 +127,11 @@ export default {
         },
 
         refreshPreset() {
-            this.setPreset(this.activePreset);
+            if (this.activePreset) {
+                this.setPreset(this.activePreset);
+            } else {
+                this.viewAll();
+            }
         },
 
         viewAll() {

From 8b1fc089b78da1443d09072dcfd3a3aeefe3623e Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 14:06:01 -0400
Subject: [PATCH 18/34] Port filter changes to users listing.

---
 resources/js/components/users/Listing.vue | 58 ++++++++++-------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index 987ec1a267f..87313a17e1b 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -16,13 +16,10 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card p-0 relative">
-                    <div class="flex items-center justify-between p-2 text-sm border-b">
-
-                        <data-list-search class="h-8" v-if="showFilters" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
                             ref="presets"
-                            v-show="! showFilters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
                             :active-filters="activeFilters"
@@ -34,38 +31,35 @@
                             @hide-filters="filtersHide"
                             @show-filters="filtersShow"
                         />
-                        <div class="flex ml-2 space-x-2">
-                            <button class="btn py-1 px-2 h-8" v-text="__('Cancel')" v-show="showFilters" @click="filtersHide" />
-                            <button class="btn py-1 px-2 h-8" v-text="__('Save')" v-show="showFilters && isDirty" @click="$refs.presets.savePreset()" />
-                            <button class="btn flex items-center py-1 px-2 h-8" @click="handleShowFilters" v-if="! showFilters" v-tooltip="__('Show Filter Controls (F)')">
-                                <svg-icon name="light/search" class="w-4 h-4" />
-                                <svg-icon name="light/filter-lines" class="w-4 h-4" />
-                            </button>
+
+                        <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+
+                        <div class="flex space-x-2 mt-2">
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
 
-                   <div v-show="showFilters">
-                        <data-list-filters
-                            ref="filters"
-                            :filters="filters"
-                            :active-preset="activePreset"
-                            :active-preset-payload="activePresetPayload"
-                            :active-filters="activeFilters"
-                            :active-filter-badges="activeFilterBadges"
-                            :active-count="activeFilterCount"
-                            :search-query="searchQuery"
-                            :is-searching="showFilters"
-                            :saves-presets="true"
-                            :preferences-prefix="preferencesPrefix"
-                            @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
-                            @saved="$refs.presets.setPreset($event)"
-                            @deleted="$refs.presets.refreshPresets()"
-                            @restore-preset="$refs.presets.viewPreset($event)"
-                            @reset="filtersReset"
-                        />
-                    </div>
+                    <data-list-filters
+                        ref="filters"
+                        :filters="filters"
+                        :active-preset="activePreset"
+                        :active-preset-payload="activePresetPayload"
+                        :active-filters="activeFilters"
+                        :active-filter-badges="activeFilterBadges"
+                        :active-count="activeFilterCount"
+                        :search-query="searchQuery"
+                        :is-searching="true"
+                        :saves-presets="true"
+                        :preferences-prefix="preferencesPrefix"
+                        @filter-changed="filterChanged"
+                        @search-changed="searchChanged"
+                        @saved="$refs.presets.setPreset($event)"
+                        @deleted="$refs.presets.refreshPresets()"
+                        @restore-preset="$refs.presets.viewPreset($event)"
+                        @reset="filtersReset"
+                    />
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />
 

From f12d47709d2d35fabb830c7882027d93f47b6dee Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Apr 2023 14:54:17 -0400
Subject: [PATCH 19/34] apply filter ui to stack selector

---
 resources/js/components/inputs/relationship/Selector.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index 47042f428d8..ca3d63714a9 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -19,8 +19,11 @@
             @selections-updated="selectionsUpdated"
         >
             <div slot-scope="{}" class="flex flex-col h-full">
-                <div class="bg-white border-b flex items-center justify-between bg-gray-200">
-                    <div class="p-4 flex flex-1 items-center">
+                <div class="bg-white bg-gray-200">
+                    <div class="p-2">
+                        <data-list-search class="h-8 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                    </div>
+                    <div>
                         <data-list-filters
                             ref="filters"
                             :filters="filters"
@@ -29,8 +32,6 @@
                             :active-count="activeFilterCount"
                             :search-query="searchQuery"
                             @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
-                            @reset="filtersReset"
                         />
                     </div>
                 </div>

From b4e98189d6b73f8dacd9a83adbba4f97874229e8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Apr 2023 14:54:31 -0400
Subject: [PATCH 20/34] remove now-unused events

---
 resources/js/components/entries/Listing.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index 16413d637f9..5e5b28da7f2 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -52,11 +52,9 @@
                             :saves-presets="true"
                             :preferences-prefix="preferencesPrefix"
                             @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
                             @saved="$refs.presets.setPreset($event)"
                             @deleted="$refs.presets.refreshPresets()"
                             @restore-preset="$refs.presets.viewPreset($event)"
-                            @reset="filtersReset"
                         />
                     </div>
 

From f6b9671d43d769b815719ea7c01460d8a82c0618 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 15:05:38 -0400
Subject: [PATCH 21/34] Remove more unused method and events.

---
 resources/js/components/data-list/Filters.vue | 6 ------
 resources/js/components/entries/Listing.vue   | 1 -
 resources/js/components/terms/Listing.vue     | 2 --
 resources/js/components/users/Listing.vue     | 2 --
 4 files changed, 11 deletions(-)

diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index e9c3c7e1c4c..392b1de7607 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -281,12 +281,6 @@ export default {
                 });
         },
 
-        reset() {
-            return this.activePreset
-                ? this.$emit('restore-preset', this.activePreset)
-                : this.$emit('reset');
-        },
-
         remove() {
             this.$preferences.remove(this.preferencesKey)
                 .then(response => {
diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index 5e5b28da7f2..dceecca23a9 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -54,7 +54,6 @@
                             @filter-changed="filterChanged"
                             @saved="$refs.presets.setPreset($event)"
                             @deleted="$refs.presets.refreshPresets()"
-                            @restore-preset="$refs.presets.viewPreset($event)"
                         />
                     </div>
 
diff --git a/resources/js/components/terms/Listing.vue b/resources/js/components/terms/Listing.vue
index c647826d3ca..9996523968d 100644
--- a/resources/js/components/terms/Listing.vue
+++ b/resources/js/components/terms/Listing.vue
@@ -62,8 +62,6 @@
                             @search-changed="searchChanged"
                             @saved="$refs.presets.setPreset($event)"
                             @deleted="$refs.presets.refreshPresets()"
-                            @restore-preset="$refs.presets.viewPreset($event)"
-                            @reset="filtersReset"
                         />
                     </div>
 
diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index 87313a17e1b..c9cb12756da 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -57,8 +57,6 @@
                         @search-changed="searchChanged"
                         @saved="$refs.presets.setPreset($event)"
                         @deleted="$refs.presets.refreshPresets()"
-                        @restore-preset="$refs.presets.viewPreset($event)"
-                        @reset="filtersReset"
                     />
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />

From 4c3ef753582864f370eb3b9bd1e16b869c3230d8 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 15:47:45 -0400
Subject: [PATCH 22/34] Port filter changes to terms listing.

---
 resources/js/components/terms/Listing.vue | 56 ++++++++++-------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/resources/js/components/terms/Listing.vue b/resources/js/components/terms/Listing.vue
index 9996523968d..a211e603059 100644
--- a/resources/js/components/terms/Listing.vue
+++ b/resources/js/components/terms/Listing.vue
@@ -17,13 +17,10 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card overflow-hidden p-0 relative">
-                    <div class="flex items-center justify-between p-2 text-sm border-b">
-
-                        <data-list-search class="h-8" v-if="showFilters" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
                             ref="presets"
-                            v-show="! showFilters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
                             :active-filters="activeFilters"
@@ -32,38 +29,33 @@
                             :search-query="searchQuery"
                             @selected="selectPreset"
                             @reset="filtersReset"
-                            @hide-filters="filtersHide"
-                            @show-filters="filtersShow"
                         />
-                        <div class="flex ml-2 space-x-2">
-                            <button class="btn py-1 px-2 h-8" v-text="__('Cancel')" v-show="showFilters" @click="filtersHide" />
-                            <button class="btn py-1 px-2 h-8" v-text="__('Save')" v-show="showFilters && isDirty" @click="$refs.presets.savePreset()" />
-                            <button class="btn flex items-center py-1 px-2 h-8" @click="handleShowFilters" v-if="! showFilters" v-tooltip="__('Show Filter Controls (F)')">
-                                <svg-icon name="light/search" class="w-4 h-4" />
-                                <svg-icon name="light/filter-lines" class="w-4 h-4" />
-                            </button>
+
+                        <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+
+                        <div class="flex space-x-2 mt-2">
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
-                    <div v-show="showFilters">
-                        <data-list-filters
-                            ref="filters"
-                            :filters="filters"
-                            :active-preset="activePreset"
-                            :active-preset-payload="activePresetPayload"
-                            :active-filters="activeFilters"
-                            :active-filter-badges="activeFilterBadges"
-                            :active-count="activeFilterCount"
-                            :search-query="searchQuery"
-                            :is-searching="showFilters"
-                            :saves-presets="true"
-                            :preferences-prefix="preferencesPrefix"
-                            @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
-                            @saved="$refs.presets.setPreset($event)"
-                            @deleted="$refs.presets.refreshPresets()"
-                        />
-                    </div>
+
+                    <data-list-filters
+                        ref="filters"
+                        :filters="filters"
+                        :active-preset="activePreset"
+                        :active-preset-payload="activePresetPayload"
+                        :active-filters="activeFilters"
+                        :active-filter-badges="activeFilterBadges"
+                        :active-count="activeFilterCount"
+                        :search-query="searchQuery"
+                        :is-searching="true"
+                        :saves-presets="true"
+                        :preferences-prefix="preferencesPrefix"
+                        @filter-changed="filterChanged"
+                        @saved="$refs.presets.setPreset($event)"
+                        @deleted="$refs.presets.refreshPresets()"
+                    />
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />
 

From a7a0703be4bd0809d40bdd73e223456807b7e08c Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 15:48:05 -0400
Subject: [PATCH 23/34] Remove unused events here too.

---
 resources/js/components/forms/SubmissionListing.vue | 6 +-----
 resources/js/components/users/Listing.vue           | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index a8ceb546749..1d1975477b8 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -19,11 +19,7 @@
             <div slot-scope="{ hasSelections }">
                 <div class="card p-0 relative">
                     <div class="data-list-header min-h-16">
-                        <data-list-filters
-                            :search-query="searchQuery"
-                            @search-changed="searchChanged"
-                            @reset="filtersReset"
-                        />
+                        <data-list-filters :search-query="searchQuery" />
                     </div>
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />
diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index c9cb12756da..75ebfa5e990 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -28,8 +28,6 @@
                             :search-query="searchQuery"
                             @selected="selectPreset"
                             @reset="filtersReset"
-                            @hide-filters="filtersHide"
-                            @show-filters="filtersShow"
                         />
 
                         <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
@@ -54,7 +52,6 @@
                         :saves-presets="true"
                         :preferences-prefix="preferencesPrefix"
                         @filter-changed="filterChanged"
-                        @search-changed="searchChanged"
                         @saved="$refs.presets.setPreset($event)"
                         @deleted="$refs.presets.refreshPresets()"
                     />

From 2fb3f4ba1a12c65826981d12cd20419c5f9d145a Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 15:52:11 -0400
Subject: [PATCH 24/34] Rename `filter-changed` event to `changed`.

---
 resources/js/components/data-list/Filters.vue          | 10 +++++-----
 resources/js/components/entries/Listing.vue            |  2 +-
 .../js/components/inputs/relationship/Selector.vue     |  2 +-
 resources/js/components/terms/Listing.vue              |  2 +-
 resources/js/components/users/Listing.vue              |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 392b1de7607..48ad3eeb2d0 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -18,7 +18,7 @@
                                 :config="fieldFilter"
                                 :values="activeFilters.fields || {}"
                                 :badges="fieldFilterBadges"
-                                @changed="$emit('filter-changed', {handle: 'fields', values: $event})"
+                                @changed="$emit('changed', {handle: 'fields', values: $event})"
                                 @cleared="creating = false"
                                 @closed="closePopover"
                             />
@@ -41,7 +41,7 @@
                             :key="filter.handle"
                             :filter="filter"
                             :values="activeFilters[filter.handle]"
-                            @changed="$emit('filter-changed', {handle: filter.handle, values: $event})"
+                            @changed="$emit('changed', {handle: filter.handle, values: $event})"
                             @closed="closePopover"
                         />
                     </div>
@@ -75,7 +75,7 @@
                                 :key="filter.handle"
                                 :filter="filter"
                                 :values="activeFilters[filter.handle]"
-                                @changed="$emit('filter-changed', {handle: filter.handle, values: $event})"
+                                @changed="$emit('changed', {handle: filter.handle, values: $event})"
                                 @cleared="creating = false"
                                 @closed="closePopover"
                             />
@@ -255,11 +255,11 @@ export default {
 
             delete fields[handle];
 
-            this.$emit('filter-changed', {handle: 'fields', values: fields});
+            this.$emit('changed', {handle: 'fields', values: fields});
         },
 
         removeStandardFilter(handle) {
-            this.$emit('filter-changed', {handle: handle, values: null});
+            this.$emit('changed', {handle: handle, values: null});
         },
 
         save() {
diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index dceecca23a9..f4610760a09 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -51,7 +51,7 @@
                             :is-searching="true"
                             :saves-presets="true"
                             :preferences-prefix="preferencesPrefix"
-                            @filter-changed="filterChanged"
+                            @changed="filterChanged"
                             @saved="$refs.presets.setPreset($event)"
                             @deleted="$refs.presets.refreshPresets()"
                         />
diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index ca3d63714a9..5f1c8ec04f6 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -31,7 +31,7 @@
                             :active-filter-badges="activeFilterBadges"
                             :active-count="activeFilterCount"
                             :search-query="searchQuery"
-                            @filter-changed="filterChanged"
+                            @changed="filterChanged"
                         />
                     </div>
                 </div>
diff --git a/resources/js/components/terms/Listing.vue b/resources/js/components/terms/Listing.vue
index a211e603059..6073c437b69 100644
--- a/resources/js/components/terms/Listing.vue
+++ b/resources/js/components/terms/Listing.vue
@@ -52,7 +52,7 @@
                         :is-searching="true"
                         :saves-presets="true"
                         :preferences-prefix="preferencesPrefix"
-                        @filter-changed="filterChanged"
+                        @changed="filterChanged"
                         @saved="$refs.presets.setPreset($event)"
                         @deleted="$refs.presets.refreshPresets()"
                     />
diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index 75ebfa5e990..3e8b1d3428f 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -51,7 +51,7 @@
                         :is-searching="true"
                         :saves-presets="true"
                         :preferences-prefix="preferencesPrefix"
-                        @filter-changed="filterChanged"
+                        @changed="filterChanged"
                         @saved="$refs.presets.setPreset($event)"
                         @deleted="$refs.presets.refreshPresets()"
                     />

From 4b01ea66fbcbbca0697e6e21ce7dab675e1e7bc7 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:05:12 -0400
Subject: [PATCH 25/34] Allow fields filter on user group users listing.

---
 src/Query/Scopes/Filters/Fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Query/Scopes/Filters/Fields.php b/src/Query/Scopes/Filters/Fields.php
index e1f01190938..2ce25209e35 100644
--- a/src/Query/Scopes/Filters/Fields.php
+++ b/src/Query/Scopes/Filters/Fields.php
@@ -63,7 +63,7 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        return in_array($key, ['entries', 'entries-fieldtype', 'terms', 'users']);
+        return in_array($key, ['entries', 'entries-fieldtype', 'terms', 'users', 'usergroup-users']);
     }
 
     protected function getFields()

From d59206a351bec5290610e0c75d1656d7980597fc Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:05:27 -0400
Subject: [PATCH 26/34] Allow search query logic on user group users listing.

---
 .../Controllers/CP/Users/UsersController.php  | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 7f4d7fc9f18..c431293f4d0 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -45,19 +45,7 @@ protected function indexQuery()
         $query = User::query();
 
         if ($search = request('search')) {
-            if (Search::indexes()->has('users')) {
-                return Search::index('users')->ensureExists()->search($search);
-            }
-
-            $query
-                ->where('email', 'like', '%'.$search.'%')
-                ->when(User::blueprint()->hasField('first_name'), function ($query) use ($search) {
-                    $query
-                        ->orWhere('first_name', 'like', '%'.$search.'%')
-                        ->orWhere('last_name', 'like', '%'.$search.'%');
-                }, function ($query) use ($search) {
-                    $query->orWhere('name', 'like', '%'.$search.'%');
-                });
+            $query = $this->searchUsers($search, $query);
         }
 
         return $query;
@@ -67,7 +55,11 @@ protected function json($request)
     {
         $query = $request->group
             ? UserGroup::find($request->group)->queryUsers()
-            : $this->indexQuery();
+            : User::query();
+
+        if ($search = request('search')) {
+            $query = $this->searchUsers($search, $query);
+        }
 
         $activeFilterBadges = $this->queryFilters($query, $request->filters, [
             'blueprints' => ['user'],
@@ -85,6 +77,25 @@ protected function json($request)
             ]]);
     }
 
+    protected function searchUsers($search, $query)
+    {
+        if (Search::indexes()->has('users')) {
+            return Search::index('users')->ensureExists()->search($search);
+        }
+
+        $query
+            ->where('email', 'like', '%'.$search.'%')
+            ->when(User::blueprint()->hasField('first_name'), function ($query) use ($search) {
+                $query
+                    ->orWhere('first_name', 'like', '%'.$search.'%')
+                    ->orWhere('last_name', 'like', '%'.$search.'%');
+            }, function ($query) use ($search) {
+                $query->orWhere('name', 'like', '%'.$search.'%');
+            });
+
+        return $query;
+    }
+
     /**
      * Create a new user.
      *

From 468fb1b2da4654fc141eca9904aff050c7877b29 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:05:57 -0400
Subject: [PATCH 27/34] Fix fields filter dropdown on user group users listing.

---
 src/Http/Controllers/CP/Users/UserGroupsController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Users/UserGroupsController.php b/src/Http/Controllers/CP/Users/UserGroupsController.php
index 50b6f40ef90..b2a1471213b 100644
--- a/src/Http/Controllers/CP/Users/UserGroupsController.php
+++ b/src/Http/Controllers/CP/Users/UserGroupsController.php
@@ -52,7 +52,9 @@ public function show($group)
 
         return view('statamic::usergroups.show', [
             'group' => $group,
-            'filters' => Scope::filters('usergroup-users'),
+            'filters' => Scope::filters('usergroup-users', [
+                'blueprints' => ['user'],
+            ]),
         ]);
     }
 

From d5cc8046c6bcf3336efecc3665956990e51c6288 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:06:19 -0400
Subject: [PATCH 28/34] Disable filter presets on user group users listing.

---
 resources/js/components/users/Listing.vue | 6 +++++-
 resources/views/usergroups/show.blade.php | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index 3e8b1d3428f..7918b37d15c 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -19,6 +19,7 @@
                     <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
+                            v-show="allowFilterPresets"
                             ref="presets"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
@@ -34,7 +35,7 @@
 
                         <div class="flex space-x-2 mt-2">
                             <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
-                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="allowFilterPresets && isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
@@ -129,6 +130,9 @@ export default {
     props: {
         listingKey: String,
         group: String,
+        allowFilterPresets: {
+            default: true,
+        },
     },
 
     data() {
diff --git a/resources/views/usergroups/show.blade.php b/resources/views/usergroups/show.blade.php
index 4b7a8d5b610..c0efed4f368 100644
--- a/resources/views/usergroups/show.blade.php
+++ b/resources/views/usergroups/show.blade.php
@@ -33,6 +33,7 @@
         listing-key="usergroup-users"
         group="{{ $group->id() }}"
         :filters="{{ $filters->toJson() }}"
+        :allow-filter-presets="false"
         action-url="{{ cp_route('users.actions.run') }}"
     ></user-listing>
 

From 0d4af10d93269cb8e742ed798c1867af03d2828d Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:27:45 -0400
Subject: [PATCH 29/34] Scope these wheres into one nested where to prevent
 conflicts.

---
 .../Controllers/CP/Users/UsersController.php  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index c431293f4d0..8cb242896bf 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -83,15 +83,17 @@ protected function searchUsers($search, $query)
             return Search::index('users')->ensureExists()->search($search);
         }
 
-        $query
-            ->where('email', 'like', '%'.$search.'%')
-            ->when(User::blueprint()->hasField('first_name'), function ($query) use ($search) {
-                $query
-                    ->orWhere('first_name', 'like', '%'.$search.'%')
-                    ->orWhere('last_name', 'like', '%'.$search.'%');
-            }, function ($query) use ($search) {
-                $query->orWhere('name', 'like', '%'.$search.'%');
-            });
+        $query->where(function ($query) use ($search) {
+            $query
+                ->where('email', 'like', '%'.$search.'%')
+                ->when(User::blueprint()->hasField('first_name'), function ($query) use ($search) {
+                    $query
+                        ->orWhere('first_name', 'like', '%'.$search.'%')
+                        ->orWhere('last_name', 'like', '%'.$search.'%');
+                }, function ($query) use ($search) {
+                    $query->orWhere('name', 'like', '%'.$search.'%');
+                });
+        });
 
         return $query;
     }

From 506294071cda1759f2f0cfde7a1c228ffed87eb0 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:42:15 -0400
Subject: [PATCH 30/34] =?UTF-8?q?Don=E2=80=99t=20use=20search=20index=20on?=
 =?UTF-8?q?=20user=20group=20users=20listing.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Http/Controllers/CP/Users/UsersController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 8cb242896bf..652acf66bde 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -58,7 +58,7 @@ protected function json($request)
             : User::query();
 
         if ($search = request('search')) {
-            $query = $this->searchUsers($search, $query);
+            $query = $this->searchUsers($search, $query, ! $request->has('group'));
         }
 
         $activeFilterBadges = $this->queryFilters($query, $request->filters, [
@@ -77,9 +77,9 @@ protected function json($request)
             ]]);
     }
 
-    protected function searchUsers($search, $query)
+    protected function searchUsers($search, $query, $useIndex = true)
     {
-        if (Search::indexes()->has('users')) {
+        if ($useIndex && Search::indexes()->has('users')) {
             return Search::index('users')->ensureExists()->search($search);
         }
 

From 8f0ce0c1ea0f30f3259d595b34b7340799bd040b Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 26 Apr 2023 16:52:31 -0400
Subject: [PATCH 31/34] Add tooltip to explain the `+` button when you have no
 saved views.

---
 resources/js/components/data-list/FilterPresets.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index f74d24ec29a..7442dcd00ce 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -24,7 +24,7 @@
                 </button>
             </template>
 
-            <button class="pill-tab" @click="createPreset" >
+            <button class="pill-tab" @click="createPreset" v-tooltip="__('Create New View')">
                 <svg-icon name="add" class="w-3 h-3"/>
             </button>
         </div>

From 81f0f98b50a43a70d38992ea92b38b86edfaea2f Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Thu, 27 Apr 2023 10:45:01 -0400
Subject: [PATCH 32/34] Respect title on filter class (in case someone binds
 custom implementation).

---
 resources/js/components/data-list/Filters.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 48ad3eeb2d0..ae0ab2b9df9 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -6,7 +6,7 @@
             <popover v-if="fieldFilter" placement="bottom-start" @closed="fieldFilterClosed">
                 <template slot="trigger">
                     <button class="filter-badge filter-badge-control mr-2 mb-2" @click="resetFilterPopover">
-                        {{ __('Field') }}
+                        {{ fieldFilter.title }}
                         <svg-icon name="micro/chevron-down-xs" class="w-2 h-2 mx-2" />
                     </button>
                 </template>

From 0d639b6523ceda79cff17c4ee53c0ee4123b3287 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Thu, 27 Apr 2023 10:45:11 -0400
Subject: [PATCH 33/34] Misc cleanup.

---
 src/Query/Scopes/ScopeRepository.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Query/Scopes/ScopeRepository.php b/src/Query/Scopes/ScopeRepository.php
index 66af616709b..2887caa2f95 100644
--- a/src/Query/Scopes/ScopeRepository.php
+++ b/src/Query/Scopes/ScopeRepository.php
@@ -6,9 +6,10 @@ class ScopeRepository
 {
     public function all()
     {
-        return app('statamic.scopes')->map(function ($class) {
-            return app($class);
-        })->values();
+        return app('statamic.scopes')
+            ->map(fn ($class) => app($class))
+            ->filter()
+            ->values();
     }
 
     public function find($key, $context = [])
@@ -21,9 +22,7 @@ public function find($key, $context = [])
     public function filters($key, $context = [])
     {
         return $this->all()
-            ->filter(function ($filter) {
-                return $filter instanceof Filter;
-            })
+            ->filter(fn ($filter) => $filter instanceof Filter)
             ->each->context($context)
             ->filter->visibleTo($key)
             ->values();

From 579e43e111e6f8860aa45de77d7975f4052be01a Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Thu, 27 Apr 2023 15:53:25 -0400
Subject: [PATCH 34/34] Fix submissions listing search.

---
 resources/js/components/forms/SubmissionListing.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index 1d1975477b8..10e9cac0687 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -17,9 +17,10 @@
             @visible-columns-updated="visibleColumns = $event"
         >
             <div slot-scope="{ hasSelections }">
-                <div class="card p-0 relative">
-                    <div class="data-list-header min-h-16">
-                        <data-list-filters :search-query="searchQuery" />
+                <div class="card overflow-hidden p-0 relative">
+                    <div class="flex flex-wrap items-center justify-between p-2 text-sm border-b">
+                        <data-list-search class="h-8 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                        <data-list-column-picker class="ml-2" :preferences-key="preferencesKey('columns')" />
                     </div>
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />