diff --git a/ghost/admin/app/controllers/team/index.js b/ghost/admin/app/controllers/team/index.js
index e7426207f8..78eabc8f07 100644
--- a/ghost/admin/app/controllers/team/index.js
+++ b/ghost/admin/app/controllers/team/index.js
@@ -1,18 +1,17 @@
/* eslint-disable ghost/ember/alias-model-in-controller */
import Controller from '@ember/controller';
+import RSVP from 'rsvp';
+import {alias, sort} from '@ember/object/computed';
import {computed} from '@ember/object';
import {inject as service} from '@ember/service';
-import {sort} from '@ember/object/computed';
+import {task} from 'ember-concurrency';
export default Controller.extend({
session: service(),
+ store: service(),
showInviteUserModal: false,
- activeUsers: null,
- suspendedUsers: null,
- invites: null,
-
inviteOrder: null,
userOrder: null,
@@ -22,17 +21,67 @@ export default Controller.extend({
this.userOrder = ['name', 'email'];
},
+ currentUser: alias('model'),
+
sortedInvites: sort('filteredInvites', 'inviteOrder'),
sortedActiveUsers: sort('activeUsers', 'userOrder'),
sortedSuspendedUsers: sort('suspendedUsers', 'userOrder'),
+ invites: computed(function () {
+ return this.store.peekAll('invite');
+ }),
+
filteredInvites: computed('invites.@each.isNew', function () {
- return this.get('invites').filterBy('isNew', false);
+ return this.invites.filterBy('isNew', false);
+ }),
+
+ allUsers: computed(function () {
+ return this.store.peekAll('user');
+ }),
+
+ activeUsers: computed('allUsers.@each.status', function () {
+ return this.allUsers.filter((user) => {
+ return user.status !== 'inactive';
+ });
+ }),
+
+ suspendedUsers: computed('allUsers.@each.status', function () {
+ return this.allUsers.filter((user) => {
+ return user.status === 'inactive';
+ });
}),
actions: {
toggleInviteUserModal() {
this.toggleProperty('showInviteUserModal');
}
- }
+ },
+
+ backgroundUpdate: task(function* () {
+ let users = this.fetchUsers.perform();
+ let invites = this.fetchInvites.perform();
+ let roles = this.fetchRoles.perform();
+
+ try {
+ yield RSVP.all([users, invites, roles]);
+ } catch (error) {
+ this.send('error', error);
+ }
+ }),
+
+ fetchUsers: task(function* () {
+ yield this.store.query('user', {limit: 'all'});
+ }),
+
+ fetchInvites: task(function* () {
+ if (this.currentUser.isAuthorOrContributor) {
+ return;
+ }
+
+ return yield this.store.query('invite', {limit: 'all'});
+ }),
+
+ fetchRoles: task(function* () {
+ return yield this.store.findAll('role');
+ })
});
diff --git a/ghost/admin/app/routes/team/index.js b/ghost/admin/app/routes/team/index.js
index 127687b5ba..5a05b76e96 100644
--- a/ghost/admin/app/routes/team/index.js
+++ b/ghost/admin/app/routes/team/index.js
@@ -1,58 +1,27 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
-import RSVP from 'rsvp';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';
export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
infinity: service(),
+ session: service(),
titleToken: 'Team',
classNames: ['view-team'],
- modelPath: 'controller.activeUsers',
- perPage: 15,
-
model() {
- return this.get('session.user').then((user) => {
- let modelPath = this.get('modelPath');
- let perPage = this.get('perPage');
-
- let modelPromises = {
- activeUsers: this.infinity.model('user', {
- modelPath,
- perPage,
- filter: 'status:-inactive',
- startingPage: 1,
- perPageParam: 'limit',
- totalPagesParam: 'meta.pagination.pages'
- })
- };
-
- // authors do not have permission to hit the invites or suspended users endpoint
- if (!user.get('isAuthorOrContributor')) {
- modelPromises.invites = this.store.query('invite', {limit: 'all'})
- .then(() => this.store.peekAll('invite'));
-
- // fetch suspended users separately so that infinite scroll still works
- modelPromises.suspendedUsers = this.store.query('user', {limit: 'all', filter: 'status:inactive'});
- }
-
- // we need to load the roles into ember cache
- // invites return role_id only and we do not offer a /role/:id endpoint
- modelPromises.roles = this.get('store').query('role', {});
-
- return RSVP.hash(modelPromises);
- });
+ return this.session.user;
},
- setupController(controller, models) {
- controller.setProperties(models);
+ setupController(controller) {
+ this._super(...arguments);
+ controller.backgroundUpdate.perform();
},
actions: {
reload() {
- this.refresh();
+ this.controller.backgroundUpdate.perform();
}
}
});
diff --git a/ghost/admin/app/templates/team/index-loading.hbs b/ghost/admin/app/templates/team/index-loading.hbs
deleted file mode 100644
index 9201baaa15..0000000000
--- a/ghost/admin/app/templates/team/index-loading.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- {{gh-loading-spinner}}
-
-
diff --git a/ghost/admin/app/templates/team/index.hbs b/ghost/admin/app/templates/team/index.hbs
index 16373f1923..185583f034 100644
--- a/ghost/admin/app/templates/team/index.hbs
+++ b/ghost/admin/app/templates/team/index.hbs
@@ -2,7 +2,7 @@