From 6adecb5db1d2c8047ac3b595eb844eef7fc55b0c Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Wed, 4 May 2022 10:21:42 +0200
Subject: [PATCH] Removed newsletter name from activity feed if no multiple
 newsletters

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

- Check if we have multiple newsletters in the members-events-fetcher
- Pass the resulting value to the `parse-member-event` helper
- Pass the value to the activity feed table and table-row components
---
 .../dashboard/latest-member-activity.hbs      |  2 +-
 .../dashboard/v5/charts/recent-activity.hbs   |  2 +-
 .../dashboard/v5/charts/recents.hbs           |  2 +-
 .../app/components/member/activity-feed.hbs   |  2 +-
 .../components/members-activity/table-row.hbs |  2 +-
 .../app/components/members-activity/table.hbs |  2 +-
 .../app/helpers/members-event-fetcher.js      | 29 +++++++++++++++++--
 ghost/admin/app/helpers/parse-member-event.js | 10 +++----
 .../admin/app/templates/members-activity.hbs  |  4 +--
 9 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/ghost/admin/app/components/dashboard/latest-member-activity.hbs b/ghost/admin/app/components/dashboard/latest-member-activity.hbs
index 092764f1a6..b743702d96 100644
--- a/ghost/admin/app/components/dashboard/latest-member-activity.hbs
+++ b/ghost/admin/app/components/dashboard/latest-member-activity.hbs
@@ -25,7 +25,7 @@
                         {{#if eventsFetcher.data}}
                             <ul class="gh-dashboard-activity-list">
                                 {{#each eventsFetcher.data as |event|}}
-                                    {{#let (parse-member-event event) as |parsedEvent|}}
+                                    {{#let (parse-member-event event eventsFetcher.hasMultipleNewsletters) as |parsedEvent|}}
                                         <li class="gh-dashboard-activity-item" data-test-dashboard-member-activity-item>
                                             <LinkTo class="member-details" @route="member" @model="{{parsedEvent.memberId}}">
                                                 <div class="gh-dashboard-activity-container">
diff --git a/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs b/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs
index 4837fa4773..4a441974c4 100644
--- a/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs
+++ b/ghost/admin/app/components/dashboard/v5/charts/recent-activity.hbs
@@ -21,7 +21,7 @@
                     {{else}}
                         {{#if eventsFetcher.data}}
                             {{#each eventsFetcher.data as |event|}}
-                                {{#let (parse-member-event event) as |parsedEvent|}}
+                                {{#let (parse-member-event event eventsFetcher.hasMultipleNewsletters) as |parsedEvent|}}
                                     <div class="gh-dashboard5-list-item" data-test-dashboard-member-activity-item>
                                         <LinkTo class="member-details" @route="member" @model="{{parsedEvent.memberId}}">
                                             <GhMemberAvatar @member={{parsedEvent.member}} @containerClass="w8 h8 mr3 flex-shrink-0" />
diff --git a/ghost/admin/app/components/dashboard/v5/charts/recents.hbs b/ghost/admin/app/components/dashboard/v5/charts/recents.hbs
index 8150fc2a0a..c158e7a21d 100644
--- a/ghost/admin/app/components/dashboard/v5/charts/recents.hbs
+++ b/ghost/admin/app/components/dashboard/v5/charts/recents.hbs
@@ -75,7 +75,7 @@
                         {{else}}
                             {{#if eventsFetcher.data}}
                                 {{#each eventsFetcher.data as |event|}}
-                                    {{#let (parse-member-event event) as |parsedEvent|}}
+                                    {{#let (parse-member-event event eventsFetcher.hasMultipleNewsletters) as |parsedEvent|}}
                                         <div class="gh-dashboard5-list-item" data-test-dashboard-member-activity-item> 
                                             <div class="gh-dashboard5-list-item-sub">
                                                 <LinkTo class="member-details" @route="member" @model="{{parsedEvent.memberId}}">
diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs
index d90ddb4c15..c514738de5 100644
--- a/ghost/admin/app/components/member/activity-feed.hbs
+++ b/ghost/admin/app/components/member/activity-feed.hbs
@@ -15,7 +15,7 @@
                             <div class="relative h17"><GhLoadingSpinner class="h30" /></div>
                         {{else if eventsFetcher.data}}
                             {{#each eventsFetcher.data as |rawEvent|}}
-                                {{#let (parse-member-event rawEvent) as |event|}}
+                                {{#let (parse-member-event rawEvent eventsFetcher.hasMultipleNewsletters) as |event|}}
                                     <div class="gh-member-feed-row">
                                         <div class="gh-member-feed-container">
                                             <div class="gh-member-feed-icon">
diff --git a/ghost/admin/app/components/members-activity/table-row.hbs b/ghost/admin/app/components/members-activity/table-row.hbs
index b8c1474699..910a6b6917 100644
--- a/ghost/admin/app/components/members-activity/table-row.hbs
+++ b/ghost/admin/app/components/members-activity/table-row.hbs
@@ -1,4 +1,4 @@
-{{#let (parse-member-event @event) as |event|}}
+{{#let (parse-member-event @event @hasMultipleNewsletters) as |event|}}
     <tr>  
         {{#unless @hideMemberColumn}}
             <div class="gh-list-data">
diff --git a/ghost/admin/app/components/members-activity/table.hbs b/ghost/admin/app/components/members-activity/table.hbs
index 18a2865f76..6633cbb935 100644
--- a/ghost/admin/app/components/members-activity/table.hbs
+++ b/ghost/admin/app/components/members-activity/table.hbs
@@ -10,7 +10,7 @@
     </thead>
     <tbody>
         {{#each @events as |event|}}
-            <MembersActivity::TableRow @hideMemberColumn={{@hideMemberColumn}} @event={{event}} />
+            <MembersActivity::TableRow @hideMemberColumn={{@hideMemberColumn}} @event={{event}} @hasMultipleNewsletters={{@hasMultipleNewsletters}} />
         {{/each}}
     </tbody>
 </table>
diff --git a/ghost/admin/app/helpers/members-event-fetcher.js b/ghost/admin/app/helpers/members-event-fetcher.js
index b3e4663346..4c45a1d892 100644
--- a/ghost/admin/app/helpers/members-event-fetcher.js
+++ b/ghost/admin/app/helpers/members-event-fetcher.js
@@ -9,6 +9,7 @@ import {tracked} from '@glimmer/tracking';
 export default class MembersEventsFetcher extends Resource {
     @service ajax;
     @service ghostPaths;
+    @service store;
 
     @tracked data = new TrackedArray([]);
     @tracked isLoading = false;
@@ -16,6 +17,11 @@ export default class MembersEventsFetcher extends Resource {
     @tracked errorMessage = null;
     @tracked hasReachedEnd = false;
 
+    /** 
+     * Keep track whether we have multiple newsletters (required for parsing events)
+    */
+    @tracked hasMultipleNewsletters = null;
+
     cursor = null;
 
     get value() {
@@ -25,7 +31,8 @@ export default class MembersEventsFetcher extends Resource {
             errorMessage: this.errorMessage,
             data: this.data,
             loadNextPage: this.loadNextPage,
-            hasReachedEnd: this.hasReachedEnd
+            hasReachedEnd: this.hasReachedEnd,
+            hasMultipleNewsletters: this.hasMultipleNewsletters
         };
     }
 
@@ -37,7 +44,9 @@ export default class MembersEventsFetcher extends Resource {
             filter += `+${this.args.named.filter}`;
         }
 
-        return this.loadEventsTask.perform({filter});
+        // Can't get this working with Promise.all, somehow results in an infinite loop
+        await this.loadEventsTask.perform({filter});
+        await this.loadMultipleNewslettersTask.perform();
     }
 
     @action
@@ -67,6 +76,22 @@ export default class MembersEventsFetcher extends Resource {
         this.loadEventsTask.perform({filter});
     }
 
+    /**
+     * We need to know whether we have multiple newsletters so we can hide/show the newsletter name
+     */
+    @task
+    *loadMultipleNewslettersTask() {
+        try {
+            const res = yield this.store.query('newsletter', {filter: 'status:active', include: 'none', limit: 1});
+            const newsletterCount = res.meta.pagination.total;
+            this.hasMultipleNewsletters = newsletterCount > 1;
+        } catch (e) {
+            // Default to true (harms the least)
+            this.hasMultipleNewsletters = true;
+            console.error(e); // eslint-disable-line
+        }
+    }
+
     @task
     *loadEventsTask(queryParams) {
         try {
diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js
index 9bba361304..71f27b4588 100644
--- a/ghost/admin/app/helpers/parse-member-event.js
+++ b/ghost/admin/app/helpers/parse-member-event.js
@@ -1,11 +1,11 @@
 import moment from 'moment';
 import {getNonDecimal, getSymbol} from 'ghost-admin/utils/currency';
 
-export default function parseMemberEvent(event) {
+export default function parseMemberEvent(event, hasMultipleNewsletters) {
     let subject = event.data.member.name || event.data.member.email;
     let icon = getIcon(event);
     let action = getAction(event);
-    let object = getObject(event);
+    let object = getObject(event, hasMultipleNewsletters);
     let info = getInfo(event);
     let timestamp = moment(event.data.created_at);
 
@@ -125,12 +125,12 @@ function getAction(event) {
     }
 }
 
-function getObject(event) {
+function getObject(event, hasMultipleNewsletters) {
     if (event.type === 'newsletter_event') {
-        if (event.data.newsletter && event.data.newsletter.name) {
+        if (hasMultipleNewsletters && event.data.newsletter && event.data.newsletter.name) {
             return 'newsletter – ' + event.data.newsletter.name;
         }
-        return 'emails';
+        return 'newsletter';
     }
 
     if (event.type === 'subscription_event') {
diff --git a/ghost/admin/app/templates/members-activity.hbs b/ghost/admin/app/templates/members-activity.hbs
index a23b674d65..fdfd5f1ac2 100644
--- a/ghost/admin/app/templates/members-activity.hbs
+++ b/ghost/admin/app/templates/members-activity.hbs
@@ -26,7 +26,7 @@
                     <GhMemberDetailsActivity @member={{this.memberRecord}} />
                 {{/if}}
                 <div class="gh-list-scrolling">   
-                    <MembersActivity::Table @hideMemberColumn={{if this.member true}} @events={{eventsFetcher.data}} />
+                    <MembersActivity::Table @hideMemberColumn={{if this.member true}} @events={{eventsFetcher.data}} @hasMultipleNewsletters={{eventsFetcher.hasMultipleNewsletters}} />
 
                     {{#if (not (or eventsFetcher.isLoading eventsFetcher.hasReachedEnd))}}
                         <GhScrollTrigger @enter={{eventsFetcher.loadNextPage}} @triggerOffset={{250}} />
@@ -45,4 +45,4 @@
     </div>
 </section>
 
-{{outlet}}
\ No newline at end of file
+{{outlet}}