copilot code review fixes

Author: hardik-desai-nhs

application/CohortManager/src/Web/app/components/removeDummyGpCodeForm.tsx

@@ -68,7 +68,7 @@ export default function RemoveDummyGpCodeForm() {
               {errorMessage}
             </span>
           )}
-          <input className={`nhsuk-input ${hasError && errorField === "forename" ? "nhsuk-input--error" : ""}`} id="forename" name="forename" type="text" defaultValue={values?.forename} data-testid="forename-input" />
+          <input className={`nhsuk-input ${hasError && errorField === "forename" ? "nhsuk-input--error" : ""}`} id="forename" name="forename" type="text" defaultValue={values?.forename} aria-describedby={hasError && errorField === "forename" ? "forename-error" : undefined} data-testid="forename-input" />
         </div>
 
         <div className={`nhsuk-form-group ${hasError && errorField === "surname" ? "nhsuk-form-group--error" : ""}`}>
@@ -79,11 +79,11 @@ export default function RemoveDummyGpCodeForm() {
               {errorMessage}
             </span>
           )}
-          <input className={`nhsuk-input ${hasError && errorField === "surname" ? "nhsuk-input--error" : ""}`} id="surname" name="surname" type="text" defaultValue={values?.surname} data-testid="surname-input" />
+          <input className={`nhsuk-input ${hasError && errorField === "surname" ? "nhsuk-input--error" : ""}`} id="surname" name="surname" type="text" defaultValue={values?.surname} aria-describedby={hasError && errorField === "surname" ? "surname-error" : undefined} data-testid="surname-input" />
         </div>
 
         <div className={`nhsuk-form-group ${hasError && errorField === "dob-day" ? "nhsuk-form-group--error" : ""}`}>
-          <fieldset className="nhsuk-fieldset" aria-describedby="dob-hint" role="group">
+          <fieldset className="nhsuk-fieldset" aria-describedby={`dob-hint${hasError && errorField === "dob-day" ? " dob-error" : ""}`} role="group">
             <legend className="nhsuk-fieldset__legend nhsuk-label nhsuk-u-font-weight-bold">Date of Birth</legend>
             <div className="nhsuk-hint" id="dob-hint">For example, 15 3 1984</div>
             {hasError && errorField === "dob-day" && (
@@ -124,7 +124,7 @@ export default function RemoveDummyGpCodeForm() {
               {errorMessage}
             </span>
           )}
-          <input className={`nhsuk-input nhsuk-input--width-10 ${hasError && errorField === "serviceNowTicketNumber" ? "nhsuk-input--error" : ""}`} id="serviceNowTicketNumber" name="serviceNowTicketNumber" type="text" defaultValue={values?.serviceNowTicketNumber} aria-describedby="serviceNowTicketNumber-hint" data-testid="service-now-ticket-input"/>
+          <input className={`nhsuk-input nhsuk-input--width-10 ${hasError && errorField === "serviceNowTicketNumber" ? "nhsuk-input--error" : ""}`} id="serviceNowTicketNumber" name="serviceNowTicketNumber" type="text" defaultValue={values?.serviceNowTicketNumber} aria-describedby={`serviceNowTicketNumber-hint${hasError && errorField === "serviceNowTicketNumber" ? " serviceNowTicketNumber-error" : ""}`} data-testid="service-now-ticket-input"/>
         </div>
 
         <button className="nhsuk-button" data-module="nhsuk-button" type="submit" data-testid="submit-button">Submit</button>

application/CohortManager/src/Web/app/globals.scss

@@ -166,6 +166,14 @@
     background-position: -200% 0;
   }
 }
+
+@media (prefers-reduced-motion: reduce) {
+  .app-loading-shimmer {
+    animation: none;
+    background-position: 0 0;
+  }
+}
+
 .nhsuk-header__content {
   display: flex;
   align-items: center;

application/CohortManager/src/Web/app/lib/formValidationSchemas.test.ts

@@ -501,6 +501,36 @@ describe("formValidationSchemas", () => {
           expect(result.error.issues[0].message).toBe("Date of Birth must be a valid date");
         }
       });
