From 48039f420fd57c6ea8249ee2bca4c7b383f1af58 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Tue, 31 Dec 2024 14:31:08 +0530
Subject: [PATCH 1/4] fixes autocomplete scroll when descendant of sheet

---
 src/components/ui/autocomplete.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/autocomplete.tsx b/src/components/ui/autocomplete.tsx
index 7938623425c..2551a8b5f7c 100644
--- a/src/components/ui/autocomplete.tsx
+++ b/src/components/ui/autocomplete.tsx
@@ -43,7 +43,7 @@ export default function Autocomplete({
   const [open, setOpen] = React.useState(false);
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
+    <Popover open={open} onOpenChange={setOpen} modal={true}>
       <PopoverTrigger asChild>
         <Button
           title={

From c31787488f7772277cc143cf995e7150f2b15e46 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Tue, 31 Dec 2024 15:26:40 +0530
Subject: [PATCH 2/4] adds support for search in OrganizationSelector

---
 src/components/ui/autocomplete.tsx                       | 3 +++
 .../Organization/components/OrganizationSelector.tsx     | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/autocomplete.tsx b/src/components/ui/autocomplete.tsx
index 2551a8b5f7c..b79d27d0688 100644
--- a/src/components/ui/autocomplete.tsx
+++ b/src/components/ui/autocomplete.tsx
@@ -27,6 +27,7 @@ interface AutocompleteProps {
   options: AutoCompleteOption[];
   value: string;
   onChange: (value: string) => void;
+  onSearch?: (value: string) => void;
   placeholder?: string;
   noOptionsMessage?: string;
   disabled?: boolean;
@@ -36,6 +37,7 @@ export default function Autocomplete({
   options,
   value,
   onChange,
+  onSearch,
   placeholder = "Select...",
   noOptionsMessage = "No options found",
   disabled,
@@ -70,6 +72,7 @@ export default function Autocomplete({
           <CommandInput
             placeholder="Search option..."
             disabled={disabled}
+            onValueChange={onSearch}
             className="outline-none border-none ring-0 shadow-none"
           />
           <CommandList>
diff --git a/src/pages/Organization/components/OrganizationSelector.tsx b/src/pages/Organization/components/OrganizationSelector.tsx
index 6ea4aed7b53..a16d754dd14 100644
--- a/src/pages/Organization/components/OrganizationSelector.tsx
+++ b/src/pages/Organization/components/OrganizationSelector.tsx
@@ -7,6 +7,8 @@ import Autocomplete from "@/components/ui/autocomplete";
 import { Button } from "@/components/ui/button";
 import InputWithError from "@/components/ui/input-with-error";
 
+import useDebouncedState from "@/hooks/useDebouncedState";
+
 import { ORGANIZATION_LEVELS } from "@/common/constants";
 
 import routes from "@/Utils/request/api";
@@ -32,6 +34,7 @@ interface AutoCompleteOption {
 export default function OrganizationSelector(props: OrganizationSelectorProps) {
   const { onChange, required } = props;
   const [selectedLevels, setSelectedLevels] = useState<Organization[]>([]);
+  const [searchQuery, setSearchQuery] = useDebouncedState("", 500);
 
   const headers = props.authToken
     ? {
@@ -42,11 +45,12 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
     : {};
 
   const { data: getAllOrganizations } = useQuery<OrganizationResponse>({
-    queryKey: ["organizations-root"],
+    queryKey: ["organizations-root", searchQuery],
     queryFn: query(routes.organization.list, {
       queryParams: {
         org_type: "govt",
         parent: "",
+        name: searchQuery || undefined,
       },
       ...headers,
     }),
@@ -58,11 +62,13 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
     queryKey: [
       "organizations-current",
       selectedLevels[selectedLevels.length - 1]?.id,
+      searchQuery,
     ],
     queryFn: query(routes.organization.list, {
       queryParams: {
         parent: selectedLevels[selectedLevels.length - 1]?.id,
         org_type: "govt",
+        name: searchQuery || undefined,
       },
       ...headers,
     }),
@@ -153,6 +159,7 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
               onChange={(value: string) =>
                 handleLevelChange(value, selectedLevels.length)
               }
+              onSearch={setSearchQuery}
             />
           </InputWithError>
         </div>

From ee3cd03c2fb3a5c4b6066991d3918045042d92f2 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Tue, 31 Dec 2024 15:50:09 +0530
Subject: [PATCH 3/4] show schedule in sidebar

---
 public/locale/en.json                     | 10 +++++-----
 public/locale/hi.json                     |  4 ++--
 public/locale/kn.json                     |  4 ++--
 public/locale/ml.json                     |  4 ++--
 public/locale/ta.json                     |  4 ++--
 src/components/ui/sidebar/app-sidebar.tsx | 22 +++++++++++++++++-----
 src/hooks/useSlug.ts                      |  3 +++
 7 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 400a11697e1..f20179944d1 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1444,8 +1444,8 @@
   "qualification": "Qualification",
   "qualification_required": "Qualification is required",
   "quantity_approved": "Quantity Approved",
-  "quantity_required": "Quantity Required",
   "quantity_requested": "Quantity Requested",
+  "quantity_required": "Quantity Required",
   "raise_consent_request": "Raise a consent request to fetch patient records over ABDM",
   "ration_card__APL": "APL",
   "ration_card__BPL": "BPL",
@@ -1552,6 +1552,7 @@
   "schedule_calendar": "Schedule Calendar",
   "schedule_information": "Schedule Information",
   "scheduled": "Scheduled",
+  "schedules": "Schedules",
   "scribe__reviewing_field": "Reviewing field {{currentField}} / {{totalFields}}",
   "scribe_error": "Could not autofill fields",
   "search": "Search",
@@ -1565,7 +1566,6 @@
   "search_icd11_placeholder": "Search for ICD-11 Diagnoses",
   "search_investigation_placeholder": "Search Investigation & Groups",
   "search_medication": "Search Medication",
-  "search_patient": "Search Patient",
   "search_patients": "Search Patients",
   "search_resource": "Search Resource",
   "searching": "Searching",
@@ -1676,10 +1676,10 @@
   "test_type": "Type of test done",
   "tested_on": "Tested on",
   "thank_you_for_choosing": "Thank you for choosing our care service",
-  "time": "Time",
-  "time_slot": "Time Slot",
   "the_request_for_resources_placed_by_yourself_is": "The request for resource (details below) placed by yourself is",
   "third_party_software_licenses": "Third Party Software Licenses",
+  "time": "Time",
+  "time_slot": "Time Slot",
   "title_of_request": "Title of Request",
   "titrate_dosage": "Titrate Dosage",
   "to": "to",
@@ -1871,4 +1871,4 @@
   "you_need_at_least_a_location_to_create_an_assest": "You need at least a location to create an assest.",
   "zoom_in": "Zoom In",
   "zoom_out": "Zoom Out"
-}
\ No newline at end of file
+}
diff --git a/public/locale/hi.json b/public/locale/hi.json
index 32195477538..af909237150 100644
--- a/public/locale/hi.json
+++ b/public/locale/hi.json
@@ -673,7 +673,7 @@
   "search_for_facility": "सुविधा खोजें",
   "search_icd11_placeholder": "ICD-11 निदान खोजें",
   "search_investigation_placeholder": "खोज जांच और समूह",
-  "search_patient": "मरीज खोजें",
+  "search_patients": "मरीज खोजें",
   "search_resource": "संसाधन खोजें",
   "select": "चुनना",
   "select_date": "तारीख़ चुनें",
@@ -808,4 +808,4 @@
   "you_need_at_least_a_location_to_create_an_assest": "संपत्ति बनाने के लिए आपको कम से कम एक स्थान की आवश्यकता होगी।",
   "zoom_in": "ज़ूम इन",
   "zoom_out": "ज़ूम आउट"
-}
+}
\ No newline at end of file
diff --git a/public/locale/kn.json b/public/locale/kn.json
index c4da586d80b..c605b382597 100644
--- a/public/locale/kn.json
+++ b/public/locale/kn.json
@@ -675,7 +675,7 @@
   "search_for_facility": "ಸೌಲಭ್ಯಕ್ಕಾಗಿ ಹುಡುಕಿ",
   "search_icd11_placeholder": "ICD-11 ರೋಗನಿರ್ಣಯಗಳಿಗಾಗಿ ಹುಡುಕಿ",
   "search_investigation_placeholder": "ಹುಡುಕಾಟ ತನಿಖೆ ಮತ್ತು ಗುಂಪುಗಳು",
-  "search_patient": "ರೋಗಿಯನ್ನು ಹುಡುಕಿ",
+  "search_patients": "ರೋಗಿಯನ್ನು ಹುಡುಕಿ",
   "search_resource": "ಹುಡುಕಾಟ ಸಂಪನ್ಮೂಲ",
   "select": "ಆಯ್ಕೆ ಮಾಡಿ",
   "select_date": "ದಿನಾಂಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ",
@@ -809,4 +809,4 @@
   "you_need_at_least_a_location_to_create_an_assest": "ಆಸ್ತಿಯನ್ನು ರಚಿಸಲು ನಿಮಗೆ ಕನಿಷ್ಠ ಸ್ಥಳದ ಅಗತ್ಯವಿದೆ.",
   "zoom_in": "ಜೂಮ್ ಇನ್",
   "zoom_out": "ಜೂಮ್ ಔಟ್"
-}
+}
\ No newline at end of file
diff --git a/public/locale/ml.json b/public/locale/ml.json
index e77837b4a63..b7b94e00e99 100644
--- a/public/locale/ml.json
+++ b/public/locale/ml.json
@@ -674,7 +674,7 @@
   "search_for_facility": "സൗകര്യത്തിനായി തിരയുക",
   "search_icd11_placeholder": "ICD-11 രോഗനിർണയങ്ങൾക്കായി തിരയുക",
   "search_investigation_placeholder": "അന്വേഷണവും ഗ്രൂപ്പുകളും",
-  "search_patient": "രോഗിയെ തിരയുക",
+  "search_patients": "രോഗിയെ തിരയുക",
   "search_resource": "തിരയൽ റിസോഴ്സ്",
   "select": "തിരഞ്ഞെടുക്കുക",
   "select_date": "തീയതി തിരഞ്ഞെടുക്കുക",
@@ -809,4 +809,4 @@
   "you_need_at_least_a_location_to_create_an_assest": "ഒരു അസസ്‌റ്റ് സൃഷ്‌ടിക്കാൻ നിങ്ങൾക്ക് ഒരു ലൊക്കേഷനെങ്കിലും ആവശ്യമാണ്.",
   "zoom_in": "സൂം ഇൻ ചെയ്യുക",
   "zoom_out": "സൂം ഔട്ട്"
-}
+}
\ No newline at end of file
diff --git a/public/locale/ta.json b/public/locale/ta.json
index 3914edb948e..cead86d1e54 100644
--- a/public/locale/ta.json
+++ b/public/locale/ta.json
@@ -673,7 +673,7 @@
   "search_for_facility": "வசதியைத் தேடுங்கள்",
   "search_icd11_placeholder": "ICD-11 நோய் கண்டறிதல்களைத் தேடவும்",
   "search_investigation_placeholder": "தேடல் விசாரணை & குழுக்கள்",
-  "search_patient": "நோயாளியைத் தேடுங்கள்",
+  "search_patients": "நோயாளியைத் தேடுங்கள்",
   "search_resource": "தேடல் ஆதாரம்",
   "select": "தேர்ந்தெடு",
   "select_date": "தேதியைத் தேர்ந்தெடுக்கவும்",
@@ -808,4 +808,4 @@
   "you_need_at_least_a_location_to_create_an_assest": "ஒரு அசெஸ்ட்டை உருவாக்க குறைந்தபட்சம் ஒரு இருப்பிடமாவது தேவை.",
   "zoom_in": "பெரிதாக்கவும்",
   "zoom_out": "பெரிதாக்கவும்"
-}
+}
\ No newline at end of file
diff --git a/src/components/ui/sidebar/app-sidebar.tsx b/src/components/ui/sidebar/app-sidebar.tsx
index 81caa3bfffa..7e2fa302349 100644
--- a/src/components/ui/sidebar/app-sidebar.tsx
+++ b/src/components/ui/sidebar/app-sidebar.tsx
@@ -41,11 +41,13 @@ interface AppSidebarProps extends React.ComponentProps<typeof Sidebar> {
 function generateFacilityLinks(
   selectedFacility: UserFacilityModel | null,
   t: TFunction,
-): NavigationLink[] {
+  // TODO: switch to UserBase once getcurrentuser serializer is updated
+  user?: UserModel,
+) {
   if (!selectedFacility) return [];
 
   const baseUrl = `/facility/${selectedFacility.id}`;
-  return [
+  const links: NavigationLink[] = [
     { name: t("facility"), url: baseUrl, icon: "d-hospital" },
     {
       name: t("appointments"),
@@ -53,7 +55,7 @@ function generateFacilityLinks(
       icon: "d-calendar",
     },
     {
-      name: t("Search Patients"),
+      name: t("search_patients"),
       url: `${baseUrl}/patients`,
       icon: "d-patient",
     },
@@ -64,11 +66,21 @@ function generateFacilityLinks(
     { name: t("users"), url: `${baseUrl}/users`, icon: "d-people" },
     // { name: t("All users"), url: "/users", icon: "d-people" },
     {
-      name: t("Organization"),
+      name: t("organization"),
       url: `${baseUrl}/organization`,
       icon: "d-book-open",
     },
   ];
+
+  if (user) {
+    links.push({
+      name: t("schedules"),
+      url: `${baseUrl}/users/${user.username}/availability`,
+      icon: "d-calendar",
+    });
+  }
+
+  return links;
 }
 
 function generateOrganizationLinks(
@@ -171,7 +183,7 @@ export function AppSidebar({
 
       <SidebarContent>
         {facilitySidebar && !selectedOrganization && (
-          <NavMain links={generateFacilityLinks(selectedFacility, t)} />
+          <NavMain links={generateFacilityLinks(selectedFacility, t, user)} />
         )}
         {selectedOrganization && (
           <NavMain
diff --git a/src/hooks/useSlug.ts b/src/hooks/useSlug.ts
index f6c69c429a1..2158520728a 100644
--- a/src/hooks/useSlug.ts
+++ b/src/hooks/useSlug.ts
@@ -2,6 +2,8 @@ import { usePath } from "raviger";
 
 /**
  * Returns the slug from the current path.
+ *
+ * @deprecated use `usePathParams` instead
  * @param prefix The prefix of the slug.
  * @returns The slug.
  * @example
@@ -15,6 +17,7 @@ export default function useSlug(prefix: string, fallback?: string) {
 
 /**
  * Returns the slugs from the current path.
+ * * @deprecated use `usePathParams` instead
  * @param prefix The prefixes of the slug.
  * @returns The slugs
  * @example

From 2c2c87f17b54307b0a45668cc66dffb39732495e Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Tue, 31 Dec 2024 15:55:26 +0530
Subject: [PATCH 4/4] fix calendar button

---
 package-lock.json              | 5 ++---
 src/components/ui/calendar.tsx | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3fce230d472..8de4696b459 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,6 @@
         "@radix-ui/react-tabs": "^1.1.1",
         "@radix-ui/react-toast": "^1.2.4",
         "@radix-ui/react-tooltip": "^1.1.6",
-        "@rollup/rollup-linux-x64-gnu": "4.29.1",
         "@sentry/browser": "^8.47.0",
         "@tanstack/react-query": "^5.62.8",
         "@tanstack/react-query-devtools": "^5.62.7",
@@ -149,8 +148,8 @@
         "node": ">=22.8.0"
       },
       "optionalDependencies": {
-        "@esbuild/linux-arm64": "*",
-        "@esbuild/linux-x64": "*",
+        "@esbuild/linux-arm64": "latest",
+        "@esbuild/linux-x64": "latest",
         "@rollup/rollup-linux-arm64-gnu": "4.29.1",
         "@rollup/rollup-linux-x64-gnu": "4.29.1"
       }
diff --git a/src/components/ui/calendar.tsx b/src/components/ui/calendar.tsx
index 1b627711afa..83a7d187132 100644
--- a/src/components/ui/calendar.tsx
+++ b/src/components/ui/calendar.tsx
@@ -62,8 +62,8 @@ function Calendar({
         ...classNames,
       }}
       components={{
-        IconLeft: () => <ChevronLeftIcon className="h-4 w-4" />,
-        IconRight: () => <ChevronRightIcon className="h-4 w-4" />,
+        PreviousMonthButton: () => <ChevronLeftIcon className="h-4 w-4" />,
+        NextMonthButton: () => <ChevronRightIcon className="h-4 w-4" />,
       }}
       {...props}
     />