Stopped role selection from editing rolesWithAccess data

Removed access related calculated fields from local storage
Simplified rendering of role selection page

Author: MatthewPopat-NHS

.vscode/eps-prescription-tracker-ui.code-workspace

@@ -67,7 +67,7 @@
       {
         "name": "packages/common/lambdaUtils",
         "path": "../packages/common/lambdaUtils"
-      }
+      },
       {
         "name": "packages/common/testing",
         "path": "../packages/common/testing"

packages/common/commonTypes/src/trackerUserInfo.ts

@@ -30,10 +30,8 @@ export type TrackerUserInfo = {
 export type TrackerUserInfoResult = {
   rolesWithAccess: Array<RoleDetails>,
   rolesWithoutAccess: Array<RoleDetails>,
-  hasNoAccess: boolean
   selectedRole: RoleDetails | undefined,
   userDetails: UserDetails | undefined,
-  hasSingleRoleAccess: boolean,
   isConcurrentSession: boolean,
   invalidSessionCause: string | undefined,
   sessionId: string | undefined,

packages/cpt-ui/__tests__/AuthProvider.test.tsx

@@ -41,10 +41,8 @@ const userDetails = {
 const mockUserInfo = {
   rolesWithAccess: rolesWithAccess,
   rolesWithoutAccess: [],
-  hasNoAccess: false,
   selectedRole: currentlySelectedRole,
   userDetails: userDetails,
-  hasSingleRoleAccess: true,
   error: undefined
 }
 
@@ -142,10 +140,8 @@ const TestConsumer = () => {
       <div data-testid="isSigningIn">{auth.isSigningIn.toString()}</div>
       <div data-testid="rolesWithAccess">{JSON.stringify(auth.rolesWithAccess, null, 2)}</div>
       <div data-testid="rolesWithoutAccess">{JSON.stringify(auth.rolesWithoutAccess, null, 2)}</div>
-      <div data-testid="noAccess">{auth.hasNoAccess.toString()}</div>
       <div data-testid="selectedRole">{JSON.stringify(auth.selectedRole, null, 2)}</div>
       <div data-testid="userDetails">{JSON.stringify(auth.userDetails, null, 2)}</div>
-      <div data-testid="singleAccess">{auth.hasSingleRoleAccess.toString()}</div>
     </div>
   )
 }
@@ -265,10 +261,8 @@ describe("AuthProvider", () => {
       expect(screen.getByTestId("user").textContent).toBe("test_user")
       expect(screen.getByTestId("rolesWithAccess").textContent).toBe(JSON.stringify(rolesWithAccess, null, 2))
       expect(screen.getByTestId("rolesWithoutAccess").textContent).toBe("[]")
-      expect(screen.getByTestId("noAccess").textContent).toBe("false")
       expect(screen.getByTestId("selectedRole").textContent).toBe(JSON.stringify(currentlySelectedRole, null, 2))
       expect(screen.getByTestId("userDetails").textContent).toBe(JSON.stringify(userDetails, null, 2))
-      expect(screen.getByTestId("singleAccess").textContent).toBe("true")
     })
   })
 
@@ -326,10 +320,8 @@ describe("AuthProvider", () => {
       expect(screen.getByTestId("error").textContent).toBe("")
       expect(screen.getByTestId("rolesWithAccess").textContent).toBe("[]")
       expect(screen.getByTestId("rolesWithoutAccess").textContent).toBe("[]")
-      expect(screen.getByTestId("noAccess").textContent).toBe("true")
       expect(screen.getByTestId("selectedRole").textContent).toBe("")
       expect(screen.getByTestId("userDetails").textContent).toBe("")
-      expect(screen.getByTestId("singleAccess").textContent).toBe("false")
     })
   })
 
