From b80ce527e5c37eed33242d6cd3125beaed280266 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Tue, 8 Feb 2022 15:06:48 +0000
Subject: [PATCH] Moved members screen filter components into
 components/members

no issue

- currently the components are screen-specific rather than generalised so shouldn't have the `gh-` prefix
- fixed linter error for confusing `{{#unless}}...{{else}}` usage
---
 ghost/admin/.lint-todo                             |  1 +
 .../filter-value.hbs}                              |  0
 .../filter-value.js}                               |  3 ++-
 .../{gh-members-filter.hbs => members/filter.hbs}  |  2 +-
 .../{gh-members-filter.js => members/filter.js}    |  2 +-
 ghost/admin/app/templates/members.hbs              | 14 +++++++-------
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename ghost/admin/app/components/{gh-members-filter-value.hbs => members/filter-value.hbs} (100%)
 rename ghost/admin/app/components/{gh-members-filter-value.js => members/filter-value.js} (96%)
 rename ghost/admin/app/components/{gh-members-filter.hbs => members/filter.hbs} (98%)
 rename ghost/admin/app/components/{gh-members-filter.js => members/filter.js} (99%)

diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo
index a7a0812193..874c5fa191 100644
--- a/ghost/admin/.lint-todo
+++ b/ghost/admin/.lint-todo
@@ -1792,3 +1792,4 @@ add|ember-template-lint|no-passed-in-event-handlers|50|12|50|12|8deb1881d48f9362
 add|ember-template-lint|no-passed-in-event-handlers|51|12|51|12|db0e4b1769dec0725404801686f1e4fbf6fbb795|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
 add|ember-template-lint|no-passed-in-event-handlers|97|8|97|8|8deb1881d48f936269c7960537ad72bfe4dfd760|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
 add|ember-template-lint|no-passed-in-event-handlers|98|8|98|8|db0e4b1769dec0725404801686f1e4fbf6fbb795|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
+remove|ember-template-lint|simple-unless|138|4|138|4|02b279bc993a1ee6632c7e6edf341a2aabc519cb|1643760000000|1646352000000|1648940400000|app/templates/members.hbs
diff --git a/ghost/admin/app/components/gh-members-filter-value.hbs b/ghost/admin/app/components/members/filter-value.hbs
similarity index 100%
rename from ghost/admin/app/components/gh-members-filter-value.hbs
rename to ghost/admin/app/components/members/filter-value.hbs
diff --git a/ghost/admin/app/components/gh-members-filter-value.js b/ghost/admin/app/components/members/filter-value.js
similarity index 96%
rename from ghost/admin/app/components/gh-members-filter-value.js
rename to ghost/admin/app/components/members/filter-value.js
index f62b7a3f0d..e69f510c3b 100644
--- a/ghost/admin/app/components/gh-members-filter-value.js
+++ b/ghost/admin/app/components/members/filter-value.js
@@ -27,8 +27,9 @@ const FILTER_OPTIONS = {
     ]
 };
 
-export default class GhMembersFilterValue extends Component {
+export default class MembersFilterValue extends Component {
     @tracked filterValue;
+
     constructor(...args) {
         super(...args);
         this.availableFilterOptions = FILTER_OPTIONS;
diff --git a/ghost/admin/app/components/gh-members-filter.hbs b/ghost/admin/app/components/members/filter.hbs
similarity index 98%
rename from ghost/admin/app/components/gh-members-filter.hbs
rename to ghost/admin/app/components/members/filter.hbs
index ca60bb3311..a9437f1da6 100644
--- a/ghost/admin/app/components/gh-members-filter.hbs
+++ b/ghost/admin/app/components/members/filter.hbs
@@ -43,7 +43,7 @@
                                 />
                                 {{svg-jar "arrow-down-small"}}
                             </span>
-                            <GhMembersFilterValue
+                            <Members::FilterValue
                                 @filter={{filter}}
                                 @setFilterValue={{this.setFilterValue}}
                                 @onLabelEdit={{@onLabelEdit}}
diff --git a/ghost/admin/app/components/gh-members-filter.js b/ghost/admin/app/components/members/filter.js
similarity index 99%
rename from ghost/admin/app/components/gh-members-filter.js
rename to ghost/admin/app/components/members/filter.js
index 4aa68e9078..3d096faed4 100644
--- a/ghost/admin/app/components/gh-members-filter.js
+++ b/ghost/admin/app/components/members/filter.js
@@ -100,7 +100,7 @@ const FILTER_VALUE_OPTIONS = {
         {label: 'Incomplete - Expired', name: 'incomplete_expired'}
     ]
 };
-export default class GhMembersFilter extends Component {
+export default class MembersFilter extends Component {
     @service session
     @tracked filters = A([
         EmberObject.create({
diff --git a/ghost/admin/app/templates/members.hbs b/ghost/admin/app/templates/members.hbs
index 9e2aec8eed..43b1cea4c9 100644
--- a/ghost/admin/app/templates/members.hbs
+++ b/ghost/admin/app/templates/members.hbs
@@ -20,7 +20,7 @@
             </div>
 
             <div class="view-actions-top-row">
-                <GhMembersFilter
+                <Members::Filter
                     @isFiltered={{this.isFiltered}}
                     @onApplyFilter={{this.applyFilter}}
                     @defaultFilterParam={{this.filterParam}}
@@ -97,7 +97,11 @@
         </section>
     </GhCanvasHeader>
 
-    {{#unless this.members.loading}}
+    {{#if this.members.loading}}
+        <div class="gh-content">
+            <GhLoadingSpinner />
+        </div>
+    {{else}}
         <section class="view-container">
             {{#if this.members}}
                 <div class="gh-list-scrolling {{if (lt this.members.length 6) "gh-list-with-helpsection"}}">
@@ -169,11 +173,7 @@
                 </div>
             {{/if}}
         </section>
-    {{else}}
-        <div class="gh-content">
-            <GhLoadingSpinner />
-        </div>
-    {{/unless}}
+    {{/if}}
 </section>
 
 {{outlet}}