- {{#unless @isMobilePreview}}
-
\ No newline at end of file
diff --git a/apps/ember-admin/app/components/gh-browser-preview.js b/apps/ember-admin/app/components/gh-browser-preview.js
deleted file mode 100644
index 8c30f8a48ec..00000000000
--- a/apps/ember-admin/app/components/gh-browser-preview.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@glimmer/component';
-import {inject as service} from '@ember/service';
-
-export default class GhBrowserPreview extends Component {
- @service settings;
-}
diff --git a/apps/ember-admin/app/components/gh-date-picker.hbs b/apps/ember-admin/app/components/gh-date-picker.hbs
deleted file mode 100644
index 62d37dce014..00000000000
--- a/apps/ember-admin/app/components/gh-date-picker.hbs
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- {{/unless}}
-
-
-
- {{#if (or @icon this.settings.icon)}}
- 
- {{else}}
- {{svg-jar "default-favicon"}}
- {{/if}}
- {{or @title this.settings.title}}
-
-
-
-
- {{yield}}
-
-
-
-
-
-
- {{#if (has-block)}}
- {{yield (assign
- dp
- (hash
- select=this.onDateSelected
- Triger=null
- Content=null
- Nav=dp.Nav
- Days=(component dp.Days minDate=this.minDate maxDate=this.maxDate weekdayFormat="min")
- )
- )}}
- {{else}}
-
-
-
- {{#if this.error}}
-
\ No newline at end of file
diff --git a/apps/ember-admin/app/components/gh-date-picker.js b/apps/ember-admin/app/components/gh-date-picker.js
deleted file mode 100644
index 75e054ad5d6..00000000000
--- a/apps/ember-admin/app/components/gh-date-picker.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import Component from '@glimmer/component';
-import moment from 'moment-timezone';
-import {action} from '@ember/object';
-import {isBlank} from '@ember/utils';
-import {tracked} from '@glimmer/tracking';
-
-export class DateError extends Error {
- constructor(msgOrObj) {
- if (typeof msgOrObj === 'string') {
- super(msgOrObj);
- } else {
- super(msgOrObj.message);
- Object.keys(msgOrObj).forEach((key) => {
- if (key !== 'message') {
- this[key] = msgOrObj[key];
- }
- });
- }
- }
-}
-
-export default class GhDatePicker extends Component {
- @tracked error = null;
-
- get dateFormat() {
- return 'YYYY-MM-DD';
- }
-
- get minDate() {
- return this._minMaxMoment(this.args.minDate);
- }
-
- get maxDate() {
- return this._minMaxMoment(this.args.maxDate);
- }
-
- @action
- setDate(dateStr) {
- this.error = null;
-
- if (!dateStr.match(/^\d\d\d\d-\d\d-\d\d$/)) {
- this.error = `Date must be ${this.dateFormat}`;
- this.args.onError?.(new DateError({
- message: this.error,
- date: dateStr
- }));
- return false;
- }
-
- const mDate = moment(dateStr);
-
- if (!mDate.isValid()) {
- this.error = 'Invalid date';
- this.args.onError?.(new DateError({
- message: this.error,
- date: dateStr
- }));
- return false;
- }
-
- if (this.args.minDate && mDate.isBefore(moment(this.args.minDate))) {
- this.error = this.args.minDateError || `Must be on or after ${moment(this.args.minDate).format(this.dateFormat)}`;
-
- this.args.onError?.(new DateError({
- message: this.error,
- date: dateStr
- }));
- return false;
- }
-
- if (this.args.maxDate && mDate.isAfter(moment(this.args.maxDate))) {
- this.error = this.args.maxDateError || `Must be on or before ${moment(this.args.maxDate).format(this.dateFormat)}`;
- this.args.onError?.(new DateError({
- message: this.error,
- date: dateStr
- }));
- return false;
- }
-
- this.args.onChange?.(mDate.toDate());
- }
-
- @action
- onDateSelected(datepickerEvent) {
- if (datepickerEvent instanceof moment) {
- this.setDate(datepickerEvent.format(this.dateFormat));
- } else {
- this.setDate(datepickerEvent.id);
- }
- }
-
- @action
- onDateInput(datepicker, event) {
- const skipFocus = true;
- datepicker.actions.close(event, skipFocus);
-
- this.args.onInput?.(event);
- }
-
- @action
- onDateBlur(event) {
- const value = event.target.value;
-
- if (!value) {
- this.resetInputValue(event.target);
- } else {
- this.setDate(value);
- }
-
- this.args.onBlur?.(event);
- }
-
- @action
- onDateKeydown(datepicker, event) {
- if (event.key === 'Escape') {
- event.preventDefault();
- event.stopImmediatePropagation();
- this.resetInputValue(event.target);
- }
-
- if (event.key === 'Enter') {
- event.preventDefault();
- event.stopImmediatePropagation();
- this.setDate(event.target.value);
- datepicker.actions.close();
- }
-
- this.args.onKeydown?.(event);
- }
-
- @action
- resetInputValue(input) {
- input.value = moment(this.args.value).format(this.dateFormat);
- this.error = null;
- }
-
- _minMaxMoment(date) {
- if (date === 'now') {
- return moment(moment().format(this.dateFormat));
- } else if (!isBlank(date)) {
- return moment(moment(date).format(this.dateFormat));
- } else {
- return null;
- }
- }
-}
diff --git a/apps/ember-admin/app/components/gh-facebook-url-input.hbs b/apps/ember-admin/app/components/gh-facebook-url-input.hbs
deleted file mode 100644
index 1765c5298df..00000000000
--- a/apps/ember-admin/app/components/gh-facebook-url-input.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/apps/ember-admin/app/components/gh-facebook-url-input.js b/apps/ember-admin/app/components/gh-facebook-url-input.js
deleted file mode 100644
index 4e8e5083ed8..00000000000
--- a/apps/ember-admin/app/components/gh-facebook-url-input.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import Component from '@glimmer/component';
-import validator from 'validator';
-import {action} from '@ember/object';
-
-export default class GhFacebookUrlInput extends Component {
- get value() {
- const {model, modelProperty, scratchValue} = this.args;
- return scratchValue || model[modelProperty];
- }
-
- @action
- setScratchValue(event) {
- this.args.setScratchValue?.(event.target.value);
- }
-
- @action
- setFacebookUrl(event) {
- const {model, modelProperty} = this.args;
-
- let newUrl = event.target.value;
-
- // reset errors and validation
- model.errors.remove('facebook');
- model.hasValidated.removeObject('facebook');
-
- if (!newUrl) {
- // Clear out the Facebook url
- model[modelProperty] = null;
- this.args.setScratchValue?.(null);
- return;
- }
-
- try {
- // strip any facebook URLs out
- newUrl = newUrl.replace(/(https?:\/\/)?(www\.)?facebook\.com/i, '');
-
- // don't allow any non-facebook urls
- if (newUrl.match(/^(http|\/\/)/i)) {
- throw 'invalid url';
- }
-
- // strip leading / if we have one then concat to full facebook URL
- newUrl = newUrl.replace(/^\//, '');
- newUrl = `https://www.facebook.com/${newUrl}`;
-
- // don't allow URL if it's not valid
- if (!validator.isURL(newUrl)) {
- throw 'invalid url';
- }
-
- model[modelProperty] = newUrl;
- this.args.setScratchValue?.(null);
- } catch (e) {
- if (e === 'invalid url') {
- const message = 'The URL must be in a format like https://www.facebook.com/yourPage';
- model.errors.add('facebook', message);
- return;
- }
-
- throw e;
- } finally {
- model.hasValidated.pushObject('facebook');
- }
- }
-}
diff --git a/apps/ember-admin/app/components/gh-html-iframe.hbs b/apps/ember-admin/app/components/gh-html-iframe.hbs
deleted file mode 100644
index 9a56dc75621..00000000000
--- a/apps/ember-admin/app/components/gh-html-iframe.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- {{svg-jar "calendar" class="gh-date-picker-cal-icon"}}
-
- {{this.error}}
- {{/if}}
-
-
-
-
\ No newline at end of file
diff --git a/apps/ember-admin/app/components/gh-html-iframe.js b/apps/ember-admin/app/components/gh-html-iframe.js
deleted file mode 100644
index dce995497b1..00000000000
--- a/apps/ember-admin/app/components/gh-html-iframe.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-export default class GhHtmlIframeComponent extends Component {
- iframes = [];
- renderedIframe = 0;
- toRenderIframe = 1;
-
- get hiddenIframeStyle() {
- return 'position: absolute; visibility: hidden; border: none;';
- }
-
- get visibleIframeStyle() {
- return 'border: none;';
- }
-
- @action
- replaceIframeContents() {
- const iframe = this.iframes[this.toRenderIframe];
-
- if (iframe && this.args.html) {
- iframe.contentWindow.document.open();
- iframe.contentWindow.document.write(this.args.html);
- iframe.contentWindow.document.close();
-
- // force swap of iframes after a set timeout to account for slower connections
- // so we display _something_ in the iframe even though it's still loading
- this.swapTimeout = setTimeout(() => {
- this.swapIframes(iframe);
- }, 500);
- }
- }
-
- @action
- registerIframe(iframe) {
- this.iframes.push(iframe);
-
- if (this.iframes.indexOf(iframe) === 0) {
- iframe.style = this.visibleIframeStyle;
- this.replaceIframeContents();
- }
-
- if (this.iframes.indexOf(iframe) === 1) {
- iframe.style = this.hiddenIframeStyle;
- }
- }
-
- @action
- didLoad(event) {
- if (this.isDestroyed || this.isDestroying) {
- return;
- }
-
- this.swapIframes(event.target);
- }
-
- swapIframes(renderedIframe) {
- if (this.isDestroyed || this.isDestroying) {
- return;
- }
-
- window.clearTimeout(this.swapTimeout);
-
- if (this.iframes.indexOf(renderedIframe) !== this.renderedIframe) {
- let newScrollTop = this.iframes[this.renderedIframe].contentDocument.body.scrollTop;
-
- if (this._lastPageId !== this.args.pageId) {
- newScrollTop = 0;
- }
- this._lastPageId = this.args.pageId;
-
- if (this.iframes[this.toRenderIframe].contentDocument.body) {
- this.iframes[this.toRenderIframe].contentDocument.body.scrollTop = newScrollTop;
- }
- this.iframes[this.toRenderIframe].style = this.visibleIframeStyle;
- this.renderedIframe = this.toRenderIframe;
- this.toRenderIframe = this.toRenderIframe === 0 ? 1 : 0;
- this.iframes[this.toRenderIframe].style = this.hiddenIframeStyle;
- }
- }
-}
diff --git a/apps/ember-admin/app/components/gh-member-details.hbs b/apps/ember-admin/app/components/gh-member-details.hbs
deleted file mode 100644
index 65e05001de7..00000000000
--- a/apps/ember-admin/app/components/gh-member-details.hbs
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
- {{#if (or @member.name @member.email)}}
-
- {{#unless @member.isNew}}
-
-
- N
-
- {{/if}}
-
-
- - {{or @member.name @member.email}} - {{#unless (or @member.name @member.email)}} - {{#if @member.isNew}} - New member - {{/if}} - {{/unless}} -
-- {{#if (and @member.name @member.email)}} - {{@member.email}} - {{/if}} -
-
-
-
- {{#if (and (not-eq this.settings.membersSignupAccess "none") (not-eq this.settings.editorDefaultEmailRecipients "disabled"))}}
- Signup info
-- {{svg-jar "member-add"}} - Created — {{moment-format (moment-site-tz @member.createdAtUTC) "D MMM YYYY"}} -
- {{#if this.referrerSource}} -- {{svg-jar "earth"}} - Source — {{this.referrerSource}} -
- {{/if}} - {{#if (and @member.attribution.url @member.attribution.title)}} -- {{svg-jar "posts"}} - Page — {{ @member.attribution.title }} -
- {{!-- Learn more → --}} - {{/if}} -
-
- {{/if}}
- {{/unless}}
- Engagement
- {{#if (eq @member.emailCount 0)}} -
-
- {{else}}
- - {{#if @member.name}} - We’ll show {{first-name @member.name}}’s email stats here once they receive their first newsletter. - {{else}} - We’ll show this member’s email stats here once they receive their first newsletter. - {{/if}} -
-
-
- {{/if}}
-
-
- Emails received
-{{@member.emailCount}}
-
-
- Emails opened
-{{@member.emailOpenedCount}}
-
-
- Average open rate
-
- {{#if (is-empty @member.emailOpenRate)}}
- This metric is calculated once a member has received 5 newsletters.
- {{else}}
- {{@member.emailOpenRate}}%
- {{/if}}
-
-
-
-
-
-{{#if this.showDetails}}
- - {{{this.error.rule}}} -
- -- {{{this.error.details}}} -
- {{#if this.error.failures}} -
-
- {{/if}}
-{{/if}}
diff --git a/apps/ember-admin/app/components/gh-theme-error-li.js b/apps/ember-admin/app/components/gh-theme-error-li.js
deleted file mode 100644
index 489a120609e..00000000000
--- a/apps/ember-admin/app/components/gh-theme-error-li.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Component from '@ember/component';
-import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
-import {tagName} from '@ember-decorators/component';
-
-@classic
-@tagName('')
-export default class GhThemeErrorLi extends Component {
- error = null;
- showDetails = false;
-
- @action
- toggleDetails() {
- this.toggleProperty('showDetails');
- }
-}
diff --git a/apps/ember-admin/app/components/gh-token-input/label-selected-item.hbs b/apps/ember-admin/app/components/gh-token-input/label-selected-item.hbs
deleted file mode 100644
index 51a1151fe62..00000000000
--- a/apps/ember-admin/app/components/gh-token-input/label-selected-item.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{@option.name}}
diff --git a/apps/ember-admin/app/components/gh-token-input/label-token.hbs b/apps/ember-admin/app/components/gh-token-input/label-token.hbs
deleted file mode 100644
index 889d9eeadc1..00000000000
--- a/apps/ember-admin/app/components/gh-token-input/label-token.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield}}
diff --git a/apps/ember-admin/app/components/gh-token-input/label-token.js b/apps/ember-admin/app/components/gh-token-input/label-token.js
deleted file mode 100644
index 0327c9c3924..00000000000
--- a/apps/ember-admin/app/components/gh-token-input/label-token.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import DraggableObject from 'ember-drag-drop/components/draggable-object';
-import classic from 'ember-classic-decorator';
-import {alias} from '@ember/object/computed';
-import {attributeBindings, classNames} from '@ember-decorators/component';
-import {computed} from '@ember/object';
-
-@classic
-@attributeBindings('title')
-@classNames('label-token')
-export default class LabelToken extends DraggableObject {
- @alias('content.name') name;
-
- @computed('name')
- get title() {
- return this.name ?? 'Label';
- }
-}
diff --git a/apps/ember-admin/app/components/gh-twitter-url-input.hbs b/apps/ember-admin/app/components/gh-twitter-url-input.hbs
deleted file mode 100644
index 22635bfafc6..00000000000
--- a/apps/ember-admin/app/components/gh-twitter-url-input.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/ember-admin/app/components/gh-twitter-url-input.js b/apps/ember-admin/app/components/gh-twitter-url-input.js
deleted file mode 100644
index 0f86e7c8f63..00000000000
--- a/apps/ember-admin/app/components/gh-twitter-url-input.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import Component from '@glimmer/component';
-import {action} from '@ember/object';
-
-export default class GhTwitterUrlInput extends Component {
- get value() {
- const {model, modelProperty, scratchValue} = this.args;
- return scratchValue || model[modelProperty];
- }
-
- @action
- setScratchValue(event) {
- this.args.setScratchValue?.(event.target.value);
- }
-
- @action
- setTwitterUrl(event) {
- const {model, modelProperty} = this.args;
-
- const newUrl = event.target.value;
-
- // reset errors and validation
- model.errors.remove(modelProperty);
- model.hasValidated.removeObject(modelProperty);
-
- if (!newUrl) {
- // Clear out the Twitter url
- model[modelProperty] = '';
- this.args.setScratchValue?.(null);
- return;
- }
-
- if (newUrl.match(/(?:twitter\.com\/)(\S+)/) || newUrl.match(/([a-z\d.]+)/i)) {
- let username = [];
-
- if (newUrl.match(/(?:twitter\.com\/)(\S+)/)) {
- [, username] = newUrl.match(/(?:twitter\.com\/)(\S+)/);
- } else {
- [username] = newUrl.match(/([^/]+)\/?$/mi);
- }
-
- // check if username starts with http or www and show error if so
- if (username.match(/^(http|www)|(\/)/) || !username.match(/^[a-z\d._]{1,15}$/mi)) {
- const message = !username.match(/^[a-z\d._]{1,15}$/mi)
- ? 'Your Username is not a valid Twitter Username'
- : 'The URL must be in a format like https://twitter.com/yourUsername';
-
- model.errors.add(modelProperty, message);
- model.hasValidated.pushObject(modelProperty);
- return;
- }
-
- model[modelProperty] = `https://twitter.com/${username}`;
- this.args.setScratchValue?.(null);
-
- model.hasValidated.pushObject(modelProperty);
- } else {
- const message = 'The URL must be in a format like https://twitter.com/yourUsername';
- model.errors.add(modelProperty, message);
- model.hasValidated.pushObject(modelProperty);
- return;
- }
- }
-}
diff --git a/apps/ember-admin/app/components/gh-url-input.hbs b/apps/ember-admin/app/components/gh-url-input.hbs
deleted file mode 100644
index 121592c5851..00000000000
--- a/apps/ember-admin/app/components/gh-url-input.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-Affected files:
--
- {{#each this.error.failures as |failure|}}
-
{{failure.ref}}{{#if failure.message}}: {{failure.message}}{{/if}}
- {{/each}}
-
Filter member {{svg-jar "arrow-down-small"}}
diff --git a/apps/ember-admin/app/components/modal-impersonate-member.hbs b/apps/ember-admin/app/components/modal-impersonate-member.hbs
deleted file mode 100644
index d275df893b6..00000000000
--- a/apps/ember-admin/app/components/modal-impersonate-member.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-Impersonate
-
-
-
-
-
-
- - This is an authentication link to sign into {{this.config.blogTitle}} as {{this.member.email}}, you can send it to them if they need it, or use it to sign into their account for customer support. -
- - -
-
diff --git a/apps/ember-admin/app/components/modal-impersonate-member.js b/apps/ember-admin/app/components/modal-impersonate-member.js
deleted file mode 100644
index 6041e3dfde4..00000000000
--- a/apps/ember-admin/app/components/modal-impersonate-member.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
-import {alias} from '@ember/object/computed';
-import {inject} from 'ghost-admin/decorators/inject';
-import {inject as service} from '@ember/service';
-import {task, timeout} from 'ember-concurrency';
-
-export default ModalComponent.extend({
- store: service(),
-
- classNames: 'modal-impersonate-member',
-
- signinUrl: null,
- config: inject(),
-
- member: alias('model'),
-
- didInsertElement() {
- this._super(...arguments);
-
- this._signinUrlUpdateTask.perform();
- },
-
- actions: {
- // noop - we don't want the enter key doing anything
- confirm() {}
- },
-
- copySigninUrl: task(function* () {
- copyTextToClipboard(this.signinUrl);
- yield timeout(1000);
- return true;
- }),
-
- _signinUrlUpdateTask: task(function*() {
- const memberSigninURL = yield this.member.fetchSigninUrl.perform();
-
- this.set('signinUrl', memberSigninURL.url);
- }).drop()
-});
diff --git a/apps/ember-admin/app/components/modal-members-label-form.hbs b/apps/ember-admin/app/components/modal-members-label-form.hbs
deleted file mode 100644
index f922edfd26c..00000000000
--- a/apps/ember-admin/app/components/modal-members-label-form.hbs
+++ /dev/null
@@ -1,71 +0,0 @@
-{{#if this.showDeleteLabelModal}}
- This link is only valid for the next 24 hours
-Are you sure you want to delete this label?
-
-
-
-
-{{else}}
-
- - You’re about to delete label "{{this.label.name}}". This is permanent! We warned you, k? -
-{{if this.label.isNew "New label" "Edit label"}}
-
-
-
-
-
-{{/if}}
\ No newline at end of file
diff --git a/apps/ember-admin/app/components/modal-members-label-form.js b/apps/ember-admin/app/components/modal-members-label-form.js
deleted file mode 100644
index 9fb6a042a86..00000000000
--- a/apps/ember-admin/app/components/modal-members-label-form.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {and} from '@ember/object/computed';
-import {resetQueryParams} from 'ghost-admin/helpers/reset-query-params';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
- router: service(),
- notifications: service(),
- labelsManager: service(),
- model: null,
- showDeleteLabelModal: false,
-
- confirm() {},
- label: and('model', 'model.label'),
-
- willDestroyElement() {
- this._super(...arguments);
- this.label.errors.clear();
- this.label.rollbackAttributes();
- },
-
- actions: {
- toggleDeleteLabelModal() {
- this.label.rollbackAttributes();
- this.set('showDeleteLabelModal', true);
- },
-
- validate(property) {
- return this.label.validate({property});
- },
-
- confirm() {
- return this.saveTask.perform();
- }
- },
-
- saveTask: task(function* () {
- const label = this.model && this.model.label;
- const availableLabels = (this.model && this.model.labels) || [];
- if (!label) {
- return false;
- }
- try {
- yield label.validate();
-
- const duplicateLabel = availableLabels.find((existingLabel) => {
- return existingLabel.name.trim().toLowerCase() === label.name.trim().toLowerCase()
- && existingLabel.slug !== label.slug;
- });
-
- if (duplicateLabel) {
- label.errors.add('name', 'A label with the same name already exists');
- label.hasValidated.pushObject('name');
- // label.invalidate();
-
- return false;
- }
-
- const savedLabel = yield label.save();
- this.notifications.showNotification('Label saved');
- this.send('closeModal');
- return savedLabel;
- } catch (error) {
- if (error) {
- this.notifications.showAPIError(error, {key: 'label.save'});
- }
- }
- }),
-
- deleteLabel: task(function * () {
- const label = this.model && this.model.label;
- if (!label) {
- return false;
- }
- try {
- yield label.destroyRecord();
- this.labelsManager.removeLabel(label);
- const routeName = this.router.currentRouteName;
- this.notifications.showNotification('Label deleted');
- this.send('closeModal');
- this.router.transitionTo(routeName, {queryParams: resetQueryParams(routeName)});
- } catch (error) {
- if (error) {
- return this.notifications.showAPIError(error, {key: 'label.delete'});
- }
- }
- })
-
-});
diff --git a/apps/ember-admin/app/components/modals/new-custom-integration.hbs b/apps/ember-admin/app/components/modals/new-custom-integration.hbs
deleted file mode 100644
index 8a584fbe522..00000000000
--- a/apps/ember-admin/app/components/modals/new-custom-integration.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/ember-admin/app/components/modals/new-custom-integration.js b/apps/ember-admin/app/components/modals/new-custom-integration.js
deleted file mode 100644
index 7073fadacd3..00000000000
--- a/apps/ember-admin/app/components/modals/new-custom-integration.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import Component from '@glimmer/component';
-import {A} from '@ember/array';
-import {action} from '@ember/object';
-import {isHostLimitError} from 'ghost-admin/services/ajax';
-import {isInvalidError} from 'ember-ajax/errors';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-import {tracked} from '@glimmer/tracking';
-
-export default class NewCustomIntegrationModal extends Component {
- @service router;
- @service store;
-
- @tracked errorMessage;
-
- constructor() {
- super(...arguments);
- this.integration = this.store.createRecord('integration');
- }
-
- willDestroy() {
- super.willDestroy(...arguments);
- this.integration.rollbackAttributes();
- }
-
- @action
- updateName(inputEvent) {
- this.integration.set('name', inputEvent.target.value);
- this.integration.set('hasValidated', A());
- this.integration.errors.clear();
- }
-
- @task({drop: true})
- *createIntegrationTask() {
- try {
- const integration = yield this.integration.save();
- this.router.transitionTo('settings.integration', integration);
- return true;
- } catch (error) {
- // TODO: server-side validation errors should be serialized
- // properly so that errors are added to model.errors automatically
- if (error && isInvalidError(error)) {
- const [firstError] = error.payload.errors;
- const {message} = firstError;
-
- if (message && message.match(/name/i)) {
- this.integration.errors.add('name', message);
- this.integration.hasValidated.pushObject('name');
- return;
- }
- }
-
- if (isHostLimitError(error)) {
- this.errorMessage = error.payload.errors[0].context;
- return;
- }
-
- // bubble up to the global error handler
- if (error) {
- throw error;
- }
- }
- }
-}
diff --git a/apps/ember-admin/app/components/posts-list/list-item.hbs b/apps/ember-admin/app/components/posts-list/list-item.hbs
deleted file mode 100644
index 1e69154a316..00000000000
--- a/apps/ember-admin/app/components/posts-list/list-item.hbs
+++ /dev/null
@@ -1,274 +0,0 @@
-{{!-- template-lint-disable no-invalid-interactive --}}
-- {{@post.title}} -
- {{#unless @hideAuthor }} - -- - Published - {{#if @post.hasEmail}} - {{#if this.isHovered}} - and sent to {{gh-pluralize @post.email.emailCount "member"}} - {{else}} - and sent - {{/if}} - {{/if}} - -
- {{/unless}} - - {{else}} -- {{#if @post.featured}} - {{svg-jar "star-fill" class="gh-featured-post"}} - {{/if}} - {{@post.title}} -
- {{#unless @hideAuthor }} - -- {{#if @post.isScheduled}} - - Scheduled - {{#if this.isHovered}} - - {{#if @post.emailOnly}} - to be sent - {{this.scheduledText}} to {{humanize-recipient-filter @post.emailSegment}} - {{else}} - to be published {{if @post.newsletter "and sent "}} - {{this.scheduledText}} - {{#if @post.newsletter}} - to {{humanize-recipient-filter @post.emailSegment}} - {{/if}} - {{/if}} - - {{/if}} - - {{/if}} - - {{#if @post.isDraft}} - - Draft - - {{/if}} - - {{#if @post.isPublished}} - - Published - {{#if @post.didEmailFail}} - but failed to send newsletter - {{else if @post.hasBeenEmailed}} - and sent - {{#if this.isHovered}} - to {{gh-pluralize @post.email.emailCount "member"}} - {{/if}} - {{/if}} - - {{/if}} - - {{#if @post.isSent}} - - {{#if @post.didEmailFail}} - Failed to send newsletter - {{else}} - Sent - {{#if this.isHovered}} - to {{gh-pluralize @post.email.emailCount "member"}} - {{/if}} - {{/if}} - - {{/if}} -
- {{/unless}} -
- {{!-- Opened / Signups column --}}
- {{#if (and @post.showEmailOpenAnalytics @post.showEmailClickAnalytics) }}
-
-
- {{#if this.isHovered}}
- {{format-number @post.email.openedCount}}
- {{else}}
- {{@post.email.openRate}}%
- {{/if}}
-
-
- opened
-
-
- {{else}}
-
-
- {{!-- Button column --}}
- {{#if @post.hasAnalyticsPage }}
- {{#if (gh-user-can-admin this.session.user)}}
-
-
- {{svg-jar "stats" title="Go to Analytics"}}
-
-
- {{/if}}
- {{else}}
- {{#if (and this.session.user.isContributor @post.isPublished)}}
-
-
- {{svg-jar "arrow-top-right" title="View post"}}
-
-
- {{else}}
-
- {{!-- Empty column to maintain spacing --}}
-
- {{/if}}
-
- {{!-- Clicked / Conversions column --}}
- {{#if @post.showEmailClickAnalytics }}
-
-
- {{#if this.isHovered}}
- {{format-number @post.count.clicks}}
- {{else}}
- {{@post.clickRate}}%
- {{/if}}
-
-
- clicked
-
-
- {{else}}
- {{#if @post.showEmailOpenAnalytics }}
-
-
- {{#if this.isHovered}}
- {{format-number @post.email.openedCount}}
- {{else}}
- {{@post.email.openRate}}%
- {{/if}}
-
-
- opened
-
-
- {{else}}
-
- {{!-- Empty column to maintain spacing --}}
-
- {{/if}}
- {{/if}}
-
- {{!-- Visitor count column (only show for published posts when traffic analytics is enabled AND web analytics is enabled) --}}
- {{#if this.settings.webAnalyticsEnabled}}
- {{#if @post.isPublished}}
- {{#if this.hasVisitorData}}
-
-
- {{format-number this.visitorCount}}
-
-
- visitors
-
-
- {{else}}
-
-
- —
-
-
- visitors
-
-
- {{/if}}
- {{/if}}
- {{/if}}
-
- {{!-- Member conversions column (only show for published posts when member tracking is enabled) --}}
- {{#if this.settings.membersTrackSources}}
- {{#if @post.isPublished}}
- {{#if this.hasMemberData}}
-
-
- +{{format-number this.totalMemberConversions}}
- {{!-- {{#if this.isHovered}}
- +{{format-number this.memberCounts.free}} free, +{{format-number this.memberCounts.paid}} paid
- {{else}}
- {{/if}} --}}
-
-
- members
-
-
- {{else}}
-
-
- —
-
-
- members
-
-
- {{/if}}
- {{/if}}
- {{/if}}
- ${oldChars}
- ${newChars}
- `);
-}
-
-export default helper(splitNumber);
diff --git a/apps/ember-admin/app/helpers/toggle-feature.js b/apps/ember-admin/app/helpers/toggle-feature.js
deleted file mode 100644
index aa99d63af0a..00000000000
--- a/apps/ember-admin/app/helpers/toggle-feature.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Helper from '@ember/component/helper';
-import {inject as service} from '@ember/service';
-
-export default class ToggleFeature extends Helper {
- @service feature;
-
- compute([featureFlag]) {
- return () => {
- const flag = !!this.feature.get(featureFlag);
- this.feature.set(featureFlag, !flag);
- };
- }
-}
diff --git a/apps/ember-admin/app/helpers/ui-btn-span.js b/apps/ember-admin/app/helpers/ui-btn-span.js
deleted file mode 100644
index 7c53c168020..00000000000
--- a/apps/ember-admin/app/helpers/ui-btn-span.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import {btnStyles} from './ui-btn';
-import {helper} from '@ember/component/helper';
-
-export function uiBtnSpan([style], hash) {
- return btnStyles(Object.assign({}, {style}, hash)).span;
-}
-
-export default helper(uiBtnSpan);
diff --git a/apps/ember-admin/app/helpers/ui-btn.js b/apps/ember-admin/app/helpers/ui-btn.js
deleted file mode 100644
index 14299905b46..00000000000
--- a/apps/ember-admin/app/helpers/ui-btn.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import {helper} from '@ember/component/helper';
-
-export function btnStyles(options = {}) {
- let button = 'dib midgrey btn-base br3 ba b--lightgrey-l1 pointer glow';
- let span = 'f8 fw5 tracked-2 dib pt0 pb0 tc';
-
- // Set style
- if (options.style) {
- switch (options.style) {
- case 'outline-white':
- case 'outline-white--s':
- button = 'bg-transparent dib white btn-base br3 ba b--white-60 pointer highlight-white';
- span = 'f8 fw5 tracked-2 dib pt0 pb0 tc';
- break;
- case 'outline-blue':
- case 'outline-blue--s':
- button = 'bg-transparent dib blue btn-base br3 ba b--lightgrey pointer glow';
- span = 'f8 fw5 tracked-2 dib pt0 pb0 tc';
- break;
- case 'blue':
- case 'blue--s':
- button = 'dib bw0 white br3 btn-base btn-blue pointer';
- span = 'f8 fw5 tracked-2 dib pt0 pb0 tc';
- break;
- case 'green':
- case 'green--s':
- button = 'dib bw0 white br3 btn-base btn-green pointer';
- span = 'f8 fw5 tracked-2 dib pt0 pb0 tc';
- break;
- case 'red':
- case 'red--s':
- button = 'dib bw0 white br3 btn-base btn-red pointer';
- span = 'f8 fw5 tracked-2 dib pt0 pb0 tc';
- break;
- }
-
- // Style ending with '--s' means small button
- if (options.style.substr(options.style.length - 3) === '--s') {
- button = `${button} btn-small`;
- }
- }
-
- if (options.class) {
- button = `${button} ${options.class}`;
- }
-
- button = `sans-serif ${button} flex-shrink-0`;
- span = `${span} inline-flex items-center`;
-
- return {
- button: button,
- span: span
- };
-}
-
-export function uiBtn([style], hash) {
- return btnStyles(Object.assign({}, {style}, hash)).button;
-}
-
-export default helper(uiBtn);
diff --git a/apps/ember-admin/app/helpers/ui-text.js b/apps/ember-admin/app/helpers/ui-text.js
deleted file mode 100644
index ddd28bc6992..00000000000
--- a/apps/ember-admin/app/helpers/ui-text.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import {helper} from '@ember/component/helper';
-
-export function uiText([style]) {
- let cssClass = '';
-
- switch (style) {
- case 'h1':
- cssClass = 'f-subheadline fw7 tracked-3 lh-heading ma0 pa0';
- break;
- case 'h2':
- cssClass = 'f2 fw6 tracked-2 tracked-3 lh-title ma0 pa0';
- break;
- case 'h3':
- cssClass = 'f5 fw6 tracked-2 lh-title ma0 pa0';
- break;
- case 'h4':
- cssClass = 'f7 fw6 tracked-2 lh-copy ma0 pa0';
- break;
- case 'h5':
- cssClass = 'f8 fw6 tracked-2 lh-copy ma0 pa0';
- break;
- case 'h6':
- cssClass = 'f-small ttu fw4 tracked-3 lh-copy ma0 pa0';
- break;
- case 'tl':
- cssClass = 'f6 fw3 lh-copy tracked-1 ma0 pa0';
- break;
- case 't':
- cssClass = 'f7 fw3 lh-copy tracked-1 ma0 pa0';
- break;
- case 'ts':
- cssClass = 'f8 fw3 lh-copy tracked-2 ma0 pa0';
- break;
- case 'txs':
- cssClass = 'f-small fw3 lh-copy tracked-3 ma0 pa0';
- break;
- }
-
- return cssClass;
-}
-
-export default helper(uiText);
diff --git a/apps/ember-admin/app/mixins/validation-state.js b/apps/ember-admin/app/mixins/validation-state.js
deleted file mode 100644
index fe9493ff926..00000000000
--- a/apps/ember-admin/app/mixins/validation-state.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import Mixin from '@ember/object/mixin';
-import {A as emberA} from '@ember/array';
-import {isEmpty} from '@ember/utils';
-import {observer} from '@ember/object';
-import {on} from '@ember/object/evented';
-import {run} from '@ember/runloop';
-
-/**
- * Adds `success` or `error` classes to the element based on the passed
- * in `DS.Errors` object, the `property` to inspect, and an array of
- * validated property names in `hasValidated`
- */
-export default Mixin.create({
-
- errors: null,
- property: '',
- hasValidated: emberA(),
-
- hasError: false,
-
- setHasError() {
- const property = this.property;
- const errors = this.errors;
- const hasValidated = this.hasValidated;
-
- // if we aren't looking at a specific property we always want an error class
- if (!property && errors && !errors.get('isEmpty')) {
- this.set('hasError', true);
- return;
- }
-
- // If we haven't yet validated this field, there is no validation class needed
- if (!hasValidated || !hasValidated.includes(property)) {
- this.set('hasError', false);
- return;
- }
-
- if (errors && !isEmpty(errors.errorsFor(property))) {
- this.set('hasError', true);
- return;
- }
-
- this.set('hasError', false);
- },
-
- // eslint-disable-next-line ghost/ember/no-observers
- hasErrorObserver: on('init', observer('errors.[]', 'property', 'hasValidated.[]', function () {
- run.once(this, 'setHasError');
- }))
-
-});
diff --git a/apps/ember-admin/app/modifiers/movable.js b/apps/ember-admin/app/modifiers/movable.js
deleted file mode 100644
index cc503be35e5..00000000000
--- a/apps/ember-admin/app/modifiers/movable.js
+++ /dev/null
@@ -1,237 +0,0 @@
-import Modifier from 'ember-modifier';
-import {action} from '@ember/object';
-import {guidFor} from '@ember/object/internals';
-import {registerDestructor} from '@ember/destroyable';
-import {inject as service} from '@ember/service';
-
-export default class MovableModifier extends Modifier {
- @service dropdown;
-
- moveThreshold = 3;
-
- active = false;
- currentX = undefined;
- currentY = undefined;
- initialX = undefined;
- initialY = undefined;
- xOffset = 0;
- yOffset = 0;
-
- constructor(owner, args) {
- super(owner, args);
- registerDestructor(this, this.cleanup);
- }
-
- // Lifecycle hooks ---------------------------------------------------------
-
- modify(element, positional, named) {
- if (!this.didSetup) {
- this.elem = element;
- this.addStartEventListeners();
-
- if (named.adjustOnResize) {
- this._resizeObserver = new ResizeObserver(() => {
- if (this.currentX === undefined || this.currentY === undefined) {
- return;
- }
-
- const {x, y} = named.adjustOnResize(element, {x: this.currentX, y: this.currentY});
-
- if (x === this.currentX && y === this.currentY) {
- return;
- }
-
- this.currentX = x;
- this.initialX = x;
- this.xOffset = x;
-
- this.currentY = y;
- this.initialY = y;
- this.yOffset = y;
-
- this.setTranslate(x, y);
- });
- this._resizeObserver.observe(element);
- }
-
- this.didSetup = true;
- }
- }
-
- cleanup = () => {
- this.removeEventListeners();
- this.removeResizeObserver();
- this.enableSelection();
- };
-
- // Custom methods -----------------------------------------------------------
-
- addStartEventListeners() {
- this.elem.addEventListener('touchstart', this.dragStart, false);
- this.elem.addEventListener('mousedown', this.dragStart, false);
- }
-
- removeStartEventListeners() {
- this.elem.removeEventListener('touchstart', this.dragStart, false);
- this.elem.removeEventListener('mousedown', this.dragStart, false);
- }
-
- addActiveEventListeners() {
- window.addEventListener('touchend', this.dragEnd, {capture: true, passive: false});
- window.addEventListener('touchmove', this.drag, {capture: true, passive: false});
- window.addEventListener('mouseup', this.dragEnd, {capture: true, passive: false});
- window.addEventListener('mousemove', this.drag, {capture: true, passive: false});
- }
-
- removeActiveEventListeners() {
- window.removeEventListener('touchend', this.dragEnd, {capture: true, passive: false});
- window.removeEventListener('touchmove', this.drag, {capture: true, passive: false});
- window.removeEventListener('mouseup', this.dragEnd, {capture: true, passive: false});
- window.removeEventListener('mousemove', this.drag, {capture: true, passive: false});
-
- // Removing this immediately results in the click event behind re-enabled in the same
- // event loop meaning that it doesn't have the desired effect when dragging out of the canvas.
- // Putting in the next tick stops the immediate click event firing when finishing drag
- setTimeout(() => {
- window.removeEventListener('click', this.cancelClick, {capture: true, passive: false});
- }, 1);
- }
-
- removeEventListeners() {
- this.removeStartEventListeners();
- this.removeActiveEventListeners();
- }
-
- removeResizeObserver() {
- this._resizeObserver?.disconnect();
- }
-
- @action
- dragStart(e) {
- if (e.type === 'touchstart' || e.button === 0) {
- if (e.type === 'touchstart') {
- this.initialX = e.touches[0].clientX - this.xOffset;
- this.initialY = e.touches[0].clientY - this.yOffset;
- } else {
- this.initialX = e.clientX - this.xOffset;
- this.initialY = e.clientY - this.yOffset;
- }
-
- for (const elem of (e.path || e.composedPath())) {
- if (elem.matches('input, .ember-basic-dropdown-trigger')) {
- break;
- }
-
- if (elem === this.elem) {
- this.addActiveEventListeners();
- break;
- }
- }
- }
- }
-
- @action
- drag(e) {
- e.preventDefault();
-
- let eventX, eventY;
-
- if (e.type === 'touchmove') {
- eventX = e.touches[0].clientX;
- eventY = e.touches[0].clientY;
- } else {
- eventX = e.clientX;
- eventY = e.clientY;
- }
-
- if (!this.active) {
- if (
- Math.abs(Math.abs(this.initialX - eventX) - Math.abs(this.xOffset)) > this.moveThreshold ||
- Math.abs(Math.abs(this.initialY - eventY) - Math.abs(this.yOffset)) > this.moveThreshold
- ) {
- this.dropdown.closeDropdowns();
- this.disableScroll();
- this.disableSelection();
- this.disablePointerEvents();
- this.active = true;
- }
- }
-
- if (this.active) {
- this.currentX = eventX - this.initialX;
- this.currentY = eventY - this.initialY;
- this.xOffset = this.currentX;
- this.yOffset = this.currentY;
-
- this.setTranslate(this.currentX, this.currentY);
- }
- }
-
- @action
- dragEnd(e) {
- e.preventDefault();
- e.stopPropagation();
-
- this.active = false;
-
- this.initialX = this.currentX;
- this.initialY = this.currentY;
-
- this.removeActiveEventListeners();
- this.enableScroll();
- this.enableSelection();
-
- // timeout required so immediate events blocked until the dragEnd has fully realised
- setTimeout(() => {
- this.enablePointerEvents();
- }, 5);
- }
-
- @action
- cancelClick(e) {
- e.preventDefault();
- e.stopPropagation();
- }
-
- setTranslate(xPos, yPos) {
- this.elem.style.transform = `translate3d(${xPos}px, ${yPos}px, 0)`;
- }
-
- disableScroll() {
- this.originalOverflow = this.elem.style.overflow;
- this.elem.style.overflow = 'hidden';
- }
-
- enableScroll() {
- this.elem.style.overflow = this.originalOverflow;
- }
-
- disableSelection() {
- window.getSelection().removeAllRanges();
-
- const stylesheet = document.createElement('style');
- stylesheet.id = `stylesheet-${guidFor(this)}`;
-
- document.head.appendChild(stylesheet);
-
- stylesheet.sheet.insertRule('* { user-select: none !important; }', 0);
- }
-
- enableSelection() {
- const stylesheet = document.getElementById(`stylesheet-${guidFor(this)}`);
- stylesheet?.remove();
- }
-
- // disabling pointer events prevents inputs being activated when drag finishes,
- // preventing clicks stops any event handlers that may otherwise result in the
- // movable element being closed when the drag finishes
- disablePointerEvents() {
- this.elem.style.pointerEvents = 'none';
- window.addEventListener('click', this.cancelClick, {capture: true, passive: false});
- }
-
- enablePointerEvents() {
- this.elem.style.pointerEvents = '';
- window.removeEventListener('click', this.cancelClick, {capture: true, passive: false});
- }
-}
diff --git a/apps/ember-admin/app/modifiers/scroll-into-view.js b/apps/ember-admin/app/modifiers/scroll-into-view.js
deleted file mode 100644
index 81f88795c11..00000000000
--- a/apps/ember-admin/app/modifiers/scroll-into-view.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import getScrollParent from 'ghost-admin/utils/get-scroll-parent';
-import {modifier} from 'ember-modifier';
-
-export default modifier((element, [shouldScroll = true], {offset = 0, useViewport = true}) => {
- if (shouldScroll) {
- const scrollParent = getScrollParent(element);
-
- // scrolls so the element is visible on-screen
- if (useViewport) {
- const elementRect = element.getBoundingClientRect();
- const scrollParentRect = scrollParent.getBoundingClientRect();
-
- // TODO: ensure scroll parent is visible?
-
- const isOffTop = elementRect.top < 0;
- const isOffBottom = elementRect.bottom > scrollParentRect.bottom;
-
- if (isOffTop) {
- // TODO: implement me
- }
-
- if (isOffBottom) {
- let adjustment = Math.abs(scrollParentRect.bottom - elementRect.bottom);
-
- // keep top on screen
- if (elementRect.top - adjustment < offset) {
- const readjustment = Math.abs(elementRect.top - adjustment - (offset * 2));
- adjustment -= readjustment;
- }
-
- const top = scrollParent.scrollTop + adjustment + offset;
-
- scrollParent.scrollTo({top, behavior: 'smooth'});
- }
- }
-
- // scrolls so the element is visible inside of the scroll parent's viewport,
- // may not result in element being visible on-screen if scroll parent is cut off
- if (!useViewport) {
- const isOffTop = element.offsetTop < scrollParent.scrollTop;
- const isOffBottom = scrollParent.scrollTop + scrollParent.offsetHeight < element.offsetTop + element.offsetHeight;
-
- if (isOffTop) {
- const top = element.offsetTop - offset;
- scrollParent.scrollTo({top, behavior: 'smooth'});
- }
-
- if (isOffBottom) {
- const top = element.offsetTop - scrollParent.offsetHeight + element.offsetHeight + offset;
- scrollParent.scrollTo({top, behavior: 'smooth'});
- }
- }
- }
-}, {eager: false});
diff --git a/apps/ember-admin/app/routes/application.js b/apps/ember-admin/app/routes/application.js
index c0ec9863380..fd7f7db0bf3 100644
--- a/apps/ember-admin/app/routes/application.js
+++ b/apps/ember-admin/app/routes/application.js
@@ -117,6 +117,7 @@ window.ReactDOM = ReactDOM;
export default Route.extend(ShortcutsRoute, {
ajax: service(),
configManager: service(),
+ feature: service(),
ghostPaths: service(),
notifications: service(),
router: service(),
@@ -243,6 +244,11 @@ export default Route.extend(ShortcutsRoute, {
},
openSearchModal() {
+ // React owns Cmd-K search while this flag is on
+ if (this.feature.globalSearchReact) {
+ return;
+ }
+
// Don't open the search modal if the sidebar is hidden
// e.g. in the editor or settings screens
if (this.ui.isFullScreen) {
diff --git a/apps/ember-admin/app/services/data-cache.js b/apps/ember-admin/app/services/data-cache.js
deleted file mode 100644
index cbc729d1f47..00000000000
--- a/apps/ember-admin/app/services/data-cache.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import Service from '@ember/service';
-
-const ONE_MINUTE = 1 * 60 * 1000;
-
-export default class DataCacheService extends Service {
- cache = {};
- timeouts = {};
-
- get(key) {
- return this.cache[key];
- }
-
- set(key, data, lifetime = ONE_MINUTE) {
- this.cache[key] = data;
-
- this.timeouts[key] = window.setTimeout(() => {
- delete this.cache[key];
- delete this.timeouts[key];
- }, lifetime);
-
- return this.cache[key];
- }
-
- clear() {
- this._clearAllTimeouts();
- this.cache = {};
- this.timeouts = {};
- }
-
- willDestroy() {
- this._clearAllTimeouts();
- }
-
- _clearAllTimeouts() {
- Object.keys(this.timeouts).forEach(key => window.clearTimeout(this.timeouts[key]));
- }
-}
diff --git a/apps/ember-admin/app/services/state-bridge.js b/apps/ember-admin/app/services/state-bridge.js
index 3c405a69afe..179726bb4be 100644
--- a/apps/ember-admin/app/services/state-bridge.js
+++ b/apps/ember-admin/app/services/state-bridge.js
@@ -29,6 +29,7 @@ const emberDataTypeMapping = {
};
export default class StateBridgeService extends Service.extend(Evented) {
+ @service billing;
@service customViews;
@service feature;
@service membersUtils;
@@ -268,6 +269,13 @@ export default class StateBridgeService extends Service.extend(Evented) {
this.trigger('openGiftLinkModal', {id, resource});
}
+ // A billing search result for the billing route already showing is a no-op
+ // Ember transition, so React hands the sub-route to the billing app directly
+ @action
+ navigateToBillingSubRoute(subRoute) {
+ this.billing.navigateToSubRoute(subRoute);
+ }
+
get sidebarVisible() {
// Sidebar is visible when NOT in fullscreen mode
return !this.ui.isFullScreen;
diff --git a/apps/ember-admin/app/transforms/moment-date.js b/apps/ember-admin/app/transforms/moment-date.js
deleted file mode 100644
index 0f78626913d..00000000000
--- a/apps/ember-admin/app/transforms/moment-date.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Transform from '@ember-data/serializer/transform';
-import moment from 'moment-timezone';
-
-export default class MomentDate extends Transform {
- deserialize(serialized) {
- if (serialized) {
- return moment(serialized);
- }
- return serialized;
- }
-
- serialize(deserialized) {
- if (deserialized) {
- return moment(deserialized).toDate();
- }
- return deserialized;
- }
-}
diff --git a/apps/ember-admin/app/transforms/visibility-string.js b/apps/ember-admin/app/transforms/visibility-string.js
deleted file mode 100644
index f1f75bab65e..00000000000
--- a/apps/ember-admin/app/transforms/visibility-string.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Transform from '@ember-data/serializer/transform';
-
-// post visibility supports `'members'` and `'paid'` as special-case options
-// but that doesn't map well for options in our token select inputs so we
-// expand/convert them here to make usage elsewhere easier
-
-export default class VisibilityString extends Transform {
- deserialize(serialized) {
- if (serialized === 'members') {
- return 'status:free,status:-free';
- }
- if (serialized === 'paid') {
- return 'status:-free';
- }
-
- return serialized;
- }
-
- serialize(deserialized) {
- if (deserialized === 'status:free,status:-free') {
- return 'members';
- }
- if (deserialized === 'status:-free') {
- return 'paid';
- }
-
- return deserialized;
- }
-}
diff --git a/apps/ember-admin/app/utils/merge-stats-by-date.js b/apps/ember-admin/app/utils/merge-stats-by-date.js
deleted file mode 100644
index bdd881f8976..00000000000
--- a/apps/ember-admin/app/utils/merge-stats-by-date.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export default function mergeStatsByDate(list) {
- const reducedStatsByDate = list.reduce((acc, current) => {
- const currentDate = current.date;
-
- if (!acc[currentDate]) {
- acc[currentDate] = {
- date: currentDate,
- count: 0,
- positiveDelta: 0,
- negativeDelta: 0,
- signups: 0,
- cancellations: 0
- };
- }
-
- acc[currentDate].count += current.count;
- acc[currentDate].positiveDelta += current.positive_delta;
- acc[currentDate].negativeDelta += current.negative_delta;
- acc[currentDate].signups += current.signups;
- acc[currentDate].cancellations += current.cancellations;
-
- return acc;
- }, {});
-
- return Object.values(reducedStatsByDate);
-}
diff --git a/apps/ember-admin/app/utils/password-generator.js b/apps/ember-admin/app/utils/password-generator.js
deleted file mode 100644
index 62b8f662522..00000000000
--- a/apps/ember-admin/app/utils/password-generator.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * copied from https://github.com/bermi/password-generator
- * Copyright(c) 2011-2015 Bermi Ferrer {{eventsFetcher.shownEvents}}
- {{eventsFetcher.totalEvents}}
- {{/let}}
- `);
-
- expect(find('.shown-events')).to.have.trimmed.text('2');
- expect(find('.total-events')).to.have.trimmed.text('10');
- });
-
- it('can update total/shown amount of events ', async function () {
- this.server.createList('member-activity-event', 5, {createdAt: moment('2022-11-01 12:00:00').format('YYYY-MM-DD HH:mm:ss')});
-
- await render(hbs`
- {{#let (activity-feed-fetcher pageSize="2") as |eventsFetcher|}}
-
-
-
- {{eventsFetcher.shownEvents}}
- {{eventsFetcher.totalEvents}}
- {{/let}}
- `);
-
- const totalEvents = find('.total-events');
- const shownEvents = find('.shown-events');
-
- expect(shownEvents).to.have.trimmed.text('2');
- expect(totalEvents).to.have.trimmed.text('5');
-
- // nothing should change if user tries to load previous page on the first one
- await click('.previous');
- expect(shownEvents).to.have.trimmed.text('2');
- expect(totalEvents).to.have.trimmed.text('5');
-
- // go to the last page
- await click('.next');
- await click('.next');
- expect(shownEvents).to.have.trimmed.text('5');
- expect(totalEvents).to.have.trimmed.text('5');
-
- // nothing should change if user tries to load next page on the last one
- await click('.next');
- expect(shownEvents).to.have.trimmed.text('5');
- expect(totalEvents).to.have.trimmed.text('5');
-
- await click('.previous');
- expect(shownEvents).to.have.trimmed.text('4');
- expect(totalEvents).to.have.trimmed.text('5');
- });
-
- it('can update data for each page', async function () {
- this.server.createList('member-activity-event', 5, {createdAt: moment('2022-11-01 12:00:00').format('YYYY-MM-DD HH:mm:ss')});
- // create event in future to make sure that user don't get events after current date
- this.server.create('member-activity-event', {createdAt: moment().add(1, 'd').format('YYYY-MM-DD HH:mm:ss')});
-
- await render(hbs`
- {{#let (activity-feed-fetcher pageSize="2") as |eventsFetcher|}}
-
-
-
- {{#each eventsFetcher.data as |event|}}
- {{event.data.id}}
- {{/each}}
- {{/let}}
- `);
-
- expect(findAll('.event-id').length).to.equal(2);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('5');
-
- await click('.next');
- expect(findAll('.event-id').length).to.equal(2);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('3');
-
- await click('.next');
- expect(findAll('.event-id').length).to.equal(1);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('1');
-
- // nothing should change if user tries to load next page on the last one
- await click('.next');
- expect(findAll('.event-id').length).to.equal(1);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('1');
-
- await click('.previous');
- expect(findAll('.event-id').length).to.equal(2);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('3');
-
- await click('.previous');
- expect(findAll('.event-id').length).to.equal(2);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('5');
-
- // nothing should change if user tries to load previous page on the first one
- await click('.previous');
- expect(findAll('.event-id').length).to.equal(2);
- expect(findAll('.event-id')[0]).to.have.trimmed.text('5');
- });
-
- it('change error state and show error message if fetch was unsuccessful ', async function () {
- this.server.createList('member-activity-event', 10, {createdAt: moment('2022-11-01 12:00:00').format('YYYY-MM-DD HH:mm:ss')});
-
- await render(hbs`
- {{#let (activity-feed-fetcher pageSize="2") as |eventsFetcher|}}
-
-
- {{eventsFetcher.isError}}
-
- {{/let}}
- `);
-
- expect(find('.error')).to.have.trimmed.text('false');
- expect(find('.error-message')).to.have.trimmed.text('');
-
- this.server.get(
- '/members/events',
- () => ({errors: [{message: 'Error message'}]}),
- 500
- );
-
- await click('.next');
-
- expect(find('.error')).to.have.trimmed.text('true');
- expect(find('.error-message')).to.have.trimmed.text('Error message');
- });
-});
diff --git a/apps/ember-admin/tests/unit/helpers/gh-count-characters-test.js b/apps/ember-admin/tests/unit/helpers/gh-count-characters-test.js
deleted file mode 100644
index 7777047a021..00000000000
--- a/apps/ember-admin/tests/unit/helpers/gh-count-characters-test.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import {countCharacters} from 'ghost-admin/helpers/gh-count-characters';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-
-describe('Unit: Helper: gh-count-characters', function () {
- const defaultStyle = 'color: rgb(69, 195, 46);';
- const errorStyle = 'color: rgb(240, 82, 48);';
-
- it('counts remaining chars', function () {
- const result = countCharacters(['test']);
- expect(result.string)
- .to.equal(`196`);
- });
-
- it('warns when nearing limit', function () {
- const result = countCharacters([Array(195 + 1).join('x')]);
- expect(result.string)
- .to.equal(`5`);
- });
-
- it('indicates too many chars', function () {
- const result = countCharacters([Array(205 + 1).join('x')]);
- expect(result.string)
- .to.equal(`-5`);
- });
-
- it('counts multibyte correctly', function () {
- let result = countCharacters(['💩']);
- expect(result.string)
- .to.equal(`199`);
-
- // emoji + modifier is still two chars
- result = countCharacters(['💃🏻']);
- expect(result.string)
- .to.equal(`198`);
- });
-});
diff --git a/apps/ember-admin/tests/unit/helpers/most-recently-updated-test.js b/apps/ember-admin/tests/unit/helpers/most-recently-updated-test.js
deleted file mode 100644
index bb1320ae24f..00000000000
--- a/apps/ember-admin/tests/unit/helpers/most-recently-updated-test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import moment from 'moment-timezone';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {mostRecentlyUpdated} from 'ghost-admin/helpers/most-recently-updated';
-
-describe('Unit: Helper: most-recently-updated', function () {
- it('returns most recent - updatedAtUTC', function () {
- const a = {updatedAtUTC: moment.utc('2022-03-04 16:10')};
- const b = {updatedAtUTC: moment.utc('2022-03-03 16:10')};
- const c = {updatedAtUTC: moment.utc('2022-03-04 16:20')};
-
- const subs = [a, b, c];
-
- expect(mostRecentlyUpdated(subs)).to.equal(c);
- });
-
- it('returns most recent - updatedAt', function () {
- const a = {updatedAt: moment('2022-03-04 16:10')};
- const b = {updatedAt: moment('2022-03-05 16:10')};
- const c = {updatedAt: moment('2022-03-04 16:20')};
-
- const subs = [a, b, c];
-
- expect(mostRecentlyUpdated(subs)).to.equal(b);
- });
-
- it('returns most recent - updated_at', function () {
- const a = {updated_at: '2022-03-04 16:10'};
- const b = {updated_at: '2022-03-03 16:10'};
- const c = {updated_at: '2022-03-04 16:20'};
-
- const subs = [a, b, c];
-
- expect(mostRecentlyUpdated(subs)).to.equal(c);
- });
-
- it('handles a single-element array', function () {
- const a = {updated_at: '2022-02-22'};
-
- expect(mostRecentlyUpdated([a])).to.equal(a);
- });
-
- it('handles null', function () {
- expect(mostRecentlyUpdated(null)).to.equal(null);
- });
-
- it('handles empty array', function () {
- expect(mostRecentlyUpdated([])).to.equal(null);
- });
-
- it('does not modify original array', function () {
- const a = {updated_at: '2022-03-04 16:10'};
- const b = {updated_at: '2022-03-03 16:10'};
- const c = {updated_at: '2022-03-04 16:20'};
-
- const subs = [a, b, c];
-
- mostRecentlyUpdated(subs);
-
- expect(subs[0]).to.equal(a);
- expect(subs[1]).to.equal(b);
- expect(subs[2]).to.equal(c);
- });
-});
diff --git a/apps/ember-admin/tests/unit/helpers/most-relevant-subscription-test.js b/apps/ember-admin/tests/unit/helpers/most-relevant-subscription-test.js
deleted file mode 100644
index e38f11155c7..00000000000
--- a/apps/ember-admin/tests/unit/helpers/most-relevant-subscription-test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-import {mostRelevantSubscription} from 'ghost-admin/helpers/most-relevant-subscription';
-
-describe('Unit: Helper: most-relevant-subscription', function () {
- it('returns active subscriptions first', function () {
- const active = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
- const canceled = {id: 'b', status: 'canceled', current_period_end: '2022-03-04 16:10'};
-
- const subs = [active, canceled];
-
- expect(mostRelevantSubscription(subs)).to.equal(active);
- });
-
- it('returns the subscription with the latest current_period_end', function () {
- const older = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
- const latest = {id: 'b', status: 'active', current_period_end: '2022-03-04 16:20'};
-
- const subs = [older, latest];
-
- expect(mostRelevantSubscription(subs)).to.equal(latest);
- });
-
- it('ignores comped subscriptions', function () {
- const normal = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
- const comped = {id: null, status: 'active', current_period_end: '2022-03-04 16:20'};
-
- const subs = [normal, comped];
-
- expect(mostRelevantSubscription(subs)).to.equal(normal);
- });
-
- it('handles null or invalid dates', function () {
- const a = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
- const b = {id: 'b', status: 'active', current_period_end: '2022-03-04 16:20'};
- const c = {id: 'c', status: 'active', current_period_end: ''};
- const d = {id: 'd', status: 'active', current_period_end: null};
- const e = {id: 'e', status: 'active', current_period_end: 'string'};
-
- const subs = [a, b, c, d, e];
-
- expect(mostRelevantSubscription(subs)).to.equal(b);
- });
-
- it('handles a single-element array', function () {
- const a = {id: 'a', current_period_end: '2022-02-22'};
-
- expect(mostRelevantSubscription([a])).to.equal(a);
- });
-
- it('handles null', function () {
- expect(mostRelevantSubscription(null)).to.equal(null);
- });
-
- it('handles empty array', function () {
- expect(mostRelevantSubscription([])).to.equal(null);
- });
-
- it('does not modify original array', function () {
- const a = {id: 'a', status: 'active', current_period_end: '2022-03-04 16:10'};
- const b = {id: 'b', status: 'canceled', current_period_end: '2022-03-04 16:10'};
- const c = {id: null, status: 'active', current_period_end: '2022-03-04 16:10'};
-
- const subs = [a, b, c];
-
- mostRelevantSubscription(subs);
-
- expect(subs[0]).to.equal(a);
- expect(subs[1]).to.equal(b);
- expect(subs[2]).to.equal(c);
- });
-});
diff --git a/apps/ember-admin/tests/unit/services/state-bridge-test.js b/apps/ember-admin/tests/unit/services/state-bridge-test.js
index 7bd3b944fcf..284b15feb81 100644
--- a/apps/ember-admin/tests/unit/services/state-bridge-test.js
+++ b/apps/ember-admin/tests/unit/services/state-bridge-test.js
@@ -55,6 +55,17 @@ describe('Unit: Service: state-bridge', function () {
sinon.restore();
});
+ describe('#navigateToBillingSubRoute', function () {
+ it('hands the sub-route to the billing app', function () {
+ const billing = this.owner.lookup('service:billing');
+ sinon.stub(billing, 'navigateToSubRoute');
+
+ service.navigateToBillingSubRoute('/plans');
+
+ expect(billing.navigateToSubRoute.calledOnceWithExactly('/plans')).to.be.true;
+ });
+ });
+
describe('#isFeatureEnabled', function () {
it('does not claim route ownership before Labs settings load', function () {
settings.settingsModel = null;
diff --git a/apps/ember-admin/tests/unit/utils/merge-stats-by-date-test.js b/apps/ember-admin/tests/unit/utils/merge-stats-by-date-test.js
deleted file mode 100644
index 62480d478a7..00000000000
--- a/apps/ember-admin/tests/unit/utils/merge-stats-by-date-test.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import mergeStatsByDate from 'ghost-admin/utils/merge-stats-by-date';
-import {describe, it} from 'mocha';
-import {expect} from 'chai';
-
-const STATS_DATA = [
- {
- date: '2024-06-22',
- tier: '111111111111111111111111',
- cadence: 'month',
- positive_delta: 0,
- negative_delta: 0,
- signups: 0,
- cancellations: 0,
- count: 456
- },
- {
- date: '2024-06-22',
- tier: '111111111111111111111111',
- cadence: 'year',
- positive_delta: 1,
- negative_delta: 1,
- signups: 0,
- cancellations: 0,
- count: 1354
- },
- {
- date: '2024-06-23',
- tier: '111111111111111111111111',
- cadence: 'month',
- positive_delta: 0,
- negative_delta: 0,
- signups: 0,
- cancellations: 0,
- count: 456
- },
- {
- date: '2024-06-23',
- tier: '111111111111111111111111',
- cadence: 'year',
- positive_delta: 1,
- negative_delta: 1,
- signups: 0,
- cancellations: 0,
- count: 1354
- },
- {
- date: '2024-06-23',
- tier: '111111111111111111111113',
- cadence: 'year',
- positive_delta: 0,
- negative_delta: 0,
- signups: 0,
- cancellations: 0,
- count: 400
- },
- {
- date: '2024-06-24',
- tier: '111111111111111111111111',
- cadence: 'year',
- positive_delta: 3,
- negative_delta: 2,
- signups: 1,
- cancellations: 0,
- count: 1355
- },
- {
- date: '2024-06-24',
- tier: '111111111111111111111113',
- cadence: 'year',
- positive_delta: 2,
- negative_delta: 1,
- signups: 2,
- cancellations: 1,
- count: 401
- },
- {
- date: '2024-06-24',
- tier: '111111111111111111111112',
- cadence: 'year',
- positive_delta: 1,
- negative_delta: 0,
- signups: 1,
- cancellations: 0,
- count: 55
- },
- {
- date: '2024-06-25',
- tier: '111111111111111111111111',
- cadence: 'month',
- positive_delta: 0,
- negative_delta: 1,
- signups: 0,
- cancellations: 1,
- count: 455
- },
- {
- date: '2024-06-25',
- tier: '111111111111111111111111',
- cadence: 'year',
- positive_delta: 2,
- negative_delta: 5,
- signups: 1,
- cancellations: 4,
- count: 1352
- },
- {
- date: '2024-06-25',
- tier: '111111111111111111111113',
- cadence: 'year',
- positive_delta: 1,
- negative_delta: 2,
- signups: 1,
- cancellations: 2,
- count: 400
- },
- {
- date: '2024-06-26',
- tier: '111111111111111111111111',
- cadence: 'year',
- positive_delta: 2,
- negative_delta: 2,
- signups: 0,
- cancellations: 0,
- count: 1352
- },
- {
- date: '2024-06-26',
- tier: '111111111111111111111113',
- cadence: 'year',
- positive_delta: 0,
- negative_delta: 0,
- signups: 0,
- cancellations: 0,
- count: 400
- }
-];
-
-describe('mergeStatsByDate', function () {
- it('merges stats as expected', function () {
- const result = mergeStatsByDate(STATS_DATA);
- expect(result).to.deep.equal([
- {
- date: '2024-06-22',
- count: 1810,
- positiveDelta: 1,
- negativeDelta: 1,
- signups: 0,
- cancellations: 0
- },
- {
- date: '2024-06-23',
- count: 2210,
- positiveDelta: 1,
- negativeDelta: 1,
- signups: 0,
- cancellations: 0
- },
- {
- date: '2024-06-24',
- count: 1811,
- positiveDelta: 6,
- negativeDelta: 3,
- signups: 4,
- cancellations: 1
- },
- {
- date: '2024-06-25',
- count: 2207,
- positiveDelta: 3,
- negativeDelta: 8,
- signups: 2,
- cancellations: 7
- },
- {
- date: '2024-06-26',
- count: 1752,
- positiveDelta: 2,
- negativeDelta: 2,
- signups: 0,
- cancellations: 0
- }
- ]);
- });
-});
diff --git a/docs/contributing/test-data.md b/docs/contributing/test-data.md
index ef7c21d9355..c72c8e63b27 100644
--- a/docs/contributing/test-data.md
+++ b/docs/contributing/test-data.md
@@ -36,7 +36,8 @@ do not cover the scenario:
```bash
docker exec ghost-dev bash -c \
- 'cd /home/ghost/ghost/core && node index.js generate-data \
+ 'cd /home/ghost/ghost/core && node --conditions=source --import=tsx index.js \
+ generate-data \
--clear-database --quantities members:10000,posts:500 --seed 123'
```
diff --git a/e2e/helpers/pages/admin/posts/post/index.ts b/e2e/helpers/pages/admin/posts/post/index.ts
index 45d9856593c..99d625f77cd 100644
--- a/e2e/helpers/pages/admin/posts/post/index.ts
+++ b/e2e/helpers/pages/admin/posts/post/index.ts
@@ -2,3 +2,7 @@ export { PageEditorPage, PostEditorPage } from './post-editor-page';
export { PostPreviewModal } from './post-preview-modal';
export { DesktopPreviewFrame, EmailPreviewFrame } from './post-preview-frames';
export type { PostPreviewImplementation } from './post-preview-frames';
+export { EditorHeader } from './post-editor-header';
+export { FeatureImage } from './post-feature-image';
+export { PostSettingsSidebar } from './post-settings-sidebar';
+export type { PostSettingsSectionId } from './post-settings-sidebar';
diff --git a/e2e/helpers/pages/admin/posts/post/post-editor-header.ts b/e2e/helpers/pages/admin/posts/post/post-editor-header.ts
new file mode 100644
index 00000000000..1c328c877ef
--- /dev/null
+++ b/e2e/helpers/pages/admin/posts/post/post-editor-header.ts
@@ -0,0 +1,69 @@
+import { Locator, Page } from '@playwright/test';
+import {
+ editorHeaderActions,
+ editorPreviewButton,
+ editorPublishButton,
+ editorPublishInputsError,
+ editorSaveButton,
+ editorSaveErrorBanner,
+ editorScheduleCountdown,
+ editorStatus,
+ editorUnpublishButton,
+ editorUnscheduleButton,
+ editorUpdateButton,
+ postsBackLink,
+} from '@tryghost/test-data/selectors/editor';
+
+/** The React editor's header: the back link, the status line and the actions. */
+export class EditorHeader {
+ readonly actions: Locator;
+ readonly backLink: Locator;
+ readonly status: Locator;
+ readonly scheduleCountdown: Locator;
+ readonly saveErrorBanner: Locator;
+ readonly publishInputsError: Locator;
+ readonly previewButton: Locator;
+ readonly publishButton: Locator;
+ readonly updateButton: Locator;
+ readonly saveButton: Locator;
+ readonly unpublishButton: Locator;
+ readonly unscheduleButton: Locator;
+
+ constructor(page: Page) {
+ this.actions = page.getByTestId(editorHeaderActions);
+ this.backLink = page.getByRole('link', { name: postsBackLink, exact: true });
+ this.status = page.getByTestId(editorStatus);
+ this.scheduleCountdown = page.getByTestId(editorScheduleCountdown);
+ this.saveErrorBanner = page.getByTestId(editorSaveErrorBanner);
+ this.publishInputsError = page.getByTestId(editorPublishInputsError);
+ // The publish flow carries a Preview button of its own, so every action is
+ // scoped to the header.
+ this.previewButton = this.actionButton(editorPreviewButton);
+ this.publishButton = this.actionButton(editorPublishButton);
+ this.updateButton = this.actionButton(editorUpdateButton);
+ this.saveButton = this.actionButton(editorSaveButton);
+ this.unpublishButton = this.actionButton(editorUnpublishButton);
+ this.unscheduleButton = this.actionButton(editorUnscheduleButton);
+ }
+
+ async preview(): PromiseAlready sent
', + plaintext: 'Already sent', + track_opens: false, + submitted_at: new Date(), + newsletter_id: newsletters[0].id, + }, + { context: { internal: true } }, + ); + const batch = await models.EmailBatch.add( + { email_id: email.id, status: 'submitted' }, + { context: { internal: true } }, + ); + for (const member of recipients) { + await models.EmailRecipient.add( + { + email_id: email.id, + batch_id: batch.id, + member_id: member.id, + member_uuid: member.uuid, + member_email: member.email, + processed_at: new Date(), + }, + { context: { internal: true } }, + ); + } + + await agent.delete(`/members/${recipients[0].id}`).expectStatus(204); + await agent.delete(`/members/${recipients[1].id}`).expectStatus(204); + + assert.equal( + await membersService.verificationTrigger.checkVerificationRequired({ + newsletterSend: true, + }), + false, + 'Two removed recipients should be within the threshold', + ); + + // Changing a member's address removes the old one just as deleting the member does + await agent + .put(`/members/${recipients[2].id}/`) + .body({ members: [{ email: 'removed-recipient-3-changed@example.com' }] }) + .expectStatus(200); + + const { body: nextPostBody } = await agent + .post('/posts/') + .body({ posts: [{ title: 'Next send', status: 'draft' }] }) + .expectStatus(201); + const nextPost = nextPostBody.posts[0]; + + const { body } = await agent + .put(`/posts/${nextPost.id}/?newsletter=${newsletters[0].get('slug')}`) + .body({ posts: [{ ...nextPost, status: 'published' }] }) + .expectStatus(403); + + assert.equal(body.errors[0].code, 'EMAIL_VERIFICATION_NEEDED'); + assert.equal(settingsCache.get('email_verification_required'), true); + assert.deepEqual( + receivedWebhookRequests.map(({ body: webhookBody }) => ({ + method: webhookBody.method, + amountTriggered: webhookBody.amountTriggered, + threshold: webhookBody.threshold, + })), + [{ method: 'removed_recipients', amountTriggered: 3, threshold: 2 }], + ); + }); }); }); diff --git a/ghost/core/test/e2e-api/admin/posts-delete-email-data.test.ts b/ghost/core/test/e2e-api/admin/posts-delete-email-data.test.ts new file mode 100644 index 00000000000..4d797599f05 --- /dev/null +++ b/ghost/core/test/e2e-api/admin/posts-delete-email-data.test.ts @@ -0,0 +1,100 @@ +import ObjectId from 'bson-objectid'; +import assert from 'node:assert/strict'; +import { agentProvider, fixtureManager } from '../../utils/e2e-framework'; + +// @ts-expect-error Module has no type declarations. +import models from '../../../core/server/models'; + +type Agent = Awaited