Merge pull request #1472 from culturecreates/develop

Develop
culturecreates · Nov 28, 2024 · e49c3aa · e49c3aa
2 parents d3e746a + c359e84
commit e49c3aa
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 39 deletions.
diff --git a/src/components/Accordion/CalendarAccordion/CalendarAccordion.jsx b/src/components/Accordion/CalendarAccordion/CalendarAccordion.jsx
@@ -84,6 +84,22 @@ function CalendarAccordion(props) {
 
   const calendarContentLanguage = currentCalendarData?.contentLanguage;
 
+  const processEntities = (entities) => {
+    if (!entities) return [];
+    return entities.map((v) => ({
+      ...v,
+      image: Array.isArray(v?.image)
+        ? v?.image.find((image) => image?.isMain) || null
+        : typeof v?.image === 'object' && v?.image !== null
+        ? v?.image
+        : null,
+    }));
+  };
+
+  const updateList = (entities, setter) => {
+    setter(treeEntitiesOption(processEntities(entities), user, calendarContentLanguage, sourceOptions.CMS));
+  };
+
   const organizationPersonSearch = (value, type) => {
     const queryMap = {
       organizers: query,
@@ -95,25 +111,10 @@ function CalendarAccordion(props) {
     getEntities({ searchKey: value, classes: decodeURIComponent(currentQuery.toString()), calendarId })
       .unwrap()
       .then((response) => {
-        if (type == 'organizers') {
-          setOrganizersList(
-            treeEntitiesOption(
-              response?.map((v) => ({ ...v, image: v?.image?.find((image) => image?.isMain) })),
-              user,
-              calendarContentLanguage,
-              sourceOptions.CMS,
-            ),
-          );
-        }
-        if (type == 'people') {
-          setPeopleList(
-            treeEntitiesOption(
-              response?.map((v) => ({ ...v, image: v?.image?.find((image) => image?.isMain) })),
-              user,
-              calendarContentLanguage,
-              sourceOptions.CMS,
-            ),
-          );
+        if (type === 'organizers') {
+          updateList(response, setOrganizersList);
+        } else if (type === 'people') {
+          updateList(response, setPeopleList);
         }
       })
       .catch((error) => console.log(error));
@@ -131,27 +132,13 @@ function CalendarAccordion(props) {
 
   useEffect(() => {
     if (initialEntities && currentCalendarData) {
-      setOrganizersList(
-        treeEntitiesOption(
-          initialEntities?.map((v) => ({ ...v, image: v?.image?.find((image) => image?.isMain) })),
-          user,
-          calendarContentLanguage,
-          sourceOptions.CMS,
-        ),
-      );
+      updateList(initialEntities, setOrganizersList);
     }
   }, [initialEntityLoading, currentCalendarData]);
 
   useEffect(() => {
     if (initialPersonEntities && currentCalendarData) {
-      setPeopleList(
-        treeEntitiesOption(
-          initialPersonEntities?.map((v) => ({ ...v, image: v?.image?.find((image) => image?.isMain) })),
-          user,
-          calendarContentLanguage,
-          sourceOptions.CMS,
-        ),
-      );
+      updateList(initialPersonEntities, setPeopleList);
     }
   }, [initialPersonEntityLoading, currentCalendarData]);
 

diff --git a/src/utils/removeUneditedFallbackValues.js b/src/utils/removeUneditedFallbackValues.js
@@ -60,15 +60,32 @@ export const filterUneditedFallbackValues = ({
 };
 
 const emptyValueFilter = (additionalFilters, modifiedValues) => {
-  if (additionalFilters && Object.values(additionalFilters).some((value) => value === true)) {
+  if (
+    typeof additionalFilters !== 'object' ||
+    typeof modifiedValues !== 'object' ||
+    !additionalFilters ||
+    !modifiedValues
+  ) {
+    return undefined;
+  }
+
+  const modifiedValuesCopy = { ...modifiedValues };
+
+  if (Object.values(additionalFilters).some((value) => value === true)) {
     Object.keys(additionalFilters).forEach((key) => {
-      if (Object.prototype.hasOwnProperty.call(modifiedValues, key)) {
+      if (Object.prototype.hasOwnProperty.call(modifiedValuesCopy, key)) {
         if (additionalFilters[key] === false) {
-          delete modifiedValues[key];
+          delete modifiedValuesCopy[key];
         }
       }
     });
   }
 
-  return modifiedValues;
+  Object.keys(modifiedValuesCopy).forEach((key) => {
+    if (typeof modifiedValuesCopy[key] === 'string' && modifiedValuesCopy[key].trim() === '') {
+      delete modifiedValuesCopy[key];
+    }
+  });
+
+  return Object.keys(modifiedValuesCopy).length ? modifiedValuesCopy : undefined;
 };