Facility Id in User Profile for Nav User

src/components/Users/UserHome.tsx

@@ -84,6 +84,9 @@ export default function UserHome(props: UserHomeProps) {
   }
 
   const SelectedTab = TABS[currentTab].body;
+  const userUrl = props.facilityId
+    ? `/facility/${props.facilityId}/users/${username}`
+    : `/users/${username}`;
 
   return (
     <>
@@ -120,7 +123,7 @@ export default function UserHome(props: UserHomeProps) {
                                 ? "border-b-2 border-primary-500 text-primary-600 hover:border-secondary-300"
                                 : "text-secondary-700 hover:text-secondary-700",
                             )}
-                            href={`/facility/${props.facilityId}/users/${username}/${p.toLocaleLowerCase()}`}
+                            href={`${userUrl}/${p.toLocaleLowerCase()}`}
                           >
                             <div className="px-3 py-1.5" id={p.toLowerCase()}>
                               {t(`USERMANAGEMENT_TAB__${p}`)}

src/components/ui/sidebar/app-sidebar.tsx

@@ -126,7 +126,13 @@ export function AppSidebar({
       </SidebarContent>
 
       <SidebarFooter>
-        {(facilitySidebar || selectedOrganization) && <FacilityNavUser />}
+        {(facilitySidebar || selectedOrganization) && (
+          <FacilityNavUser
+            {...(facilitySidebar && {
+              selectedFacilityId: selectedFacility?.id,
+            })}
+          />
+        )}
         {patientSidebar && <PatientNavUser />}
       </SidebarFooter>
 

src/components/ui/sidebar/nav-user.tsx

@@ -27,7 +27,11 @@ import useAuthUser, { useAuthContext } from "@/hooks/useAuthUser";
 import { usePatientSignOut } from "@/hooks/usePatientSignOut";
 import { usePatientContext } from "@/hooks/usePatientUser";
 
-export function FacilityNavUser() {
+export function FacilityNavUser({
+  selectedFacilityId,
+}: {
+  selectedFacilityId?: string;
+}) {
   const { t } = useTranslation();
   const user = useAuthUser();
   const { isMobile, open, setOpenMobile } = useSidebar();
@@ -94,7 +98,10 @@ export function FacilityNavUser() {
             <DropdownMenuGroup>
               <DropdownMenuItem
                 onClick={() => {
-                  navigate(`/users/${user.username}`);
+                  const profileUrl = selectedFacilityId
+                    ? `/facility/${selectedFacilityId}/users/${user.username}`
+                    : `/users/${user.username}`;
+                  navigate(profileUrl);
                   if (isMobile) {
                     setOpenMobile(false);
                   }