From d11cf9e1c7d7746c5bacc102ed9b783474370972 Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Tue, 10 May 2022 14:58:22 +0200 Subject: [PATCH] Added newsletter name in post scheduled tooltip refs https://github.com/TryGhost/Team/issues/1576 This change was required to avoid showing 'all members' or 'all paid members', when it was in fact 'all paid subscribers of newsletter X'. The newsletter name is only shown when multiple newsletters are activated on a site. --- .../app/components/gh-editor-post-status.hbs | 4 +-- .../app/components/gh-members-filter-count.js | 2 +- .../components/gh-recipient-filter-count.hbs | 2 +- .../modals/editor/confirm-publish.js | 2 +- ghost/admin/app/controllers/editor.js | 5 ++-- .../admin/app/services/members-count-cache.js | 28 +++++++++++++------ 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ghost/admin/app/components/gh-editor-post-status.hbs b/ghost/admin/app/components/gh-editor-post-status.hbs index 69fee9e2ad..d11b9f95c8 100644 --- a/ghost/admin/app/components/gh-editor-post-status.hbs +++ b/ghost/admin/app/components/gh-editor-post-status.hbs @@ -7,7 +7,7 @@ Scheduled {{#if this.isHovered}} {{/if}} @@ -24,7 +24,7 @@ {{#if this.isHovered}} to be published {{#if (and @post.emailRecipientFilter (not @post.email))}} - and sent to + and sent to {{/if}} {{this.scheduledTime}} {{/if}} diff --git a/ghost/admin/app/components/gh-members-filter-count.js b/ghost/admin/app/components/gh-members-filter-count.js index 449afb6e51..366b2234c1 100644 --- a/ghost/admin/app/components/gh-members-filter-count.js +++ b/ghost/admin/app/components/gh-members-filter-count.js @@ -17,7 +17,7 @@ export default class GhMembersFilterCountComponent extends Component { *getMembersCountTask() { this.memberCount = yield this.membersCountCache.countString( this.args.filter, - {knownCount: this.args.knownCount} + {knownCount: this.args.knownCount, newsletter: this.args.newsletter} ); } } diff --git a/ghost/admin/app/components/gh-recipient-filter-count.hbs b/ghost/admin/app/components/gh-recipient-filter-count.hbs index 6cd26989e2..64a907f8b2 100644 --- a/ghost/admin/app/components/gh-recipient-filter-count.hbs +++ b/ghost/admin/app/components/gh-recipient-filter-count.hbs @@ -1,5 +1,5 @@ {{#if @filter}} - + {{else}} 0 members {{/if}} diff --git a/ghost/admin/app/components/modals/editor/confirm-publish.js b/ghost/admin/app/components/modals/editor/confirm-publish.js index 97c5fec9b7..85255f8421 100644 --- a/ghost/admin/app/components/modals/editor/confirm-publish.js +++ b/ghost/admin/app/components/modals/editor/confirm-publish.js @@ -63,7 +63,7 @@ export default class ConfirmPublishModal extends Component { const filter = `${newsletter.recipientFilter}+(${sendEmailWhenPublished})`; this.memberCount = sendEmailWhenPublished ? (yield this.membersCountCache.count(filter)) : 0; - this.memberCountString = sendEmailWhenPublished ? (yield this.membersCountCache.countString(filter)) : '0 members'; + this.memberCountString = sendEmailWhenPublished ? (yield this.membersCountCache.countString(filter, {newsletter})) : '0 members'; } @task diff --git a/ghost/admin/app/controllers/editor.js b/ghost/admin/app/controllers/editor.js index 92d2f519bf..ebaac614ac 100644 --- a/ghost/admin/app/controllers/editor.js +++ b/ghost/admin/app/controllers/editor.js @@ -1071,7 +1071,8 @@ export default class EditorController extends Controller { publishedAtUTC, emailRecipientFilter, previewUrl, - emailOnly + emailOnly, + newsletter } = this.post; let publishedAtBlogTZ = moment.tz(publishedAtUTC, this.settings.get('timezone')); @@ -1079,7 +1080,7 @@ export default class EditorController extends Controller { let description = emailOnly ? ['Will be sent'] : ['Will be published']; if (emailRecipientFilter && emailRecipientFilter !== 'none') { - const recipientCount = await this.membersCountCache.countString(this.post.fullRecipientFilter); + const recipientCount = await this.membersCountCache.countString(this.post.fullRecipientFilter, {newsletter}); description.push(`${!emailOnly ? 'and delivered ' : ''}to ${recipientCount}`); } diff --git a/ghost/admin/app/services/members-count-cache.js b/ghost/admin/app/services/members-count-cache.js index 33c1110975..f06d88261a 100644 --- a/ghost/admin/app/services/members-count-cache.js +++ b/ghost/admin/app/services/members-count-cache.js @@ -9,6 +9,7 @@ export default class MembersCountCacheService extends Service { @service store; cache = {}; + hasMultipleNewsletters = null; @action async count(query) { @@ -31,10 +32,21 @@ export default class MembersCountCacheService extends Service { } @action - async countString(filter = '', {knownCount} = {}) { + async countString(filter = '', {knownCount, newsletter} = {}) { + // Determine if we need to show the name of the newsletter or not + // TODO: replace this with a service or a settings boolean if we ever add a shortcut for this + if (this.hasMultipleNewsletters === null) { + const allNewsletters = await this.store.query('newsletter', {status: 'active', limit: 'all'}); + this.hasMultipleNewsletters = allNewsletters.length > 1; + } + const user = this.session.user; - const basicFilter = filter.replace(/^newsletters\.status:active\+\((.*)\)$/, '$1'); + const nounSingular = newsletter && this.hasMultipleNewsletters ? 'subscriber' : 'member'; + const nounPlural = nounSingular + 's'; + const suffix = newsletter && this.hasMultipleNewsletters ? (' of ' + newsletter.name) : ''; + + const basicFilter = newsletter ? filter.replace(newsletter.recipientFilter, '').replace(/^\+\((.*)\)$/, '$1') : filter; const filterParts = basicFilter.split(','); const isFree = filterParts.length === 1 && filterParts[0] === 'status:free'; const isPaid = filterParts.length === 1 && filterParts[0] === 'status:-free'; @@ -44,13 +56,13 @@ export default class MembersCountCacheService extends Service { // TODO: remove when editors have relevant permissions or we have a different way of fetching counts if (user.isEditor && knownCount === undefined) { if (isFree) { - return 'all free members'; + return 'all free ' + nounPlural + suffix; } if (isPaid) { - return 'all paid members'; + return 'all paid members' + nounPlural + suffix; } if (isAll) { - return 'all members'; + return 'all members' + nounPlural + suffix; } return 'a custom members segment'; @@ -59,14 +71,14 @@ export default class MembersCountCacheService extends Service { const recipientCount = knownCount !== undefined ? knownCount : await this.count(filter); if (isFree) { - return ghPluralize(recipientCount, 'free member'); + return ghPluralize(recipientCount, 'free ' + nounSingular) + suffix; } if (isPaid) { - return ghPluralize(recipientCount, 'paid member'); + return ghPluralize(recipientCount, 'paid ' + nounSingular) + suffix; } - return ghPluralize(recipientCount, 'member'); + return ghPluralize(recipientCount, nounSingular) + suffix; } @action