From 652fc883d7b7da012be905323565d850d829c00d Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 9 Mar 2022 16:52:51 +0000
Subject: [PATCH] Changed default member filter to "Name is"

refs https://github.com/TryGhost/Team/issues/1408

- "Name" is the first filter in the list and has a basic value type so it makes sense to make it the default compared to label
---
 ghost/admin/app/components/members/filter.js | 65 ++++++++++++++------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/ghost/admin/app/components/members/filter.js b/ghost/admin/app/components/members/filter.js
index 8697ea0583..0f81576564 100644
--- a/ghost/admin/app/components/members/filter.js
+++ b/ghost/admin/app/components/members/filter.js
@@ -141,14 +141,23 @@ export default class MembersFilter extends Component {
     @service settings;
     @service store;
 
-    @tracked filters = new TrackedArray([
-        new Filter({
-            type: 'label',
-            relation: 'is',
-            value: [],
-            relationOptions: FILTER_RELATIONS_OPTIONS.label
-        })
-    ]);
+    @tracked filters = this.feature.membersContainsFilters
+        ? new TrackedArray([
+            new Filter({
+                type: 'name',
+                relation: 'is',
+                value: '',
+                relationOptions: FILTER_RELATIONS_OPTIONS.name
+            })
+        ])
+        : new TrackedArray([
+            new Filter({
+                type: 'label',
+                relation: 'is',
+                value: [],
+                relationOptions: FILTER_RELATIONS_OPTIONS.label
+            })
+        ]);
 
     availableFilterRelationsOptions = FILTER_RELATIONS_OPTIONS;
     availableFilterValueOptions = FILTER_VALUE_OPTIONS;
@@ -195,12 +204,21 @@ export default class MembersFilter extends Component {
 
     @action
     addFilter() {
-        this.filters.push(new Filter({
-            type: 'label',
-            relation: 'is',
-            value: [],
-            relationOptions: FILTER_RELATIONS_OPTIONS.label
-        }));
+        if (this.feature.membersContainsFilters) {
+            this.filters.push(new Filter({
+                type: 'name',
+                relation: 'is',
+                value: '',
+                relationOptions: FILTER_RELATIONS_OPTIONS.name
+            }));
+        } else {
+            this.filters.push(new Filter({
+                type: 'label',
+                relation: 'is',
+                value: [],
+                relationOptions: FILTER_RELATIONS_OPTIONS.label
+            }));
+        }
         this.applySoftFilter();
     }
 
@@ -483,14 +501,25 @@ export default class MembersFilter extends Component {
 
     @action
     resetFilter() {
-        this.filters = new TrackedArray([
-            new Filter({
+        const filters = [];
+
+        if (this.feature.membersContainsFilters) {
+            filters.push(new Filter({
+                type: 'name',
+                relation: 'is',
+                value: '',
+                relationOptions: FILTER_RELATIONS_OPTIONS.name
+            }));
+        } else {
+            filters.push(new Filter({
                 type: 'label',
                 relation: 'is',
                 value: [],
                 relationOptions: FILTER_RELATIONS_OPTIONS.label
-            })
-        ]);
+            }));
+        }
+
+        this.filters = new TrackedArray(filters);
         this.args.onResetFilter();
     }