diff --git a/ghost/admin/app/components/posts/debug.hbs b/ghost/admin/app/components/posts/debug.hbs index 34c5de543f..c14c41b4fa 100644 --- a/ghost/admin/app/components/posts/debug.hbs +++ b/ghost/admin/app/components/posts/debug.hbs @@ -55,7 +55,7 @@ - +

{{svg-jar "analytics-tab-sent-large"}} {{this.tabTotals.permanentFailures}}

Permanent {{gh-pluralize this.tabTotals.permanentFailures "failure" without-count=true}}

@@ -67,29 +67,37 @@ {{#each this.permanentFailureData as |failure index|}}
-
-
-
- {{failure.recipient.initials}} + {{#if failure.member.id}} + + +
+

{{failure.recipient.name}}

+

{{failure.recipient.email}}

+
+
+ {{else}} +
+
+
+ {{failure.recipient.initials}} +
+
+
+

{{failure.recipient.name}}

+

{{failure.recipient.email}}

-
-
-

{{failure.recipient.name}}

-

{{failure.recipient.email}}

-
+ {{/if}}
Failure code: {{failure.code}} - Enhanced code: {{failure.enhancedCode}} -
-
- - - {{failure.message}} + {{#if failure.enhancedCode}} + Enhanced code: {{failure.enhancedCode}} + {{/if}}
+
@@ -116,33 +124,38 @@ {{#each this.temporaryFailureData as |failure index|}}
-
-
-
- {{failure.recipient.initials}} + {{#if failure.member.id}} + + +
+

{{failure.recipient.name}}

+

{{failure.recipient.email}}

+
+
+ {{else}} +
+
+
+ {{failure.recipient.initials}} +
+
+
+

{{failure.recipient.name}}

+

{{failure.recipient.email}}

- {{!-- {{#if this.avatarImage}} - {{or failure.recipient.name failure.recipient.email}} - {{/if}} --}} -
-
-

{{failure.recipient.name}}

-

{{failure.recipient.email}}

-
+ {{/if}}
Failure code: {{failure.code}} - Enhanced code: {{failure.enhancedCode}} -
-
- - - {{failure.message}} + {{#if failure.enhancedCode}} + Enhanced code: {{failure.enhancedCode}} + {{/if}}
+
@@ -199,10 +212,11 @@ {{#if (or batch.providerId batch.errorStatusCode batch.errorMessage)}}
{{#if batch.providerId}} -
Provider id: - +
+ Provider id: + {{batch.providerId}} - +
{{/if}} {{#if batch.errorStatusCode}} @@ -214,9 +228,9 @@ {{batch.errorMessage}} {{/if}}
- {{#if batch.errorMessage}} -
{{svg-jar "download" title="Download full failure message"}}
- {{/if}} + {{!-- {{#if batch.errorMessage}} +
{{svg-jar "download" title="Download full failure message"}}
+ {{/if}} --}} {{else}}
N/A
{{/if}} @@ -231,93 +245,6 @@ {{/unless}} - {{!-- -
- Failed -
-
- 22 June, 2022 19:34:29 -
-
- -status:free -
-
- 1,000 -
-
-
-
-
Provider id: 20220824043031.b31949925525913d@m.ghost.io
-
Failure status code: 500
- Mailgun Error 500: Internal server error -
-
{{svg-jar "download" title="Download full failure message"}}
-
-
- - -
- Pending -
-
- 22 June, 2022 19:34:29 -
-
- -status:free -
-
- 1,000 -
-
-
-
-
Provider id: 20220824043031.b31949925525913d@m.ghost.io
-
-
-
- - -
- Submitting -
-
- 22 June, 2022 19:34:29 -
-
- -status:free -
-
- 1,000 -
-
-
-
-
Provider id: 20220824043031.b31949925525913d@m.ghost.io
-
-
-
- - -
- -
-
- 22 June, 2022 19:34:29 -
-
- -status:free -
-
- 1,000 -
-
-
-
-
Provider id: 20220824043031.b31949925525913d@m.ghost.io
-
-
-
- --}} diff --git a/ghost/admin/app/components/posts/debug.js b/ghost/admin/app/components/posts/debug.js index abc5ba1d80..a23fcef10a 100644 --- a/ghost/admin/app/components/posts/debug.js +++ b/ghost/admin/app/components/posts/debug.js @@ -97,6 +97,8 @@ export default class Debug extends Component { initials: this.getInitials(failure.email_recipient?.member_name || failure.email_recipient?.member_email) }, member: { + record: failure.member, + id: failure.member?.id, name: failure.member?.name || '', email: failure.member?.email || '', initials: this.getInitials(failure.member?.name) @@ -120,6 +122,8 @@ export default class Debug extends Component { initials: this.getInitials(failure.email_recipient?.member_name || failure.email_recipient?.member_email) }, member: { + record: failure.member, + id: failure.member?.id, name: failure.member?.name || '', email: failure.member?.email || '', initials: this.getInitials(failure.member?.name) diff --git a/ghost/admin/app/components/posts/debug/email-error-message.hbs b/ghost/admin/app/components/posts/debug/email-error-message.hbs new file mode 100644 index 0000000000..fb6f6a4398 --- /dev/null +++ b/ghost/admin/app/components/posts/debug/email-error-message.hbs @@ -0,0 +1,5 @@ +
+ + + {{@message}} +
diff --git a/ghost/admin/app/components/posts/debug/email-error-message.js b/ghost/admin/app/components/posts/debug/email-error-message.js new file mode 100644 index 0000000000..1a2f0e210a --- /dev/null +++ b/ghost/admin/app/components/posts/debug/email-error-message.js @@ -0,0 +1,15 @@ +import Component from '@glimmer/component'; +import {action} from '@ember/object'; +import {tracked} from '@glimmer/tracking'; + +export default class EmailErrorMessage extends Component { + @tracked more = false; + + @action + setup(element) { + const errorContainer = element.querySelector('span'); + if (element.offsetWidth <= errorContainer.offsetWidth) { + this.more = true; + } + } +} diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index fc6abb21ae..5a9f85dd94 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -3369,7 +3369,6 @@ p.theme-validation-details { /* Debug screen /* ---------------------------------------------------------- */ - .gh-email-debug .gh-post-analytics-header .gh-canvas-header-content { border-bottom: none; padding-bottom: 0; @@ -3456,6 +3455,7 @@ p.theme-validation-details { display: flex; flex-direction: column; gap: 2px; + width: 100%; } .gh-email-debug-failure-codes { @@ -3538,6 +3538,16 @@ p.theme-validation-details { word-break: break-all; } +.gh-email-debug-batch-col-details .detailtext .noselect { + user-select: none; +} + +.gh-email-debug-batch-col-details .detailtext div code { + white-space: unset; + word-break: normal; + user-select: text; +} + .gh-email-debug-batch-col-details .error { color: color-mod(var(--red) l(-2%)); font-weight: unset; @@ -3619,6 +3629,7 @@ p.theme-validation-details { .gh-email-debug-readmore-error { display: inline-flex; + width: 100%; } .gh-email-debug-readmore-error label { @@ -3648,7 +3659,7 @@ p.theme-validation-details { } .gh-email-debug-readmore-error .toggle-checkbox:checked ~ label { - display: none; + display: none !important; } .gh-email-debug-readmore-error svg {