Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Removed use of ember-route-action-helper

Browse source 
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
This commit is contained in:
Kevin Ansfield 2022-08-30 16:41:48 +01:00
parent 5bd66fd8b7
commit bc185665a4
6 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ghost/admin/.lint-todo
View file

@ -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

10
ghost/admin/app/controllers/settings/staff/index.js
View file

@ -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;
}

7
ghost/admin/app/routes/settings/staff/index.js
View file

@ -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() {

2
ghost/admin/app/templates/settings/staff/index.hbs
View file

@ -62,7 +62,7 @@
<div class="apps-grid">
{{#each this.invites as |invite|}}
<GhUserInvited @invite={{invite}} @reload={{route-action "reload"}} as |component|>
<GhUserInvited @invite={{invite}} @reload={{perform this.backgroundUpdateTask}} as |component|>
<div class="apps-grid-cell" data-test-invite-id="{{invite.id}}">
<article class="apps-card-app">
<div class="apps-card-left">

3
ghost/admin/package.json
View file

@ -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"
}
}
}

10
yarn.lock
View file

@ -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"