Skip to content

Fixes for Welsh tasks in the draft form task list - #3205

Merged
stephencdaly merged 4 commits into
mainfrom
only-calculate-make-language-live-task-statuses-when-required
Oct 16, 2026
Merged

stephencdaly merged 4 commits into
mainfrom
only-calculate-make-language-live-task-statuses-when-required

Conversation

@stephencdaly

@stephencdaly stephencdaly commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Fixes the following:

  • Stops unnecessarily regenerating the draft form to compare against the live form
  • Only calculate the status of the make English/Welsh version live tasks when we'll show those tasks
  • Fixes the completed task counts for both when the user can make forms live and when they can't
  • Stop counting the Welsh translation task in the completed task count to be consistent with other optional tasks

When checking whether the draft form has changed from the live version
when calculating the status of the tasks to make only the English or
Welsh versions of the form live, use the draft form document from the
database rather than regenerating it.

The draft form document is updated after any changes to the form are
saved, so it will always be up to date.
Only calculate the `make_only_english_live_status` and
`make_only_welsh_live_status` task statuses when we will show the
corresponding tasks on the task list.

Update the task list service to use the presence of the task statuses
to decide whether these tasks are shown.

This also fixes the task status count, as it was incorrectly counting
all of the make live tasks when only a subset were ever shown to the
user.

Co-Authored-By: Claude
If the tasks to make the English and Welsh versions of the form live
separately would be shown, but the current user does not have the
permission to make the form live the task status count was incorrectly
including these tasks.

Co-Authored-By: Claude
@stephencdaly
stephencdaly marked this pull request as draft October 14, 2026 10:36
This task is optional, so should be excluded from the task count as
we do for other optional tasks.
@github-actions

Copy link
Copy Markdown

🎉 A review copy of this PR has been deployed! You can reach it at: https://pr-3205.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.

@stephencdaly
stephencdaly marked this pull request as ready for review October 14, 2026 10:54
@stephencdaly stephencdaly changed the title Fix showing make language live tasks in the task list Fixes for Welsh tasks in the draft form task list Oct 14, 2026
@stephencdaly
stephencdaly requested a review from a team October 16, 2026 08:27
@stephencdaly
stephencdaly added this pull request to the merge queue Oct 16, 2026
Merged via the queue into main with commit 093df1c Oct 16, 2026
7 checks passed
@stephencdaly
stephencdaly deleted the only-calculate-make-language-live-task-statuses-when-required branch October 16, 2026 08:47
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