From cae44515aea7e54ea9df8cd4af12dcebf314f6b1 Mon Sep 17 00:00:00 2001
From: Kamishetty Rishith <119791436+Rishith25@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:39:12 +0530
Subject: [PATCH] Fix: Overflow for switchers in sidebar, Avatar size in notes
 tab, Textbox expansion in Add Facility (#10005)

---
 public/locale/en.json                         |  2 ++
 .../Facility/CreateFacilityForm.tsx           |  2 --
 .../ui/sidebar/facility-switcher.tsx          | 10 ++++++++--
 .../ui/sidebar/organization-switcher.tsx      | 19 ++++++++++++++-----
 .../Encounters/tabs/EncounterNotesTab.tsx     |  2 +-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 10179650df4..8666ea956df 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1325,6 +1325,7 @@
   "move_to_onvif_preset": "Move to an ONVIF Preset",
   "moving_camera": "Moving Camera",
   "my_doctors": "My Doctors",
+  "my_organizations": "My Organizations",
   "my_profile": "My Profile",
   "my_schedules": "My Schedules",
   "name": "Name",
@@ -1852,6 +1853,7 @@
   "select_location_first": "Select Location First",
   "select_method": "Select method",
   "select_new_role": "Select New Role",
+  "select_organization": "Select Organization",
   "select_patient": "Select Patient",
   "select_policy": "Select an Insurance Policy",
   "select_policy_to_add_items": "Select a Policy to Add Items",
diff --git a/src/components/Facility/CreateFacilityForm.tsx b/src/components/Facility/CreateFacilityForm.tsx
index 718da1d2318..3db298fa9c8 100644
--- a/src/components/Facility/CreateFacilityForm.tsx
+++ b/src/components/Facility/CreateFacilityForm.tsx
@@ -218,7 +218,6 @@ export default function CreateFacilityForm({
                     {...field}
                     data-cy="facility-description"
                     placeholder="Describe your facility (Markdown supported)"
-                    className="h-24"
                   />
                 </FormControl>
                 <FormMessage />
@@ -305,7 +304,6 @@ export default function CreateFacilityForm({
                     {...field}
                     data-cy="facility-address"
                     placeholder="Enter complete address"
-                    className="h-20"
                   />
                 </FormControl>
                 <FormMessage />
diff --git a/src/components/ui/sidebar/facility-switcher.tsx b/src/components/ui/sidebar/facility-switcher.tsx
index 0769f2a825f..b14c8c275ea 100644
--- a/src/components/ui/sidebar/facility-switcher.tsx
+++ b/src/components/ui/sidebar/facility-switcher.tsx
@@ -3,6 +3,8 @@ import { Hospital } from "lucide-react";
 import { navigate } from "raviger";
 import { useTranslation } from "react-i18next";
 
+import { cn } from "@/lib/utils";
+
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -51,7 +53,7 @@ export function FacilitySwitcher({
             </SidebarMenuButton>
           </DropdownMenuTrigger>
           <DropdownMenuContent
-            className="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
+            className="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg max-h-screen overflow-y-auto"
             align="start"
             side={isMobile ? "bottom" : "right"}
             sideOffset={4}
@@ -72,7 +74,11 @@ export function FacilitySwitcher({
                     setOpenMobile(false);
                   }
                 }}
-                className="gap-2 p-2"
+                className={cn(
+                  "gap-2 p-2",
+                  facility.name === selectedFacility?.name &&
+                    "bg-primary-500 text-white",
+                )}
               >
                 <div className="flex size-6 items-center justify-center rounded-sm border">
                   <Hospital className="size-4 shrink-0" />
diff --git a/src/components/ui/sidebar/organization-switcher.tsx b/src/components/ui/sidebar/organization-switcher.tsx
index d5af48af504..7db6018da7a 100644
--- a/src/components/ui/sidebar/organization-switcher.tsx
+++ b/src/components/ui/sidebar/organization-switcher.tsx
@@ -1,6 +1,9 @@
 import { CaretSortIcon, DashboardIcon } from "@radix-ui/react-icons";
 import { Globe } from "lucide-react";
 import { navigate } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import { cn } from "@/lib/utils";
 
 import {
   DropdownMenu,
@@ -29,6 +32,7 @@ export function OrganizationSwitcher({
   selectedOrganization,
 }: Props) {
   const { isMobile, setOpenMobile } = useSidebar();
+  const { t } = useTranslation();
 
   return (
     <DropdownMenu>
@@ -45,8 +49,8 @@ export function OrganizationSwitcher({
               <div className="grid flex-1 text-left text-sm leading-tight">
                 <span className="truncate font-semibold">
                   {selectedOrganization
-                    ? "My Organizations"
-                    : "Select Organization"}
+                    ? t("my_organizations")
+                    : t("select_organization")}
                 </span>
               </div>
               <CaretSortIcon className="ml-auto" />
@@ -55,16 +59,16 @@ export function OrganizationSwitcher({
         </SidebarMenu>
       </DropdownMenuTrigger>
       <DropdownMenuContent
-        className="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
+        className="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg max-h-screen overflow-y-auto"
         align="start"
         side={isMobile ? "bottom" : "right"}
         sideOffset={4}
       >
         <DropdownMenuItem onClick={() => navigate("/")}>
           <DashboardIcon className="size-4" />
-          View Dashboard
+          {t("view_dashboard")}
         </DropdownMenuItem>
-        <DropdownMenuLabel>Organizations</DropdownMenuLabel>
+        <DropdownMenuLabel>{t("organizations")}</DropdownMenuLabel>
         <DropdownMenuSeparator />
         {organizations.map((org) => (
           <DropdownMenuItem
@@ -75,6 +79,11 @@ export function OrganizationSwitcher({
                 setOpenMobile(false);
               }
             }}
+            className={cn(
+              "gap-2 p-2",
+              org?.name === selectedOrganization?.name &&
+                "bg-primary-500 text-white",
+            )}
           >
             {org.name}
           </DropdownMenuItem>
diff --git a/src/pages/Encounters/tabs/EncounterNotesTab.tsx b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
index d8a93b592c5..d10fa051d24 100644
--- a/src/pages/Encounters/tabs/EncounterNotesTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterNotesTab.tsx
@@ -153,7 +153,7 @@ const MessageItem = ({ message }: { message: Message }) => {
         <TooltipProvider>
           <Tooltip>
             <TooltipTrigger asChild>
-              <div className="flex-shrink-0">
+              <div className="flex">
                 <Avatar
                   name={message.created_by.username}
                   imageUrl={message.created_by.profile_picture_url}