From 32339bb5e975a128f46b9cefa658db7d75a9b234 Mon Sep 17 00:00:00 2001
From: Ochieng Paul <ochiengpaul442@gmail.com>
Date: Wed, 11 Dec 2024 15:22:19 +0300
Subject: [PATCH 1/2] code clean up and optimization

---
 .../dataDownload/components/CustomFields.jsx  | 36 +++++++++----------
 .../dataDownload/modules/DataDownload.jsx     |  4 ++-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx b/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx
index 9cba6d624f..df9293a3ce 100644
--- a/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx
+++ b/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx
@@ -7,9 +7,6 @@ import DatePicker from '../../../Calendar/DatePicker';
 /**
  * Formats the name based on the specified text format.
  * Replaces underscores and hyphens with spaces.
- * @param {string} name - The string to format.
- * @param {string} textFormat - The desired text format ('uppercase' or 'lowercase').
- * @returns {string} - The formatted string.
  */
 const formatName = (name, textFormat = 'lowercase') => {
   if (typeof name !== 'string' || !name) return name;
@@ -17,12 +14,21 @@ const formatName = (name, textFormat = 'lowercase') => {
   return textFormat === 'uppercase' ? formatted.toUpperCase() : formatted;
 };
 
+/**
+ * Formats the field value based on the field ID.
+ * If the field ID is 'organization', it returns the value in uppercase without altering hyphens.
+ * Otherwise, it applies the formatName function.
+ */
+const formatFieldValue = (value, fieldId, textFormat) => {
+  if (fieldId === 'organization') {
+    return value.toUpperCase();
+  }
+  return formatName(value, textFormat);
+};
+
 /**
  * CustomFields Component
  * Renders different types of input fields based on props.
- *
- * @param {object} props - Component properties.
- * @returns {JSX.Element} - Rendered component.
  */
 const CustomFields = ({
   field = false,
@@ -38,22 +44,18 @@ const CustomFields = ({
   textFormat = 'lowercase',
 }) => {
   const [selectedOption, setSelectedOption] = useState(
-    defaultOption || options[0],
+    defaultOption || (options.length > 0 ? options[0] : { id: '', name: '' }),
   );
 
   /**
    * Handles the selection of an option.
    * Conditionally formats the name based on the field's ID.
-   *
-   * @param {object} option - The selected option object.
    */
   const handleSelect = useCallback(
     (option) => {
-      // Determine if formatting should be applied
-      const shouldFormat = id !== 'organization';
       const formattedOption = {
         ...option,
-        name: shouldFormat ? formatName(option.name, textFormat) : option.name,
+        name: formatFieldValue(option.name, id, textFormat),
       };
       setSelectedOption(formattedOption);
       handleOptionSelect(id, formattedOption);
@@ -69,12 +71,10 @@ const CustomFields = ({
         // Render a text input field
         <input
           className="bg-transparent text-[16px] font-medium leading-6 p-0 m-0 w-full h-auto border-none"
-          value={
-            id === 'organization'
-              ? selectedOption.name
-              : formatName(selectedOption.name, textFormat)
+          value={formatFieldValue(selectedOption.name, id, textFormat)}
+          onChange={(e) =>
+            handleSelect({ ...selectedOption, name: e.target.value })
           }
-          onChange={(e) => handleSelect({ name: e.target.value })}
           type="text"
           name={id}
           disabled={!edit}
@@ -98,7 +98,7 @@ const CustomFields = ({
           btnText={
             btnText
               ? formatName(btnText, textFormat)
-              : formatName(selectedOption.name, textFormat)
+              : formatFieldValue(selectedOption.name, id, textFormat)
           }
           customPopperStyle={{ left: '-7px' }}
           dropDownClass="w-full"
diff --git a/platform/src/common/components/Modal/dataDownload/modules/DataDownload.jsx b/platform/src/common/components/Modal/dataDownload/modules/DataDownload.jsx
index 554feef9f4..3ded25167e 100644
--- a/platform/src/common/components/Modal/dataDownload/modules/DataDownload.jsx
+++ b/platform/src/common/components/Modal/dataDownload/modules/DataDownload.jsx
@@ -120,7 +120,9 @@ const DataDownload = ({ onClose }) => {
    */
   useEffect(() => {
     if (formData.organization) {
-      dispatch(fetchSitesSummary({ group: formData.organization.name }));
+      dispatch(
+        fetchSitesSummary({ group: formData.organization.name.toLowerCase() }),
+      );
     }
   }, [dispatch, formData.organization]);
 

From 96555288bfcbc579e3542b51986c47c1d5cb39f9 Mon Sep 17 00:00:00 2001
From: Ochieng Paul <ochiengpaul442@gmail.com>
Date: Wed, 11 Dec 2024 15:31:11 +0300
Subject: [PATCH 2/2] clean up

---
 .../components/Modal/dataDownload/components/CustomFields.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx b/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx
index df9293a3ce..50eff39e37 100644
--- a/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx
+++ b/platform/src/common/components/Modal/dataDownload/components/CustomFields.jsx
@@ -10,7 +10,7 @@ import DatePicker from '../../../Calendar/DatePicker';
  */
 const formatName = (name, textFormat = 'lowercase') => {
   if (typeof name !== 'string' || !name) return name;
-  const formatted = name.replace(/[_-]/g, ' '); // Replace underscores and hyphens with spaces
+  const formatted = name.replace(/[_-]/g, ' ');
   return textFormat === 'uppercase' ? formatted.toUpperCase() : formatted;
 };