From 139ba9413a680338fa058d57ceecf649fa8cbcad Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 20 Apr 2021 09:08:15 +0100 Subject: [PATCH] Hid members data in dashboard when signup access is "Nobody" refs https://github.com/TryGhost/Team/issues/579 Members is essentially disabled when signup access is set to "Nobody" so it doesn't make sense to show members related charts and actions in the dashboard. - adds `showMembersData` property to the dashboard controller that returns `false` when members is disabled - wraps members related sections of the dashboard in conditionals --- ghost/admin/app/controllers/dashboard.js | 4 + ghost/admin/app/templates/dashboard.hbs | 144 ++++++++++++----------- 2 files changed, 78 insertions(+), 70 deletions(-) diff --git a/ghost/admin/app/controllers/dashboard.js b/ghost/admin/app/controllers/dashboard.js index 917014b84c..63f734041e 100644 --- a/ghost/admin/app/controllers/dashboard.js +++ b/ghost/admin/app/controllers/dashboard.js @@ -42,6 +42,10 @@ export default class DashboardController extends Controller { }); } + get showMembersData() { + return this.settings.get('membersSignupAccess') !== 'none'; + } + initialise() { this.loadEvents(); this.loadTopMembers(); diff --git a/ghost/admin/app/templates/dashboard.hbs b/ghost/admin/app/templates/dashboard.hbs index 2846873765..3e0025c489 100644 --- a/ghost/admin/app/templates/dashboard.hbs +++ b/ghost/admin/app/templates/dashboard.hbs @@ -26,7 +26,7 @@ - {{else}} + {{else if this.showMembersData}}
@@ -141,13 +141,15 @@

Start creating content

- - {{svg-jar "members"}} -
-

Create your first member

-

Add yourself or import members from CSV

-
- + {{#if this.showMembersData}} + + {{svg-jar "members"}} +
+

Create your first member

+

Add yourself or import members from CSV

+
+ + {{/if}} {{svg-jar "posts"}}
@@ -181,7 +183,7 @@
- +
@@ -256,75 +258,77 @@
- {{#if this.topMembersData}} -
-
-

Top members

- {{#if this.topMembersDataHasOpenRates}} -

Open rate

- {{else}} -

Member since

- {{/if}} -
-
- {{#if this.topMembersLoading}} - Loading... - {{else}} - {{#if this.topMembersError}} -

- There was an error loading member events. - -

+ {{#if this.showMembersData}} + {{#if this.topMembersData}} +
+
+

Top members

+ {{#if this.topMembersDataHasOpenRates}} +

Open rate

{{else}} -
    - {{#each this.topMembersData as |member|}} -
  • - - - {{#if member.name}} - {{member.name}} - {{else}} - - {{/if}} - - {{#if member.emailOpenRate}} - {{member.emailOpenRate}}% - {{else}} - - {{moment-format member.createdAtUTC "D MMM YYYY"}} - - {{/if}} -
    • - {{/each}} -
+

Member since

{{/if}} - {{/if}} -
- See all members {{svg-jar "arrow-right"}} +
+
+ {{#if this.topMembersLoading}} + Loading... + {{else}} + {{#if this.topMembersError}} +

+ There was an error loading member events. + +

+ {{else}} +
    + {{#each this.topMembersData as |member|}} +
  • + + + {{#if member.name}} + {{member.name}} + {{else}} + + {{/if}} + + {{#if member.emailOpenRate}} + {{member.emailOpenRate}}% + {{else}} + + {{moment-format member.createdAtUTC "D MMM YYYY"}} + + {{/if}} +
    • + {{/each}} +
+ {{/if}} + {{/if}} +
+ See all members {{svg-jar "arrow-right"}} +
-
- {{/if}} + {{/if}} - {{#unless (and this.session.user.isOwner (not this.feature.launchComplete))}} -
-

Activity feed

-
- {{#if this.eventsLoading}} - Loading... - {{else}} - {{#if this.eventsError}} -

- There was an error loading events - {{this.eventsError.message}} -

+ {{#unless (and this.session.user.isOwner (not this.feature.launchComplete))}} +
+

Activity feed

+
+ {{#if this.eventsLoading}} + Loading... {{else}} - + {{#if this.eventsError}} +

+ There was an error loading events + {{this.eventsError.message}} +

+ {{else}} + + {{/if}} {{/if}} - {{/if}} +
-
- {{/unless}} + {{/unless}} + {{/if}} {{#unless (or whatsNewEntriesLoading whatsNewEntriesError)}}