From bc7ef6b0f7880ae237eece16abcb112599702910 Mon Sep 17 00:00:00 2001
From: mohanrajnambe <mohanrajnambe@gmail.com>
Date: Fri, 8 Mar 2024 12:00:31 +0530
Subject: [PATCH 1/3] Handle no option available case when result array is
 empty

---
 src/Components/Patient/PatientRegister.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index efc269fa00c..c7e64b87dea 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -1464,10 +1464,15 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                     required
                                     placeholder={
                                       field("district").value
-                                        ? "Choose Localbody"
+                                        ? !localBody.length
+                                          ? "No options available"
+                                          : "Choose Localbody"
                                         : "Select District First"
                                     }
-                                    disabled={!field("district").value}
+                                    disabled={
+                                      !field("district").value ||
+                                      !localBody.length
+                                    }
                                     options={localBody}
                                     optionLabel={(o: any) => o.name}
                                     optionValue={(o: any) => o.id}

From b4304b3f83cb6f3c02d7179174f9f56af84f60db Mon Sep 17 00:00:00 2001
From: mohanrajnambe <mohanrajnambe@gmail.com>
Date: Thu, 14 Mar 2024 22:52:00 +0530
Subject: [PATCH 2/3] Add Length check validation in rendering Select List

---
 src/Components/Form/SelectMenuV2.tsx | 72 +++++++++++++++-------------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/Components/Form/SelectMenuV2.tsx b/src/Components/Form/SelectMenuV2.tsx
index 2e277b40b4f..718b4e796b2 100644
--- a/src/Components/Form/SelectMenuV2.tsx
+++ b/src/Components/Form/SelectMenuV2.tsx
@@ -116,40 +116,46 @@ const SelectMenuV2 = <T, V>(props: SelectMenuProps<T, V>) => {
                   props.position === "above" ? "bottom-0 mb-12" : "top-0 mt-12"
                 )}
               >
-                <DropdownTransition show={open}>
-                  <Listbox.Options className="cui-dropdown-base">
-                    {options.map((option, index) => (
-                      <Listbox.Option
-                        id={`${props.id}-option-${option.value}`}
-                        key={index}
-                        className={dropdownOptionClassNames}
-                        value={option}
-                      >
-                        {({ active, selected }) => (
-                          <div className="flex flex-col gap-2">
-                            <div className="flex justify-between">
-                              {option.label}
-                              {props.optionIcon
-                                ? option.icon
-                                : selected && (
-                                    <CareIcon className="care-l-check text-lg" />
-                                  )}
+                {options.length ? (
+                  <DropdownTransition show={open}>
+                    <Listbox.Options className="cui-dropdown-base">
+                      {options.map((option, index) => (
+                        <Listbox.Option
+                          id={`${props.id}-option-${option.value}`}
+                          key={index}
+                          className={dropdownOptionClassNames}
+                          value={option}
+                        >
+                          {({ active, selected }) => (
+                            <div className="flex flex-col gap-2">
+                              <div className="flex justify-between">
+                                {option.label}
+                                {props.optionIcon
+                                  ? option.icon
+                                  : selected && (
+                                      <CareIcon className="care-l-check text-lg" />
+                                    )}
+                              </div>
+                              {option.description && (
+                                <p
+                                  className={`font-normal ${
+                                    active
+                                      ? "text-primary-200"
+                                      : "text-gray-700"
+                                  }`}
+                                >
+                                  {option.description}
+                                </p>
+                              )}
                             </div>
-                            {option.description && (
-                              <p
-                                className={`font-normal ${
-                                  active ? "text-primary-200" : "text-gray-700"
-                                }`}
-                              >
-                                {option.description}
-                              </p>
-                            )}
-                          </div>
-                        )}
-                      </Listbox.Option>
-                    ))}
-                  </Listbox.Options>
-                </DropdownTransition>
+                          )}
+                        </Listbox.Option>
+                      ))}
+                    </Listbox.Options>
+                  </DropdownTransition>
+                ) : (
+                  <></>
+                )}
               </div>
             </div>
           </>

From 80a9ef108dcf1cd09555c3393d436cbc47e9b811 Mon Sep 17 00:00:00 2001
From: mohanrajnambe <mohanrajnambe@gmail.com>
Date: Sat, 30 Mar 2024 23:28:57 +0530
Subject: [PATCH 3/3] Add validation in the Select Component

---
 src/Components/Form/SelectMenuV2.tsx       | 5 +++--
 src/Components/Patient/PatientRegister.tsx | 9 ++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Components/Form/SelectMenuV2.tsx b/src/Components/Form/SelectMenuV2.tsx
index 640f3163b9d..2c22510cef1 100644
--- a/src/Components/Form/SelectMenuV2.tsx
+++ b/src/Components/Form/SelectMenuV2.tsx
@@ -59,7 +59,8 @@ const SelectMenuV2 = <T, V>(props: SelectMenuProps<T, V>) => {
 
   const showChevronIcon = props.showChevronIcon ?? true;
 
-  const placeholder = props.placeholder ?? "Select";
+  const placeholder =
+    valueOptions?.length > 0 ? props.placeholder ?? "Select" : "No options";
   const defaultOption = {
     label: placeholder,
     selectedLabel: <p className="font-normal text-gray-600">{placeholder}</p>,
@@ -77,7 +78,7 @@ const SelectMenuV2 = <T, V>(props: SelectMenuProps<T, V>) => {
   return (
     <div className={props.className} id={props.id}>
       <Listbox
-        disabled={props.disabled}
+        disabled={props.disabled || valueOptions?.length === 0}
         value={value}
         onChange={(selection: any) => props.onChange(selection.value)}
       >
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 00cd88bf6ac..85a5002f8da 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -1487,15 +1487,10 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                     required
                                     placeholder={
                                       field("district").value
-                                        ? !localBody.length
-                                          ? "No options available"
-                                          : "Choose Localbody"
+                                        ? "Choose Localbody"
                                         : "Select District First"
                                     }
-                                    disabled={
-                                      !field("district").value ||
-                                      !localBody.length
-                                    }
+                                    disabled={!field("district").value}
                                     options={localBody}
                                     optionLabel={(o: any) => o.name}
                                     optionValue={(o: any) => o.id}