From dc564252399b9dd40b55c3d38fe5c43854b59292 Mon Sep 17 00:00:00 2001 From: AishDani Date: Fri, 28 Feb 2025 11:44:31 +0530 Subject: [PATCH 1/2] refactor:resolved content mapper bug [CMG-520] --- ui/src/components/ContentMapper/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index 55f7d49f..2981c4ff 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -1521,7 +1521,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R isDisabled: true } : (OptionsForRow?.length === 0 || (OptionsForRow?.length > 0 && OptionsForRow?.every((item)=>item?.isDisabled) - && (!existingField[data?.uid] || ! updatedExstingField[data?.uid] ) ) || (OptionsForRow?.length > 0 && data?.contentstackFieldType === "dropdown")) + && (!existingField[data?.uid]?.label || ! updatedExstingField[data?.uid]?.label ) ) || (OptionsForRow?.length > 0 && data?.contentstackFieldType === "dropdown")) ? { label: Fields[data?.contentstackFieldType]?.label ?? 'No Option', value: Fields[data?.contentstackFieldType]?.label ?? 'No Option', From 4603a7826083ff806c25641d5332a65944948b25 Mon Sep 17 00:00:00 2001 From: AishDani <141744636+AishDani@users.noreply.github.com> Date: Tue, 4 Mar 2025 19:00:53 +0530 Subject: [PATCH 2/2] refactor:added validation in otherCmsUid state variable --- ui/src/components/ContentMapper/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx index 2981c4ff..47977598 100644 --- a/ui/src/components/ContentMapper/index.tsx +++ b/ui/src/components/ContentMapper/index.tsx @@ -265,7 +265,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R label: contentTypeMapped?.[otherCmsTitle] ?? `Select ${isContentType ? 'Content Type' : 'Global Field'} from Existing Stack`, value: contentTypeMapped?.[otherCmsTitle] ?? `Select ${isContentType ? 'Content Type' : 'Global Field'} from Existing Stack`, }); - const [otherCmsUid, setOtherCmsUid] = useState(contentTypes[0]?.otherCmsUid); + const [otherCmsUid, setOtherCmsUid] = useState(contentTypes?.[0]?.otherCmsUid); const [active, setActive] = useState(0); @@ -2423,4 +2423,4 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R }); ContentMapper.displayName = 'ContentMapper'; -export default ContentMapper; \ No newline at end of file +export default ContentMapper;