From cc3ff6c027d1cdf47649c94099723b033e79957b Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Mon, 19 Jan 2026 18:02:38 +0530
Subject: [PATCH 1/2] refactor: Enhance content mapping logic by ensuring
 safeField.id is set correctly and improving type matching in the
 ContentMapper component.

---
 api/src/services/contentMapper.service.ts | 1 +
 ui/src/components/ContentMapper/index.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/src/services/contentMapper.service.ts b/api/src/services/contentMapper.service.ts
index ffb7ad7c0..4525a4400 100644
--- a/api/src/services/contentMapper.service.ts
+++ b/api/src/services/contentMapper.service.ts
@@ -103,6 +103,7 @@ const putTestData = async (req: Request) => {
                 safeField?.id ?
                   safeField.id.replace(/[{}]/g, '').toLowerCase()
                   : uuidv4();
+              safeField.id = id
     
               fieldIds.push(id);
     
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 4c466fd44..d85dde8cf 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -1798,11 +1798,14 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
           ...option,
           isDisabled: selectedOptions?.includes?.(option?.label ?? '')
         }));
+   
+    const isTypeMatch = checkConditions(Fields[data?.contentstackFieldType]?.type?.toLowerCase(), existingField[data?.backupFieldUid]?.value, data);
+
     return (
       <div className="table-row">
         <div className="select">
           <Select
-            value={(OptionsForRow?.length === 0 || (Fields[data?.contentstackFieldType]?.type?.toLowerCase() !== existingField[data?.backupFieldUid]?.value?.data_type || existingField?.[data?.backupFieldUid]?.label === undefined)) ? OptionValue : 
+            value={(OptionsForRow?.length === 0 || (! isTypeMatch || existingField?.[data?.backupFieldUid]?.label === undefined)) ? OptionValue : 
 
             existingField[data?.backupFieldUid]}
             onChange={(selectedOption: FieldTypes) => {
@@ -1815,7 +1818,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
             placeholder="Select Field"
             version={'v2'}
             maxWidth="290px"
-            isClearable={data?.backupFieldType === existingField[data?.backupFieldUid]?.value?.data_type && selectedOptions?.includes?.(existingField?.[data?.backupFieldUid]?.label ?? '')}
+            isClearable={isTypeMatch && selectedOptions?.includes?.(existingField?.[data?.backupFieldUid]?.label ?? '')}
             options={adjustedOptions}
             isDisabled={OptionValue?.isDisabled || newMigrationData?.project_current_step > 4}
             menuPlacement="auto"

From 00b81fa6b05fa00ddc966f8729a47083ddbafdf9 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Mon, 19 Jan 2026 18:45:42 +0530
Subject: [PATCH 2/2] refactor: resolved PR comments by copilot

---
 api/src/services/contentMapper.service.ts | 2 +-
 ui/src/components/ContentMapper/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/services/contentMapper.service.ts b/api/src/services/contentMapper.service.ts
index 4525a4400..b8dade2e3 100644
--- a/api/src/services/contentMapper.service.ts
+++ b/api/src/services/contentMapper.service.ts
@@ -103,7 +103,7 @@ const putTestData = async (req: Request) => {
                 safeField?.id ?
                   safeField.id.replace(/[{}]/g, '').toLowerCase()
                   : uuidv4();
-              safeField.id = id
+              safeField.id = id;
     
               fieldIds.push(id);
     
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index d85dde8cf..e92bfc410 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -1805,7 +1805,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       <div className="table-row">
         <div className="select">
           <Select
-            value={(OptionsForRow?.length === 0 || (! isTypeMatch || existingField?.[data?.backupFieldUid]?.label === undefined)) ? OptionValue : 
+            value={(OptionsForRow?.length === 0 || (!isTypeMatch || existingField?.[data?.backupFieldUid]?.label === undefined)) ? OptionValue : 
 
             existingField[data?.backupFieldUid]}
             onChange={(selectedOption: FieldTypes) => {