Merge branch 'fix/REGISTRY-2731' of https://github.com/HDRUK/safepeopleregistry-web into fix/REGISTRY-2731

Author: SaharBatol-HDRUK

CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.38.0](https://github.com/HDRUK/safepeopleregistry-web/compare/v1.37.0...v1.38.0) (2026-07-31)
+
+### ✨ Features
+
+* **REGISTRY-1006:** Organisations - add parent organisation (subsidiaries) (#839) ([5023bda](https://github.com/HDRUK/safepeopleregistry-web/commit/5023bda86be0efa7d5b606e02ef22e93cc241b93))
+* **REGISTRY-2622:** User | Change UK Stats Authority tick box to instead be its own table (#838) ([fa0d2ae](https://github.com/HDRUK/safepeopleregistry-web/commit/fa0d2ae7abe8a8bb85abb1b4e3d2ecc969ec5b5f))
+
+### 🐛 Bug Fixes
+
+* **REGISTRY-0000:** Fix 'Add organisation manual check' modal header (#837) ([f463f2e](https://github.com/HDRUK/safepeopleregistry-web/commit/f463f2ed47d18de13e0082da82e940d2c7954e2c))
+* **REGISTRY-000:** Update copyright notices' year to 2026 (#841) ([868c7b0](https://github.com/HDRUK/safepeopleregistry-web/commit/868c7b010de0c96ae55d1ea44d434179b7d33711))
+* **REGISTRY-2854:** Update banner text on pre-prod to say July 23, not June 30 (#840) ([44f4a93](https://github.com/HDRUK/safepeopleregistry-web/commit/44f4a93bf7c7e0089640cc8d8af74e25ed6e389e))
+
 ## [1.37.0](https://github.com/HDRUK/safepeopleregistry-web/compare/v1.36.1...v1.37.0) (2026-07-10)
 
 ### ✨ Features

chart/soursd-web/Chart.yaml

@@ -21,4 +21,4 @@ version: 1.0.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.37.0"
+appVersion: "1.38.0"

cypress/e2e/user-journeys/admin/emails.cy.ts

@@ -7,6 +7,30 @@ import { dataCy, getModalByHeader, logout } from "cypress/support/utils/common";
 
 const dataInviteUser = mockedInvitedUser();
 
+const refreshUntilFirstRowMatches = (
+  predicate: (firstRowText: string) => boolean,
+  maxAttempts = 5,
+  attempts = 0
+) => {
+  cy.get(dataCy("emails-list"))
+    .find("tbody tr")
+    .should("have.length.greaterThan", 0)
+    .first()
+    .then($row => {
+      if (predicate($row.text())) {
+        return;
+      }
+
+      if (attempts >= maxAttempts) {
+        throw new Error("Timed out waiting for first row to match condition");
+      }
+
+      cy.contains("button", "Update").click();
+      cy.wait(1000);
+      refreshUntilFirstRowMatches(predicate, maxAttempts, attempts + 1);
+    });
+};
+
 describe("Resend invite", () => {
   before(() => {
     loginAdmin();
@@ -29,9 +53,7 @@ describe("Resend invite", () => {
   });
 
   it("Shows a list of emails", () => {
-    cy.wait(20000);
-    cy.contains("button", "Update").click();
-
+    refreshUntilFirstRowMatches(text => text.includes(dataInviteUser.email));
     cy.get(dataCy("emails-list"))
       .find("tbody tr")
       .first()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "safepeopleregistry-web",
-  "version": "1.37.0",
+  "version": "1.38.0",
   "private": true,
   "scripts": {
     "maildev": "maildev",

src/organisms/NavBar/NavBar.test.tsx

@@ -1,4 +1,4 @@
-import { useStore } from "@/data/store";
+import { StoreState, useStore } from "@/data/store";
 import { mockedJwt } from "@/mocks/data/auth";
 import { mockedUser } from "@/mocks/data/user";
 import theme from "@/theme";
@@ -15,6 +15,9 @@ import {
   waitFor,
 } from "../../utils/testUtils";
 import NavBar from "./NavBar";
+import { mockedOrganisation } from "@/mocks/data/organisation";
+import { mockedCustodian } from "@/mocks/data/custodian";
+import { AccountType } from "@/types/accounts";
 
 jest.mock("js-cookie", () => ({
   get: jest.fn(),
@@ -117,7 +120,11 @@ describe("NavBar Component", () => {
       selector({
         getUser: () => mockedUser(),
         setUser: jest.fn(),
-      })
+        config: {
+          organisation: mockedOrganisation,
+          custodian: mockedCustodian,
+        },
+      } as unknown as StoreState)
     );
 
     render(<NavBar loggedIn />);
@@ -127,6 +134,40 @@ describe("NavBar Component", () => {
     expect(handleLogout).toHaveBeenCalled();
   });
 
+  it("displays 'Organisation' chip when the user belongs to an organisation", () => {
+    mockUseStore.mockImplementation(selector =>
+      selector({
+        getUser: () => mockedUser(),
+        setUser: jest.fn(),
+        config: {
+          organisation: mockedOrganisation,
+          custodian: undefined,
+        },
+      } as unknown as StoreState)
+    );
+
+    render(<NavBar loggedIn />);
+
+    expect(screen.getByText(AccountType.ORGANISATION)).toBeInTheDocument();
+  });
+
+  it("displays 'Custodian' chip when the user belongs to an custodian", () => {
+    mockUseStore.mockImplementation(selector =>
+      selector({
+        getUser: () => mockedUser(),
+        setUser: jest.fn(),
+        config: {
+          organisation: undefined,
+          custodian: mockedCustodian,
+        },
+      } as unknown as StoreState)
+    );
+
+    render(<NavBar loggedIn />);
+
+    expect(screen.getByText(AccountType.CUSTODIAN)).toBeInTheDocument();
+  });
+
   it("displays 'My Account' and 'Sign Out' if the user is authenticated", () => {
     mockGetMe.mockResolvedValueOnce({
       status: 200,
@@ -137,7 +178,11 @@ describe("NavBar Component", () => {
       selector({
         getUser: () => mockedUser(),
         setUser: jest.fn(),
-      })
+        config: {
+          organisation: undefined,
+          custodian: undefined,
+        },
+      } as unknown as StoreState)
     );
 
     (get as jest.Mock).mockReturnValue(mockedJwt);

src/organisms/NavBar/NavBar.tsx

@@ -9,6 +9,7 @@ import MenuIcon from "@mui/icons-material/Menu";
 import {
   Box,
   Button,
+  Chip,
   IconButton,
   MenuItem,
   MenuList,
@@ -27,6 +28,7 @@ import { handleLogin, handleLogout } from "../../utils/keycloak";
 import NotificationsMenu from "../NotificationsMenu";
 import SupportMenu from "../SupportMenu/SupportMenu";
 import { StyledContainer, StyledHeader } from "./NavBar.styles";
+import { AccountType } from "@/types/accounts";
 
 const NAMESPACE_TRANSLATIONS_NAVBAR = "NavBar";
 
@@ -105,6 +107,8 @@ export default function NavBar({ loggedIn }: NavBarProps) {
     store.getUser(),
     store.setUser,
   ]);
+  const storedOrganisation = useStore(state => state.config.organisation);
+  const storedCustodian = useStore(state => state.config.custodian);
 
   const theme = useTheme();
   const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -214,6 +218,24 @@ export default function NavBar({ loggedIn }: NavBarProps) {
                   sx={{ mr: 4 }}
                 />
               </Link>
+              {loggedIn && (
+                <Chip
+                  label={
+                    storedOrganisation
+                      ? AccountType.ORGANISATION
+                      : storedCustodian
+                        ? AccountType.CUSTODIAN
+                        : AccountType.USER
+                  }
+                  sx={{
+                    textTransform: "uppercase",
+                    backgroundColor: theme.palette[`neutral-500`].main,
+                    color: theme.palette.white,
+                  }}
+                  size="medium"
+                />
+              )}
+
               {renderButtons(left_buttons)}
             </Box>
             <Box sx={{ display: "flex", alignItems: "center", gap: 2 }}>