From 691748d4d3a419e9cc7eda26a97b900275e441e7 Mon Sep 17 00:00:00 2001
From: Jacobjohnjeevan <mail@jacobjeevan.me>
Date: Tue, 31 Dec 2024 16:19:27 +0530
Subject: [PATCH 1/5] minor styling changes/mobile responsiveness

---
 src/components/Common/UserSelector.tsx             | 14 +++++++++++---
 .../components/LinkFacilityUserSheet.tsx           | 10 ++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx
index b181c212022..6a756864f2a 100644
--- a/src/components/Common/UserSelector.tsx
+++ b/src/components/Common/UserSelector.tsx
@@ -56,7 +56,7 @@ export default function UserSelector({
 
   return (
     <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
+      <PopoverTrigger asChild className="w-full">
         <Button
           variant="outline"
           role="combobox"
@@ -77,14 +77,22 @@ export default function UserSelector({
           <CaretDownIcon className="ml-auto" />
         </Button>
       </PopoverTrigger>
-      <PopoverContent className="p-0" align="start">
+      <PopoverContent
+        className="p-0 w-[var(--radix-popover-trigger-width)] max-w-[--radix-popover-content-available-width]"
+        align="start"
+        sideOffset={4}
+      >
         <Command filter={() => 1}>
           <CommandInput
             placeholder={t("search")}
             onValueChange={setSearch}
             className="outline-none border-none ring-0 shadow-none"
           />
-          <CommandList>
+          <CommandList
+            onWheel={(e) => {
+              e.stopPropagation();
+            }}
+          >
             <CommandEmpty>
               {isFetching
                 ? t("searching")
diff --git a/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx b/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx
index 29ea4b7db3b..7e4fcfbdea2 100644
--- a/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx
+++ b/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx
@@ -117,7 +117,7 @@ export default function LinkFacilityUserSheet({
           Link User
         </Button>
       </SheetTrigger>
-      <SheetContent>
+      <SheetContent className="w-full sm:max-w-md overflow-y-auto p-8">
         <SheetHeader>
           <SheetTitle>Link User to Facility</SheetTitle>
           <SheetDescription>
@@ -172,7 +172,13 @@ export default function LinkFacilityUserSheet({
                   <SelectTrigger className="h-12">
                     <SelectValue placeholder="Select a role" />
                   </SelectTrigger>
-                  <SelectContent>
+                  <SelectContent
+                    position="popper"
+                    className="max-h-[calc(100vh-60vh)] w-[var(--radix-select-trigger-width)] max-w-[var(--radix-select-content-available-width)] overflow-y-auto"
+                    sideOffset={4}
+                    side="bottom"
+                    avoidCollisions={true}
+                  >
                     {roles?.results?.map((role) => (
                       <SelectItem key={role.id} value={role.id}>
                         <div className="flex flex-col text-left">

From 80fe44f7d158667112719c6db378a324efb17639 Mon Sep 17 00:00:00 2001
From: Jacobjohnjeevan <mail@jacobjeevan.me>
Date: Tue, 31 Dec 2024 19:06:37 +0530
Subject: [PATCH 2/5] minor fixes

---
 src/pages/Encounters/EncounterList.tsx          | 2 +-
 src/pages/Encounters/tabs/EncounterFilesTab.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Encounters/EncounterList.tsx b/src/pages/Encounters/EncounterList.tsx
index 39bc5537a1b..9bbce649f38 100644
--- a/src/pages/Encounters/EncounterList.tsx
+++ b/src/pages/Encounters/EncounterList.tsx
@@ -184,7 +184,7 @@ export function EncounterList({
       queryParams: {
         ...buildQueryParams(status, facilityId, encounterClass, priority),
         name,
-        encounter_id,
+        id: encounter_id,
         external_identifier,
         limit: resultsPerPage,
         offset: ((qParams.page || 1) - 1) * resultsPerPage,
diff --git a/src/pages/Encounters/tabs/EncounterFilesTab.tsx b/src/pages/Encounters/tabs/EncounterFilesTab.tsx
index 9b89fe926e4..053637b75d8 100644
--- a/src/pages/Encounters/tabs/EncounterFilesTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterFilesTab.tsx
@@ -28,7 +28,7 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Tabs, TabsContent } from "@/components/ui/tabs";
 import {
   Tooltip,
   TooltipContent,
@@ -490,7 +490,7 @@ export const EncounterFilesTab = (props: EncounterTabProps) => {
       >
         <div className="mx-2 flex flex-col flex-wrap gap-3 sm:flex-row justify-between">
           <div className="flex sm:flex-row flex-wrap flex-col gap-4 sm:items-center">
-            <TabsList className="flex flex-row flex-wrap gap-2 h-auto">
+            {/* <TabsList className="flex flex-row flex-wrap gap-2 h-auto">
               {fileCategories.map((category) => (
                 <TabsTrigger
                   key={category.value}
@@ -500,7 +500,7 @@ export const EncounterFilesTab = (props: EncounterTabProps) => {
                   {category.label}
                 </TabsTrigger>
               ))}
-            </TabsList>
+            </TabsList> */}
             <FilterButton />
           </div>
           <FileUploadButtons />

From b00fbbfcc52ecfc1e357b4b6c586e51547987aac Mon Sep 17 00:00:00 2001
From: Jacobjohnjeevan <mail@jacobjeevan.me>
Date: Tue, 31 Dec 2024 20:30:33 +0530
Subject: [PATCH 3/5] support for encounterId search

---
 src/pages/Encounters/EncounterList.tsx | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/pages/Encounters/EncounterList.tsx b/src/pages/Encounters/EncounterList.tsx
index 9bbce649f38..a1fb5da391c 100644
--- a/src/pages/Encounters/EncounterList.tsx
+++ b/src/pages/Encounters/EncounterList.tsx
@@ -184,13 +184,23 @@ export function EncounterList({
       queryParams: {
         ...buildQueryParams(status, facilityId, encounterClass, priority),
         name,
-        id: encounter_id,
         external_identifier,
         limit: resultsPerPage,
         offset: ((qParams.page || 1) - 1) * resultsPerPage,
       },
     }),
-    enabled: !propEncounters,
+    enabled: !propEncounters && !encounter_id,
+  });
+
+  const { data: queryEncounter } = useQuery<Encounter>({
+    queryKey: ["encounter", encounter_id],
+    queryFn: query(routes.encounter.get, {
+      pathParams: { id: encounter_id },
+      queryParams: {
+        facility: facilityId,
+      },
+    }),
+    enabled: !!encounter_id,
   });
 
   const searchOptions = [
@@ -220,7 +230,10 @@ export function EncounterList({
     },
   ];
 
-  const encounters = propEncounters || queryEncounters?.results || [];
+  const encounters =
+    propEncounters ||
+    queryEncounters?.results ||
+    (queryEncounter ? [queryEncounter] : []);
 
   const { t } = useTranslation();
 

From 658428262b2146f5a632eddc28f5b35edb687899 Mon Sep 17 00:00:00 2001
From: Jacobjohnjeevan <mail@jacobjeevan.me>
Date: Tue, 31 Dec 2024 20:34:50 +0530
Subject: [PATCH 4/5] suggestion edit

---
 src/components/Common/UserSelector.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx
index 6a756864f2a..7598b1eb477 100644
--- a/src/components/Common/UserSelector.tsx
+++ b/src/components/Common/UserSelector.tsx
@@ -55,7 +55,7 @@ export default function UserSelector({
   const users = data?.results || [];
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover open={open} onOpenChange={setOpen} modal={true}>
       <PopoverTrigger asChild className="w-full">
         <Button
           variant="outline"
@@ -88,11 +88,7 @@ export default function UserSelector({
             onValueChange={setSearch}
             className="outline-none border-none ring-0 shadow-none"
           />
-          <CommandList
-            onWheel={(e) => {
-              e.stopPropagation();
-            }}
-          >
+          <CommandList>
             <CommandEmpty>
               {isFetching
                 ? t("searching")

From 3910b64a1a985851f53acb525a11bf2d3ede46e3 Mon Sep 17 00:00:00 2001
From: Jacobjohnjeevan <mail@jacobjeevan.me>
Date: Thu, 2 Jan 2025 14:08:49 +0530
Subject: [PATCH 5/5] suggestion

---
 src/components/Common/UserSelector.tsx                        | 4 +++-
 .../FacilityOrganization/components/LinkFacilityUserSheet.tsx | 1 +
 src/pages/Organization/components/LinkUserSheet.tsx           | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx
index 7598b1eb477..4846c8baf3f 100644
--- a/src/components/Common/UserSelector.tsx
+++ b/src/components/Common/UserSelector.tsx
@@ -33,6 +33,7 @@ interface Props {
   onChange: (user: UserBase) => void;
   placeholder?: string;
   noOptionsMessage?: string;
+  popoverClassName?: string;
 }
 
 export default function UserSelector({
@@ -40,6 +41,7 @@ export default function UserSelector({
   onChange,
   placeholder,
   noOptionsMessage,
+  popoverClassName,
 }: Props) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
@@ -56,7 +58,7 @@ export default function UserSelector({
 
   return (
     <Popover open={open} onOpenChange={setOpen} modal={true}>
-      <PopoverTrigger asChild className="w-full">
+      <PopoverTrigger asChild className={popoverClassName}>
         <Button
           variant="outline"
           role="combobox"
diff --git a/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx b/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx
index 7e4fcfbdea2..6265216e030 100644
--- a/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx
+++ b/src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx
@@ -130,6 +130,7 @@ export default function LinkFacilityUserSheet({
             onChange={handleUserChange}
             placeholder="Search for a user"
             noOptionsMessage="No users found"
+            popoverClassName="w-full"
           />
           {selectedUser && (
             <div className="space-y-4">
diff --git a/src/pages/Organization/components/LinkUserSheet.tsx b/src/pages/Organization/components/LinkUserSheet.tsx
index 8c0634f8881..b2b5c0e1b64 100644
--- a/src/pages/Organization/components/LinkUserSheet.tsx
+++ b/src/pages/Organization/components/LinkUserSheet.tsx
@@ -128,6 +128,7 @@ export default function LinkUserSheet({
             onChange={handleUserChange}
             placeholder="Search for a user"
             noOptionsMessage="No users found"
+            popoverClassName="w-full"
           />
           {selectedUser && (
             <div className="space-y-4">