Differences between upstream (red) and UKHSA's fork (green)#1337
Draft
kathryn-dale wants to merge 854 commits intoXGovFormBuilder:mainfrom
Draft
Differences between upstream (red) and UKHSA's fork (green)#1337kathryn-dale wants to merge 854 commits intoXGovFormBuilder:mainfrom
kathryn-dale wants to merge 854 commits intoXGovFormBuilder:mainfrom
Conversation
…ionals-change Fix for bug relating to changing 'myself' to 'someone else' or vice versa
Add GA to close contacts
…ondon-in-report-an-outbreak-frontend RITM0182454 Enable London in Report An Outbreak Frontend
Change some numbers and replace the 'webforms' default title
* fix: use DISABLE_V8_COMPILE_CACHE=1 so the designer can build via docker (XGovFormBuilder#1363) * fix: MiniSummaryPageController change link issue (XGovFormBuilder#1360) * chore(ci): use GITHUB_TOKEN instead of GHCR_PAT for checkout action (XGovFormBuilder#1347) * Summary card button accessibility and consistency issues * The button was technically a link, which meant how it looked and how screen readers treated it was inconsistent. I have changed it so that it's a button that does a GET request to the page when clicked. * The word 'remove' has been changed to 'delete'. * The button text will now just say 'Add...' if there's only one entry, which is consistent with the functionality where you can't delete entries if only one is present. * Set base tag to Alpine and add symlink to fix SSL issue (XGovFormBuilder#1366) * feature: custom ConfirmationSessionTimeout per form setup (XGovFormBuilder#1359) --------- Co-authored-by: Jen Duong <hi@jen.digital> Co-authored-by: calum-ukhsa <calum.hemphill@ukhsa.gov.uk> Co-authored-by: Trevor Rea <trevorrea@users.noreply.github.com> Co-authored-by: SullyK <68860309+SullyK@users.noreply.github.com>
Co-authored-by: SullyK <68860309+SullyK@users.noreply.github.com>
* fix: use DISABLE_V8_COMPILE_CACHE=1 so the designer can build via docker (XGovFormBuilder#1363) * fix: MiniSummaryPageController change link issue (XGovFormBuilder#1360) * chore(ci): use GITHUB_TOKEN instead of GHCR_PAT for checkout action (XGovFormBuilder#1347) * Summary card button accessibility and consistency issues * The button was technically a link, which meant how it looked and how screen readers treated it was inconsistent. I have changed it so that it's a button that does a GET request to the page when clicked. * The word 'remove' has been changed to 'delete'. * The button text will now just say 'Add...' if there's only one entry, which is consistent with the functionality where you can't delete entries if only one is present. * Set base tag to Alpine and add symlink to fix SSL issue (XGovFormBuilder#1366) * feature: custom ConfirmationSessionTimeout per form setup (XGovFormBuilder#1359) * Don't capitalize the configured service name * patch: file upload errors (XGovFormBuilder#1351) --------- Co-authored-by: Jen Duong <hi@jen.digital> Co-authored-by: calum-ukhsa <calum.hemphill@ukhsa.gov.uk> Co-authored-by: Trevor Rea <trevorrea@users.noreply.github.com> Co-authored-by: SullyK <68860309+SullyK@users.noreply.github.com> Co-authored-by: kitttang <katrina.tang@accenture.com>
Confirmation pages, linking of form titles to form start page and JS validation fix
…-links Close contact footer links
> [!NOTE] > This template is designed to help both contributors and maintainers. It is a checklist to ensure all necessary > information is provided, and prompts contributors on any contribution guidelines they have missed. > > Do not remove sections. > They are important for the review process and help maintainers ensure quality and good documentation across the > project. > > Some checkboxes will not apply to every change, so feel free to leave them unchecked if they are not relevant. <!-- Include these details if applicable: - A summary of the change - A link to the issue this change addresses - Motivation and context for the change - Acceptance criteria if you have any - A screen recording or screenshots of the feature or change --> TODO.. - Change (s) to s for GDS https://ukhsa.atlassian.net/browse/KLSKAB-2235 - About your enquiry changes https://ukhsa.atlassian.net/browse/KLSKAB-2244 What is the type of change you are making? - [x] Chore or documentation (non-breaking change that does not add functionality) - [ ] ADR (Architectural Decision Record, non-breaking change that documents or proposes a decision) - [ ] Refactor (non-breaking change that improves code quality) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) PR titles should be prefixed with the type of change you are making, based on the [README.md#versioning](https://github.com/XGovFormBuilder/digital-form-builder?tab=readme-ov-file#versioning). This is so that when performing a squash merge, the PR title is automatically used as the commit message. Have you updated the PR title to match the type of change you are making? - [x] Yes - [ ] No, I need help or guidance <!-- Several departments use XGovFormBuilder in production. Automated tests help ensure that changes do not break existing functionality for another department. Maintainers are sympathetic to the time constraints of government departments, but please try to be good citizens and add tests when possible. --> Have you added automated tests? - [ ] Yes, unit or integration tests - [ ] Yes, end-to-end (cypress) tests - [ ] No, tests are not required for this change - [ ] No, I need help or guidance - [x] No (explain why tests are not required or can't be added at this time) Have you manually tested your changes? - [x] Yes - [ ] No, manual tests are not required or sufficiently covered by automated tests Have you attached an example form JSON or snippet for the reviewer in this PR? - [ ] Yes - [ ] No, any existing form can be used - [x] No, it is not required or not applicable <!-- Only fill out this section if you answered "Yes" to manually testing your changes. In this section - describe the tests that you ran to verify your changes - provide instructions and a form JSON or snippet so we can reproduce the test if necessary If uploading a form JSON, use the "attach files" feature in GitHub PR. --> 1. Step 1 2. Step 2 Have you updated the documentation? - [ ] Yes, I have updated [./docs](https://github.com/XGovFormBuilder/digital-form-builder/tree/main/docs) for this change since additional explanation or steps to use/configure the feature is required - [ ] Yes, I have added or updated an [ADR](https://github.com/XGovFormBuilder/digital-form-builder/tree/main/docs/adr) for this change since it is large, complex, or has significant architectural implications - [ ] Yes, I have added inline comments for hard-to-understand areas - [ ] No, I am not sure if documentation is required - [x] No, documentation is not required for this change > [!WARNING] > > Large or complex changes may require discussion with the maintainers before they can be merged. If it has not yet been discussed, it may delay the review process Have you discussed this change with the maintainers? - [ ] Yes, I have discussed this change with the maintainers on slack, email or via GitHub issues - [ ] Yes, this change is an ADR to help kick-off discussion - [x] No, this change is small and does not require discussion - [ ] No, I am not sure if one is required
…ammendment FORM ONLY SMALL AMMENDMENTS
….com/ukhsa-collaboration/digital-form-builder into micol/add-base-path-timeout-redirect
…timeout-redirect BUG FIX - Timout Page
…hange changed button names to confirm and submit
Update close-contact-feedback.json
…_summary AMMENDMENT TO PREVIOUS TIMEOUT PR + (small kls defects resolution)
close-contact-form-mers
…RS_Forms Added new forms for MERS-CoV
change reference branch to trunk (which branch deployment repo is running on) change input branch to v2 (which branch of digital form builder is being deployed)
Feature: XGOV SOW37 Automated Form Deployment
…imout-fix added 3 second timeout on form submission
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Differences between upstream (red) and UKHSA's fork (green)