Import members
diff --git a/ghost/admin/app/components/modal-regenerate-token.hbs b/ghost/admin/app/components/modal-regenerate-token.hbs deleted file mode 100644 index 22d5b42e8a..0000000000 --- a/ghost/admin/app/components/modal-regenerate-token.hbs +++ /dev/null @@ -1,20 +0,0 @@ -Regenerate your Staff Access Token
-
-
-
-
diff --git a/ghost/admin/app/components/modal-regenerate-token.js b/ghost/admin/app/components/modal-regenerate-token.js
deleted file mode 100644
index e18aa093bd..0000000000
--- a/ghost/admin/app/components/modal-regenerate-token.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-
-export default ModalComponent.extend({
- actions: {
- confirm() {
- this.confirm();
- this.send('closeModal');
- }
- }
-});
diff --git a/ghost/admin/app/components/modal-select-user-role.hbs b/ghost/admin/app/components/modal-select-user-role.hbs
deleted file mode 100644
index 98f10e6cca..0000000000
--- a/ghost/admin/app/components/modal-select-user-role.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-- You can regenerate your Staff Access Token any time, but any scripts or applications using it will need to be updated. -
- {{#if this.errorMessage}} -{{this.errorMessage}}
- {{/if}} -Change user role
-
-
-
-
diff --git a/ghost/admin/app/components/modal-select-user-role.js b/ghost/admin/app/components/modal-select-user-role.js
deleted file mode 100644
index 72133c34b2..0000000000
--- a/ghost/admin/app/components/modal-select-user-role.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import ModalBase from 'ghost-admin/components/modal-base';
-import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
-import {tracked} from '@glimmer/tracking';
-
-// TODO: update modals to work fully with Glimmer components
-@classic
-export default class ModalPostPreviewComponent extends ModalBase {
- @tracked role;
-
- // TODO: rename to confirm() when modals have full Glimmer support
- @action
- confirmAction() {
- this.confirm(this.role);
- this.close();
- }
-
- @action
- close(event) {
- event?.preventDefault?.();
- this.closeModal();
- }
-
- @action
- setRoleFromModel() {
- this.role = this.model;
- }
-
- actions = {
- confirm() {
- this.confirmAction(...arguments);
- },
-
- // needed because ModalBase uses .send() for keyboard events
- closeModal() {
- this.close();
- }
- };
-}
diff --git a/ghost/admin/app/components/modal-suspend-user.hbs b/ghost/admin/app/components/modal-suspend-user.hbs
deleted file mode 100644
index 7aa8d4399f..0000000000
--- a/ghost/admin/app/components/modal-suspend-user.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-Are you sure you want to suspend this user?
-
- WARNING: This user will no longer be able to log in but their posts will be kept.
-
-
-
diff --git a/ghost/admin/app/components/modal-suspend-user.js b/ghost/admin/app/components/modal-suspend-user.js
deleted file mode 100644
index 7a323f5565..0000000000
--- a/ghost/admin/app/components/modal-suspend-user.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {alias} from '@ember/object/computed';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
- // Allowed actions
- confirm: () => {},
-
- user: alias('model'),
-
- actions: {
- confirm() {
- return this.suspendUser.perform();
- }
- },
-
- suspendUser: task(function* () {
- try {
- yield this.confirm();
- } finally {
- this.send('closeModal');
- }
- }).drop()
-});
diff --git a/ghost/admin/app/components/modal-transfer-owner.hbs b/ghost/admin/app/components/modal-transfer-owner.hbs
deleted file mode 100644
index 951c67ed79..0000000000
--- a/ghost/admin/app/components/modal-transfer-owner.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-Transfer Ownership
-
-
-
-
diff --git a/ghost/admin/app/components/modal-transfer-owner.js b/ghost/admin/app/components/modal-transfer-owner.js
deleted file mode 100644
index 829742c651..0000000000
--- a/ghost/admin/app/components/modal-transfer-owner.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
- user: null,
-
- // Allowed actions
- confirm: () => {},
-
- actions: {
- confirm() {
- this.transferOwnership.perform();
- }
- },
-
- transferOwnership: task(function* () {
- try {
- yield this.confirm();
- } finally {
- this.send('closeModal');
- }
- }).drop()
-});
diff --git a/ghost/admin/app/components/modal-unsuspend-user.hbs b/ghost/admin/app/components/modal-unsuspend-user.hbs
deleted file mode 100644
index e401d63f66..0000000000
--- a/ghost/admin/app/components/modal-unsuspend-user.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-- Are you sure you want to transfer the ownership of this blog? - You will not be able to undo this action. -
-Are you sure you want to un-suspend this user?
-
- WARNING: This user will be able to log in again and will have the same permissions they had previously.
-
-
-
diff --git a/ghost/admin/app/components/modal-unsuspend-user.js b/ghost/admin/app/components/modal-unsuspend-user.js
deleted file mode 100644
index 2922c820c8..0000000000
--- a/ghost/admin/app/components/modal-unsuspend-user.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {alias} from '@ember/object/computed';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
- // Allowed actions
- confirm: () => {},
-
- user: alias('model'),
-
- actions: {
- confirm() {
- return this.unsuspendUser.perform();
- }
- },
-
- unsuspendUser: task(function* () {
- try {
- yield this.confirm();
- } finally {
- this.send('closeModal');
- }
- }).drop()
-});
diff --git a/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.hbs b/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.hbs
deleted file mode 100644
index 9d44ebc01b..0000000000
--- a/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.hbs
+++ /dev/null
@@ -1,20 +0,0 @@
-Upgrade to un-suspend this user
-
-
-
-
\ No newline at end of file
diff --git a/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js b/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js
deleted file mode 100644
index 99c3e17ee7..0000000000
--- a/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {inject as service} from '@ember/service';
-
-export default ModalComponent.extend({
- router: service(),
-
- actions: {
- upgrade() {
- this.router.transitionTo('pro');
- },
-
- confirm() {
- this.send('upgrade');
- }
- }
-});
diff --git a/ghost/admin/app/components/modal-upload-image.hbs b/ghost/admin/app/components/modal-upload-image.hbs
deleted file mode 100644
index 360759e4a5..0000000000
--- a/ghost/admin/app/components/modal-upload-image.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-- {{html-safe this.model.message}} To give this user access to Ghost, upgrade to a different plan. -
-
- {{#if this.url}}
-
- {{else}}
-
-
-
diff --git a/ghost/admin/app/components/modal-upload-image.js b/ghost/admin/app/components/modal-upload-image.js
deleted file mode 100644
index 9d44f2db6b..0000000000
--- a/ghost/admin/app/components/modal-upload-image.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
-import {computed} from '@ember/object';
-import {isEmpty} from '@ember/utils';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
- config: service(),
- notifications: service(),
-
- model: null,
-
- url: '',
- newUrl: '',
- _isUploading: false,
-
- image: computed('model.{model,imageProperty}', {
- get() {
- let imageProperty = this.get('model.imageProperty');
-
- return this.get(`model.model.${imageProperty}`);
- },
-
- set(key, value) {
- let model = this.get('model.model');
- let imageProperty = this.get('model.imageProperty');
-
- return model.set(imageProperty, value);
- }
- }),
-
- didReceiveAttrs() {
- this._super(...arguments);
-
- let image = this.image;
- this.set('url', image);
- this.set('newUrl', image);
- },
-
- actions: {
- fileUploaded(url) {
- this.set('url', url);
- this.set('newUrl', url);
- },
-
- removeImage() {
- this.set('url', '');
- this.set('newUrl', '');
- },
-
- confirm() {
- this.uploadImage.perform();
- },
-
- isUploading() {
- this.toggleProperty('_isUploading');
- }
- },
-
- // TODO: should validation be handled in the gh-image-uploader component?
- // pro - consistency everywhere, simplification here
- // con - difficult if the "save" is happening externally as it does here
- //
- // maybe it should be handled at the model level?
- // - automatically present everywhere
- // - file uploads should always result in valid urls so it should only
- // affect the url input form
- keyDown() {
- this._setErrorState(false);
- },
-
- _setErrorState(state) {
- if (state) {
- this.element.querySelector('.url').classList.add('error');
- } else {
- this.element.querySelector('.url').classList.remove('error');
- }
- },
-
- _validateUrl(url) {
- if (!isEmpty(url) && !cajaSanitizers.url(url)) {
- this._setErrorState(true);
- return {message: 'Image URI is not valid'};
- }
-
- return true;
- },
- // end validation
-
- uploadImage: task(function* () {
- let model = this.get('model.model');
- let newUrl = this.newUrl;
- let result = this._validateUrl(newUrl);
- let notifications = this.notifications;
-
- if (result === true) {
- this.set('image', newUrl);
-
- try {
- yield model.save();
- } catch (e) {
- notifications.showAPIError(e, {key: 'image.upload'});
- } finally {
- this.send('closeModal');
- }
- }
- }).drop()
-});
diff --git a/ghost/admin/app/components/settings/staff/modals/delete-user.hbs b/ghost/admin/app/components/settings/staff/modals/delete-user.hbs
new file mode 100644
index 0000000000..758650c24a
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/delete-user.hbs
@@ -0,0 +1,34 @@
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/delete-user.js b/ghost/admin/app/components/settings/staff/modals/delete-user.js
new file mode 100644
index 0000000000..83eadf104d
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/delete-user.js
@@ -0,0 +1,31 @@
+import Component from '@glimmer/component';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+export default class DeleteUserModal extends Component {
+ @service notifications;
+ @service router;
+ @service store;
+
+ get ownerUser() {
+ return this.store.peekAll('user').findBy('isOwnerOnly', true);
+ }
+
+ @task({drop: true})
+ *deleteUserTask() {
+ try {
+ const {user} = this.args.data;
+
+ yield user.destroyRecord();
+
+ this.notifications.closeAlerts('user.delete');
+ this.store.unloadAll('post');
+ this.router.transitionTo('settings.staff');
+ } catch (error) {
+ this.notifications.showAlert('The user could not be deleted. Please try again.', {type: 'error', key: 'user.delete.failed'});
+ throw error;
+ } finally {
+ this.args.close();
+ }
+ }
+}
diff --git a/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.hbs b/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.hbs
new file mode 100644
index 0000000000..4f811b3852
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.hbs
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.js b/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.js
new file mode 100644
index 0000000000..82700ff2be
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/regenerate-staff-token.js
@@ -0,0 +1,23 @@
+import Component from '@glimmer/component';
+import {action} from '@ember/object';
+import {inject as service} from '@ember/service';
+
+export default class RegenerateStaffTokenModal extends Component {
+ @service ajax;
+ @service ghostPaths;
+ @service notifications;
+
+ @action
+ async regenerateStaffToken() {
+ const url = this.ghostPaths.url.api('users', 'me', 'token');
+
+ try {
+ const {apiKey} = await this.ajax.put(url, {data: {}});
+
+ this.args.close(`${apiKey.id}:${apiKey.secret}`);
+ } catch (error) {
+ this.notifications.showAPIError(error, {key: 'token.regenerate'});
+ this.args.close();
+ }
+ }
+}
diff --git a/ghost/admin/app/components/settings/staff/modals/select-role.hbs b/ghost/admin/app/components/settings/staff/modals/select-role.hbs
new file mode 100644
index 0000000000..faca0d3f23
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/select-role.hbs
@@ -0,0 +1,18 @@
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/select-role.js b/ghost/admin/app/components/settings/staff/modals/select-role.js
new file mode 100644
index 0000000000..c38f44b3f2
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/select-role.js
@@ -0,0 +1,11 @@
+import Component from '@glimmer/component';
+import {tracked} from '@glimmer/tracking';
+
+export default class SelectRoleModal extends Component {
+ @tracked role;
+
+ constructor() {
+ super(...arguments);
+ this.role = this.args.data.currentRole;
+ }
+}
diff --git a/ghost/admin/app/components/settings/staff/modals/suspend-user.hbs b/ghost/admin/app/components/settings/staff/modals/suspend-user.hbs
new file mode 100644
index 0000000000..2208023bbf
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/suspend-user.hbs
@@ -0,0 +1,21 @@
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/suspend-user.js b/ghost/admin/app/components/settings/staff/modals/suspend-user.js
new file mode 100644
index 0000000000..65ea2c6ce5
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/suspend-user.js
@@ -0,0 +1,24 @@
+import Component from '@glimmer/component';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+export default class SuspendUserModal extends Component {
+ @service notifications;
+
+ @task({drop: true})
+ *suspendUserTask() {
+ try {
+ const {user, saveTask} = this.args.data;
+
+ user.status = 'inactive';
+ yield saveTask.perform();
+
+ this.notifications.closeAlerts('user.suspend');
+ } catch (error) {
+ this.notifications.showAlert('The user could not be suspended. Please try again.', {type: 'error', key: 'user.suspend.failed'});
+ throw error;
+ } finally {
+ this.args.close();
+ }
+ }
+}
diff --git a/ghost/admin/app/components/settings/staff/modals/transfer-ownership.hbs b/ghost/admin/app/components/settings/staff/modals/transfer-ownership.hbs
new file mode 100644
index 0000000000..32bb26259d
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/transfer-ownership.hbs
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/transfer-ownership.js b/ghost/admin/app/components/settings/staff/modals/transfer-ownership.js
new file mode 100644
index 0000000000..9dc9998334
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/transfer-ownership.js
@@ -0,0 +1,47 @@
+import Component from '@glimmer/component';
+import {isArray} from '@ember/array';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+
+export default class TransferOwnershipModal extends Component {
+ @service ajax;
+ @service dropdown;
+ @service ghostPaths;
+ @service notifications;
+ @service store;
+
+ @task({drop: true})
+ *transferOwnershipTask() {
+ try {
+ const {user} = this.args.data;
+
+ this.dropdown.closeDropdowns();
+
+ const response = yield this.ajax.put(url, {
+ data: {
+ owner: [{
+ id: user.id
+ }]
+ }
+ });
+
+ // manually update the roles for the users that just changed roles
+ // because store.pushPayload is not working with embedded relations
+ if (isArray(response?.users)) {
+ response.users.forEach((userJSON) => {
+ const updatedUser = this.store.peekRecord('user', userJSON.id);
+ const role = this.store.peekRecord('role', userJSON.roles[0].id);
+
+ updatedUser.role = role;
+ });
+ }
+
+ this.notifications.showAlert(`Ownership successfully transferred to ${user.get('name')}`, {type: 'success', key: 'owner.transfer.success'});
+ } catch (error) {
+ this.notifications.showAPIError(error, {key: 'owner.transfer'});
+ throw error;
+ } finally {
+ this.args.close();
+ }
+ }
+}
diff --git a/ghost/admin/app/components/settings/staff/modals/unsuspend-user.hbs b/ghost/admin/app/components/settings/staff/modals/unsuspend-user.hbs
new file mode 100644
index 0000000000..0cedd25509
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/unsuspend-user.hbs
@@ -0,0 +1,46 @@
+{{#if this.hostLimitError}}
+
+{{else}}
+
+{{/if}}
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/unsuspend-user.js b/ghost/admin/app/components/settings/staff/modals/unsuspend-user.js
new file mode 100644
index 0000000000..b654e4ce2a
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/unsuspend-user.js
@@ -0,0 +1,57 @@
+import Component from '@glimmer/component';
+import {action} from '@ember/object';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+import {tracked} from '@glimmer/tracking';
+
+export default class UnsuspendUserModal extends Component {
+ @service limit;
+ @service notifications;
+ @service router;
+
+ @tracked hostLimitError = null;
+
+ constructor() {
+ super(...arguments);
+ this.checkHostLimitsTask.perform();
+ }
+
+ @action
+ upgrade() {
+ this.router.transitionTo('pro');
+ this.args.close();
+ }
+
+ @task
+ *checkHostLimitsTask() {
+ if (this.args.data.user.role.name !== 'Contributor' && this.limit.limiter.isLimited('staff')) {
+ try {
+ yield this.limit.limiter.errorIfWouldGoOverLimit('staff');
+ } catch (error) {
+ if (error.errorType === 'HostLimitError') {
+ this.hostLimitError = error.message;
+ } else {
+ this.notifications.showAPIError(error, {key: 'staff.limit'});
+ this.args.close();
+ }
+ }
+ }
+ }
+
+ @task({drop: true})
+ *unsuspendUserTask() {
+ try {
+ const {user, saveTask} = this.args.data;
+
+ user.status = 'active';
+ yield saveTask.perform();
+
+ this.notifications.closeAlerts('user.unsuspend');
+ } catch (error) {
+ this.notifications.showAlert('The user could not be unsuspended. Please try again.', {type: 'error', key: 'user.unsuspend.failed'});
+ throw error;
+ } finally {
+ this.args.close();
+ }
+ }
+}
diff --git a/ghost/admin/app/components/settings/staff/modals/upload-image.hbs b/ghost/admin/app/components/settings/staff/modals/upload-image.hbs
new file mode 100644
index 0000000000..fd638d619d
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/upload-image.hbs
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/settings/staff/modals/upload-image.js b/ghost/admin/app/components/settings/staff/modals/upload-image.js
new file mode 100644
index 0000000000..345064967d
--- /dev/null
+++ b/ghost/admin/app/components/settings/staff/modals/upload-image.js
@@ -0,0 +1,52 @@
+import Component from '@glimmer/component';
+import {action} from '@ember/object';
+import {inject as service} from '@ember/service';
+import {task} from 'ember-concurrency';
+import {tracked} from '@glimmer/tracking';
+
+export default class UploadImageModal extends Component {
+ @service notifications;
+
+ @tracked errorMessage;
+ @tracked isUploading = false;
+ @tracked url = '';
+
+ constructor() {
+ super(...arguments);
+ this.url = this._getModelProperty();
+ }
+
+ @action
+ fileUploaded(url) {
+ this.url = url;
+ }
+
+ @action
+ removeImage() {
+ this.url = '';
+ }
+
+ @task({drop: true})
+ *uploadImageTask() {
+ this._setModelProperty(this.url);
+
+ try {
+ yield this.args.data.model.save();
+ } catch (e) {
+ this.notifications.showAPIError(e, {key: 'image.upload'});
+ } finally {
+ this.args.close();
+ }
+ }
+
+ _getModelProperty() {
+ const {model, modelProperty} = this.args.data;
+ return model[modelProperty];
+ }
+
+ _setModelProperty(url) {
+ const {model, modelProperty} = this.args.data;
+ model[modelProperty] = url;
+ return url;
+ }
+}
diff --git a/ghost/admin/app/controllers/settings/staff/user.js b/ghost/admin/app/controllers/settings/staff/user.js
index 5172964ece..b2a94bba8e 100644
--- a/ghost/admin/app/controllers/settings/staff/user.js
+++ b/ghost/admin/app/controllers/settings/staff/user.js
@@ -1,4 +1,11 @@
import Controller from '@ember/controller';
+import DeleteUserModal from '../../../components/settings/staff/modals/delete-user';
+import RegenerateStaffTokenModal from '../../../components/settings/staff/modals/regenerate-staff-token';
+import SelectRoleModal from '../../../components/settings/staff/modals/select-role';
+import SuspendUserModal from '../../../components/settings/staff/modals/suspend-user';
+import TransferOwnershipModal from '../../../components/settings/staff/modals/transfer-ownership';
+import UnsuspendUserModal from '../../../components/settings/staff/modals/unsuspend-user';
+import UploadImageModal from '../../../components/settings/staff/modals/upload-image';
import boundOneWay from 'ghost-admin/utils/bound-one-way';
import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
import isNumber from 'ghost-admin/utils/isNumber';
@@ -6,7 +13,6 @@ import validator from 'validator';
import windowProxy from 'ghost-admin/utils/window-proxy';
import {action, computed} from '@ember/object';
import {alias, and, not, or, readOnly} from '@ember/object/computed';
-import {isArray as isEmberArray} from '@ember/array';
import {run} from '@ember/runloop';
import {inject as service} from '@ember/service';
import {task, taskGroup, timeout} from 'ember-concurrency';
@@ -14,26 +20,17 @@ import {task, taskGroup, timeout} from 'ember-concurrency';
export default Controller.extend({
ajax: service(),
config: service(),
- dropdown: service(),
ghostPaths: service(),
- limit: service(),
+ membersUtils: service(),
+ modals: service(),
notifications: service(),
session: service(),
slugGenerator: service(),
utils: service(),
- membersUtils: service(),
personalToken: null,
- limitErrorMessage: null,
personalTokenRegenerated: false,
dirtyAttributes: false,
- showDeleteUserModal: false,
- showSuspendUserModal: false,
- showTransferOwnerModal: false,
- showUploadCoverModal: false,
- showUploadImageModal: false,
- showRegenerateTokenModal: false,
- showRoleSelectionModal: false,
_scratchFacebook: null,
_scratchTwitter: null,
@@ -88,62 +85,6 @@ export default Controller.extend({
}),
actions: {
- toggleRoleSelectionModal(event) {
- event?.preventDefault?.();
- this.toggleProperty('showRoleSelectionModal');
- },
-
- changeRole(newRole) {
- this.user.set('role', newRole);
- this.set('dirtyAttributes', true);
- },
-
- toggleDeleteUserModal() {
- if (this.deleteUserActionIsVisible) {
- this.toggleProperty('showDeleteUserModal');
- }
- },
-
- suspendUser() {
- this.user.set('status', 'inactive');
- return this.save.perform();
- },
-
- toggleSuspendUserModal() {
- if (this.deleteUserActionIsVisible) {
- this.toggleProperty('showSuspendUserModal');
- }
- },
-
- unsuspendUser() {
- this.user.set('status', 'active');
- return this.save.perform();
- },
-
- toggleUnsuspendUserModal() {
- if (this.deleteUserActionIsVisible) {
- if (this.user.role.name !== 'Contributor'
- && this.limit.limiter
- && this.limit.limiter.isLimited('staff')
- ) {
- this.limit.limiter.errorIfWouldGoOverLimit('staff')
- .then(() => {
- this.toggleProperty('showUnsuspendUserModal');
- })
- .catch((error) => {
- if (error.errorType === 'HostLimitError') {
- this.limitErrorMessage = error.message;
- this.toggleProperty('showUnsuspendUserModal');
- } else {
- this.notifications.showAPIError(error, {key: 'staff.limit'});
- }
- });
- } else {
- this.toggleProperty('showUnsuspendUserModal');
- }
- }
- },
-
validateFacebookUrl() {
let newUrl = this._scratchFacebook;
let oldUrl = this.get('user.facebook');
@@ -255,50 +196,6 @@ export default Controller.extend({
}
},
- transferOwnership() {
- let user = this.user;
- let url = this.get('ghostPaths.url').api('users', 'owner');
-
- this.dropdown.closeDropdowns();
-
- return this.ajax.put(url, {
- data: {
- owner: [{
- id: user.get('id')
- }]
- }
- }).then((response) => {
- // manually update the roles for the users that just changed roles
- // because store.pushPayload is not working with embedded relations
- if (response && isEmberArray(response.users)) {
- response.users.forEach((userJSON) => {
- let updatedUser = this.store.peekRecord('user', userJSON.id);
- let role = this.store.peekRecord('role', userJSON.roles[0].id);
-
- updatedUser.set('role', role);
- });
- }
-
- this.notifications.showAlert(`Ownership successfully transferred to ${user.get('name')}`, {type: 'success', key: 'owner.transfer.success'});
- }).catch((error) => {
- this.notifications.showAPIError(error, {key: 'owner.transfer'});
- });
- },
-
- toggleTransferOwnerModal() {
- if (this.canMakeOwner) {
- this.toggleProperty('showTransferOwnerModal');
- }
- },
-
- toggleUploadCoverModal() {
- this.toggleProperty('showUploadCoverModal');
- },
-
- toggleUploadImageModal() {
- this.toggleProperty('showUploadImageModal');
- },
-
// TODO: remove those mutation actions once we have better
// inline validations that auto-clear errors on input
updatePassword(password) {
@@ -317,28 +214,77 @@ export default Controller.extend({
this.set('user.ne2Password', password);
this.get('user.hasValidated').removeObject('ne2Password');
this.get('user.errors').remove('ne2Password');
- },
-
- confirmRegenerateTokenModal() {
- this.set('showRegenerateTokenModal', true);
- },
-
- cancelRegenerateTokenModal() {
- this.set('showRegenerateTokenModal', false);
- },
-
- regenerateToken() {
- let url = this.get('ghostPaths.url').api('users', 'me', 'token');
-
- return this.ajax.put(url, {data: {}}).then(({apiKey}) => {
- this.set('personalToken', apiKey.id + ':' + apiKey.secret);
- this.set('personalTokenRegenerated', true);
- }).catch((error) => {
- this.notifications.showAPIError(error, {key: 'token.regenerate'});
- });
}
},
+ deleteUser: action(async function () {
+ if (this.deleteUserActionIsVisible) {
+ await this.modals.open(DeleteUserModal, {
+ user: this.model
+ });
+ }
+ }),
+
+ suspendUser: action(async function () {
+ if (this.deleteUserActionIsVisible) {
+ await this.modals.open(SuspendUserModal, {
+ user: this.model,
+ saveTask: this.save
+ });
+ }
+ }),
+
+ unsuspendUser: action(async function () {
+ if (this.deleteUserActionIsVisible) {
+ await this.modals.open(UnsuspendUserModal, {
+ user: this.model,
+ saveTask: this.save
+ });
+ }
+ }),
+
+ transferOwnership: action(async function () {
+ if (this.canMakeOwner) {
+ await this.modals.open(TransferOwnershipModal, {
+ user: this.model
+ });
+ }
+ }),
+
+ regenerateStaffToken: action(async function () {
+ const apiToken = await this.modals.open(RegenerateStaffTokenModal);
+
+ if (apiToken) {
+ this.set('personalToken', apiToken);
+ this.set('personalTokenRegenerated', true);
+ }
+ }),
+
+ selectRole: action(async function () {
+ const newRole = await this.modals.open(SelectRoleModal, {
+ currentRole: this.model.role
+ });
+
+ if (newRole) {
+ this.user.role = newRole;
+ this.set('dirtyAttributes', true);
+ }
+ }),
+
+ changeCoverImage: action(async function () {
+ await this.modals.open(UploadImageModal, {
+ model: this.model,
+ modelProperty: 'coverImage'
+ });
+ }),
+
+ changeProfileImage: action(async function () {
+ await this.modals.open(UploadImageModal, {
+ model: this.model,
+ modelProperty: 'profileImage'
+ });
+ }),
+
reset: action(function () {
this.user.rollbackAttributes();
this.user.password = '';
@@ -362,19 +308,6 @@ export default Controller.extend({
}
}),
- deleteUser: task(function *() {
- try {
- yield this.user.destroyRecord();
-
- this.notifications.closeAlerts('user.delete');
- this.store.unloadAll('post');
- this.transitionToRoute('settings.staff');
- } catch (error) {
- this.notifications.showAlert('The user could not be deleted. Please try again.', {type: 'error', key: 'user.delete.failed'});
- throw error;
- }
- }),
-
updateSlug: task(function* (newSlug) {
let slug = this.get('user.slug');
diff --git a/ghost/admin/app/templates/settings/staff/user.hbs b/ghost/admin/app/templates/settings/staff/user.hbs
index cea9e3f01d..9440026dff 100644
--- a/ghost/admin/app/templates/settings/staff/user.hbs
+++ b/ghost/admin/app/templates/settings/staff/user.hbs
@@ -31,33 +31,27 @@
+ {{#if this.url}}
+
+
+
+
+ 
+
+
+ {{else}}
+