mirror of
https://github.com/TryGhost/Ghost-Admin.git
synced 2023-12-14 02:33:04 +01:00
e4c0aaf7b9
refs https://github.com/TryGhost/Ghost/issues/6949 Handle version mismatch errors by: - displaying an alert asking the user to copy any data and refresh - disabling navigation so that unsaved data is not accidentally lost Detailed changes: - add `error` action to application route for global route-based error handling - remove 404-handler mixin, move logic into app route error handler - update `.catch` in validation-engine so that promises are rejected with the original error objects - add `VersionMismatchError` and `isVersionMismatchError` to ajax service - add `upgrade-status` service - has a method to trigger the alert and toggle the "upgrade required" mode - is injected into all routes by default so that it can be checked before transitioning - add `Route` override - updates the `willTransition` hook to check the `upgrade-status` service and abort the transition if we're in "upgrade required" mode - update notifications `showAPIError` method to handle version mismatch errors - update any areas where we were catching ajax errors manually so that the version mismatch error handling is obeyed - fix redirect tests in editor acceptance test - fix mirage's handling of 404s for unknown posts in get post requests - adjust alert z-index to to appear above modal backgrounds
46 lines
1.6 KiB
JavaScript
46 lines
1.6 KiB
JavaScript
import {A as emberA} from 'ember-array/utils';
|
|
import ModalComponent from 'ghost-admin/components/modals/base';
|
|
|
|
export default ModalComponent.extend({
|
|
actions: {
|
|
updateEmail(newEmail) {
|
|
this.set('model.email', newEmail);
|
|
this.set('model.hasValidated', emberA());
|
|
this.get('model.errors').clear();
|
|
},
|
|
|
|
confirm() {
|
|
let confirmAction = this.get('confirm');
|
|
|
|
this.set('submitting', true);
|
|
|
|
confirmAction().then(() => {
|
|
this.send('closeModal');
|
|
}).catch((error) => {
|
|
// TODO: server-side validation errors should be serialized
|
|
// properly so that errors are added to the model's errors
|
|
// property
|
|
if (error && error.isAdapterError) {
|
|
let [firstError] = error.errors;
|
|
let {message, errorType} = firstError;
|
|
|
|
if (errorType === 'ValidationError') {
|
|
if (message && message.match(/email/i)) {
|
|
this.get('model.errors').add('email', message);
|
|
this.get('model.hasValidated').pushObject('email');
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
// this is a route action so it should bubble up to the global
|
|
// error handler
|
|
throw error;
|
|
}).finally(() => {
|
|
if (!this.get('isDestroying') && !this.get('isDestroyed')) {
|
|
this.set('submitting', false);
|
|
}
|
|
});
|
|
}
|
|
}
|
|
});
|