+
+      it("should reject impossible calendar dates", () => {
+        const data = {
+          nhsNumber: "9434765919",
+          forename: "Jane",
+          surname: "Smith",
+          dateOfBirth: "2024-02-31",
+          serviceNowTicketNumber: "CS1234567",
+        };
+        const result = removeDummyGpCodeSchema.safeParse(data);
+        expect(result.success).toBe(false);
+        if (!result.success) {
+          expect(result.error.issues[0].message).toBe("Date of Birth must be a valid date");
+        }
+      });
+
+      it("should reject dates that are not zero-padded ISO format", () => {
+        const data = {
+          nhsNumber: "9434765919",
+          forename: "Jane",
+          surname: "Smith",
+          dateOfBirth: "2024-2-3",
+          serviceNowTicketNumber: "CS1234567",
+        };
+        const result = removeDummyGpCodeSchema.safeParse(data);
+        expect(result.success).toBe(false);
+        if (!result.success) {
+          expect(result.error.issues[0].message).toBe("Date of Birth must be a valid date");
+        }
+      });
     });
 
     describe("Service Now Ticket Number validation", () => {

application/CohortManager/src/Web/app/lib/formValidationSchemas.ts

@@ -1,5 +1,23 @@
 import { z } from "zod";
 
+function isValidIsoDateString(value: string): boolean {
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+    return false;
+  }
+
+  const [yearText, monthText, dayText] = value.split("-");
+  const year = Number.parseInt(yearText, 10);
+  const month = Number.parseInt(monthText, 10);
+  const day = Number.parseInt(dayText, 10);
+  const date = new Date(Date.UTC(year, month - 1, day));
+
+  return (
+    date.getUTCFullYear() === year &&
+    date.getUTCMonth() === month - 1 &&
+    date.getUTCDate() === day
+  );
+}
+
 // This schema validates the ServiceNow case ID for updating exceptions status.
 // In edit mode, empty input is allowed to clear the ServiceNow ID (convert raised to non-raised).
 // In non-edit mode, the ID is required and must start with two letters followed by at least seven digits (e.g. CS0619153).
@@ -69,10 +87,7 @@ export const removeDummyGpCodeSchema = z.object({
   dateOfBirth: z
     .string()
     .min(1, "Date of Birth is required")
-    .refine((val) => {
-      const date = new Date(val);
-      return !Number.isNaN(date.getTime());
-    }, "Date of Birth must be a valid date"),
+    .refine((val) => isValidIsoDateString(val), "Date of Birth must be a valid date"),
   serviceNowTicketNumber: z
     .string()
     .min(1, "Service Now Ticket Number is required")

application/CohortManager/src/Web/tests/features/removeDummyGpCode.feature

@@ -0,0 +1,31 @@
+Feature: Remove Dummy GP Code page
+
+  Background:
+    Given I sign in with a test account
+
+  Scenario: Form is visible with expected fields and actions
+    When I go to the page "/remove-dummy-gp-code"
+    Then I should see the heading "Remove Dummy GP Code"
+    And I see the link "Home" with the href "/"
+    And I see the input with label "NHS Number"
+    And I see the text "Forename"
+    And I see the text "Surname"
+    And I see the text "Date of Birth"
+    And I see the text "Service Now Ticket Number"
+    And I see the button "Submit"
+
+  Scenario: Page has no accessibility issues when signed in
+    When I go to the page "/remove-dummy-gp-code"
+    Then I should see the heading "Remove Dummy GP Code"
+    And I should expect 0 accessibility issues
+
+  Scenario: Empty submit shows the NHS Number validation error
+    When I go to the page "/remove-dummy-gp-code"
+    And I click the button "Submit"
+    Then I should see the error summary with message "NHS Number is required"
+    And I should see the inline error message "NHS Number is required"
+
+  Scenario: Success confirmation panel is shown when success query parameter is present
+    When I go to the page "/remove-dummy-gp-code?success=true"
+    Then I should see the heading "Request submitted successfully"
+    And I see the text "Your request to remove the dummy GP Code has been accepted."

application/CohortManager/src/Web/tests/features/steps/steps.ts

@@ -174,6 +174,15 @@ Then("I see the button {string}", async ({ page }, buttonText: string) => {
     .toBeVisible();
 });
 
+Then(
+  "I see the input with label {string}",
+  async ({ page }, labelText: string) => {
+    await test
+      .expect(page.getByLabel(labelText, { exact: true }))
+      .toBeVisible();
+  }
+);
+
 Then(
   "I see the link {string} with the href {string}",
   async ({ page }, linkText: string, expectedHref: string) => {