From 7b723d220cf16aa0807d91204e66f09e2d97eaf1 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Thu, 8 May 2025 12:42:48 +0530
Subject: [PATCH 01/13] fix:resolved the bug [CMG-634]

---
 ui/src/components/ContentMapper/index.scss |  4 ++++
 ui/src/components/ContentMapper/index.tsx  | 28 ++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index fa2f9f237..96a42ced4 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -311,3 +311,7 @@ div .table-row {
   font-size: $size-font-large;
   font-weight: $font-weight-semi-bold;
 }
+.filtetButton-color{
+  color: $color-brand-primary-base;
+  font-weight: $font-weight-bold;
+}
\ No newline at end of file
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 0ffa4c062..3ce478a78 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -35,7 +35,7 @@ import { updateMigrationData, updateNewMigrationData } from '../../store/slice/m
 
 // Utilities
 import { CS_ENTRIES, CONTENT_MAPPING_STATUS, STATUS_ICON_Mapping } from '../../utilities/constants';
-import { validateArray } from '../../utilities/functions';
+import { isEmptyString, validateArray } from '../../utilities/functions';
 import useBlockNavigation from '../../hooks/userNavigation';
 
 // Interface
@@ -291,6 +291,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   const [isContentDeleted, setIsContentDeleted] = useState<boolean>(false);
   const [isCsCTypeUpdated, setsCsCTypeUpdated] = useState<boolean>(false);
   const [isLoadingSaveButton, setisLoadingSaveButton] = useState<boolean>(false);
+  const [activeFilter, setActiveFilter] = useState<string>('');
 
 
   /** ALL HOOKS Here */
