From bc185665a4fe073a5938e461364da0784e396b57 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Tue, 30 Aug 2022 16:41:48 +0100 Subject: [PATCH] Removed use of `ember-route-action-helper` refs https://github.com/TryGhost/Ghost/issues/14101 refs https://github.com/TryGhost/Team/issues/1734 - use of the helper was generating deprecation warnings when building Admin - removed the single usage in favor of using `{{perform}}` directly on a controller task property as there was no need to go via the route - changed naming of task properties to include a `...Task` suffix so it's clear when dealing with a task object --- ghost/admin/.lint-todo | 1 + ghost/admin/app/controllers/settings/staff/index.js | 10 +++++----- ghost/admin/app/routes/settings/staff/index.js | 7 +------ ghost/admin/app/templates/settings/staff/index.hbs | 2 +- ghost/admin/package.json | 3 +-- yarn.lock | 10 +--------- 6 files changed, 10 insertions(+), 23 deletions(-) diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo index d4cbfea650..aecfe1cf08 100644 --- a/ghost/admin/.lint-todo +++ b/ghost/admin/.lint-todo @@ -963,3 +963,4 @@ remove|ember-template-lint|no-action|44|19|44|19|40bf79016dee9fe1dca46383af6c4c3 remove|ember-template-lint|no-action|50|19|50|19|de05e88a1b6b658430d78f36b93dfa372903c26d|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs remove|ember-template-lint|no-action|89|103|89|103|8a5526f86c3c3289a47e2e033e39292ceaa3999e|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs remove|ember-template-lint|no-action|92|105|92|105|8ef55f22a4332a43d47b2508c5903048f972cefa|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs +remove|ember-template-lint|no-route-action|63|62|63|62|e9f8663f45f4f41bc590f8db8df3d5dabd9cc732|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs diff --git a/ghost/admin/app/controllers/settings/staff/index.js b/ghost/admin/app/controllers/settings/staff/index.js index 19ae290a1e..848af932ce 100644 --- a/ghost/admin/app/controllers/settings/staff/index.js +++ b/ghost/admin/app/controllers/settings/staff/index.js @@ -51,9 +51,9 @@ export default class IndexController extends Controller { } @task - *backgroundUpdate() { - let users = this.fetchUsers.perform(); - let invites = this.fetchInvites.perform(); + *backgroundUpdateTask() { + let users = this.fetchUsersTask.perform(); + let invites = this.fetchInvitesTask.perform(); try { yield RSVP.all([users, invites]); @@ -63,12 +63,12 @@ export default class IndexController extends Controller { } @task - *fetchUsers() { + *fetchUsersTask() { yield this.store.query('user', {limit: 'all'}); } @task - *fetchInvites() { + *fetchInvitesTask() { if (this.currentUser.isAuthorOrContributor) { return; } diff --git a/ghost/admin/app/routes/settings/staff/index.js b/ghost/admin/app/routes/settings/staff/index.js index 9c37e4e765..9ae517fb57 100644 --- a/ghost/admin/app/routes/settings/staff/index.js +++ b/ghost/admin/app/routes/settings/staff/index.js @@ -22,12 +22,7 @@ export default class IndexRoute extends AuthenticatedRoute { setupController(controller) { super.setupController(...arguments); - controller.backgroundUpdate.perform(); - } - - @action - reload() { - this.controller.backgroundUpdate.perform(); + controller.backgroundUpdateTask.perform(); } buildRouteInfoMetadata() { diff --git a/ghost/admin/app/templates/settings/staff/index.hbs b/ghost/admin/app/templates/settings/staff/index.hbs index 0ce8a36fe7..df20092dc2 100644 --- a/ghost/admin/app/templates/settings/staff/index.hbs +++ b/ghost/admin/app/templates/settings/staff/index.hbs @@ -62,7 +62,7 @@
{{#each this.invites as |invite|}} - +
diff --git a/ghost/admin/package.json b/ghost/admin/package.json index fd6fab4533..0fc09893ef 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -112,7 +112,6 @@ "ember-power-datepicker": "cibernox/ember-power-datepicker", "ember-power-select": "4.1.5", "ember-resolver": "8.0.3", - "ember-route-action-helper": "2.0.8", "ember-simple-auth": "4.2.2", "ember-sinon": "5.0.0", "ember-source": "3.24.0", @@ -176,4 +175,4 @@ "path-browserify": "1.0.1", "webpack": "5.74.0" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 2714ae162f..f9c7024147 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10098,7 +10098,7 @@ ember-get-config@: ember-cli-babel "^7.26.6" ember-cli-htmlbars "^5.7.1" -"ember-getowner-polyfill@^1.1.0 || ^2.0.0", ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.0.1: +"ember-getowner-polyfill@^1.1.0 || ^2.0.0", ember-getowner-polyfill@^2.0.1: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz#38e7dccbcac69d5ec694000329ec0b2be651d2b2" integrity sha512-rwGMJgbGzxIAiWYjdpAh04Abvt0s3HuS/VjHzUFhVyVg2pzAuz45B9AzOxYXzkp88vFC7FPaiA4kE8NxNk4A4Q== @@ -10346,14 +10346,6 @@ ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a" integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw== -ember-route-action-helper@2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/ember-route-action-helper/-/ember-route-action-helper-2.0.8.tgz#f227fcccb73e839b65e9b814e241b322fe8c02fc" - integrity sha512-V+4uKwqaYveriVt2rl4e+9mzHJiQOr1B8dCPQQ2TS3iAcmi5RD2giRDFGtCK9d2XY9Arb/f9hJh0obP20iyt3A== - dependencies: - ember-cli-babel "^6.8.1" - ember-getowner-polyfill "^2.0.0" - ember-router-generator@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"