mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-25 09:03:12 +03:00
Updated publishing with renamed newsletter and email_segment options (#2380)
refs https://github.com/TryGhost/Team/issues/1596 This commit updates admin to align with the changes in the backend in https://github.com/TryGhost/Ghost/pull/14798 - `post.email_recipient_filter` option and property is renamed to `email_segment` - `newsletter_id` option is renamed to `newsletter` (and now uses slug instead of id) - Sending a post via email, means you need to set the `newsletter` option. The `email_segment` option is optional now and defaults to `all`. Not setting `newsletter` means not sending an email, setting `email_segment` is ignored if `newsletter` is missing. - We can no longer use `email_recipient_filter` (now renamed to `email_segment`) to know whether a post is published/scheduled to be sent as an email. We need to rely on the newsletter relation now. The `email_segment` `none` value has been dropped and will be `all` even if no email will be sent (newsletter will be null). - `sendEmailWhenPublished` option is no longer supported in the backend.
This commit is contained in:
Simon Backx
GitHub
parent
3e8c5403b6
commit
3a11faf0b6
@ -6,22 +6,21 @@ export default class Post extends ApplicationAdapter {
|
||||
const url = this.buildURL(modelName, id, snapshot, requestType, query);
|
||||
const parsedUrl = new URL(url);
|
||||
|
||||
// TODO: cleanup sendEmailWhenPublished when removing publishingFlow flag
|
||||
let emailRecipientFilter = snapshot?.adapterOptions?.emailRecipientFilter
|
||||
|| snapshot?.adapterOptions?.sendEmailWhenPublished;
|
||||
|
||||
if (emailRecipientFilter) {
|
||||
if (emailRecipientFilter === 'status:free,status:-free') {
|
||||
emailRecipientFilter = 'all';
|
||||
}
|
||||
|
||||
parsedUrl.searchParams.append('email_recipient_filter', emailRecipientFilter);
|
||||
}
|
||||
|
||||
if (snapshot?.adapterOptions?.newsletter) {
|
||||
// TODO: rename newsletter_id to newsletter once changed in the backend
|
||||
const newsletterId = snapshot.adapterOptions.newsletter;
|
||||
parsedUrl.searchParams.append('newsletter_id', newsletterId);
|
||||
const newsletter = snapshot.adapterOptions.newsletter;
|
||||
parsedUrl.searchParams.append('newsletter', newsletter);
|
||||
|
||||
// TODO: cleanup sendEmailWhenPublished when removing publishingFlow flag
|
||||
let emailSegment = snapshot?.adapterOptions?.emailSegment
|
||||
|| snapshot?.adapterOptions?.sendEmailWhenPublished;
|
||||
|
||||
if (emailSegment) {
|
||||
if (emailSegment === 'status:free,status:-free') {
|
||||
emailSegment = 'all';
|
||||
}
|
||||
|
||||
parsedUrl.searchParams.append('email_segment', emailSegment);
|
||||
}
|
||||
}
|
||||
|
||||
return parsedUrl.toString();
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
{{#if
|
||||
(or post.isSent
|
||||
(and post.isPublished post.email)
|
||||
(and post.isScheduled post.emailRecipientFilter (not post.email))
|
||||
post.willEmail
|
||||
)
|
||||
}}
|
||||
{{#if post.emailOnly}}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
Scheduled
|
||||
{{#if this.isHovered}}
|
||||
to be published
|
||||
{{#if (and @post.emailRecipientFilter (not @post.email))}}
|
||||
{{#if (and @post.newsletter (not @post.email))}}
|
||||
and sent to <GhRecipientFilterCount @filter={{@post.fullRecipientFilter}} @newsletter={{@post.newsletter}} />
|
||||
{{/if}}
|
||||
{{this.scheduledTime}}
|
||||
|
||||
@ -51,13 +51,11 @@
|
||||
{{#if (and this.feature.emailAnalytics (eq @post.displayName "post"))}}
|
||||
<LinkTo @route="editor.edit" @models={{array @post.displayName @post.id}} class="permalink gh-list-data gh-post-list-recipients">
|
||||
<div class="flex fw4">
|
||||
{{#if (or @post.email @post.willEmail)}}
|
||||
{{#if (eq @post.email.status "submitted")}}
|
||||
<span class="flex" data-tooltip="{{capitalize @post.email.recipientFilter}} members">
|
||||
<span class="darkgrey fw5 gh-content-email-stats">{{format-number @post.email.emailCount}}</span>
|
||||
<span class="midgrey-l2 fw4 gh-content-email-stats-mobile">{{gh-pluralize @post.email.emailCount "send"}}</span>
|
||||
</span>
|
||||
{{/if}}
|
||||
{{#if (eq @post.email.status "submitted")}}
|
||||
<span class="flex" data-tooltip="{{capitalize @post.email.recipientFilter}} members">
|
||||
<span class="darkgrey fw5 gh-content-email-stats">{{format-number @post.email.emailCount}}</span>
|
||||
<span class="midgrey-l2 fw4 gh-content-email-stats-mobile">{{gh-pluralize @post.email.emailCount "send"}}</span>
|
||||
</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
</LinkTo>
|
||||
@ -84,9 +82,9 @@
|
||||
<a href={{@post.url}} class="permalink gh-list-data gh-post-list-status" target="_blank" rel="noopener noreferrer">
|
||||
<div class="flex items-center">
|
||||
{{#if @post.isScheduled}}
|
||||
<span class="gh-content-status-scheduled gh-badge nowrap" title="Scheduled" data-tooltip="{{capitalize this.scheduledText}} to {{@post.emailRecipientFilter}} members">
|
||||
<span class="gh-content-status-scheduled gh-badge nowrap" title="Scheduled" data-tooltip="{{capitalize this.scheduledText}} to {{@post.emailSegment}} members">
|
||||
Scheduled
|
||||
{{#if @post.emailRecipientFilter}}
|
||||
{{#if @post.newsletter}}
|
||||
{{svg-jar "email-stroke"}}
|
||||
{{/if}}
|
||||
</span>
|
||||
@ -118,9 +116,9 @@
|
||||
<LinkTo @route="editor.edit" @models={{array @post.displayName @post.id}} class="permalink gh-list-data gh-post-list-status">
|
||||
<div class="flex items-center">
|
||||
{{#if @post.isScheduled}}
|
||||
<span class="gh-content-status-scheduled gh-badge nowrap" title="Scheduled" data-tooltip="{{capitalize this.scheduledText}} to {{@post.emailRecipientFilter}} members">
|
||||
<span class="gh-content-status-scheduled gh-badge nowrap" title="Scheduled" data-tooltip="{{capitalize this.scheduledText}} to {{@post.emailSegment}} members">
|
||||
Scheduled
|
||||
{{#if @post.emailRecipientFilter}}
|
||||
{{#if @post.newsletter}}
|
||||
{{svg-jar "email-stroke"}}
|
||||
{{/if}}
|
||||
</span>
|
||||
|
||||
@ -11,11 +11,6 @@ export default class GhPostsListItemComponent extends Component {
|
||||
|
||||
@tracked isHovered = false;
|
||||
|
||||
get sendEmailWhenPublished() {
|
||||
let {post} = this.args;
|
||||
return post.emailRecipientFilter && post.emailRecipientFilter !== 'none';
|
||||
}
|
||||
|
||||
get scheduledText() {
|
||||
let {post} = this.args;
|
||||
let text = [];
|
||||
|
||||
@ -335,7 +335,7 @@ export default Component.extend({
|
||||
// Set default newsletter recipients
|
||||
this.set('sendEmailWhenPublished', this.defaultEmailRecipients);
|
||||
} else {
|
||||
this.set('sendEmailWhenPublished', this.post.emailRecipientFilter);
|
||||
this.set('sendEmailWhenPublished', this.post.emailSegment);
|
||||
}
|
||||
},
|
||||
|
||||
@ -476,7 +476,7 @@ export default Component.extend({
|
||||
|
||||
try {
|
||||
// will show alert for non-date related failed validations
|
||||
post = yield this.saveTask.perform({sendEmailWhenPublished, newsletter: this.selectedNewsletter?.id, emailOnly});
|
||||
post = yield this.saveTask.perform({sendEmailWhenPublished, newsletter: this.selectedNewsletter?.slug, emailOnly});
|
||||
|
||||
this._cachePublishedAtBlogTZ();
|
||||
|
||||
|
||||
@ -1069,7 +1069,6 @@ export default class EditorController extends Controller {
|
||||
async _showScheduledNotification(delayed) {
|
||||
let {
|
||||
publishedAtUTC,
|
||||
emailRecipientFilter,
|
||||
previewUrl,
|
||||
emailOnly,
|
||||
newsletter
|
||||
@ -1079,7 +1078,7 @@ export default class EditorController extends Controller {
|
||||
let title = 'Scheduled';
|
||||
let description = emailOnly ? ['Will be sent'] : ['Will be published'];
|
||||
|
||||
if (emailRecipientFilter && emailRecipientFilter !== 'none') {
|
||||
if (newsletter) {
|
||||
const recipientCount = await this.membersCountCache.countString(this.post.fullRecipientFilter, {newsletter});
|
||||
description.push(`${!emailOnly ? 'and delivered ' : ''}to <span><strong>${recipientCount}</strong></span>`);
|
||||
}
|
||||
|
||||
@ -104,7 +104,7 @@ export default Model.extend(Comparable, ValidationEngine, {
|
||||
updatedBy: attr('number'),
|
||||
url: attr('string'),
|
||||
uuid: attr('string'),
|
||||
emailRecipientFilter: attr('members-segment-string', {defaultValue: null}),
|
||||
emailSegment: attr('members-segment-string', {defaultValue: null}),
|
||||
emailOnly: attr('boolean', {defaultValue: false}),
|
||||
|
||||
featureImage: attr('string'),
|
||||
@ -160,9 +160,8 @@ export default Model.extend(Comparable, ValidationEngine, {
|
||||
hasEmail: computed('email', 'emailOnly', function () {
|
||||
return this.email !== null || this.emailOnly;
|
||||
}),
|
||||
|
||||
willEmail: computed('emailRecipientFilter', 'email', function () {
|
||||
return this.emailRecipientFilter !== null && !this.email;
|
||||
willEmail: computed('isScheduled', 'newsletter', 'email', function () {
|
||||
return this.isScheduled && !!this.newsletter && !this.email;
|
||||
}),
|
||||
|
||||
previewUrl: computed('uuid', 'ghostPaths.url', 'config.blogUrl', function () {
|
||||
@ -201,12 +200,12 @@ export default Model.extend(Comparable, ValidationEngine, {
|
||||
}
|
||||
}),
|
||||
|
||||
fullRecipientFilter: computed('newsletter.recipientFilter', 'emailRecipientFilter', function () {
|
||||
fullRecipientFilter: computed('newsletter.recipientFilter', 'emailSegment', function () {
|
||||
if (!this.newsletter) {
|
||||
return this.emailRecipientFilter;
|
||||
return this.emailSegment;
|
||||
}
|
||||
|
||||
return `${this.newsletter.recipientFilter}+(${this.emailRecipientFilter})`;
|
||||
return `${this.newsletter.recipientFilter}+(${this.emailSegment})`;
|
||||
}),
|
||||
|
||||
// check every second to see if we're past the scheduled time
|
||||
|
||||
@ -273,8 +273,8 @@ export default class PublishOptions {
|
||||
const adapterOptions = {};
|
||||
|
||||
if (willEmail) {
|
||||
adapterOptions.newsletter = this.newsletter.id;
|
||||
adapterOptions.emailRecipientFilter = this.recipientFilter;
|
||||
adapterOptions.newsletter = this.newsletter.slug;
|
||||
adapterOptions.emailSegment = this.recipientFilter;
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user