@@ -1240,7 +1241,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   
   //utility function to map the source cms field type to content type field type
   function checkConditions(fieldTypeToMatch: string | string[], value: ContentTypesSchema, data: FieldMapType) {
-    const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link','global_field','json','blocks']);  
+    const fieldTypes = new Set(['number', 'isodate', 'file', 'reference', 'boolean', 'group', 'link','global_field','json','blocks','taxonomy']);  
     switch (fieldTypeToMatch) {
       case 'text':
         return (
@@ -1373,7 +1374,6 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   
     return OptionsForRow;
   };
-
   const SelectAccessorOfColumn = (data: FieldMapType) => {
     // Fetch options for the current row from Fields based on backupFieldType( empty stack options)
     const OptionsForEachRow = Fields?.[data?.backupFieldType]?.options;
@@ -1424,7 +1424,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
       const fieldTypeToMatch = Fields[data?.backupFieldType as keyof Mapping]?.type;
       //check if UID of souce field is matching to exsting content type field UID
       for (const value of contentTypeSchema) {
-        if (data?.uid === value?.uid || (data?.uid === value?.uid && data?.otherCmsType === value?.data_type)) {
+        if (data?.uid === value?.uid && data?.contentstackFieldType === value?.data_type) {
           OptionsForRow.push({ label: value?.display_name, value, isDisabled: false });
           break;
         }
@@ -1821,10 +1821,23 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
           };
           dispatch(updateNewMigrationData(newMigrationDataObj));
           const resetCT = filteredContentTypes?.map?.(ct => 
+            ct?.id === selectedContentType?.id  ? { ...ct, status: data?.data?.status } : ct
+          )
+          
+          let filteredCT = resetCT;
+          if (!isEmptyString(activeFilter)) {
+            filteredCT = resetCT?.filter((ct) => 
+              CONTENT_MAPPING_STATUS?.[ct?.status] === activeFilter
+            );
+          }
+
+          const resetContentTypes = contentTypes?.map?.(ct => 
             ct?.id === selectedContentType?.id ? { ...ct, status: data?.data?.status } : ct
           );
-          setFilteredContentTypes(resetCT);
-          setContentTypes(resetCT);
+          setFilteredContentTypes(filteredCT);
+          setContentTypes(resetContentTypes);
+          setCount(filteredCT?.length);
+
           Notification({
             notificationContent: { text: data?.message },
             notificationProps: {
@@ -2138,6 +2151,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
 
   // Function to filter content types as per the status
   const handleContentTypeFilter = (value: string, e: MouseOrKeyboardEvent) => {
+    setActiveFilter(value);
     const li_list = document.querySelectorAll('.filter-wrapper li');
     if(li_list) {
       li_list?.forEach((ele) => {
@@ -2240,7 +2254,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                             }
                           }}
                         >
-                          {CONTENT_MAPPING_STATUS[key] && <span className='filter-status'>{CONTENT_MAPPING_STATUS[key]}</span> }
+                          {CONTENT_MAPPING_STATUS[key] && <span className={`${activeFilter ===  CONTENT_MAPPING_STATUS[key] ? 'filter-status filtetButton-color' :'filter-status' }`}>{CONTENT_MAPPING_STATUS[key]}</span> }
                           {STATUS_ICON_Mapping[key] && <Icon size="small" icon={STATUS_ICON_Mapping[key]} className={STATUS_ICON_Mapping[key] === 'CheckedCircle' ? 'mapped-icon' : ''} />}
                         </button>
                       </li>

From 016c9406a1e4a47cafdd0e4bda07de57e2173e3e Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Thu, 8 May 2025 18:00:39 +0530
Subject: [PATCH 02/13] fix:[CMG-633]:prefiled values of affic and validation
 message on new project creation

---
 ui/src/components/Modal/index.tsx          | 16 +++++----------
 ui/src/components/Modal/modal.interface.ts |  2 +-
 ui/src/pages/Projects/index.tsx            | 24 ++++++++++++++++++++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/ui/src/components/Modal/index.tsx b/ui/src/components/Modal/index.tsx
index e54106516..f5e135bf2 100644
--- a/ui/src/components/Modal/index.tsx
+++ b/ui/src/components/Modal/index.tsx
@@ -34,23 +34,17 @@ const Modal = (props: ProjectModalProps) => {
       title
     },
     selectedOrg,
-    isOpen
+    isOpen,
+    createProject
   } = props;
 
   const [inputValue, setInputValue] = useState<boolean>(false);
 
-  const handleSubmit = async (values: FormData): Promise<boolean> => {
+  const handleSubmit = async (values: FormData)=> {
     // const payload = {name: values?.name, description: values?.description || ''}
 
-    const res = await createProject(selectedOrg?.uid || '', values);
-    if (res?.error) {
-      return res?.error;
-    }
-    if (res?.status === 201) {
-      const projectId = res?.data?.project?.id;
-      window.location.href = `/projects/${projectId}/migration/steps/1`;
-    }
-    return res;
+    const result = await createProject(values);
+    return result;
   };
 
   const nameValidation = (value: string) => {
diff --git a/ui/src/components/Modal/modal.interface.ts b/ui/src/components/Modal/modal.interface.ts
index 7248e2cb2..29ef23ce3 100644
--- a/ui/src/components/Modal/modal.interface.ts
+++ b/ui/src/components/Modal/modal.interface.ts
@@ -4,12 +4,12 @@ import { ModalType } from '../../pages/Projects/projects.interface';
 export interface ModalObj {
   closeModal: () => void;
 }
-
 export interface ProjectModalProps {
   modalData: ModalType;
   selectedOrg: IDropDown;
   closeModal: () => void;
   isOpen: (flag: boolean) => void;
+  createProject: (values : FormData)=> void
 }
 export interface SettingsModalProps {
   selectedOrg: IDropDown;
diff --git a/ui/src/pages/Projects/index.tsx b/ui/src/pages/Projects/index.tsx
index 80e5b6712..f05ede6e2 100644
--- a/ui/src/pages/Projects/index.tsx
+++ b/ui/src/pages/Projects/index.tsx
@@ -10,7 +10,7 @@ import {
 } from '@contentstack/venus-components';
 import { jsonToHtml } from '@contentstack/json-rte-serializer';
 import HTMLReactParser from 'html-react-parser';
-import { useLocation } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 
 // Redux
@@ -19,7 +19,7 @@ import useBlockNavigation from '../../hooks/userNavigation';
 
 // Services
 import { getCMSDataFromFile } from '../../cmsData/cmsSelector';
-import { getAllProjects } from '../../services/api/project.service';
+import { createProject, getAllProjects } from '../../services/api/project.service';
 
 // Utilities
 import { CS_ENTRIES } from '../../utilities/constants';
@@ -41,6 +41,9 @@ import { NO_PROJECTS, NO_PROJECTS_SEARCH } from '../../common/assets';
 
 // styles
 import './index.scss';
+import { useDispatch } from 'react-redux';
+import { DEFAULT_NEW_MIGRATION } from '../../context/app/app.interface';
+import { updateNewMigrationData } from '../../store/slice/migrationDataSlice';
 
 const Projects = () => {
   const [data, setData] = useState<ProjectsType>({});
@@ -69,6 +72,8 @@ const Projects = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
   usePreventBackNavigation();
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
 
   const fetchProjects = async () => {
     setLoadStatus(true);
@@ -132,6 +137,20 @@ const Projects = () => {
   };
   useBlockNavigation(isModalOpen || true);
 
+  const createProjectCall = async(values : any) => {
+        const res:any = await createProject(selectedOrganisation?.uid || '', values);
+        if (res?.error) {
+          return res?.error;
+        }
+        if (res?.status === 201) {
+          const projectId = res?.data?.project?.id;
+          dispatch(updateNewMigrationData(DEFAULT_NEW_MIGRATION))
+          navigate(`/projects/${projectId}/migration/steps/1`);
+          
+        }
+        return res;
+
+  }
   // Function for open modal
   const openModal = () => {
     setIsModalOpen(true);
@@ -144,6 +163,7 @@ const Projects = () => {
           }
           selectedOrg={selectedOrganisation}
           isOpen={setIsModalOpen}
+          createProject={createProjectCall}
           {...props}
         />
       ),

From be6771570e21380aac9287dd2b287713629daa00 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Tue, 13 May 2025 11:40:37 +0530
Subject: [PATCH 03/13] fix:resolved the bug [CMG-622] mapping of nested group
 in content mapper

---
 api/src/utils/content-type-creator.utils.ts | 117 ++++++++++++++------
 api/src/utils/field-attacher.utils.ts       |   2 +-
 2 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index e00b14c14..e5835b728 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -74,9 +74,19 @@ const arrangGroups = ({ schema, newStack }: any) => {
   schema?.forEach((item: any) => {
     if (item?.contentstackFieldType === 'group') {
       const groupSchema: any = { ...item, schema: [] }
+      if (item?.contentstackFieldUid?.includes('.')) {
+        const parts = item.contentstackFieldUid.split('.');
+        groupSchema.contentstackFieldUid = parts[parts.length - 1];
+      }
       schema?.forEach((et: any) => {
         if (et?.contentstackFieldUid?.includes(`${item?.contentstackFieldUid}.`) ||
           (newStack === false && et?.uid?.includes(`${item?.uid}.`))) {
+            const target = groupSchema?.contentstackFieldUid;
+            const index = et?.contentstackFieldUid?.indexOf(target);
+
+            if (index > 0) {
+              et.contentstackFieldUid = et?.contentstackFieldUid?.substring(index);
+            }
           groupSchema?.schema?.push(et);
         }
       })
@@ -112,7 +122,7 @@ const saveAppMapper = async ({ marketPlacePath, data, fileName }: any) => {
   }
 }
 
-const convertToSchemaFormate = ({ field, advanced = true, marketPlacePath }: any) => {
+const convertToSchemaFormate = ({ field, advanced = true, marketPlacePath, keyMapper }: any) => {
   switch (field?.contentstackFieldType) {
     case 'single_line_text': {
       return {
@@ -435,7 +445,7 @@ const convertToSchemaFormate = ({ field, advanced = true, marketPlacePath }: any
       return {
         data_type: "reference",
         display_name: field?.title,
-        reference_to: field?.refrenceTo ?? [],
+        reference_to: field?.refrenceTo?.map((item:string) => keyMapper[item] || item) ?? [],
         field_metadata: {
           ref_multiple: true,
           ref_multiple_content_types: true
@@ -654,45 +664,85 @@ const existingCtMapper = async ({ keyMapper, contentTypeUid, projectId, region,
   }
 }
 
-const mergeArrays = async (a: any[], b: any[]) => {
-  for await (const fieldGp of b) {
-    const exists = a.some(fld =>
-      fld?.uid === fieldGp?.uid &&
-      fld?.data_type === fieldGp?.data_type
+const mergeArrays = (a: any[], b: any[]): any[] => {
+  const result = [...a];
+
+  for (const field of b) {
+    const exists = result.some(f =>
+      f?.uid === field?.uid &&
+      f?.data_type === field?.data_type
     );
     if (!exists) {
-      a.push(fieldGp);
+      result.push(field);
+    }
+  }
+
+  return result;
+};
+
+const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {
+  const result: any[] = [];
+
+  for (const field2 of schema2) {
+    if (field2.data_type === 'group') {
+      const machingGroup = findGroupByUid(schema1, field2?.uid);
+      if(machingGroup){
+       const schema = await mergeArrays(machingGroup?.schema ?? [],field2?.schema ?? [] );
+        result.push({
+          ...field2,
+          schema: schema
+        });
+      }
+      else{
+        result.push({
+          ...field2,
+         schema:  await mergeFields(schema1, field2?.schema)
+        })
+      }
+    }
+    else{
+      const exists = schema1.find(
+        (fld) =>
+          fld.uid === field2.uid &&
+          fld.data_type === field2.data_type
+      );
+      if (!exists) {
+        result.push(field2);
+      }
+
     }
+     
   }
-  return a;
+  return result;
 }
 
+
+const findGroupByUid = (
+  schema: any[],
+  uid: string,
+  excludeRef: any = null
+): any | undefined => {
+  for (const field of schema) {
+    if (field.data_type === 'group') {
+      if (field.uid === uid && field !== excludeRef) return field;
+      const nested = findGroupByUid(field.schema ?? [], uid, excludeRef);
+      if (nested) return nested;
+    }
+  }
+  return undefined;
+};
+
 const mergeTwoCts = async (ct: any, mergeCts: any) => {
-  const ctData: any = {
-    ...ct,
+  const merged :any = {
     title: mergeCts?.title,
     uid: mergeCts?.uid,
     options: {
       "singleton": false,
-    }
-  }
-  for await (const field of ctData?.schema ?? []) {
-    if (field?.data_type === 'group') {
-      const currentGroup = mergeCts?.schema?.find((grp: any) => grp?.uid === field?.uid &&
-        grp?.data_type === 'group');
-      const group = [];
-      for await (const fieldGp of currentGroup?.schema ?? []) {
-        const fieldNst = field?.schema?.find((fld: any) => fld?.uid === fieldGp?.uid &&
-          fld?.data_type === fieldGp?.data_type);
-        if (fieldNst === undefined) {
-          group?.push(fieldGp);
-        }
-      }
-      field.schema = [...field?.schema ?? [], ...group];
-    }
-  }
-  ctData.schema = await mergeArrays(ctData?.schema, mergeCts?.schema) ?? [];
-  return ctData;
+    },
+    schema: await mergeFields(ct?.schema ?? [], mergeCts?.schema ?? [])
+  };
+
+  return merged;
 }
 
 export const contenTypeMaker = async ({ contentType, destinationStackId, projectId, newStack, keyMapper, region, user_id }: any) => {
@@ -717,7 +767,7 @@ export const contenTypeMaker = async ({ contentType, destinationStackId, project
         "display_name": item?.contentstackField,
         "field_metadata": {},
         "schema": [],
-        "uid": item?.contentstackFieldUid,
+        "uid": item?.contentstackFieldUid?.replace(/\./g, '_'),
         "multiple": false,
         "mandatory": false,
         "unique": false
@@ -728,7 +778,7 @@ export const contenTypeMaker = async ({ contentType, destinationStackId, project
           uid: extractValue(element?.contentstackFieldUid, item?.contentstackFieldUid, '.'),
           title: extractValue(element?.contentstackField, item?.contentstackField, ' >')?.trim(),
         }
-        const schema: any = convertToSchemaFormate({ field, marketPlacePath });
+        const schema: any = convertToSchemaFormate({ field, marketPlacePath, keyMapper});
         if (typeof schema === 'object' && Array.isArray(group?.schema) && element?.isDeleted === false) {
           group.schema.push(schema);
         }
@@ -741,7 +791,8 @@ export const contenTypeMaker = async ({ contentType, destinationStackId, project
           title: item?.contentstackField,
           uid: item?.contentstackFieldUid
         },
-        marketPlacePath
+        marketPlacePath,
+        keyMapper
       });
       if (dt && item?.isDeleted === false) {
         ct?.schema?.push(dt);
diff --git a/api/src/utils/field-attacher.utils.ts b/api/src/utils/field-attacher.utils.ts
index 7ac4efb68..1eafa6821 100644
--- a/api/src/utils/field-attacher.utils.ts
+++ b/api/src/utils/field-attacher.utils.ts
@@ -22,7 +22,7 @@ export const fieldAttacher = async ({ projectId, orgId, destinationStackId, regi
         contentType.fieldMapping = contentType?.fieldMapping?.map((fieldUid: any) => {
           const field = FieldMapperModel.chain
             .get("field_mapper")
-            .find({ id: fieldUid, projectId: projectId })
+            .find({ id: fieldUid, projectId: projectId , contentTypeId: contentId})
             .value()
           return field;
         })

From 67f11c894931895d5655079b5e4e7324670919a8 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Tue, 13 May 2025 14:13:56 +0530
Subject: [PATCH 04/13] fix:refactored the bug [CMG-639] When uid of the field
 is title and then for existing case it is getting mapped to title of existing
 content type

---
 .../advanceProperties.interface.ts            |  2 +-
 ui/src/components/AdvancePropertise/index.tsx | 19 ++++++++++++------
 ui/src/components/ContentMapper/index.tsx     | 20 +++++++++----------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ui/src/components/AdvancePropertise/advanceProperties.interface.ts b/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
index 87d1b6830..f018cea6e 100644
--- a/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
+++ b/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
@@ -25,7 +25,7 @@ export interface SchemaProps {
    * @param value - The advanced settings.
    * @param checkBoxChanged - Indicates whether the checkbox has changed.
    */
-  updateFieldSettings: (rowId: string, value: Advanced, checkBoxChanged: boolean) => void;
+  updateFieldSettings: (rowId: string, value: Advanced, checkBoxChanged: boolean, rowContentstackFieldUid: string) => void;
 
   /**
    * Indicates whether the field is localized.
diff --git a/ui/src/components/AdvancePropertise/index.tsx b/ui/src/components/AdvancePropertise/index.tsx
index fe3073873..7834b3dd2 100644
--- a/ui/src/components/AdvancePropertise/index.tsx
+++ b/ui/src/components/AdvancePropertise/index.tsx
@@ -147,7 +147,9 @@ const AdvancePropertise = (props: SchemaProps) => {
         title: currentToggleStates?.title,
         url: currentToggleStates?.url
       },
-      checkBoxChanged
+      checkBoxChanged,
+      props?.data?.contentstackFieldUid
+
     );
   };
 
@@ -189,7 +191,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         title: currentToggleStates?.title,
         url: currentToggleStates?.url
       },
-      checkBoxChanged
+      checkBoxChanged,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -215,7 +218,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         embedObject: currentToggleStates?.embedObject,
         embedObjects: embedObjectsLabels
       },
-      true
+      true,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -251,7 +255,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         embedObjects: embedObjectsLabels,
         options: options
       },
-      true
+      true,
+      props?.data?.contentstackFieldUid
     );
   };
   const handleRemoveDefalutValue = (index: number) => {
@@ -280,7 +285,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         embedObjects: embedObjectsLabels,
         options: options
       },
-      true
+      true,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -583,7 +589,8 @@ const AdvancePropertise = (props: SchemaProps) => {
                             validationRegex: toggleStates?.validationRegex ?? '',
                             embedObjects: embedObject
                           },
-                          true
+                          true,
+                          props?.data?.contentstackFieldUid
                         );
                       }}
                       options={option}
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 3ce478a78..2ac9b5b9f 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -766,11 +766,11 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
       });
   }
 
-  const updateFieldSettings = (rowId: string, updatedSettings: Advanced, checkBoxChanged: boolean) => {
+  const updateFieldSettings = (rowId: string, updatedSettings: Advanced, checkBoxChanged: boolean, rowContentstackFieldUid: string) => {
     setIsDropDownChanged(checkBoxChanged);
     
     const newTableData = tableData?.map?.((row) => {
-      if (row?.uid === rowId) {
+      if (row?.uid === rowId && row?.contentstackFieldUid === rowContentstackFieldUid) {
 
         return { ...row, advanced: { ...row?.advanced, ...updatedSettings } };
       }
@@ -985,11 +985,11 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   };
 
   // Method for change select value
-  const handleValueChange = (value: FieldTypes, rowIndex: string) => {
+  const handleValueChange = (value: FieldTypes, rowIndex: string, rowContentstackFieldUid: string) => {
     setIsDropDownChanged(true);
     setFieldValue(value);
     const updatedRows: FieldMapType[] = selectedEntries?.map?.((row) => {
-      if (row?.uid === rowIndex) {
+      if (row?.uid === rowIndex && row?.contentstackFieldUid === rowContentstackFieldUid) {
         return { ...row, contentstackFieldType: value?.value };
       }
       return row;
@@ -1069,7 +1069,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
           <Select
             id={data?.uid}
             value={initialOption || fieldValue}
-            onChange={(selectedOption: FieldTypes) => handleValueChange(selectedOption, data?.uid)}
+            onChange={(selectedOption: FieldTypes) => handleValueChange(selectedOption, data?.uid, data?.contentstackFieldUid)}
             placeholder="Select Field"
             version={'v2'}
             maxWidth="290px"
@@ -1129,7 +1129,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
     );
   };
 
-  const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string) => {
+  const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string, contentstackFieldUid: string) => {
     setIsDropDownChanged(true);
     const previousSelectedValue = existingField[rowIndex]?.label;
     const groupArray = nestedList?.filter(item => 
@@ -1156,7 +1156,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
     else {
       setIsFieldDeleted(false);
     }
-    
+    console.info("row index ---> ", rowIndex)
     setExistingField((prevOptions: ExistingFieldType) => ({
       ...prevOptions,
       [rowIndex]: { label: selectedValue?.label, value: selectedValue?.value }
@@ -1176,7 +1176,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   
 
     const updatedRows: FieldMapType[] = tableData.map((row) => {
-      if (row?.uid === rowIndex) {
+      if (row?.uid === rowIndex && row?.contentstackFieldUid === contentstackFieldUid) {
         return {
           ...row,
           contentstackField: selectedValue?.label,
@@ -1569,9 +1569,9 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
             value={(OptionsForRow?.length === 0 || existingField?.[data?.uid]?.label === undefined) ? OptionValue : existingField[data?.uid]}
             onChange={(selectedOption: FieldTypes) => {
               if (OptionsForRow?.length === 0) {
-                handleValueChange(selectedOption, data?.uid)
+                handleValueChange(selectedOption, data?.uid, data?.contentstackFieldUid)
               } else {
-                handleFieldChange(selectedOption, data?.uid)
+                handleFieldChange(selectedOption, data?.uid, data?.contentstackFieldUid)
               }
             }}
             placeholder="Select Field"

From 7cd5c9ca04a3f6edc30af5d14e0327887265ec5e Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Tue, 13 May 2025 15:17:34 +0530
Subject: [PATCH 05/13] fix:resolved selection and deselection for duplicate
 title and uid fields [CMG-640]

---
 .../components/ContentMapper/contentMapper.interface.ts  | 1 +
 ui/src/components/ContentMapper/index.tsx                | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/ContentMapper/contentMapper.interface.ts b/ui/src/components/ContentMapper/contentMapper.interface.ts
index 866860956..10d096d1c 100644
--- a/ui/src/components/ContentMapper/contentMapper.interface.ts
+++ b/ui/src/components/ContentMapper/contentMapper.interface.ts
@@ -206,4 +206,5 @@ export interface ModifiedField {
   backupFieldType: string;
   parentId: string;
   uid: string;
+  _canSelect?: boolean;
 }
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 2ac9b5b9f..17e696920 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -828,17 +828,18 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   }, [tableData]);
 
   const getParentId = (uid: string) => {
-    return tableData?.find(i => i?.uid?.toLowerCase() === uid?.toLowerCase())?.id ?? ''
+    return tableData?.find((i) => i?.uid?.toLowerCase() === uid?.toLowerCase() && i?.backupFieldType?.toLowerCase() === 'group')?.id ?? ''
   }
 
   const modifiedObj = (obj: FieldMapType) => {
-    const {backupFieldType, uid, id} = obj ?? {}
+    const {backupFieldType, uid, id, _canSelect} = obj ?? {}
     const excludeArr = ["group"]
     return {
       id,
       backupFieldType,
       uid,
-      parentId : excludeArr?.includes?.(backupFieldType?.toLowerCase()) ? '' : getParentId(uid?.split('.')[0]?.toLowerCase())
+      parentId : excludeArr?.includes?.(backupFieldType?.toLowerCase()) ? '' : getParentId(uid?.split('.')[0]?.toLowerCase()),
+      _canSelect,
     }
   }
   
@@ -940,7 +941,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
           })
         }
       }
-    } else if(latestRow?.parentId && !["title", "url"]?.includes?.(latestRow?.uid?.toLowerCase())){
+    } else if(latestRow?.parentId && latestRow?._canSelect === true){
       // Extract the group UID if item is child of any group
       const uidBeforeDot = latestRow?.uid?.split?.('.')?.[0]?.toLowerCase();
       const groupItem = tableData?.find((entry) => entry?.uid?.toLowerCase() === uidBeforeDot);   

From cec94e41f1192013a336576c7e10effb31aa3c85 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Thu, 15 May 2025 14:53:16 +0530
Subject: [PATCH 06/13] refactor:changed uid key to backupFieldUid in mapping
 to avoid duplicate uid issues

---
 api/src/utils/content-type-creator.utils.ts |  6 +--
 ui/src/components/ContentMapper/index.tsx   | 57 ++++++++++-----------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index e5835b728..47d777df2 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -706,9 +706,9 @@ const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {
           fld.uid === field2.uid &&
           fld.data_type === field2.data_type
       );
-      if (!exists) {
-        result.push(field2);
-      }
+     result?.push({
+      ...field2
+     });
 
     }
      
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 17e696920..e53a740b1 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -368,7 +368,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
             if (!updatedSelectedOptions?.includes?.(schema?.display_name)) {
               updatedSelectedOptions.push(schema?.display_name);  
             }
-            updatedExstingField[row?.uid] = {
+            updatedExstingField[row?.backupFieldUid] = {
               label: schema?.display_name,
               value: schema
             };
@@ -382,7 +382,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                   if (!updatedSelectedOptions?.includes?.(`${schema?.display_name} > ${childSchema?.display_name}`)) {
                     updatedSelectedOptions.push(`${schema?.display_name} > ${childSchema?.display_name}`);  
                   }
-                  updatedExstingField[row?.uid] = {
+                  updatedExstingField[row?.backupFieldUid] = {
                     label: `${schema?.display_name} > ${childSchema?.display_name}`,
                     value: childSchema
                   }
@@ -397,7 +397,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                       if (!updatedSelectedOptions?.includes?.(`${schema?.display_name} > ${childSchema?.display_name} > ${nestedSchema?.display_name}`)) {
                         updatedSelectedOptions.push(`${schema?.display_name} > ${childSchema?.display_name} > ${nestedSchema?.display_name}`);  
                       }
-                      updatedExstingField[row?.uid] = {
+                      updatedExstingField[row?.backupFieldUid] = {
                         label: `${schema?.display_name} > ${childSchema?.display_name} > ${nestedSchema?.display_name}`,
                         value: nestedSchema
                       }
@@ -412,7 +412,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                           if (!updatedSelectedOptions?.includes?.(`${schema?.display_name} > ${childSchema?.display_name} > ${nestedSchema?.display_name} > ${nestedChild?.display_name}`)) {
                             updatedSelectedOptions.push(`${schema?.display_name} > ${childSchema?.display_name} > ${nestedSchema?.display_name} > ${nestedChild?.display_name}`);  
                           }
-                          updatedExstingField[row?.uid] = {
+                          updatedExstingField[row?.backupFieldUid] = {
                             label: `${schema?.display_name} > ${childSchema?.display_name} > ${nestedSchema?.display_name} > ${nestedChild?.display_name}`,
                             value: nestedChild
                           }
@@ -1130,37 +1130,36 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
     );
   };
 
-  const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string, contentstackFieldUid: string) => {
+  const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string, contentstackFieldUid: string, backupFieldUid: string) => {
     setIsDropDownChanged(true);
-    const previousSelectedValue = existingField[rowIndex]?.label;
+    const previousSelectedValue = existingField[backupFieldUid]?.label;
     const groupArray = nestedList?.filter(item => 
       item?.child?.some(e => e?.id)
     )
     
     if(groupArray?.[0]?.child && previousSelectedValue !== selectedValue?.label && groupArray?.[0]?.uid === rowIndex){
        for(const item of groupArray?.[0]?.child ?? []){
-        deletedExstingField[item?.uid] = {
+        deletedExstingField[item?.backupFieldUid] = {
           label:item?.uid,
-          value:existingField[item?.uid]
+          value:existingField[item?.backupFieldUid]
 
         }
         setIsFieldDeleted(true);
-        const index = selectedOptions?.indexOf(existingField[item?.uid]?.value?.label);
+        const index = selectedOptions?.indexOf(existingField[item?.backupFieldUid]?.value?.label);
         
         if(index > -1){
           selectedOptions?.splice(index,1 );
         }
-        delete existingField[item?.uid]    
+        delete existingField[item?.backupFieldUid]    
         
        }
     }
     else {
       setIsFieldDeleted(false);
     }
-    console.info("row index ---> ", rowIndex)
     setExistingField((prevOptions: ExistingFieldType) => ({
       ...prevOptions,
-      [rowIndex]: { label: selectedValue?.label, value: selectedValue?.value }
+      [backupFieldUid]: { label: selectedValue?.label, value: selectedValue?.value }
     }));
 
     //add selected option to array if it is not mapped to any other field
@@ -1177,7 +1176,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
   
 
     const updatedRows: FieldMapType[] = tableData.map((row) => {
-      if (row?.uid === rowIndex && row?.contentstackFieldUid === contentstackFieldUid) {
+      if (row?.uid === rowIndex && row?.contentstackFieldUid === backupFieldUid) {
         return {
           ...row,
           contentstackField: selectedValue?.label,
@@ -1247,9 +1246,9 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
       case 'text':
         return (
           (value?.uid  !== 'title' && 
-          data?.uid !== 'title') &&
+          data?.backupFieldUid !== 'title') &&
           (value?.uid !== 'url' && 
-          data?.uid !== 'url') &&
+          data?.backupFieldUid !== 'url') &&
           !fieldTypes.has(value?.data_type ?? '') &&
           !value?.field_metadata?.multiline &&
           !value?.enum &&
@@ -1311,11 +1310,11 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
     if (value?.data_type === 'group') {
 
       // Check and process the group itself
-      if (data?.otherCmsType === 'Group' && checkConditions('Group', value, data)) {
+      if (data?.backupFieldType === 'group' && checkConditions('Group', value, data)) {
         OptionsForRow.push(getMatchingOption(value, true, updatedDisplayName, uid ?? ''));
       }
 
-      const existingLabel = existingField[groupArray?.[0]?.uid]?.label ?? '';
+      const existingLabel = existingField[groupArray?.[0]?.backupFieldUid]?.label ?? '';
       const lastLabelSegment = existingLabel.includes('>')
         ? existingLabel?.split('>')?.pop()?.trim()
         : existingLabel;
@@ -1326,7 +1325,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
           for (const item of array) {
             const fieldTypeToMatch = Fields[item?.backupFieldType as keyof Mapping]?.type;
             if (item?.id === data?.id) {
-              for (const key of existingField[groupArray?.[0]?.uid]?.value?.schema || []) {
+              for (const key of existingField[groupArray?.[0]?.backupFieldUid]?.value?.schema || []) {
                  
                 if (checkConditions(fieldTypeToMatch, key, item)) {                            
                   OptionsForRow.push(getMatchingOption(key, true, `${updatedDisplayName} > ${key?.display_name}` || '', `${uid}.${key?.uid}`));
@@ -1425,7 +1424,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
       const fieldTypeToMatch = Fields[data?.backupFieldType as keyof Mapping]?.type;
       //check if UID of souce field is matching to exsting content type field UID
       for (const value of contentTypeSchema) {
-        if (data?.uid === value?.uid && data?.contentstackFieldType === value?.data_type) {
+        if (data?.uid === value?.uid && data?.backupFieldType === value?.data_type) {
           OptionsForRow.push({ label: value?.display_name, value, isDisabled: false });
           break;
         }
@@ -1460,7 +1459,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
       ))
       {
         updatedRows = updatedRows.map((row: FieldMapType) => {
-          if (row?.uid === data?.uid) {
+          if (row?.uid === data?.uid && row?.backupFieldType === data?.backupFieldType) {
             return {
               ...row,
               contentstackField: OptionsForRow?.[0]?.value?.display_name ?? '',
@@ -1478,7 +1477,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
         });        
 
         // Disable option if it's not already in existingField
-        if (!existingField[data?.uid] && OptionsForRow?.[0]) {         
+        if (!existingField[data?.backupFieldUid] && OptionsForRow?.[0]) {         
           OptionsForRow[0].isDisabled = true;
         }
         const newLabel = OptionsForRow?.[0]?.value?.display_name;
@@ -1496,7 +1495,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
             ...updatedExstingField,
             [data?.uid]: { label: newLabel, value: newvalue }
           };
-          existingField[data?.uid] = { label: newLabel, value: newvalue }
+          existingField[data?.backupFieldUid] = { label: newLabel, value: newvalue }
         }
 
         const newValue: string = OptionsForRow?.[0]?.value?.display_name;
@@ -1527,7 +1526,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
 
     
     const OptionValue: FieldTypes =
-      OptionsForRow?.length === 1 && (existingField[data?.uid] ||  updatedExstingField[data?.uid] ) &&
+      OptionsForRow?.length === 1 && (existingField[data?.backupFieldUid] ||  updatedExstingField[data?.backupFieldUid] ) &&
       (OptionsForRow?.[0]?.value?.uid === 'url' || OptionsForRow?.[0]?.value?.uid === 'title' || OptionsForRow?.[0]?.value?.data_type === 'group' || OptionsForRow?.[0]?.value?.data_type === 'reference' 
         
       )
@@ -1537,7 +1536,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
           isDisabled: true
         }
         : (OptionsForRow?.length === 0 || (OptionsForRow?.length > 0 && OptionsForRow?.every((item)=>item?.isDisabled) 
-          && (!existingField[data?.uid]?.label || ! updatedExstingField[data?.uid]?.label ) ))
+          && (!existingField[data?.backupFieldUid]?.label || ! updatedExstingField[data?.backupFieldUid]?.label ) ))
           ? {
             label: Fields[data?.contentstackFieldType]?.label ?? 'No Option',
             value: Fields[data?.contentstackFieldType]?.label ?? 'No Option',
@@ -1567,18 +1566,18 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
       <div className="table-row">
         <div className="select">
           <Select
-            value={(OptionsForRow?.length === 0 || existingField?.[data?.uid]?.label === undefined) ? OptionValue : existingField[data?.uid]}
+            value={(OptionsForRow?.length === 0 || existingField?.[data?.backupFieldUid]?.label === undefined) ? OptionValue : existingField[data?.backupFieldUid]}
             onChange={(selectedOption: FieldTypes) => {
               if (OptionsForRow?.length === 0) {
-                handleValueChange(selectedOption, data?.uid, data?.contentstackFieldUid)
+                handleValueChange(selectedOption, data?.uid, data?.backupFieldUid)
               } else {
-                handleFieldChange(selectedOption, data?.uid, data?.contentstackFieldUid)
+                handleFieldChange(selectedOption, data?.uid, data?.contentstackFieldUid, data?.backupFieldUid)
               }
             }}
             placeholder="Select Field"
             version={'v2'}
             maxWidth="290px"
-            isClearable={selectedOptions?.includes?.(existingField?.[data?.uid]?.label ?? '')}
+            isClearable={selectedOptions?.includes?.(existingField?.[data?.backupFieldUid]?.label ?? '')}
             options={adjustedOptions}
             isDisabled={OptionValue?.isDisabled || newMigrationData?.project_current_step > 4}
             menuPlacement="auto"
@@ -1600,7 +1599,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
             >
               <Button
                 buttonType="light"
-                disabled={(contentTypeSchema && existingField[data?.uid]) || newMigrationData?.project_current_step > 4}
+                disabled={(contentTypeSchema && existingField[data?.backupFieldUid]) || newMigrationData?.project_current_step > 4}
               >
                 <Icon
                   version={'v2'}

From 24a34ed373dc0b5a5da683c4a50e2cdecfcebb59 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Wed, 28 May 2025 15:43:12 +0530
Subject: [PATCH 07/13] fix:resolved language mapper bugs and added custom
 starting message for migration

---
 api/src/services/migration.service.ts         |  14 +-
 api/src/utils/content-type-creator.utils.ts   |  13 ++
 ui/src/components/ContentMapper/index.tsx     |   1 +
 .../Actions/LoadLanguageMapper.tsx            | 132 +++++++++++-------
 .../DestinationStack/Actions/LoadStacks.tsx   |   7 +-
 ui/src/components/DestinationStack/index.tsx  |  11 ++
 ui/src/pages/Migration/index.tsx              |  10 +-
 7 files changed, 132 insertions(+), 56 deletions(-)

diff --git a/api/src/services/migration.service.ts b/api/src/services/migration.service.ts
index 88b5be057..4b15e4b85 100644
--- a/api/src/services/migration.service.ts
+++ b/api/src/services/migration.service.ts
@@ -522,7 +522,7 @@ const startMigration = async (req: Request): Promise<any> => {
     .findIndex({ id: projectId })
     .value();
   if (index > -1) {
-    ProjectModelLowdb.update((data: any) => {
+    await ProjectModelLowdb.update((data: any) => {
       data.projects[index].isMigrationStarted = true;
     });
   }
@@ -538,6 +538,18 @@ const startMigration = async (req: Request): Promise<any> => {
       projectId,
       `${project?.destination_stack_id}.log`
     );
+    const message = getLogMessage(
+      'start Migration',
+      'Starting Migration...',
+      {}
+    );
+    await customLogger(
+      projectId,
+      project?.destination_stack_id,
+      'info',
+      message
+    );
+
     await setLogFilePath(loggerPath);
 
     const copyLogsToStack = async (
diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index 47d777df2..8549e2c7f 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -713,6 +713,19 @@ const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {
     }
      
   }
+
+  for (const field1 of schema1) {
+    const isMatched = schema2.some(
+      (field2) =>
+        field1.uid === field2.uid &&
+        field1.data_type === field2.data_type
+    );
+
+    if (!isMatched) {
+      result.push(field1);
+    }
+  }
+
   return result;
 }
 
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index e53a740b1..e0ae9a7fd 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -982,6 +982,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
     });  
 
     setRowIds(selectedObj);
+    setTableData(updatedTableData);
     setSelectedEntries(updatedTableData);
   };
 
diff --git a/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx b/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
index feea23612..bcd821761 100644
--- a/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
+++ b/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
@@ -13,7 +13,7 @@ import TableHeader from './tableHeader'
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '../../../store';
 import { updateNewMigrationData } from '../../../store/slice/migrationDataSlice';
-import { IDropDown, INewMigration } from '../../../context/app/app.interface';
+import { DEFAULT_DROPDOWN, IDropDown, INewMigration } from '../../../context/app/app.interface';
 
 export type ExistingFieldType = {
   [key: string]: { label: string; value: string };
@@ -30,22 +30,24 @@ export type ExistingFieldType = {
  */
 const Mapper = ({
   key,
-  stack,
+  uid,
   cmsLocaleOptions,
   handleLangugeDelete,
   options,
   sourceOptions,
   isDisabled,
-  localeChanged,
+  isStackChanged,
+  stack,
 }: {
+  key: string;
+  uid:string;
   cmsLocaleOptions: Array<{ label: string; value: string }>;
   handleLangugeDelete: (index: number, locale: { label: string; value: string }) => void;
   options: Array<{ label: string; value: string }>;
   sourceOptions: Array<{ label: string; value: string }>;
   isDisabled: boolean;
-  localeChanged: boolean,
-  stack: IDropDown,
-  key: string,
+  isStackChanged: boolean;
+  stack: IDropDown
 }) => {
   const [selectedMappings, setSelectedMappings] = useState<{ [key: string]: string }>({});
   const [existingField, setExistingField] = useState<ExistingFieldType>({});
@@ -55,12 +57,12 @@ const Mapper = ({
   const [csOptions, setcsOptions] = useState(options);
   const [sourceoptions, setsourceoptions] = useState(sourceOptions);
   const newMigrationData = useSelector((state: RootState) => state?.migration?.newMigrationData);
-  const [selectedStack,setSelectedStack] = useState<IDropDown>();
   const dispatch = useDispatch();
+  const [selectedStack, setSelectedStack] = useState<IDropDown>();
   const [placeholder] = useState<string>('Select language');
 
   useEffect(()=>{
-    setSelectedStack(stack)
+    setSelectedStack(stack);
   },[]);
 
   useEffect(() => {
@@ -107,26 +109,31 @@ const Mapper = ({
     const updatedExistingLocale = {...existingLocale};
     let updatedSelectedMappings = { ...selectedMappings };
 
-    const validLabels = cmsLocaleOptions?.map((item)=> item?.label);
+    // const validLabels = cmsLocaleOptions?.map((item)=> item?.label);
 
     const existingMasterKey = Object?.keys(selectedMappings || {})?.find((key) =>
       key?.includes('-master_locale')
     );
 
-    const recentMsterLocale = cmsLocaleOptions?.find((item)=>{item?.value === 'master_locale'})
+    const recentMsterLocale = cmsLocaleOptions?.find((item) => item?.value === 'master_locale')?.label;
 
     Object.keys(updatedExistingField || {})?.forEach((key) => {
-      if (!validLabels?.includes(updatedExistingField?.[key]?.label) || existingMasterKey !== `${recentMsterLocale}-master_locale`) {
-        delete updatedExistingField?.[key];
+      if ((existingMasterKey !== `${recentMsterLocale}-master_locale`) || isStackChanged) {
+        delete updatedExistingField[key];
       }
     });
 
     Object.keys(updatedExistingLocale || {})?.forEach((key) => {
-      
-      if ((!validLabels?.includes(updatedExistingLocale?.[key]?.label) && Object?.entries(updatedExistingField)?.length === 0) || existingMasterKey !== `${recentMsterLocale}-master_locale`) {
-        delete updatedExistingLocale?.[key];
+      if ((existingMasterKey !== `${recentMsterLocale}-master_locale`) || isStackChanged) {
+        delete updatedExistingLocale[key];
       }
     });
+    if ( (existingMasterKey !== `${recentMsterLocale}-master_locale`) || isStackChanged) {
+      setselectedCsOption([]);
+      setselectedSourceOption([]);
+    }
+
+    setexistingLocale(updatedExistingLocale);
 
     cmsLocaleOptions?.map((locale, index)=>{
       if(locale?.value === 'master_locale'){
@@ -138,20 +145,22 @@ const Mapper = ({
         }
 
   
-        if ( existingMasterKey !== `${locale?.label}-master_locale`) {
+        if ( (existingMasterKey !== `${locale?.label}-master_locale`) || isStackChanged) {
           setselectedCsOption([]);
           setselectedSourceOption([]);
+          setexistingLocale({});
+          setExistingField({});
+
           updatedSelectedMappings = {
             [`${locale?.label}-master_locale`]: '',
           };
+          setSelectedMappings(updatedSelectedMappings);
           
         }
       }        
     })
-
+  
     setExistingField(updatedExistingField);
-    setexistingLocale(updatedExistingLocale);
-    setSelectedMappings(updatedSelectedMappings);
   
    
    }, [cmsLocaleOptions]);
@@ -165,6 +174,7 @@ const Mapper = ({
   ) => {
     const selectedLocaleKey = selectedValue?.value;
 
+    let existingLabel = existingField[index];
     if (!selectedValue?.label) {
       setselectedCsOption((prevSelected) =>
         prevSelected?.filter((item) => item !== existingField?.[index]?.label)
@@ -173,9 +183,10 @@ const Mapper = ({
   
 
     setExistingField((prevOptions: ExistingFieldType) => {
+      existingLabel = prevOptions[index];
       const updatedOptions = {
         ...prevOptions,
-        [index]: { label: selectedValue?.label || null, value: selectedValue?.label }
+        [index]: selectedValue?.label ? { label: selectedValue?.label || null, value: selectedValue?.label } : null
       };
       //   setselectedOption((prevSelected) =>
       //     prevSelected.filter((item) =>
@@ -199,9 +210,10 @@ const Mapper = ({
     setSelectedMappings((prev) => {
       const updatedMappings = { ...prev };
 
-
       if (!selectedValue) {
-        delete updatedMappings[existingField[index]?.value];
+        //const valueToKeep = updatedMappings[existingLabel?.value];
+        delete updatedMappings[existingLabel?.value];
+        //updatedMappings[""] = valueToKeep;
       }
       else if (type === 'csLocale' && selectedLocaleKey) {
         updatedMappings[selectedLocaleKey] = existingLocale[index]?.label
@@ -215,8 +227,6 @@ const Mapper = ({
   const handleSelectedSourceLocale = (
     selectedValue: { label: string; value: string },
     index: number,
-    type: 'csLocale' | 'sourceLocale',
-    label: any
   ) => {
     const csLocaleKey = existingField?.[index]?.value;
 
@@ -230,9 +240,8 @@ const Mapper = ({
     setexistingLocale((prevOptions: ExistingFieldType) => {
       const updatedOptions: ExistingFieldType = {
         ...prevOptions,
-        [index]: { label: selectedValue?.label || null, value: selectedValue?.label }
+        [index]: selectedValue?.label ? { label: selectedValue?.label, value: selectedValue?.label } : null
       };
-
       // Ensure selectedOption only contains values that exist in updatedOptions
       setselectedSourceOption((prevSelected) =>
         prevSelected?.filter((item) =>
@@ -260,24 +269,35 @@ const Mapper = ({
         [csLocaleKey]: selectedValue?.label || ''
       }));
   };
-  const handleLanguageDeletaion = (index: number, locale: { label: string; value: string }) => {
+  const handleLanguageDeletaion = async (index: number, locale: { label: string; value: string }) => {
     // Remove item at index from existingField
-    let csLocale = '';
+    const csLocale = existingField?.[index]?.label ?? '';
+    const sourceLocale = existingLocale?.[index]?.label ?? '';
 
     setExistingField(
       (prevOptions: Record<number, { label: string; value: string }> | undefined) => {
-        if (!prevOptions) return {}; // Ensure it's an object
+        //if (!prevOptions) return {}; // Ensure it's an object
 
         const updatedOptions = { ...prevOptions }; // Create a shallow copy
-        csLocale = updatedOptions[index]?.label;
+        //csLocale = updatedOptions[index]?.label;
+
         setselectedCsOption((prevSelected) => {
           const newSelectedOptions: string[] = prevSelected?.filter(
             (item) => item !== csLocale // Remove the item equal to csLocale
           );
           return newSelectedOptions;
         });
-        
-        delete updatedOptions[index]; // Remove the key
+     
+        Object.entries(updatedOptions).forEach(([key, value]) => {
+          const numKey = Number(key);
+          if (numKey < index) {
+            updatedOptions[numKey] = value;
+          } else if (numKey > index) {
+            updatedOptions[numKey - 1] = value; // Shift down by 1
+            delete updatedOptions[numKey]
+          }
+        });
+         // Remove the key
 
         return updatedOptions;
       }
@@ -287,10 +307,11 @@ const Mapper = ({
     setexistingLocale((prevLocales: ExistingFieldType) => {
       if (!prevLocales) return {};
       const updatedOptions = { ...prevLocales }; // Create a shallow copy;
-      const locale = updatedOptions[index]?.label
+
+      //sourceLocale = updatedOptions[index]?.label;
       setselectedSourceOption((prevSelected) => {
         const newSelectedOptions: string[] = prevSelected?.filter(
-          (item) => item !== locale // Remove the item equal to locale
+          (item) => item !== sourceLocale // Remove the item equal to locale
         );
         return newSelectedOptions;
       });
@@ -300,14 +321,24 @@ const Mapper = ({
 
     setSelectedMappings((prev) => {
       const updatedMappings = { ...prev };
-
-      delete updatedMappings[csLocale];
-
+      if(!csLocale){
+        Object.entries(updatedMappings).forEach(([key, value]) => {
+          if (value === sourceLocale) {
+            delete updatedMappings[key];
+          }
+        });
+      }else{
+        delete updatedMappings[csLocale];
+      }
       return updatedMappings;
     });
 
     handleLangugeDelete(index, locale);
   };
+
+  useEffect(()=>{
+    console.info("existing locale --> ", existingLocale)
+  },[existingLocale])
   return (
     <>
       {cmsLocaleOptions?.length > 0  ? (
@@ -392,7 +423,7 @@ const Mapper = ({
                     : existingLocale[locale?.label]
                 }
                 onChange={(data: { label: string; value: string }) =>
-                  handleSelectedSourceLocale(data, index, 'sourceLocale', locale)
+                  handleSelectedSourceLocale(data, index)
                 }
                 styles={{
                   menuPortal: (base: any) => ({ ...base, zIndex: 9999 })
@@ -446,14 +477,13 @@ const Mapper = ({
   );
 };
 
-const LanguageMapper = ({stack, uid } :{ stack : IDropDown, uid: string}) => {
-  
+const LanguageMapper = ({stack, uid} :{ stack : IDropDown | null, uid : string}) => {
+
   const newMigrationData = useSelector((state: RootState) => state?.migration?.newMigrationData);
   const [options, setoptions] = useState<{ label: string; value: string }[]>([]);
   const [cmsLocaleOptions, setcmsLocaleOptions] = useState<{ label: string; value: string }[]>([]);
   const [sourceLocales, setsourceLocales] = useState<{ label: string; value: string }[]>([]);
   const [isLoading, setisLoading] = useState<boolean>(false);
-  const [localeChanged, setlocaleChanged] = useState<boolean>(false);
   const [currentStack, setCurrentStack] = useState<IDropDown>();
   const [previousStack, setPreviousStack] = useState<IDropDown>();
   const [isStackChanged, setisStackChanged] = useState<boolean>(false);
@@ -461,12 +491,15 @@ const LanguageMapper = ({stack, uid } :{ stack : IDropDown, uid: string}) => {
   const prevStackRef:any = useRef(null);
 
   useEffect(() => {
-    if (prevStackRef.current && stack?.uid !== prevStackRef.current?.uid) {
+    console.info("-----> ", prevStackRef?.current , stack?.uid , prevStackRef?.current)
+    if (prevStackRef?.current && stack && stack?.uid !== prevStackRef?.current?.uid) {
       setisStackChanged(true);
       setCurrentStack(stack);
       setPreviousStack(prevStackRef?.current);
     }
+    
     prevStackRef.current = stack;
+    console.info("after setting ", prevStackRef.current)
   }, [stack]);
 
   useEffect(() => {
@@ -491,15 +524,14 @@ const LanguageMapper = ({stack, uid } :{ stack : IDropDown, uid: string}) => {
         currentStack?.uid !== previousStack?.uid || isStackChanged) &&
         newMigrationData?.project_current_step <= 2)
         {
-         setcmsLocaleOptions((prevList: { label: string; value: string }[]) => {
-          const newLabel = stack?.master_locale;
+         setcmsLocaleOptions((prevList: { label: string ; value: string }[]) => {
+          const newLabel = stack?.master_locale ?? '';
     
             const isPresent = prevList?.filter(
               (item: { label: string; value: string }) => (item?.value === 'master_locale')
             );
             if(isPresent?.[0]?.label !== newLabel || currentStack?.uid !== previousStack?.uid || isStackChanged){
-              setisStackChanged(false);
-              setlocaleChanged(true);
+              //setisStackChanged(false);
               return [
                 ...prevList?.filter(item => (item?.value !== 'master_locale' && item?.value !== '')) ?? [],
                 {
@@ -557,7 +589,6 @@ const LanguageMapper = ({stack, uid } :{ stack : IDropDown, uid: string}) => {
   //     return await getStackLocales(newMigrationData?.destination_stack?.selectedOrg?.value);
   //   };
   const addRowComp = () => {
-    setlocaleChanged(false);
     setcmsLocaleOptions((prevList: { label: string; value: string }[]) => [
       ...prevList, // Keep existing elements
       {
@@ -588,14 +619,15 @@ const LanguageMapper = ({stack, uid } :{ stack : IDropDown, uid: string}) => {
             }
             rowComponent={
               <Mapper
-                key={stack?.value}
-                stack={stack}
-                localeChanged={localeChanged}
+                key={stack?.value ?? ''}
+                uid={stack?.value ?? ''}
                 options={options}
                 cmsLocaleOptions={cmsLocaleOptions}
                 handleLangugeDelete={handleDeleteLocale}
                 sourceOptions={sourceLocales}
                 isDisabled={newMigrationData?.project_current_step > 2}
+                isStackChanged={isStackChanged}
+                stack={stack ?? DEFAULT_DROPDOWN}
               />
             }
             type="Secondary"
diff --git a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
index 9e3b13490..a62fafef8 100644
--- a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
+++ b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
@@ -15,7 +15,7 @@ import { RootState } from '../../../store';
 import { updateNewMigrationData } from '../../../store/slice/migrationDataSlice';
 
 // Interface
-import { DEFAULT_DROPDOWN, IDropDown, INewMigration } from '../../../context/app/app.interface';
+import { IDropDown, INewMigration } from '../../../context/app/app.interface';
 import { StackResponse } from '../../../services/api/service.interface';
 import { Stack } from '../../../components/Common/AddStack/addStack.interface';
 
@@ -176,7 +176,8 @@ const LoadStacks = (props: LoadFileFormatProps) => {
         ...newMigrationData,
         destination_stack: {
           ...newMigrationData?.destination_stack,
-          selectedStack: { ...data }
+          selectedStack: { ...data },
+          localeMapping: data?.value ? newMigrationData?.destination_stack?.localeMapping : {}
         }
       };
 
@@ -374,7 +375,7 @@ const LoadStacks = (props: LoadFileFormatProps) => {
           </div>
           <LanguageMapper
           uid={selectedStack?.uid ?? ''}
-          stack={selectedStack ?? DEFAULT_DROPDOWN} />
+          stack={selectedStack} />
         </div>
       )}
     </div>
diff --git a/ui/src/components/DestinationStack/index.tsx b/ui/src/components/DestinationStack/index.tsx
index dec93e4a9..1975da6aa 100644
--- a/ui/src/components/DestinationStack/index.tsx
+++ b/ui/src/components/DestinationStack/index.tsx
@@ -14,6 +14,7 @@ import { getCMSDataFromFile } from '../../cmsData/cmsSelector';
 import { RootState } from '../../store';
 import { updateMigrationData } from '../../store/slice/migrationDataSlice';
 import { AutoVerticalStepperRef } from '../LegacyCms';
+import { isEmptyString } from '../../utilities/functions';
 
 type DestinationStackComponentProps = {
   isCompleted: boolean;
@@ -99,6 +100,16 @@ const DestinationStackComponent = ({
     setisProjectMapped(newMigrationData?.isprojectMapped);
   },[newMigrationData?.isprojectMapped]);
 
+    useEffect(()=>{
+     if(! isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value ) 
+       ){
+        handleAllStepsComplete(true);
+      }
+      else{
+        handleAllStepsComplete(false);
+      }
+    },[newMigrationData])
+
   return (
     <>
       {isLoading || isProjectMapped ? (
diff --git a/ui/src/pages/Migration/index.tsx b/ui/src/pages/Migration/index.tsx
index c8e11681f..44d262f0b 100644
--- a/ui/src/pages/Migration/index.tsx
+++ b/ui/src/pages/Migration/index.tsx
@@ -533,8 +533,14 @@ const Migration = () => {
 
     const hasNonEmptyMapping =
       newMigrationData?.destination_stack?.localeMapping &&
-      Object.values(newMigrationData?.destination_stack?.localeMapping)?.every(
-        (value) => value !== '' && value !== null && value !== undefined
+      Object.entries(newMigrationData?.destination_stack?.localeMapping || {})?.every(
+        ([key, value]: [string, any]) =>
+          key !== '' &&
+          key !== null &&
+          key !== undefined &&
+          value !== '' &&
+          value !== null &&
+          value !== undefined
       );
 
     const master_locale: LocalesType = {};

From 43f1c94fad875ba487c5f3e1b4d8c93c0ceb0a58 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Fri, 30 May 2025 15:27:38 +0530
Subject: [PATCH 08/13] refactor:resolved talisman errors

---
 .../Actions/LoadLanguageMapper.tsx            | 84 +++++++++----------
 .../DestinationStack/Actions/LoadStacks.tsx   |  7 +-
 ui/src/context/app/app.interface.ts           |  2 +-
 ui/src/pages/Migration/index.tsx              |  6 +-
 4 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx b/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
index bcd821761..fa6249610 100644
--- a/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
+++ b/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
@@ -111,24 +111,25 @@ const Mapper = ({
 
     // const validLabels = cmsLocaleOptions?.map((item)=> item?.label);
 
-    const existingMasterKey = Object?.keys(selectedMappings || {})?.find((key) =>
+    const existingMasterID = Object?.keys(selectedMappings || {})?.find((key) =>
       key?.includes('-master_locale')
     );
 
     const recentMsterLocale = cmsLocaleOptions?.find((item) => item?.value === 'master_locale')?.label;
+    const presentLocale = `${recentMsterLocale}-master_locale`;
 
     Object.keys(updatedExistingField || {})?.forEach((key) => {
-      if ((existingMasterKey !== `${recentMsterLocale}-master_locale`) || isStackChanged) {
+      if ((existingMasterID !== presentLocale) || isStackChanged) {
         delete updatedExistingField[key];
       }
     });
 
     Object.keys(updatedExistingLocale || {})?.forEach((key) => {
-      if ((existingMasterKey !== `${recentMsterLocale}-master_locale`) || isStackChanged) {
+      if ((existingMasterID !== presentLocale) || isStackChanged) {
         delete updatedExistingLocale[key];
       }
     });
-    if ( (existingMasterKey !== `${recentMsterLocale}-master_locale`) || isStackChanged) {
+    if ( (existingMasterID !== presentLocale) || isStackChanged) {
       setselectedCsOption([]);
       setselectedSourceOption([]);
     }
@@ -136,6 +137,10 @@ const Mapper = ({
     setexistingLocale(updatedExistingLocale);
 
     cmsLocaleOptions?.map((locale, index)=>{
+      const existingLabel = existingMasterID;
+      const expectedLabel = `${locale?.label}-master_locale`;
+
+      const isLabelMismatch = existingLabel && existingLabel.localeCompare(expectedLabel) !== 0;
       if(locale?.value === 'master_locale'){
         if (!updatedExistingField?.[index]) {
           updatedExistingField[index] = {
@@ -145,7 +150,7 @@ const Mapper = ({
         }
 
   
-        if ( (existingMasterKey !== `${locale?.label}-master_locale`) || isStackChanged) {
+        if (isLabelMismatch || isStackChanged) {
           setselectedCsOption([]);
           setselectedSourceOption([]);
           setexistingLocale({});
@@ -274,34 +279,25 @@ const Mapper = ({
     const csLocale = existingField?.[index]?.label ?? '';
     const sourceLocale = existingLocale?.[index]?.label ?? '';
 
-    setExistingField(
-      (prevOptions: Record<number, { label: string; value: string }> | undefined) => {
-        //if (!prevOptions) return {}; // Ensure it's an object
-
-        const updatedOptions = { ...prevOptions }; // Create a shallow copy
-        //csLocale = updatedOptions[index]?.label;
-
-        setselectedCsOption((prevSelected) => {
-          const newSelectedOptions: string[] = prevSelected?.filter(
-            (item) => item !== csLocale // Remove the item equal to csLocale
-          );
-          return newSelectedOptions;
-        });
-     
-        Object.entries(updatedOptions).forEach(([key, value]) => {
-          const numKey = Number(key);
-          if (numKey < index) {
-            updatedOptions[numKey] = value;
-          } else if (numKey > index) {
-            updatedOptions[numKey - 1] = value; // Shift down by 1
-            delete updatedOptions[numKey]
-          }
-        });
-         // Remove the key
-
-        return updatedOptions;
+    setExistingField((prevOptions) => {
+      const updatedOptions: Record<number, { label: string; value: string }> = {};
+      const prev = prevOptions ?? {};
+  
+      setselectedCsOption((prevSelected) =>
+        prevSelected?.filter((item) => item !== csLocale)
+      );
+  
+      for (let i = 0; i < Object?.keys(prev)?.length; i++) {
+        if (i < index) {
+          updatedOptions[i] = prev?.[i];
+        } else if (i > index) {
+          updatedOptions[i - 1] = prev?.[i];
+        }
       }
-    );
+  
+      return updatedOptions;
+    });
+  
 
     // Remove item at index from existingLocale
     setexistingLocale((prevLocales: ExistingFieldType) => {
@@ -322,11 +318,14 @@ const Mapper = ({
     setSelectedMappings((prev) => {
       const updatedMappings = { ...prev };
       if(!csLocale){
-        Object.entries(updatedMappings).forEach(([key, value]) => {
-          if (value === sourceLocale) {
-            delete updatedMappings[key];
+        for (const key in updatedMappings) {
+          if (Object?.prototype?.hasOwnProperty?.call(updatedMappings, key)) {
+            const value = updatedMappings?.[key];
+            if (value === sourceLocale) {
+              delete updatedMappings?.[key];
+            }
           }
-        });
+        }
       }else{
         delete updatedMappings[csLocale];
       }
@@ -336,9 +335,6 @@ const Mapper = ({
     handleLangugeDelete(index, locale);
   };
 
-  useEffect(()=>{
-    console.info("existing locale --> ", existingLocale)
-  },[existingLocale])
   return (
     <>
       {cmsLocaleOptions?.length > 0  ? (
@@ -477,7 +473,7 @@ const Mapper = ({
   );
 };
 
-const LanguageMapper = ({stack, uid} :{ stack : IDropDown | null, uid : string}) => {
+const LanguageMapper = ({stack, uid} :{ stack : IDropDown, uid : string}) => {
 
   const newMigrationData = useSelector((state: RootState) => state?.migration?.newMigrationData);
   const [options, setoptions] = useState<{ label: string; value: string }[]>([]);
@@ -487,11 +483,11 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown | null, uid : string})
   const [currentStack, setCurrentStack] = useState<IDropDown>();
   const [previousStack, setPreviousStack] = useState<IDropDown>();
   const [isStackChanged, setisStackChanged] = useState<boolean>(false);
+  const [stackValue, setStackValue] = useState<string>(stack?.value)
 
   const prevStackRef:any = useRef(null);
 
   useEffect(() => {
-    console.info("-----> ", prevStackRef?.current , stack?.uid , prevStackRef?.current)
     if (prevStackRef?.current && stack && stack?.uid !== prevStackRef?.current?.uid) {
       setisStackChanged(true);
       setCurrentStack(stack);
@@ -499,7 +495,6 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown | null, uid : string})
     }
     
     prevStackRef.current = stack;
-    console.info("after setting ", prevStackRef.current)
   }, [stack]);
 
   useEffect(() => {
@@ -605,7 +600,6 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown | null, uid : string})
       );
     });
   };
-
   return (
     <div>
       {isLoading ? (
@@ -619,8 +613,8 @@ const LanguageMapper = ({stack, uid} :{ stack : IDropDown | null, uid : string})
             }
             rowComponent={
               <Mapper
-                key={stack?.value ?? ''}
-                uid={stack?.value ?? ''}
+                key={uid}
+                uid={stack?.value}
                 options={options}
                 cmsLocaleOptions={cmsLocaleOptions}
                 handleLangugeDelete={handleDeleteLocale}
diff --git a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
index a62fafef8..9e3b13490 100644
--- a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
+++ b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
@@ -15,7 +15,7 @@ import { RootState } from '../../../store';
 import { updateNewMigrationData } from '../../../store/slice/migrationDataSlice';
 
 // Interface
-import { IDropDown, INewMigration } from '../../../context/app/app.interface';
+import { DEFAULT_DROPDOWN, IDropDown, INewMigration } from '../../../context/app/app.interface';
 import { StackResponse } from '../../../services/api/service.interface';
 import { Stack } from '../../../components/Common/AddStack/addStack.interface';
 
@@ -176,8 +176,7 @@ const LoadStacks = (props: LoadFileFormatProps) => {
         ...newMigrationData,
         destination_stack: {
           ...newMigrationData?.destination_stack,
-          selectedStack: { ...data },
-          localeMapping: data?.value ? newMigrationData?.destination_stack?.localeMapping : {}
+          selectedStack: { ...data }
         }
       };
 
@@ -375,7 +374,7 @@ const LoadStacks = (props: LoadFileFormatProps) => {
           </div>
           <LanguageMapper
           uid={selectedStack?.uid ?? ''}
-          stack={selectedStack} />
+          stack={selectedStack ?? DEFAULT_DROPDOWN} />
         </div>
       )}
     </div>
diff --git a/ui/src/context/app/app.interface.ts b/ui/src/context/app/app.interface.ts
index 148327420..7b6cd6c81 100644
--- a/ui/src/context/app/app.interface.ts
+++ b/ui/src/context/app/app.interface.ts
@@ -176,7 +176,7 @@ export interface IDestinationStack {
   stackArray: IDropDown[];
   migratedStacks: string[];
   sourceLocale: string[];
-  localeMapping: {};
+  localeMapping: Record<string, string>;
   csLocale: string[];
 }
 export interface IContentMapper {
diff --git a/ui/src/pages/Migration/index.tsx b/ui/src/pages/Migration/index.tsx
index 44d262f0b..2666f0e98 100644
--- a/ui/src/pages/Migration/index.tsx
+++ b/ui/src/pages/Migration/index.tsx
@@ -534,10 +534,8 @@ const Migration = () => {
     const hasNonEmptyMapping =
       newMigrationData?.destination_stack?.localeMapping &&
       Object.entries(newMigrationData?.destination_stack?.localeMapping || {})?.every(
-        ([key, value]: [string, any]) =>
-          key !== '' &&
-          key !== null &&
-          key !== undefined &&
+        ([label, value]: [string, string]) =>
+          Boolean(label?.trim()) &&
           value !== '' &&
           value !== null &&
           value !== undefined

From a3012ad87132e0fb39f4298ac48a152a7ef7e36b Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Fri, 30 May 2025 16:53:54 +0530
Subject: [PATCH 09/13] fix:added uid in duplicate title entry in wordpress

---
 api/src/services/wordpress.service.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/api/src/services/wordpress.service.ts b/api/src/services/wordpress.service.ts
index 72b517c6e..a72c917b3 100644
--- a/api/src/services/wordpress.service.ts
+++ b/api/src/services/wordpress.service.ts
@@ -2330,6 +2330,17 @@ async function extractPosts( packagePath: string, destinationStackId: string, pr
       // Process the current chunk
       const chunkPostData = await processChunkData(chunkData, filename, isLastChunk, contenttype);
       postdataCombined = { ...postdataCombined, ...chunkPostData };
+
+      const seenTitles = new Map();
+      Object?.entries(postdataCombined)?.forEach(([uid, item]:any) => {
+        const originalTitle = item?.title;
+      
+        if (seenTitles.has(originalTitle)) {
+          item.title = `${originalTitle} - ${item?.uid}`;
+        }
+        seenTitles.set(item?.title, true);
+      });
+
       const message = getLogMessage(
         srcFunc,
         `${filename.split(".").slice(0, -1).join(".")} has been successfully transformed.`,

From 58f3f1481dd540686ccfa1c4c29bb7c36f2e5b6f Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Fri, 30 May 2025 17:06:51 +0530
Subject: [PATCH 10/13] refactor:added optional chaining

---
 api/src/utils/content-type-creator.utils.ts | 34 ++++++++++-----------
 ui/src/components/ContentMapper/index.tsx   |  8 ++---
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index 8549e2c7f..6eb2bb9df 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -75,8 +75,8 @@ const arrangGroups = ({ schema, newStack }: any) => {
     if (item?.contentstackFieldType === 'group') {
       const groupSchema: any = { ...item, schema: [] }
       if (item?.contentstackFieldUid?.includes('.')) {
-        const parts = item.contentstackFieldUid.split('.');
-        groupSchema.contentstackFieldUid = parts[parts.length - 1];
+        const parts = item?.contentstackFieldUid?.split('.');
+        groupSchema.contentstackFieldUid = parts?.[parts?.length - 1];
       }
       schema?.forEach((et: any) => {
         if (et?.contentstackFieldUid?.includes(`${item?.contentstackFieldUid}.`) ||
@@ -668,12 +668,12 @@ const mergeArrays = (a: any[], b: any[]): any[] => {
   const result = [...a];
 
   for (const field of b) {
-    const exists = result.some(f =>
+    const exists = result?.some(f =>
       f?.uid === field?.uid &&
       f?.data_type === field?.data_type
     );
     if (!exists) {
-      result.push(field);
+      result?.push(field);
     }
   }
 
@@ -684,27 +684,27 @@ const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {
   const result: any[] = [];
 
   for (const field2 of schema2) {
-    if (field2.data_type === 'group') {
+    if (field2?.data_type === 'group') {
       const machingGroup = findGroupByUid(schema1, field2?.uid);
       if(machingGroup){
        const schema = await mergeArrays(machingGroup?.schema ?? [],field2?.schema ?? [] );
-        result.push({
+        result?.push({
           ...field2,
           schema: schema
         });
       }
       else{
-        result.push({
+        result?.push({
           ...field2,
          schema:  await mergeFields(schema1, field2?.schema)
         })
       }
     }
     else{
-      const exists = schema1.find(
+      const exists = schema1?.find(
         (fld) =>
-          fld.uid === field2.uid &&
-          fld.data_type === field2.data_type
+          fld?.uid === field2?.uid &&
+          fld?.data_type === field2?.data_type
       );
      result?.push({
       ...field2
@@ -715,14 +715,14 @@ const mergeFields = async (schema1: any[], schema2: any[]): Promise<any[]> => {
   }
 
   for (const field1 of schema1) {
-    const isMatched = schema2.some(
+    const isMatched = schema2?.some(
       (field2) =>
-        field1.uid === field2.uid &&
-        field1.data_type === field2.data_type
+        field1?.uid === field2?.uid &&
+        field1?.data_type === field2?.data_type
     );
 
     if (!isMatched) {
-      result.push(field1);
+      result?.push(field1);
     }
   }
 
@@ -736,9 +736,9 @@ const findGroupByUid = (
   excludeRef: any = null
 ): any | undefined => {
   for (const field of schema) {
-    if (field.data_type === 'group') {
-      if (field.uid === uid && field !== excludeRef) return field;
-      const nested = findGroupByUid(field.schema ?? [], uid, excludeRef);
+    if (field?.data_type === 'group') {
+      if (field?.uid === uid && field !== excludeRef) return field;
+      const nested = findGroupByUid(field?.schema ?? [], uid, excludeRef);
       if (nested) return nested;
     }
   }
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index e0ae9a7fd..f8b70f752 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -1133,7 +1133,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
 
   const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string, contentstackFieldUid: string, backupFieldUid: string) => {
     setIsDropDownChanged(true);
-    const previousSelectedValue = existingField[backupFieldUid]?.label;
+    const previousSelectedValue = existingField?.[backupFieldUid]?.label;
     const groupArray = nestedList?.filter(item => 
       item?.child?.some(e => e?.id)
     )
@@ -1142,16 +1142,16 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
        for(const item of groupArray?.[0]?.child ?? []){
         deletedExstingField[item?.backupFieldUid] = {
           label:item?.uid,
-          value:existingField[item?.backupFieldUid]
+          value:existingField?.[item?.backupFieldUid]
 
         }
         setIsFieldDeleted(true);
-        const index = selectedOptions?.indexOf(existingField[item?.backupFieldUid]?.value?.label);
+        const index = selectedOptions?.indexOf(existingField?.[item?.backupFieldUid]?.value?.label);
         
         if(index > -1){
           selectedOptions?.splice(index,1 );
         }
-        delete existingField[item?.backupFieldUid]    
+        delete existingField?.[item?.backupFieldUid]    
         
        }
     }

From 7a0b2182cfa5d905edf9abca2aea9a7fc71c6310 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Mon, 2 Jun 2025 12:57:29 +0530
Subject: [PATCH 11/13] refactor:resolved copilots error

---
 .talismanrc                                  |  3 +++
 ui/src/components/ContentMapper/index.scss   |  2 +-
 ui/src/components/ContentMapper/index.tsx    |  2 +-
 ui/src/components/DestinationStack/index.tsx | 18 +++++++++---------
 ui/src/components/Modal/index.tsx            |  1 -
 ui/src/components/Modal/modal.interface.ts   | 16 +++++++++++++++-
 ui/src/pages/Projects/index.tsx              |  6 +++---
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.talismanrc b/.talismanrc
index 0252a7bb7..1fd431471 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -10,4 +10,7 @@ ignoreconfig:
     ignore_detectors:
       - Base64Detector
 
+  - filename: ui/src/components/ContentMapper/index.tsx
+    checksum: 938aaf193e830bade84f9d8d385e55942269c3f2e7be82939994d64d76df3fa6
+    
 version: "1.0"
diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index 96a42ced4..11d01fdc3 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -311,7 +311,7 @@ div .table-row {
   font-size: $size-font-large;
   font-weight: $font-weight-semi-bold;
 }
-.filtetButton-color{
+.filterButton-color{
   color: $color-brand-primary-base;
   font-weight: $font-weight-bold;
 }
\ No newline at end of file
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index f8b70f752..dfa3e887a 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -2255,7 +2255,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                             }
                           }}
                         >
-                          {CONTENT_MAPPING_STATUS[key] && <span className={`${activeFilter ===  CONTENT_MAPPING_STATUS[key] ? 'filter-status filtetButton-color' :'filter-status' }`}>{CONTENT_MAPPING_STATUS[key]}</span> }
+                          {CONTENT_MAPPING_STATUS[key] && <span className={`${activeFilter ===  CONTENT_MAPPING_STATUS[key] ? 'filter-status filterButton-color' :'filter-status' }`}>{CONTENT_MAPPING_STATUS[key]}</span> }
                           {STATUS_ICON_Mapping[key] && <Icon size="small" icon={STATUS_ICON_Mapping[key]} className={STATUS_ICON_Mapping[key] === 'CheckedCircle' ? 'mapped-icon' : ''} />}
                         </button>
                       </li>
diff --git a/ui/src/components/DestinationStack/index.tsx b/ui/src/components/DestinationStack/index.tsx
index 1975da6aa..6e6ace5ea 100644
--- a/ui/src/components/DestinationStack/index.tsx
+++ b/ui/src/components/DestinationStack/index.tsx
@@ -100,15 +100,15 @@ const DestinationStackComponent = ({
     setisProjectMapped(newMigrationData?.isprojectMapped);
   },[newMigrationData?.isprojectMapped]);
 
-    useEffect(()=>{
-     if(! isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value ) 
-       ){
-        handleAllStepsComplete(true);
-      }
-      else{
-        handleAllStepsComplete(false);
-      }
-    },[newMigrationData])
+  useEffect(()=>{
+    if(! isEmptyString(newMigrationData?.destination_stack?.selectedStack?.value ) 
+      ){
+      handleAllStepsComplete(true);
+    }
+    else{
+      handleAllStepsComplete(false);
+    }
+  },[newMigrationData?.destination_stack?.selectedStack])
 
   return (
     <>
diff --git a/ui/src/components/Modal/index.tsx b/ui/src/components/Modal/index.tsx
index f5e135bf2..8ddba2832 100644
--- a/ui/src/components/Modal/index.tsx
+++ b/ui/src/components/Modal/index.tsx
@@ -19,7 +19,6 @@ import { ProjectModalProps, FormData } from './modal.interface';
 
 // Services
 import { useState } from 'react';
-import { createProject } from '../../services/api/project.service';
 
 const Modal = (props: ProjectModalProps) => {
   const {
diff --git a/ui/src/components/Modal/modal.interface.ts b/ui/src/components/Modal/modal.interface.ts
index 29ef23ce3..76c5a2203 100644
--- a/ui/src/components/Modal/modal.interface.ts
+++ b/ui/src/components/Modal/modal.interface.ts
@@ -9,7 +9,7 @@ export interface ProjectModalProps {
   selectedOrg: IDropDown;
   closeModal: () => void;
   isOpen: (flag: boolean) => void;
-  createProject: (values : FormData)=> void
+  createProject: (values : FormData)=> Promise<CreateProjectResponse>
 }
 export interface SettingsModalProps {
   selectedOrg: IDropDown;
@@ -23,3 +23,17 @@ export interface SettingsModalProps {
 export interface FormData {
   name?: string;
 }
+
+export interface Project {
+  name: string;
+  id: string;
+  status: string;
+  created_at: string;   
+  modified_at: string;  
+}
+
+export interface CreateProjectResponse {
+  status: "success";
+  message: string;
+  project: Project;
+}
diff --git a/ui/src/pages/Projects/index.tsx b/ui/src/pages/Projects/index.tsx
index f05ede6e2..140ca6614 100644
--- a/ui/src/pages/Projects/index.tsx
+++ b/ui/src/pages/Projects/index.tsx
@@ -27,7 +27,7 @@ import { validateObject } from '../../utilities/functions';
 
 // Interfaces
 import { ProjectsType, ProjectsObj } from './projects.interface';
-import { ModalObj } from '../../components/Modal/modal.interface';
+import { CreateProjectResponse, ModalObj, FormData } from '../../components/Modal/modal.interface';
 import { CTA } from '../Home/home.interface';
 import usePreventBackNavigation from '../../hooks/usePreventBackNavigation';
 
@@ -137,8 +137,8 @@ const Projects = () => {
   };
   useBlockNavigation(isModalOpen || true);
 
-  const createProjectCall = async(values : any) => {
-        const res:any = await createProject(selectedOrganisation?.uid || '', values);
+  const createProjectCall = async(values : FormData): Promise<CreateProjectResponse> => {
+        const res = await createProject(selectedOrganisation?.uid || '', values);
         if (res?.error) {
           return res?.error;
         }

From 06947c7155f43616a7483bb890ef12b08aa5ca5d Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Mon, 2 Jun 2025 14:28:34 +0530
Subject: [PATCH 12/13] refactor:resolved PR comments

---
 .talismanrc                                                 | 5 ++---
 api/src/services/wordpress.service.ts                       | 6 +++---
 api/src/utils/content-type-creator.utils.ts                 | 2 +-
 ui/src/components/ContentMapper/index.tsx                   | 2 +-
 .../DestinationStack/Actions/LoadLanguageMapper.tsx         | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.talismanrc b/.talismanrc
index 1fd431471..93f1f002d 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -11,6 +11,5 @@ ignoreconfig:
       - Base64Detector
 
   - filename: ui/src/components/ContentMapper/index.tsx
-    checksum: 938aaf193e830bade84f9d8d385e55942269c3f2e7be82939994d64d76df3fa6
-    
-version: "1.0"
+    checksum: 6743142fce18f945d55fc61d7d774118db400b72ccc7a0b5e089ccc8aed20340
+version: "“1.0.1-beta”"
diff --git a/api/src/services/wordpress.service.ts b/api/src/services/wordpress.service.ts
index a72c917b3..9c9a4ea2a 100644
--- a/api/src/services/wordpress.service.ts
+++ b/api/src/services/wordpress.service.ts
@@ -2332,13 +2332,13 @@ async function extractPosts( packagePath: string, destinationStackId: string, pr
       postdataCombined = { ...postdataCombined, ...chunkPostData };
 
       const seenTitles = new Map();
-      Object?.entries(postdataCombined)?.forEach(([uid, item]:any) => {
+      Object?.entries?.(postdataCombined)?.forEach?.(([uid, item]:any) => {
         const originalTitle = item?.title;
       
-        if (seenTitles.has(originalTitle)) {
+        if (seenTitles?.has(originalTitle)) {
           item.title = `${originalTitle} - ${item?.uid}`;
         }
-        seenTitles.set(item?.title, true);
+        seenTitles?.set?.(item?.title, true);
       });
 
       const message = getLogMessage(
diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index 6eb2bb9df..2233faf68 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -82,7 +82,7 @@ const arrangGroups = ({ schema, newStack }: any) => {
         if (et?.contentstackFieldUid?.includes(`${item?.contentstackFieldUid}.`) ||
           (newStack === false && et?.uid?.includes(`${item?.uid}.`))) {
             const target = groupSchema?.contentstackFieldUid;
-            const index = et?.contentstackFieldUid?.indexOf(target);
+            const index = et?.contentstackFieldUid?.indexOf?.(target);
 
             if (index > 0) {
               et.contentstackFieldUid = et?.contentstackFieldUid?.substring(index);
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index dfa3e887a..575247e04 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -2255,7 +2255,7 @@ const ContentMapper = forwardRef(({handleStepChange}: contentMapperProps, ref: R
                             }
                           }}
                         >
-                          {CONTENT_MAPPING_STATUS[key] && <span className={`${activeFilter ===  CONTENT_MAPPING_STATUS[key] ? 'filter-status filterButton-color' :'filter-status' }`}>{CONTENT_MAPPING_STATUS[key]}</span> }
+                          {CONTENT_MAPPING_STATUS[key] && <span className={`${activeFilter ===  CONTENT_MAPPING_STATUS[key] ? 'filter-status filterButton-color ' :'filter-status' }`}>{CONTENT_MAPPING_STATUS[key]}</span> }
                           {STATUS_ICON_Mapping[key] && <Icon size="small" icon={STATUS_ICON_Mapping[key]} className={STATUS_ICON_Mapping[key] === 'CheckedCircle' ? 'mapped-icon' : ''} />}
                         </button>
                       </li>
diff --git a/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx b/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
index fa6249610..4537c2aa4 100644
--- a/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
+++ b/ui/src/components/DestinationStack/Actions/LoadLanguageMapper.tsx
@@ -111,7 +111,7 @@ const Mapper = ({
 
     // const validLabels = cmsLocaleOptions?.map((item)=> item?.label);
 
-    const existingMasterID = Object?.keys(selectedMappings || {})?.find((key) =>
+    const existingMasterID = Object?.keys?.(selectedMappings || {})?.find((key) =>
       key?.includes('-master_locale')
     );
 
@@ -140,7 +140,7 @@ const Mapper = ({
       const existingLabel = existingMasterID;
       const expectedLabel = `${locale?.label}-master_locale`;
 
-      const isLabelMismatch = existingLabel && existingLabel.localeCompare(expectedLabel) !== 0;
+      const isLabelMismatch = existingLabel && existingLabel?.localeCompare(expectedLabel) !== 0;
       if(locale?.value === 'master_locale'){
         if (!updatedExistingField?.[index]) {
           updatedExistingField[index] = {
@@ -179,7 +179,7 @@ const Mapper = ({
   ) => {
     const selectedLocaleKey = selectedValue?.value;
 
-    let existingLabel = existingField[index];
+    let existingLabel = existingField?.[index];
     if (!selectedValue?.label) {
       setselectedCsOption((prevSelected) =>
         prevSelected?.filter((item) => item !== existingField?.[index]?.label)

From 5ed10b259e3ae900ee4688fad8445c8b28bb049c Mon Sep 17 00:00:00 2001
From: Sayali Joshi <sayali.joshi@contentstack.com>
Date: Mon, 2 Jun 2025 15:16:30 +0530
Subject: [PATCH 13/13] Update .talismanrc

---
 .talismanrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.talismanrc b/.talismanrc
index 93f1f002d..3b24d02c6 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -12,4 +12,4 @@ ignoreconfig:
 
   - filename: ui/src/components/ContentMapper/index.tsx
     checksum: 6743142fce18f945d55fc61d7d774118db400b72ccc7a0b5e089ccc8aed20340
-version: "“1.0.1-beta”"
+version: "1.0.1-beta"