patch: Align with GDS and Accessibility requirements (#1353)

* patch: Align with GDS and Accessibility

* Update layout.html

* Update initialiseSession.feature

* Update layout.html

moving out skip to main content change

Author: kitttang

e2e/cypress/e2e/runner/dateValidation.js

@@ -22,7 +22,7 @@ Then("I see the date parts error {string}", (error) => {
   /**
    * Date parts only show one error at a time.
    */
-  cy.findByText("Fix the following errors");
+  cy.findByText("There is a problem");
   cy.findByRole("link", { name: error, exact: false });
 });
 
@@ -32,7 +32,7 @@ Then(
     /**
      * Date parts only show one error at a time.
      */
-    cy.findByText("Fix the following errors");
+    cy.findByText("There is a problem");
     cy.get(`#${fieldName}-error`).within(() => {
       cy.findByText(error, { exact: false });
     });

e2e/cypress/e2e/runner/initialiseSession.feature

@@ -6,7 +6,7 @@ Feature: Initialise session - prepopulate a session
       | form              | callbackUrl                                                | redirectPath | message | htmlMessage | title |
       | initialiseSession | https://61bca17e-fe74-40e0-9c15-a901ad120eca.mock.pstmn.io | /summary     |         |             |       |
     And I go to the initialised session URL
-    Then I see "Summary"
+    Then I see the heading "Summary"
 
 
   Scenario: The configured message is displayed
@@ -15,7 +15,7 @@ Feature: Initialise session - prepopulate a session
       | form              | callbackUrl                                                | redirectPath | message                     | htmlMessage | title |
       | initialiseSession | https://61bca17e-fe74-40e0-9c15-a901ad120eca.mock.pstmn.io | /summary     | your favourite egg is wrong |             |       |
     And I go to the initialised session URL
-    Then I see "Summary"
+    Then I see the heading "Summary"
     And I see "your favourite egg is wrong"
 
   Scenario: The configured htmlMessage is displayed
@@ -24,7 +24,7 @@ Feature: Initialise session - prepopulate a session
       | form              | callbackUrl                                                 | redirectPath | message | htmlMessage                      | title |
       | initialiseSession | https://61bca17e-fe74-40e0-9c15-a901ad120eca.mock.pstmn.io | /summary     |         | <p>This is not a type of egg</p> |       |
     And I go to the initialised session URL
-    Then I see "Summary"
+    Then I see the heading "Summary"
     And I see "This is not a type of egg"
     And I don't see "<p>"
 
@@ -46,4 +46,4 @@ Feature: Initialise session - prepopulate a session
     And I declare and continue
     Then I see "Cookies are files saved on your phone"
     When  I revisit the status page
-    Then I see "Cookies are files saved on your phone"
+    Then I see "Cookies are files saved on your phone"

e2e/cypress/support/step_definitions/common/i_see_the_error_string_for_string.js

@@ -1,7 +1,7 @@
 import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I see the error {string} for {string}", (error, fieldName) => {
-  cy.findByText("Fix the following errors");
+  cy.findByText("There is a problem");
   cy.findByRole("link", { name: error });
   cy.findByRole("group", { description: `Error: ${error}` });
 });

runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts

@@ -611,7 +611,7 @@ export class PageControllerBase {
       });
 
       formResult.errors = Object.is(formResult.errors, null)
-        ? { titleText: "Fix the following errors" }
+        ? { titleText: "There is a problem" }
         : formResult.errors;
       formResult.errors.errorList = reformattedErrors;
     }
@@ -638,7 +638,7 @@ export class PageControllerBase {
       });
 
       formResult.errors = Object.is(formResult.errors, null)
-        ? { titleText: "Fix the following errors" }
+        ? { titleText: "There is a problem" }
         : formResult.errors;
       formResult.errors.errorList = reformattedErrors;
     }
@@ -841,7 +841,7 @@ export class PageControllerBase {
   }
 
   get errorSummaryTitle() {
-    return "Fix the following errors";
+    return "There is a problem";
   }
 
   /**

runner/src/server/plugins/engine/pluginHandlers/exit/prehandlers/utils.ts

@@ -19,7 +19,7 @@ export function errorListFromValidationResult(
   const errorList = errors.details.map(errorListItemToErrorVM);
 
   return {
-    titleText: "Fix the following errors",
+    titleText: "There is a problem",
     errorList: errorList.filter(
       ({ text }, index) =>
         index === errorList.findIndex((err) => err.text === text)

runner/src/server/plugins/engine/types.ts

@@ -61,7 +61,7 @@ export type FormSubmissionState = {
 };
 
 export type FormSubmissionErrors = {
-  titleText: string; // e.b: "Fix the following errors"
+  titleText: string; // e.b: "There is a problem"
   errorList: {
     path: string; // e.g: "firstName"
     href: string; // e.g: "#firstName"

runner/src/server/plugins/engine/views/components/fileuploadfield.html

@@ -5,8 +5,8 @@
       <p class="govuk-body">You previously uploaded the file ‘{{component.model.value}}’</p>
   {% endif %}
     <div class="govuk-error-summary govuk-border-green upload-dialog" aria-labelledby="success-summary-title" role="alert" tabindex="-1">
-        <h2 class="govuk-!-margin-0 govuk-heading-m" id="success-summary-title">
+        <p class="govuk-!-margin-0 govuk-heading-m" id="success-summary-title">
             Your file was successfully selected
-        </h2>
+        </p>
     </div>
 {% endmacro %}

runner/src/server/services/upload/uploadService.ts

@@ -47,10 +47,14 @@ export class UploadService {
   validFiletypesString(customAcceptedTypes?: string[]) {
     const acceptedTypes = customAcceptedTypes ?? this.validContentTypes;
 
-    const acceptedTypeNames = acceptedTypes
+    let acceptedTypeNames = acceptedTypes
       .map((type) => contentTypeToName[type])
-      .filter(Boolean);
+      .filter(Boolean)
+      .map((type) => type.toUpperCase());
 
+    const namesSet = new Set(acceptedTypeNames);
+    acceptedTypeNames = Array.from(namesSet);
+    
     const acceptedTypesNameWithoutLast = acceptedTypeNames
       .slice(0, -1)
       .join(", ");

runner/test/cases/server/plugins/engine/datepartsfield.test.ts

@@ -62,7 +62,7 @@ suite("Date parts field", () => {
       type: "DatePartsField",
     };
     const errors = {
-      titleText: "Fix the following errors",
+      titleText: "There is a problem",
       errorList: [
         {
           path: "approximate__day",

runner/test/cases/server/plugins/engine/pageControllers/PageControllerBase.test.ts

@@ -63,7 +63,7 @@ suite("PageControllerBase", () => {
     };
 
     expect(page.getErrors(error)).to.equal({
-      titleText: "Fix the following errors",
+      titleText: "There is a problem",
       errorList: [
         {
           path: "approximate",