From 34b9eb4c2aad65d4c964afa3994baec5b1139a88 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Thu, 3 Oct 2024 15:30:50 +0200 Subject: [PATCH 1/2] update description, hide button on Pay events --- .../FlowEditor/components/Settings/Submissions/EventsLog.tsx | 4 ++-- .../FlowEditor/components/Settings/Submissions/index.tsx | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 index ff21f5325a..743a7a1f29 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx @@ -112,8 +112,8 @@ const CollapsibleRow: React.FC = (submission) => { const showDownloadButton = canUserEditTeam(teamSlug) && submission.status === "Success" && - submissionEmail && - isBefore(new Date(), submissionDataExpirationDate); + submission.eventType !== "Pay"; + submissionEmail && isBefore(new Date(), submissionDataExpirationDate); return ( diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx index 73d1e4c247..f8b2dd6e02 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx @@ -78,7 +78,9 @@ const Submissions: React.FC = () => { Submissions - Feed of payment and submission events for this service + Feed of payment and submission events for this service. Successful + submission events within the last 28 days are availabe to download to + team editors. From f4b505fa0d4d1741297916cdb352da910b05d3b1 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Thu, 3 Oct 2024 15:40:25 +0200 Subject: [PATCH 2/2] fix typo --- .../FlowEditor/components/Settings/Submissions/EventsLog.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index 743a7a1f29..069b00572b 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx @@ -112,8 +112,9 @@ const CollapsibleRow: React.FC = (submission) => { const showDownloadButton = canUserEditTeam(teamSlug) && submission.status === "Success" && - submission.eventType !== "Pay"; - submissionEmail && isBefore(new Date(), submissionDataExpirationDate); + submission.eventType !== "Pay" && + submissionEmail && + isBefore(new Date(), submissionDataExpirationDate); return (