move retry to event title

theopensystemslab · May 16, 2024 · 10236d2 · 10236d2
1 parent b925a59
commit 10236d2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/api.planx.uk/modules/send/email/index.test.ts b/api.planx.uk/modules/send/email/index.test.ts
@@ -118,7 +118,9 @@ describe(`sending an application by email to a planning office`, () => {
       .expect(200)
       .then((res) => {
         expect(res.body).toEqual({
-          message: 'Successfully sent "Submit" email',
+          message: `Successfully sent to email`,
+          inbox: "[email protected]",
+          govuk_notify_template: "Submit",
         });
       });
   });

diff --git a/api.planx.uk/modules/send/email/index.ts b/api.planx.uk/modules/send/email/index.ts
@@ -69,7 +69,9 @@ export async function sendToEmail(
     );
 
     return res.status(200).send({
-      message: `Successfully sent "Submit" email`,
+      message: `Successfully sent to email`,
+      inbox: sendToEmail,
+      govuk_notify_template: "Submit",
     });
   } catch (error) {
     return next({

diff --git a/api.planx.uk/modules/send/s3/index.ts b/api.planx.uk/modules/send/s3/index.ts
@@ -36,7 +36,7 @@ export async function sendToS3(
     if (!powerAutomateWebhookURL || !powerAutomateAPIKey) {
       return next({
         status: 400,
-        message: `Send to S3 is not enabled for this local authority (${localAuthority})`,
+        message: `Upload to S3 is not enabled for this local authority (${localAuthority})`,
       });
     }
 

diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx
@@ -65,13 +65,13 @@ const EventsLog: React.FC<GetSubmissionsResponse> = ({
       <Table sx={{ tableLayout: "fixed" }}>
         <TableHead>
           <TableRow>
-            <TableCell sx={{ width: 240 }}>
+            <TableCell sx={{ width: 250 }}>
               <strong>Event</strong>
             </TableCell>
             <TableCell sx={{ width: 130 }}>
               <strong>Status</strong>
             </TableCell>
-            <TableCell sx={{ width: 130 }}>
+            <TableCell sx={{ width: 120 }}>
               <strong>Date</strong>
             </TableCell>
             <TableCell sx={{ width: 350 }}>
@@ -81,8 +81,8 @@ const EventsLog: React.FC<GetSubmissionsResponse> = ({
           </TableRow>
         </TableHead>
         <TableBody>
-          {submissions.map((submission) => (
-            <CollapsibleRow {...submission} />
+          {submissions.map((submission, i) => (
+            <CollapsibleRow {...submission} key={i} />
           ))}
         </TableBody>
       </Table>
@@ -94,7 +94,7 @@ const CollapsibleRow: React.FC<Submission> = (submission) => {
   const [open, setOpen] = useState<boolean>(false);
 
   return (
-    <React.Fragment key={submission.eventId}>
+    <React.Fragment key={`${submission.eventId}-${submission.createdAt}`}>
       <TableRow sx={{ "& > *": { borderBottom: "unset" } }}>
         <TableCell>
           <Box
@@ -106,7 +106,7 @@ const CollapsibleRow: React.FC<Submission> = (submission) => {
           >
             {submission.eventType === "Pay" ? <Payment /> : <Send />}
             <Typography variant="body2" ml={1}>
-              {submission.eventType}
+              {submission.eventType} {submission.retry && ` [Retry]`}
             </Typography>
           </Box>
         </TableCell>
@@ -116,13 +116,6 @@ const CollapsibleRow: React.FC<Submission> = (submission) => {
           ) : (
             <Chip label={submission.status} size="small" color="error" />
           )}
-          {submission.retry && (
-            <Chip
-              label="Retry"
-              size="small"
-              sx={{ marginTop: 0.5, background: "#ddd" }}
-            />
-          )}
         </TableCell>
         <TableCell>
           {format(new Date(submission.createdAt), "dd/MM/yy hh:mm:ss")}