RELEASE: safepeopleregistry-web 2.6.7 (#842)

Author: soringumeni1

.github/workflows/e2e-isolated.yml

@@ -196,7 +196,7 @@ jobs:
       id-token: "write"
     steps:
       - name: Install MailDev
-        run: npm install -g maildev
+        run: npm install -g maildev@2.2.1 # pinned to v2.2.1 because v3.0 changes the API - a future cleanup task will be to update the code to work with v3.0 and remove this pinning
 
       - name: Start MailDev
         run: |

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Health Data Research UK
+Copyright (c) 2026 Health Data Research UK
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cypress/support/utils/custodian/manualChecksConfiguration.ts

@@ -5,15 +5,15 @@ const hasUnCheckedOnUsersConfigurationManualChecks = () => {
   cy.get('[data-cy="skeleton-checkboxlist"]').should("not.exist", {
     timeout: 20000,
   });
-  cy.get("#13").should("exist").uncheck();
+  cy.get("#37").should("exist").uncheck();
   cy.contains(
     "p",
     "Contact details tab: Location meets project & policy requirements"
   ).should("exist");
   cy.get('[data-cy="action-menu"]')
     .find('button[type="button"]')
     .should("exist");
-  cy.get("#14").should("exist").uncheck();
+  cy.get("#38").should("exist").uncheck();
   cy.contains(
     "p",
     "Projects tab: Previous sensitive data project with us in last 2 years at same affiliation?"
@@ -28,8 +28,8 @@ const hasCheckedOnUsersConfigurationManualChecks = () => {
   cy.get('[data-cy="skeleton-checkboxlist"]').should("not.exist", {
     timeout: 20000,
   });
-  cy.get("#13").should("exist").check();
-  cy.get("#14").should("exist").check();
+  cy.get("#37").should("exist").check();
+  cy.get("#38").should("exist").check();
 };
 
 const addManualChecksForUsersConfigurationManualChecks = (title: string) => {
@@ -130,14 +130,14 @@ const hasUnCheckedOnOrganisationConfigurationManualChecks = () => {
   cy.get('[data-cy="skeleton-checkboxlist"]').should("not.exist", {
     timeout: 20000,
   });
-  cy.get("#19").should("exist").uncheck();
+  cy.get("#43").should("exist").uncheck();
   cy.contains("span", "Contact details tab: Verify SRO identity").should(
     "exist"
   );
   cy.get('[data-cy="action-menu"]')
     .find('button[type="button"]')
     .should("exist");
-  cy.get("#21").should("exist").uncheck();
+  cy.get("#45").should("exist").uncheck();
   cy.contains(
     "p",
     "Digital identifiers tab: Check validity & type (Public, Private, etc.)"
@@ -152,8 +152,8 @@ const hasCheckedOnOrganisationConfigurationManualChecks = () => {
   cy.get('[data-cy="skeleton-checkboxlist"]').should("not.exist", {
     timeout: 20000,
   });
-  cy.get("#19").should("exist").check();
-  cy.get("#21").should("exist").check();
+  cy.get("#43").should("exist").check();
+  cy.get("#45").should("exist").check();
 };
 
 const hasAddManualChecksForOrganisationConfigurationManualChecks = () => {
@@ -167,7 +167,7 @@ const hasAddManualChecksForOrganisationConfigurationManualChecks = () => {
     .within(() => {
       cy.contains("button", "Add manual check").click();
     });
-  cy.contains("h3", "Add User manual check").should("exist");
+  cy.contains("h3", "Add Organisation manual check").should("exist");
   cy.contains("label", "Description").should("exist");
   cy.contains("button", "Cancel").should("exist");
   cy.get("#text").type(text);

cypress/support/utils/custodian/users.ts

@@ -53,16 +53,6 @@ const hasTrainingandAccreditationsTabCustodianUser = () => {
   cy.contains("h2", "Training and Accreditations").should("exist");
   cy.contains("h3", "Training history").should("exist");
   cy.contains("h3", "Professional membership history").should("exist");
-  cy.contains(
-    "p",
-    "I am a registered Accredited Researcher as published on the UK Statistics Authority website."
-  ).should("exist");
-  cy.contains(
-    "p",
-    "I have signed a User declaration for accessing Digital Economy Act accredited environments."
-  ).should("exist");
-  cy.get('[data-testid="AccreditedResearcherIcon"]').should("exist");
-  cy.get('[data-testid="UserDeclarationIcon"]').should("exist");
 };
 
 const hasAutomatedFlagsTabCustodianUser = () => {

cypress/support/utils/user/accreditation.ts

@@ -0,0 +1,77 @@
+import { Accreditation } from "@/types/application";
+import { formatShortDate } from "@/utils/date";
+import { dataCy } from "../common";
+
+const addAccreditation = (accreditation: Accreditation) => {
+  cy.buttonClick("Add accreditated research registration");
+
+  cy.get(dataCy("form-modal")).should("be.visible");
+
+  cy.get("#associated_organisation_name").type(
+    accreditation.associated_organisation_name
+  );
+  cy.get("#id_string").type(accreditation.id_string);
+  cy.dateSelectValue("issue_date", accreditation.issue_date);
+  cy.dateSelectValue("expiry_date", accreditation.expiry_date);
+
+  cy.saveFormClick();
+};
+
+const hasAccreditation = (accreditation: Accreditation) => {
+  cy.getLatestRowOfResults();
+  const row = cy.getResultsRowByValue(
+    accreditation.associated_organisation_name
+  );
+
+  row.within(() => {
+    cy.contains("td", accreditation.associated_organisation_name);
+    cy.contains("td", accreditation.id_string);
+    cy.contains("td", formatShortDate(accreditation.issue_date));
+    cy.contains("td", formatShortDate(accreditation.expiry_date));
+  });
+};
+
+const editAccreditation = (
+  accreditation: Accreditation,
+  updated: Partial<Accreditation>
+) => {
+  cy.getResultsActionMenu(accreditation.associated_organisation_name).click();
+
+  cy.actionMenuClick("View or edit");
+
+  if (updated.associated_organisation_name) {
+    cy.get("#associated_organisation_name")
+      .clear()
+      .type(updated.associated_organisation_name);
+  }
+
+  if (updated.id_string) {
+    cy.get("#id_string").clear().type(updated.id_string);
+  }
+
+  cy.saveFormClick();
+};
+
+const removeAccreditation = (accreditation: Accreditation) => {
+  cy.getLatestRowOfResults();
+  cy.getResultsActionMenu(accreditation.associated_organisation_name).click();
+
+  cy.actionMenuClick("Delete");
+
+  cy.clickAlertModal("Delete", "Warning");
+  cy.clickAlertModal("Close");
+};
+
+const hasRemovedAccreditation = (accreditation: Accreditation) => {
+  cy.getResultsRow()
+    .contains("td", accreditation.associated_organisation_name)
+    .should("not.exist");
+};
+
+export {
+  addAccreditation,
+  editAccreditation,
+  hasRemovedAccreditation,
+  hasAccreditation,
+  removeAccreditation,
+};

mocks/data/cms.tsx

@@ -4,7 +4,7 @@ import { ReactNode } from "react";
 
 export const mockedChristmasBannerContent = () => (
   <>
-    We wiped this pre-production test site of its data on the week of June 30.
+    We wiped this pre-production test site of its data on the week of July 23.
     You will need to re-register an account to continue testing this site. If
     you contacted us previously, you should receive an email within 24 hours
     inviting you or your team back onto the system. Otherwise, if you'd like to

src/app/[locale]/(logged-in)/data-custodian/profile/components/ValidationChecks/ValidationChecks.tsx

@@ -244,7 +244,7 @@ export default function ValidationChecks() {
           rightButton={
             isAdmin && (
               <AddNewValidationCheck
-                title={t("userAddTitle")}
+                title={t("orgAddTitle")}
                 onSubmit={handleAddOrganisationCheck}
               />
             )

src/app/[locale]/(logged-in)/organisation/profile/components/NameAndAddress/NameAndAddress.tsx

@@ -24,6 +24,7 @@ import { useRouter } from "next/navigation";
 import { useEffect, useMemo } from "react";
 import useUpdateOrganisation from "../../hooks/useUpdateOrganisation";
 import SroFields from "../SroFields";
+import OrganisationsParents from "@/organisms/OrganisationsParents";
 
 export interface NameAndAddressFormValues {
   organisation_name: string;
@@ -258,6 +259,10 @@ export default function NameAndAddress() {
                   </Grid>
                 </Grid>
               </PageSection>
+              <OrganisationsParents
+                onEditSuccess={() => handleRefetch()}
+                onDeleteSuccess={() => handleRefetch()}
+              />
               <OrganisationsSubsidiaries
                 onEditSuccess={() => handleRefetch()}
                 onDeleteSuccess={() => handleRefetch()}

src/app/[locale]/(logged-in)/user/profile/components/Trainings/Trainings.test.tsx

@@ -27,12 +27,6 @@ jest.mock("@/data/store", () => ({
 
 describe("Trainings", () => {
   const mockUser = mockedUser({ id: 1 });
-  const mockUserData = {
-    data: {
-      uksa_registered: false,
-      declaration_signed: false,
-    },
-  };
 
   const mockRouter = {
     push: jest.fn(),
@@ -43,7 +37,6 @@ describe("Trainings", () => {
 
     mockUseStore({ user: mockUser });
     (useQuery as jest.Mock).mockReturnValue({
-      data: mockUserData,
       isLoading: false,
       refetch: jest.fn(),
     });
@@ -61,42 +54,6 @@ describe("Trainings", () => {
     ).toBeInTheDocument();
   });
 
-  it("displays checkboxes", () => {
-    render(<Trainings />);
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes).toHaveLength(2);
-  });
-
-  it("displays 'Find out more' links", () => {
-    render(<Trainings />);
-    expect(screen.getAllByText("Find out more")).toHaveLength(2);
-  });
-
-  it("submits form with correct data", async () => {
-    const mockPutUser = jest.fn();
-    (useMutation as jest.Mock).mockReturnValue({
-      mutateAsync: mockPutUser,
-      isPending: false,
-    });
-
-    render(<Trainings />);
-
-    const checkboxes = screen.getAllByRole("checkbox");
-    fireEvent.click(checkboxes[0]);
-    fireEvent.click(checkboxes[1]);
-
-    await act(async () => {
-      fireEvent.click(screen.getByText("Finish"));
-    });
-
-    await waitFor(() => {
-      expect(mockPutUser).toHaveBeenCalledWith({
-        uksa_registered: true,
-        declaration_signed: true,
-      });
-    });
-  });
-
   it("navigates to the correct route after submission", async () => {
     render(<Trainings />);
 
@@ -111,33 +68,6 @@ describe("Trainings", () => {
     });
   });
 
-  it("updates form when user data changes", async () => {
-    const { rerender } = render(<Trainings />);
-
-    const checkboxes = screen.getAllByRole("checkbox");
-    expect(checkboxes[0]).not.toBeChecked();
-    expect(checkboxes[1]).not.toBeChecked();
-
-    (useQuery as jest.Mock).mockReturnValue({
-      data: {
-        data: {
-          ...mockUser,
-          uksa_registered: true,
-          declaration_signed: true,
-        },
-      },
-      isLoading: false,
-    });
-
-    rerender(<Trainings />);
-
-    await waitFor(() => {
-      const updatedCheckboxes = screen.getAllByRole("checkbox");
-      expect(updatedCheckboxes[0]).toBeChecked();
-      expect(updatedCheckboxes[1]).toBeChecked();
-    });
-  });
-
   it("has no accessibility violations", async () => {
     commonAccessibilityTests(render(<Trainings />));
   });