Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Added special error modal copy on email freeze

Browse source 
closes https://github.com/TryGhost/Team/issues/913

- When an error is returned from the server during a CSV import and it's because of the email freeze the import modal error has to show a special header along with error message
This commit is contained in:
Naz 2021-07-27 16:19:26 +04:00
parent 35ac6abd6a
commit a7bb783d33
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/admin/app/components/modal-import-members.hbs
View file

@ -35,7 +35,7 @@
{{#if (eq this.state 'ERROR')}} {{#if (eq this.state 'ERROR')}}
<header class="modal-header" data-test-modal="import-members"> <header class="modal-header" data-test-modal="import-members">
<h1>Import error</h1> <h1>{{this.errorHeader}}</h1>
</header> </header>
{{/if}} {{/if}}

8
ghost/admin/app/components/modal-import-members.js
View file

@ -27,6 +27,7 @@ export default ModalComponent.extend({
paramName: 'membersfile', paramName: 'membersfile',
importResponse: null, importResponse: null,
errorMessage: null, errorMessage: null,
errorHeader: null,
showMappingErrors: false, showMappingErrors: false,
// Allowed actions // Allowed actions
@ -83,6 +84,7 @@ export default ModalComponent.extend({
reset() { reset() {
this.set('showMappingErrors', false); this.set('showMappingErrors', false);
this.set('errorMessage', null); this.set('errorMessage', null);
this.set('errorHeader', null);
this.set('file', null); this.set('file', null);
this.set('mapping', null); this.set('mapping', null);
this.set('state', 'INIT'); this.set('state', 'INIT');
@ -194,6 +196,7 @@ export default ModalComponent.extend({
_uploadError(error) { _uploadError(error) {
let message; let message;
let header = 'Import error';
if (isVersionMismatchError(error)) { if (isVersionMismatchError(error)) {
this.notifications.showAPIError(error); this.notifications.showAPIError(error);
@ -205,11 +208,16 @@ export default ModalComponent.extend({
message = 'The file you uploaded was larger than the maximum file size your server allows.'; message = 'The file you uploaded was larger than the maximum file size your server allows.';
} else if (error.payload && error.payload.errors && !isBlank(error.payload.errors[0].message)) { } else if (error.payload && error.payload.errors && !isBlank(error.payload.errors[0].message)) {
message = htmlSafe(error.payload.errors[0].message); message = htmlSafe(error.payload.errors[0].message);
if (error.payload.errors[0].message.match(/list of that size/gi)) {
header = 'Woah there cowboy, that\'s a big list';
}
} else { } else {
console.error(error); // eslint-disable-line console.error(error); // eslint-disable-line
message = 'Something went wrong :('; message = 'Something went wrong :(';
} }
this.set('errorMessage', message); this.set('errorMessage', message);
this.set('errorHeader', header);
} }
}); });