fix: filter path because a dynamic zone component is a component but …

…it should be classified as a dynamic zone
strapi · Dec 8, 2022 · faccd12 · faccd12
1 parent 11d5ceb
commit faccd12
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...ore/admin/admin/src/content-manager/components/DynamicZone/components/DynamicComponent.js b/...ore/admin/admin/src/content-manager/components/DynamicZone/components/DynamicComponent.js
@@ -111,7 +111,7 @@ const DynamicZoneComponent = ({
       <StyledBox hasRadius>
         <Accordion expanded={isOpen} onToggle={handleToggle} size="S" error={errorMessage}>
           <AccordionToggle
-            startIcon={<FontAwesomeIcon icon={icon} />}
+            startIcon={icon && <FontAwesomeIcon icon={icon} />}
             action={
               <Stack horizontal spacing={0} expanded={isOpen}>
                 {showDownIcon && (

diff --git a/...ager/components/EditViewDataManagerProvider/utils/recursivelyFindPathsBasedOnCondition.js b/...ager/components/EditViewDataManagerProvider/utils/recursivelyFindPathsBasedOnCondition.js
@@ -55,8 +55,15 @@ const recursivelyFindPathsBasedOnConditionSetup = (components, predicate = () =>
                *
                * NOTE: we don't need to know the path to the `array` because it's about data shape not about the actual data
                */
-            }).map((path) => path.split(`${componentName}.`)[1]);
+            }).map((path) => {
+              return path.split(`${componentName}.`)[1];
+            });
           })
+          /**
+           * We filter because this will give you `dynamiczone.undefined` because the dynamic_zone component
+           * is not required to be returned in this circumstance.
+           */
+          .filter((path) => Boolean(path))
           .map((path) => `${key}.${path}`);
 
         acc = [...acc, attributesInDynamicComponents];

diff --git a/...admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js b/...admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js
@@ -40,7 +40,7 @@ export const RelationInputDataManager = ({
   const { connectRelation, disconnectRelation, loadRelation, modifiedData, slug, initialData } =
     useCMEditViewDataManager();
 
-  const relationsFromModifiedData = get(modifiedData, name) ?? [];
+  const relationsFromModifiedData = get(modifiedData, name, []);
 
   const currentLastPage = Math.ceil(get(initialData, name, []).length / RELATIONS_TO_DISPLAY);