From c849bea5495a1881a31fc53672bcd478f4ce5167 Mon Sep 17 00:00:00 2001 From: Gabriel Csapo Date: Wed, 2 Feb 2022 02:38:52 -0800 Subject: [PATCH] [chore] runs native classes codemod for apps/helpers (#2241) refs https://github.com/TryGhost/Admin/pull/2227 - a continuation of #2227 that runs the native classes codemod against app/helpers --- ghost/admin/app/helpers/gravatar.js | 9 ++++++--- ghost/admin/app/helpers/members-event-filter.js | 14 ++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ghost/admin/app/helpers/gravatar.js b/ghost/admin/app/helpers/gravatar.js index 0924f06c54..e4267b3939 100644 --- a/ghost/admin/app/helpers/gravatar.js +++ b/ghost/admin/app/helpers/gravatar.js @@ -1,10 +1,13 @@ import Helper from '@ember/component/helper'; +import classic from 'ember-classic-decorator'; import md5 from 'blueimp-md5'; import {isEmpty} from '@ember/utils'; import {inject as service} from '@ember/service'; -export default Helper.extend({ - config: service(), +@classic +export default class Gravatar extends Helper { + @service + config; compute([email], {size = 180, d = 'blank'}/*, hash*/) { if (!this.get('config.useGravatar')) { @@ -17,4 +20,4 @@ export default Helper.extend({ return `https://www.gravatar.com/avatar/${md5(email)}?s=${size}&d=${d}`; } -}); +} diff --git a/ghost/admin/app/helpers/members-event-filter.js b/ghost/admin/app/helpers/members-event-filter.js index 156a242d3c..4bfccbb653 100644 --- a/ghost/admin/app/helpers/members-event-filter.js +++ b/ghost/admin/app/helpers/members-event-filter.js @@ -1,14 +1,20 @@ import Helper from '@ember/component/helper'; +import classic from 'ember-classic-decorator'; import {isBlank} from '@ember/utils'; import {inject as service} from '@ember/service'; export const EMAIL_EVENTS = ['email_delivered_event','email_opened_event','email_failed_event']; export const NEWSLETTER_EVENTS = ['newsletter_event']; -export default Helper.extend({ - settings: service(), +@classic +export default class MembersEventFilter extends Helper { + @service + settings; - compute(positionalParams, {excludedEvents = [], member = '', excludeEmailEvents = false}) { + compute( + positionalParams, + {excludedEvents = [], member = '', excludeEmailEvents = false} + ) { const excludedEventsSet = new Set(); if (this.settings.get('editorDefaultEmailRecipients') === 'disabled') { @@ -36,4 +42,4 @@ export default Helper.extend({ return filterParts.join('+'); } -}); +}