Show Notify email subjects in activity log

Author: paulrobertlloyd

app/assets/stylesheets/components/_details.scss

@@ -20,6 +20,11 @@
     background-color: nhsuk-colour("white");
     font-family: Helvetica, Arial, sans-serif;
 
+    h3:first-child {
+      padding-bottom: nhsuk-spacing(4);
+      border-bottom: 1px solid $nhsuk-border-colour;
+    }
+
     .nhsuk-inset-text {
       margin-top: 0;
       border-color: $nhsuk-border-colour;

app/globals.js

@@ -113,15 +113,23 @@ export default () => {
 
       // Show email message content if recipient given with email address
       if (auditEvent.messageRecipient?.email) {
+        const subject = nunjucksEnv.renderString(
+          en.emails.consent[auditEvent.messageTemplate].name,
+          auditEvent.messageData
+        )
+
+        const body = nunjucksEnv
+          .render(
+            `emails/consent/${auditEvent.messageTemplate}.njk`,
+            auditEvent.messageData
+          )
+          .replaceAll('## ', '#### ')
+          .replaceAll('### ', '##### ')
+
         details.push({
           classes: 'app-details--notify-message',
           summaryText: `Email sent to ${auditEvent.messageRecipient?.email}`,
-          html: formatMarkdown(
-            nunjucksEnv.render(
-              `emails/consent/${auditEvent.messageTemplate}.njk`,
-              auditEvent.messageData
-            )
-          )
+          html: formatMarkdown(`### ${subject}\n\n${body}`)
         })
       }
 

app/locales/en.js

@@ -1056,7 +1056,7 @@ export const en = {
       },
       'invite-clinic': {
         label: 'Clinic booking',
-        name: '{{consent.child.firstName}} has still not had their {{session.vaccinationNames.sentenceCase}}'
+        name: '{{child.firstName}} has still not had their {{session.vaccinationNames.sentenceCase}}'
       },
       'invite-clinic-reminder': {
         label: 'Clinic booking reminder',
@@ -1068,28 +1068,28 @@ export const en = {
       },
       'consent-already-vaccinated': {
         label: 'Already vaccinated',
-        name: 'You’ve told us that {{consent.child.firstName}} is fully vaccinated against MMR'
+        name: 'You’ve told us that {{child.firstName}} is fully vaccinated against MMR'
       },
       'consent-given': {
         label: 'Consent given',
-        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{consent.child.firstName}}'
+        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{child.firstName}}'
       },
       'consent-given-changed-school': {
         label: 'Consent given (changed school)',
         name: 'Your child’s {{session.vaccinationNames.sentenceCase}}'
       },
       'consent-refused': {
         label: 'Consent refused',
-        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{consent.child.firstName}}'
+        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{child.firstName}}'
       },
       'consent-followed-up': {
         // Reuses same confirmation as that for consent refused (or given)
         label: 'Consent refusal confirmed',
-        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{consent.child.firstName}}'
+        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{child.firstName}}'
       },
       'consent-needs-triage': {
         label: 'Consent needs triage',
-        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{consent.child.firstName}}'
+        name: '{{session.vaccinationNames.titleCase}} on {{session.formatted.nextDate}} for {{child.firstName}}'
       },
       'consent-unknown-contact': {
         label: 'Consent response from unknown contact',
@@ -1101,7 +1101,7 @@ export const en = {
       },
       'triage-vaccinate-second-dose': {
         label: 'Vaccinate (second dose)',
-        name: '{{consent.child.firstName}} needs another dose of the MMR vaccination'
+        name: '{{child.firstName}} needs another dose of the MMR vaccination'
       },
       'triage-delay-vaccination': {
         label: 'Delay vaccination',
@@ -1117,11 +1117,11 @@ export const en = {
       },
       'vaccination-reminder': {
         label: 'Session reminder',
-        name: '{{consent.child.fullName}} may get their {{session.vaccinationNames.sentenceCase}} on {{session.formatted.nextDate}}'
+        name: '{{child.fullName}} may get their {{session.vaccinationNames.sentenceCase}} on {{session.formatted.nextDate}}'
       },
       'vaccination-already-had': {
         label: 'Vaccination already had',
-        name: 'Cancelled {{session.vaccinationNames.sentenceCase}} appointment for {{consent.child.firstName}}'
+        name: 'Cancelled {{session.vaccinationNames.sentenceCase}} appointment for {{child.firstName}}'
       },
       'vaccination-deleted': {
         label: 'Vaccination message sent in error',

app/models/session.js

@@ -570,8 +570,7 @@ export class Session {
           sentenceCaseProgrammeName(programme.emailName())
         )
       )} ${pluralisation}`,
-      titleCase: `${filters.formatList(this.programmes.map((programme) => programme.emailName()))}
-        ${pluralisation}`
+      titleCase: `${filters.formatList(this.programmes.map((programme) => programme.emailName()))} ${pluralisation}`
     }
   }