@@ -395,7 +387,7 @@ describe("AuthProvider", () => {
       };
 
       (updateRemoteSelectedRole as jest.Mock).mockResolvedValue({
-        rolesWithAccess: [newRole]
+        currentlySelectedRole: newRole
       })
 
       let contextValue: AuthContextType | null

packages/cpt-ui/__tests__/BasicDetailsSearch.test.tsx

@@ -45,8 +45,6 @@ const signedInAuthState: AuthContextType = {
   error: null,
   rolesWithAccess: [],
   rolesWithoutAccess: [],
-  hasNoAccess: false,
-  hasSingleRoleAccess: false,
   selectedRole: undefined,
   userDetails: undefined,
   isConcurrentSession: false,

packages/cpt-ui/__tests__/BasicDetailsSearchResultsPage.test.tsx

@@ -50,8 +50,6 @@ const mockAuthContext: AuthContextType = {
   invalidSessionCause: undefined,
   rolesWithAccess: [],
   rolesWithoutAccess: [],
-  hasNoAccess: false,
-  hasSingleRoleAccess: false,
   selectedRole: undefined,
   userDetails: undefined,
   isConcurrentSession: false,

packages/cpt-ui/__tests__/EpsHeader.test.tsx

@@ -54,8 +54,6 @@ const defaultAuthContext: AuthContextType = {
   invalidSessionCause: undefined,
   rolesWithAccess: [],
   rolesWithoutAccess: [],
-  hasNoAccess: false,
-  hasSingleRoleAccess: false,
   selectedRole: undefined,
   userDetails: undefined,
   isConcurrentSession: false,

packages/cpt-ui/__tests__/EpsPrescriptionList.test.tsx

@@ -137,8 +137,6 @@ const signedInAuthState: AuthContextType = {
   error: null,
   rolesWithAccess: [],
   rolesWithoutAccess: [],
-  hasNoAccess: false,
-  hasSingleRoleAccess: false,
   selectedRole: undefined,
   userDetails: undefined,
   isConcurrentSession: false,

packages/cpt-ui/__tests__/EpsRoleSelectionPage.test.tsx

@@ -13,6 +13,7 @@ import {FRONTEND_PATHS} from "@/constants/environment"
 import {getSearchParams} from "@/helpers/getSearchParams"
 import {handleRestartLogin} from "@/helpers/logout"
 import axios from "axios"
+import {RoleDetails} from "@cpt-ui-common/common-types"
 
 jest.mock("@/context/AuthProvider")
 jest.mock("@/helpers/getSearchParams")
@@ -89,7 +90,6 @@ describe("RoleSelectionPage", () => {
   it("renders loading spinner if redirecting during sign in", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: true,
-      hasNoAccess: false,
       rolesWithAccess: [],
       rolesWithoutAccess: [],
       error: null,
@@ -107,7 +107,6 @@ describe("RoleSelectionPage", () => {
   it("renders error message if auth.error exists", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
-      hasNoAccess: false,
       rolesWithAccess: [],
       rolesWithoutAccess: [],
       error: "Something went wrong"
@@ -118,10 +117,9 @@ describe("RoleSelectionPage", () => {
     expect(screen.getByText("Something went wrong")).toBeInTheDocument()
   })
 
-  it("renders titleNoAccess and captionNoAccess when hasNoAccess is true", () => {
+  it("renders titleNoAccess and captionNoAccess when rolesWithAccess is empty", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
-      hasNoAccess: true,
       rolesWithAccess: [],
       rolesWithoutAccess: [],
       error: null
@@ -139,8 +137,6 @@ describe("RoleSelectionPage", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: true,
       isSignedIn: false,
-      hasSingleRoleAccess: true,
-      hasNoAccess: false,
       rolesWithAccess: [],
       rolesWithoutAccess: [],
       selectedRole: null,
@@ -157,16 +153,21 @@ describe("RoleSelectionPage", () => {
     expect(navigateMock).toHaveBeenCalledWith(FRONTEND_PATHS.LOGIN)
   })
 
-  it("redirects if user hasSingleRoleAccess", () => {
+  it("redirects if user has single roleWithAccess", () => {
     const navigateMock = jest.fn()
     mockNavigate.mockReturnValue(navigateMock)
 
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
       isSignedIn: true,
-      hasSingleRoleAccess: true,
-      hasNoAccess: false,
-      rolesWithAccess: [],
+      rolesWithAccess: [
+        {
+          role_id: "1",
+          role_name: "Pharmacist",
+          org_code: "ABC",
+          org_name: "Pharmacy Org"
+        }
+      ],
       rolesWithoutAccess: [],
       selectedRole: null,
       error: null
@@ -180,8 +181,6 @@ describe("RoleSelectionPage", () => {
   it("renders login info when selectedRole is present", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
-      hasSingleRoleAccess: false,
-      hasNoAccess: false,
       selectedRole: {
         org_name: "Test Org",
         org_code: "TEST123",
@@ -202,7 +201,6 @@ describe("RoleSelectionPage", () => {
   it("renders roles without access in table", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
-      hasNoAccess: false,
       rolesWithAccess: [],
       rolesWithoutAccess: [
         {
@@ -224,7 +222,6 @@ describe("RoleSelectionPage", () => {
   it("renders EpsCard components for roles with access", () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
-      hasNoAccess: false,
       selectedRole: {
         role_id: "1"
       },
@@ -265,7 +262,6 @@ describe("RoleSelectionPage", () => {
   it("navigates on confirm and continue button click", async () => {
     mockUseAuth.mockReturnValue({
       isSigningIn: false,
-      hasNoAccess: false,
       selectedRole: {
         role_id: "1",
         org_name: "Pharmacy A",
@@ -284,7 +280,6 @@ describe("RoleSelectionPage", () => {
     expect(button).toBeEnabled()
     fireEvent.click(button)
 
-    expect(mockNavigate.mock.calls.length).toBe(5)
     expect(mockNavigate).toHaveBeenCalledWith("/continue")
   })
 
@@ -293,11 +288,9 @@ describe("RoleSelectionPage", () => {
     const authState = {
       isSigningIn: true,
       isSignedIn: false,
-      hasSingleRoleAccess: false,
-      hasNoAccess: false,
-      rolesWithAccess: [],
+      rolesWithAccess: [] as Array<RoleDetails>,
       rolesWithoutAccess: [],
-      selectedRole: null,
+      selectedRole: undefined as RoleDetails | undefined,
       error: null,
       clearAuthState: jest.fn()
     }
@@ -317,8 +310,14 @@ describe("RoleSelectionPage", () => {
     // Step 2: Simulate login complete and role assignment
     act(() => {
       authState.isSigningIn = false
-      authState.isSignedIn = true
-      authState.hasSingleRoleAccess = true
+      const role = {
+        role_id: "2",
+        role_name: "Pharmacist",
+        org_code: "ABC",
+        org_name: "Pharmacy Org"
+      }
+      authState.rolesWithAccess = [role]
+      authState.selectedRole = role
       authState.isSignedIn = true
       mockUseAuth.mockReturnValue(authState)
     })

packages/cpt-ui/__tests__/EpsSearchForAPrescription.test.tsx

@@ -17,8 +17,6 @@ const defaultAuthContext: AuthContextType = {
   invalidSessionCause: undefined,
   rolesWithAccess: [],
   rolesWithoutAccess: [],
-  hasNoAccess: false,
-  hasSingleRoleAccess: false,
   selectedRole: undefined,
   userDetails: undefined,
   isConcurrentSession: false,

packages/cpt-ui/__tests__/LoginPage.test.tsx

@@ -89,8 +89,6 @@ const defaultAuthState: AuthContextType = {
   error: null,
   rolesWithAccess: [],
   rolesWithoutAccess: [],
-  hasNoAccess: false,
-  hasSingleRoleAccess: false,
   selectedRole: undefined,
   userDetails: undefined,
   isConcurrentSession: false,