Skip to content

Update content for delivery configurations#2964

Open
stephencdaly wants to merge 3 commits into
mainfrom
update-content-for-delivery-configurations
Open

Update content for delivery configurations#2964
stephencdaly wants to merge 3 commits into
mainfrom
update-content-for-delivery-configurations

Conversation

@stephencdaly

@stephencdaly stephencdaly commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

What problem does this pull request solve?

Trello card: https://trello.com/c/WMnjLlJV/245-allow-both-email-and-s3-submissions-simultaneously

Update:

  • Details component content on submission email page now that both S3 and email can be enabled at the same time.
  • The live form page to display when S3 submissions are enabled, and not display the submission email when email submissions are disabled.

New details component content:

Screenshot 2026-07-23 at 13 13 22

Live form page for a form with both email and S3 enabled:

Screenshot 2026-07-23 at 13 15 44

Live form page for a form with only S3 submissions enabled:

Screenshot 2026-07-23 at 13 10 36

Things to consider when reviewing

  • Ensure that you consider the wider context.
  • Does it work when run on your machine?
  • Is it clear what the code is doing?
  • Do the commit messages explain why the changes were made?
  • Are there all the unit tests needed?
  • Do the end to end tests need updating before these changes will pass?
  • Has all relevant documentation been updated?

Update content in the details component on the submission email page
to reflect that email submissions can remain switched on when
submissions to an S3 bucket are configured.
@stephencdaly
stephencdaly force-pushed the update-content-for-delivery-configurations branch from 3858c7d to e4e7da4 Compare July 23, 2026 08:47
@stephencdaly
stephencdaly marked this pull request as ready for review July 23, 2026 08:54
On the live form page, if S3 bucket delivery is enabled, include a
subheading "S3 bucket" with details about the bucket name and file
format (CSV or JSON).

If email delivery is not enabled, do not show the "Email" subheading
and the submission email address.
The form didn't have a format set, which is required for S3 delivery.
@stephencdaly
stephencdaly force-pushed the update-content-for-delivery-configurations branch from e4e7da4 to 30593ac Compare July 23, 2026 11:50
@github-actions

Copy link
Copy Markdown

🎉 A review copy of this PR has been deployed! You can reach it at: https://pr-2964.admin.review.forms.service.gov.uk/

It may take 5 minutes or so for the application to be fully deployed and working. If it still isn't ready
after 5 minutes, there may be something wrong with the ECS task. You will need to go to the integration AWS account
to debug, or otherwise ask an infrastructure person.

For the sign in details and more information, see the review apps wiki page.

Comment thread config/locales/en.yml
<p>You can get completed forms sent to an AWS S3 bucket instead of an email address.</p>
<p>To find out more about this option, including how to set it up, <a href="https://www.forms.service.gov.uk/processing-completed-form-submissions">read our guidance on processing completed form submissions</a>.</p>
<p>You still need to set an email address here to mark this task complete. When you switch to an S3 bucket, you’ll stop getting completed forms by email.</p>
<p>You still need to set an email address here to mark this task complete, even if you do not want to want to receive submissions by email over the long term.</p>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<p>You still need to set an email address here to mark this task complete, even if you do not want to want to receive submissions by email over the long term.</p>
<p>You still need to set an email address here to mark this task complete, even if you do not want to receive submissions by email over the long term.</p>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe something like this?

Suggested change
<p>You still need to set an email address here to mark this task complete, even if you do not want to want to receive submissions by email over the long term.</p>
<p>You still need to set an email address here to mark this task complete, even if you plan to get completed forms in an S3 bucket instead.</p>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good spot with the repetition, I didn't proof-read this.
In terms of the different content suggestion, what do you think @StephenGill?

Comment thread config/locales/en.yml
<p>To find out more about this option, including how to set it up, <a href="https://www.forms.service.gov.uk/processing-completed-form-submissions">read our guidance on processing completed form submissions</a>.</p>
<p>You still need to set an email address here to mark this task complete. When you switch to an S3 bucket, you’ll stop getting completed forms by email.</p>
<p>You still need to set an email address here to mark this task complete, even if you do not want to want to receive submissions by email over the long term.</p>
<p>To find out how to set an S3 bucket, <a href="https://www.forms.service.gov.uk/processing-completed-form-submissions">read our guidance on processing completed form submissions</a>.</p>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<p>To find out how to set an S3 bucket, <a href="https://www.forms.service.gov.uk/processing-completed-form-submissions">read our guidance on processing completed form submissions</a>.</p>
<p>To find out how to set up an S3 bucket, <a href="https://www.forms.service.gov.uk/processing-completed-form-submissions">read our guidance on processing completed form submissions</a>.</p>

@theseanything theseanything left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a code perspective looks fine! Might need a content review - but still an improvement either way.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants