Add the currentlySelectedRole logic and the mockUserInfo file

Author: kris-szlapa

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

@@ -144,7 +144,10 @@
       "typescript.tsdk": "eps-prescription-tracker-ui-monorepo/node_modules/typescript/lib",
       "eslint.useFlatConfig": true,
       "eslint.format.enable": true,
-      "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+      "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+      "[typescriptreact]": {
+        "editor.defaultFormatter": "vscode.typescript-language-features"
+      }
     },
     "extensions": {
       "recommendations": [

packages/cpt-ui/app/selectyourrole/page.tsx

@@ -7,7 +7,7 @@ import {AuthContext} from "@/context/AuthProvider"
 import {useAccess} from '@/context/AccessProvider'
 
 import EpsCard, {EpsCardProps} from "@/components/EpsCard"
-import EpsSpinner from "@/components/EpsSpinner";
+import EpsSpinner from "@/components/EpsSpinner"
 
 import {SELECT_YOUR_ROLE_PAGE_TEXT} from "@/constants/ui-strings/CardStrings"
 
@@ -58,7 +58,7 @@ const {
     noRoleName,
     noAddress,
     errorDuringRoleSelection
-} = SELECT_YOUR_ROLE_PAGE_TEXT;
+} = SELECT_YOUR_ROLE_PAGE_TEXT
 
 export default function SelectYourRolePage() {
     const {setNoAccess} = useAccess()
@@ -67,6 +67,7 @@ export default function SelectYourRolePage() {
     const [redirecting, setRedirecting] = useState<boolean>(false)
     const [rolesWithAccess, setRolesWithAccess] = useState<RolesWithAccessProps[]>([])
     const [rolesWithoutAccess, setRolesWithoutAccess] = useState<RolesWithoutAccessProps[]>([])
+    const [selectedRole, setCurrentlySelectedRole] = useState<RoleDetails | undefined>(undefined)
 
     const router = useRouter()
     const auth = useContext(AuthContext)
@@ -76,11 +77,12 @@ export default function SelectYourRolePage() {
         setError(null)
         setRolesWithAccess([])
         setRolesWithoutAccess([])
+        setCurrentlySelectedRole(undefined)
 
         if (!auth?.isSignedIn || !auth) {
             setLoading(false)
             setError(null)
-            return;
+            return
         }
 
         try {
@@ -105,11 +107,10 @@ export default function SelectYourRolePage() {
 
             const rolesWithAccess = userInfo.roles_with_access
             const rolesWithoutAccess = userInfo.roles_without_access
-            // Unused for now
-            // const currentlySelectedRole = userInfo.currently_selected_role ? {
-            //     ...userInfo.currently_selected_role,
-            //     uuid: `selected_role_0`
-            // } : undefined
+            const currentlySelectedRole = userInfo.currently_selected_role ? {
+                ...userInfo.currently_selected_role,
+                uuid: `selected_role_0`
+            } : undefined
 
             // Populate the EPS card props
             setRolesWithAccess(
@@ -132,6 +133,7 @@ export default function SelectYourRolePage() {
                 }))
             )
 
+            setCurrentlySelectedRole(currentlySelectedRole)
             setNoAccess(rolesWithAccess.length === 0)
 
             // Redirect if conditions are met
@@ -212,9 +214,12 @@ export default function SelectYourRolePage() {
     }
 
     const noAccess = rolesWithAccess.length === 0
-    
-    console.log("Title for no access:", SELECT_YOUR_ROLE_PAGE_TEXT.titleNoAccess);
-    console.log("No Access State:", noAccess);
+    const insetTextMessage = selectedRole
+        ? `You are currently logged in at ${selectedRole.org_name} (ODS: ${selectedRole.org_code}) with ${selectedRole.role_name}.`
+        : ""
+
+    console.log("Title for no access:", SELECT_YOUR_ROLE_PAGE_TEXT.titleNoAccess)
+    console.log("No Access State:", noAccess)
 
     return (
         <main id="main-content" className="nhsuk-main-wrapper">
@@ -238,7 +243,7 @@ export default function SelectYourRolePage() {
                             <section aria-label="Login Information">
                                 <InsetText>
                                     <span className="nhsuk-u-visually-hidden">{insetText.visuallyHidden}</span>
-                                    <p>{insetText.message}</p>
+                                    <p>{insetTextMessage}</p>
                                 </InsetText>
                                 {/* Confirm Button */}
                                 <Button href={confirmButton.link}>{confirmButton.text}</Button>

packages/trackerUserInfoLambda/src/handler.ts

@@ -9,6 +9,7 @@ import {DynamoDBDocumentClient} from "@aws-sdk/lib-dynamodb"
 
 import {fetchAndVerifyCIS2Tokens, getUsernameFromEvent} from "./cis2TokenHelpers"
 import {fetchUserInfo, updateDynamoTable} from "./userInfoHelpers"
+import {mockUserInfo} from "./mockUserInfo"
 
 const logger = new Logger({serviceName: "trackerUserInfo"})
 
@@ -70,14 +71,29 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
     // eslint-disable-next-line
     const {cis2AccessToken, cis2IdToken} = await fetchAndVerifyCIS2Tokens(event, documentClient, logger)
 
-    const userInfoResponse = await fetchUserInfo(
-      cis2AccessToken,
-      CPT_ACCESS_ACTIVITY_CODES,
-      undefined,
-      logger
-    )
-
+    // Mock user info for testing AEA-4645
+    let userInfoResponse
     const username = getUsernameFromEvent(event)
+
+    if (username === "555043304334") {
+      userInfoResponse = mockUserInfo()
+    } else {
+      userInfoResponse = await fetchUserInfo(
+        cis2AccessToken,
+        CPT_ACCESS_ACTIVITY_CODES,
+        undefined,
+        logger
+      )
+    }
+
+    // const userInfoResponse = await fetchUserInfo(
+    //   cis2AccessToken,
+    //   CPT_ACCESS_ACTIVITY_CODES,
+    //   undefined,
+    //   logger
+    // )
+
+    // const username = getUsernameFromEvent(event)
     updateDynamoTable(username, userInfoResponse, documentClient, logger)
 
     return {

packages/trackerUserInfoLambda/src/mockUserInfo.ts

@@ -0,0 +1,68 @@
+// mockUserInfo.ts
+import {TrackerUserInfo, RoleDetails} from "./userInfoTypes"
+
+export const mockUserInfo = (): TrackerUserInfo => {
+  const rolesWithAccess: Array<RoleDetails> = [
+    {
+      role_name: "General Medical Practitioner",
+      role_id: "555043304334",
+      org_code: "N82668"
+    },
+    {
+      role_name: "General Medical Practitioner",
+      role_id: "555043304334",
+      org_code: "A21293"
+    },
+    {
+      role_name: "General Medical Practitioner",
+      role_id: "555043304334",
+      org_code: "B84610"
+    }
+  ]
+
+  const rolesWithoutAccess: Array<RoleDetails> = [
+    {
+      role_name: "Registration Authority Agent",
+      role_id: "555043304334",
+      org_code: "X09"
+    },
+    {
+      role_name: "General Medical Practitioner",
+      role_id: "555043304334",
+      org_code: "A22279"
+    },
+    {
+      role_name: "Consultant",
+      role_id: "555043304334",
+      org_code: "RCD"
+    },
+    {
+      role_name: "Registration Authority Manager",
+      role_id: "555043304334",
+      org_code: "5BR"
+    },
+    {
+      role_name: "Demographic Supervisor",
+      role_id: "555043304334",
+      org_code: "8JD29"
+    },
+    {
+      role_name: "General Medical Practitioner",
+      role_id: "555043304334",
+      org_code: "P84009"
+    }
+  ]
+
+  const currentlySelectedRole: RoleDetails = {
+    role_name: "Health Professional Access Role",
+    role_id: "555043304334",
+    org_code: "ODS: FG419",
+    org_name: "GREENE'S PHARMACY"
+  }
+
+  return {
+    roles_with_access: rolesWithAccess,
+    roles_without_access: rolesWithoutAccess,
+    currently_selected_role: currentlySelectedRole
+  }
+}