From 3cfb24aa5148262da631729a251edda04f9fb5e7 Mon Sep 17 00:00:00 2001
From: AdityaJ2305 <adityajindal2305@gmail.com>
Date: Sat, 11 Jan 2025 20:22:36 +0530
Subject: [PATCH] remove alphabet shortcut

---
 src/components/Common/SearchByMultipleFields.tsx | 1 -
 src/components/Patient/PatientIndex.tsx          | 1 -
 src/pages/Encounters/EncounterList.tsx           | 7 +++----
 src/pages/Facility/FacilitiesPage.tsx            | 1 -
 src/pages/Organization/OrganizationPatients.tsx  | 2 --
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/Common/SearchByMultipleFields.tsx b/src/components/Common/SearchByMultipleFields.tsx
index 89e5bfc8748..d067fe446e5 100644
--- a/src/components/Common/SearchByMultipleFields.tsx
+++ b/src/components/Common/SearchByMultipleFields.tsx
@@ -35,7 +35,6 @@ interface SearchOption {
   type: "text" | "phone";
   placeholder: string;
   value: string;
-  shortcutKey: string;
   component?: React.ComponentType<HTMLDivElement>;
 }
 
diff --git a/src/components/Patient/PatientIndex.tsx b/src/components/Patient/PatientIndex.tsx
index 5e89d419978..daed7b8a673 100644
--- a/src/components/Patient/PatientIndex.tsx
+++ b/src/components/Patient/PatientIndex.tsx
@@ -85,7 +85,6 @@ export default function PatientIndex({ facilityId }: { facilityId: string }) {
       type: "phone" as const,
       placeholder: t("search_by_phone_number"),
       value: phoneNumber,
-      shortcutKey: "p",
     },
   ];
 
diff --git a/src/pages/Encounters/EncounterList.tsx b/src/pages/Encounters/EncounterList.tsx
index 482b150b2a0..8a70917ebb6 100644
--- a/src/pages/Encounters/EncounterList.tsx
+++ b/src/pages/Encounters/EncounterList.tsx
@@ -214,7 +214,6 @@ export function EncounterList({
     }),
     enabled: !!encounter_id,
   });
-
   const searchOptions = [
     {
       key: "name",
@@ -222,7 +221,6 @@ export function EncounterList({
       type: "text" as const,
       placeholder: "Search by patient name",
       value: name || "",
-      shortcutKey: "n",
     },
     {
       key: "encounter_id",
@@ -230,7 +228,6 @@ export function EncounterList({
       type: "text" as const,
       placeholder: "Search by encounter ID",
       value: encounter_id || "",
-      shortcutKey: "i",
     },
     {
       key: "external_identifier",
@@ -238,7 +235,6 @@ export function EncounterList({
       type: "text" as const,
       placeholder: "Search by external ID",
       value: external_identifier || "",
-      shortcutKey: "e",
     },
   ];
 
@@ -285,6 +281,9 @@ export function EncounterList({
                       <SearchByMultipleFields
                         id="encounter-search"
                         options={searchOptions}
+                        initialOptionIndex={searchOptions.findIndex(
+                          (option) => option.value !== "",
+                        )}
                         onFieldChange={handleFieldChange}
                         onSearch={handleSearch}
                         clearSearch={clearSearch}
diff --git a/src/pages/Facility/FacilitiesPage.tsx b/src/pages/Facility/FacilitiesPage.tsx
index d1427444187..8966aa4a7b3 100644
--- a/src/pages/Facility/FacilitiesPage.tsx
+++ b/src/pages/Facility/FacilitiesPage.tsx
@@ -67,7 +67,6 @@ export function FacilitiesPage() {
               type: "text" as const,
               placeholder: t("facility_search_placeholder_text"),
               value: qParams.name || "",
-              shortcutKey: "f",
             },
           ]}
           className="w-full sm:w-1/2"
diff --git a/src/pages/Organization/OrganizationPatients.tsx b/src/pages/Organization/OrganizationPatients.tsx
index 6091ea5af15..1f8db33054d 100644
--- a/src/pages/Organization/OrganizationPatients.tsx
+++ b/src/pages/Organization/OrganizationPatients.tsx
@@ -99,14 +99,12 @@ export default function OrganizationPatients({ id, navOrganizationId }: Props) {
               type: "text",
               placeholder: "Search by name",
               value: qParams.name || "",
-              shortcutKey: "n",
             },
             {
               key: "phone_number",
               type: "phone",
               placeholder: "Search by phone number",
               value: qParams.phone_number || "",
-              shortcutKey: "p",
             },
           ]}
           onSearch={handleSearch}