From 5cf48d5f54e18e7acac43ab18524f8506a730c59 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Thu, 31 Jul 2025 14:57:11 +0530
Subject: [PATCH 1/2] refactor:added code from conflicts

---
 api/src/utils/content-type-creator.utils.ts   |  9 +++--
 ui/src/components/ContentMapper/index.tsx     | 37 +++++++++++++------
 .../DestinationStack/Actions/LoadStacks.tsx   |  1 +
 .../LegacyCms/Actions/LoadUploadFile.tsx      |  4 ++
 .../components/MigrationFlowHeader/index.tsx  | 13 ++++---
 ui/src/context/app/app.interface.ts           |  4 +-
 ui/src/hooks/useWarnOnrefresh.tsx             |  1 +
 ui/src/pages/Migration/index.tsx              |  9 ++++-
 .../libs/contentTypeMapper.js                 |  4 +-
 .../libs/createInitialMapper.js               |  2 +-
 10 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index e00b14c14..49e25a950 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -112,7 +112,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 +435,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
@@ -728,7 +728,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 +741,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/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 6113fea8b..4cc6d86d1 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -272,9 +272,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
   const [otherCmsUid, setOtherCmsUid] = useState<string>(contentTypes?.[0]?.otherCmsUid);
 
   const [active, setActive] = useState<number | null>(0);
-
   const [searchContentType, setSearchContentType] = useState('');
-
   const [rowIds, setRowIds] = useState<Record<string, boolean>>({});
   const [selectedEntries, setSelectedEntries] = useState<FieldMapType[]>([]);
   const [contentTypeSchema, setContentTypeSchema] = useState<ContentTypesSchema[] | undefined>([]);
@@ -365,6 +363,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
 
     if (newMigrationData?.content_mapping?.content_type_mapping?.[selectedContentType?.contentstackUid || ''] === otherContentType?.id) {
       setIsAllCheck(false);
+
       tableData?.forEach((row) => {
         contentTypeSchema?.forEach((schema) => {
 
@@ -679,6 +678,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       setItemStatusMap({ ...itemStatusMap });
 
       const validTableData = data?.fieldMapping?.filter((field: FieldMapType) => field?.otherCmsType !== undefined);
+
       setIsAllCheck(true);
       setTableData(validTableData ?? []);
       setSelectedEntries(validTableData ?? []);
@@ -726,6 +726,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       setTotalCounts([...tableData, ...validTableData ?? tableData]?.length);
       setIsLoading(false);
       setIsAllCheck(true);
+
     } catch (error) {
       console.error('loadMoreItems -> error', error);
     }
@@ -898,6 +899,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
 
   const handleSelectedEntries = (singleSelectedRowIds: string[]) => {
     const selectedObj: UidMap = {};
+
     setIsAllCheck(false);
     singleSelectedRowIds?.forEach((uid: string) => {
       const isId = selectedEntries?.some((item) => item?.id === uid);
@@ -1023,6 +1025,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
 
   const handleDropDownChange = (value: FieldTypes) => {
     (value?.id !== otherContentType?.id) && setsCsCTypeUpdated(true);
+
     setIsAllCheck(false);
     setOtherContentType(value);
   };
@@ -1437,7 +1440,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       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?.backupFieldType === value?.data_type) {
+        if (data?.uid === value?.uid && data?.backupFieldType === value?.data_type && fieldTypeToMatch) {
           OptionsForRow.push({ label: value?.display_name, value, isDisabled: false });
           break;
         }
@@ -1505,7 +1508,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       if (!hasMatchingEntry) {
         updatedExstingField = {
           ...updatedExstingField,
-          [data?.uid]: { label: newLabel, value: newvalue }
+          [data?.backupFieldUid]: { label: newLabel, value: newvalue }
         };
         existingField[data?.backupFieldUid] = { label: newLabel, value: newvalue }
       }
@@ -1579,12 +1582,13 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
           ...option,
           isDisabled: selectedOptions?.includes?.(option?.label ?? '')
         }));
-
     return (
       <div className="table-row">
         <div className="select">
           <Select
-            value={(OptionsForRow?.length === 0 || existingField?.[data?.backupFieldUid]?.label === undefined) ? OptionValue : existingField[data?.backupFieldUid]}
+            value={(OptionsForRow?.length === 0 || (data?.backupFieldType !== existingField[data?.backupFieldUid]?.value?.data_type || existingField?.[data?.backupFieldUid]?.label === undefined)) ? OptionValue : 
+              
+            existingField[data?.backupFieldUid]}
             onChange={(selectedOption: FieldTypes) => {
               if (OptionsForRow?.length === 0) {
                 handleValueChange(selectedOption, data?.uid, data?.backupFieldUid)
@@ -1595,7 +1599,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
             placeholder="Select Field"
             version={'v2'}
             maxWidth="290px"
-            isClearable={selectedOptions?.includes?.(existingField?.[data?.backupFieldUid]?.label ?? '')}
+            isClearable={data?.backupFieldType === existingField[data?.backupFieldUid]?.value?.data_type && selectedOptions?.includes?.(existingField?.[data?.backupFieldUid]?.label ?? '')}
             options={adjustedOptions}
             isDisabled={OptionValue?.isDisabled || newMigrationData?.project_current_step > 4}
             menuPlacement="auto"
@@ -1719,10 +1723,19 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
           const savedCT = filteredContentTypes?.map?.(ct =>
             ct?.id === data?.data?.updatedContentType?.id ? { ...ct, status: data?.data?.updatedContentType?.status } : ct
           );
+          let filteredCT = savedCT;
+          if (!isEmptyString(activeFilter)) {
+            filteredCT = savedCT?.filter((ct) =>
+              CONTENT_MAPPING_STATUS?.[ct?.status] === activeFilter
+            );
+          }
+          const savedContentTypes = contentTypes?.map?.(ct =>
+            ct?.id === selectedContentType?.id ? { ...ct, status: data?.data?.status } : ct
+          );
 
-          setFilteredContentTypes(savedCT);
-          setContentTypes(savedCT);
-
+          setFilteredContentTypes(filteredCT);
+          setContentTypes(savedContentTypes);
+          setCount(filteredCT?.length);
           try {
             otherContentType?.id && await updateContentMapper(orgId, projectID, { ...contentTypeMapped, [selectedContentType?.contentstackUid]: otherContentType?.id });
           } catch (err) {
@@ -2181,6 +2194,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
     (e?.target as HTMLElement)?.closest('li')?.classList?.add('active-filter');
 
     const filteredCT = contentTypes?.filter((ct) => { return CONTENT_MAPPING_STATUS[ct?.status] === value });
+    console.info('content types --> ',filteredCT)
     if (value !== 'All') {
       setFilteredContentTypes(filteredCT);
       setCount(filteredCT?.length);
@@ -2450,7 +2464,8 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                         ...newMigrationData?.legacy_cms,
                         uploadedFile: {
                           ...newMigrationData?.legacy_cms?.uploadedFile,
-                          reValidate: true
+                          reValidate: true,
+                          buttonClicked: true,
                         }
                       }
                     }
diff --git a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
index 39082685f..d7c1f6c32 100644
--- a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
+++ b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx
@@ -376,6 +376,7 @@ const LoadStacks = (props: LoadFileFormatProps) => {
               ></Icon>
             </Tooltip>
           </div>
+          
           <LanguageMapper
           uid={selectedStack?.uid ?? ''}
           stack={newMigrationData?.destination_stack?.selectedStack ?? DEFAULT_DROPDOWN} />
diff --git a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
index 03335f95b..817219684 100644
--- a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
@@ -35,6 +35,7 @@ interface UploadState {
   fileDetails?: FileDetails;
 }
 
+
 const FileComponent = ({ fileDetails }: Props) => {
   return (
     <div>
@@ -122,6 +123,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
         legacy_cms: {
           ...newMigrationDataRef?.current?.legacy_cms,
           uploadedFile: {
+            ...newMigrationDataRef?.current?.legacy_cms?.uploadedFile,
             name: data?.file_details?.localPath || '',
             url: data?.file_details?.localPath,
             validation: data?.message,
@@ -186,6 +188,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
       }, 1000);
 
       setIsLoading(false);
+
       saveStateToLocalStorage(
         {
           isLoading,
@@ -287,6 +290,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
 
   useEffect(() => {
     const savedState = getStateFromLocalStorage(projectId);
+    
     if (savedState) {
       setIsLoading(savedState.isLoading);
       setIsConfigLoading(savedState.isConfigLoading);
diff --git a/ui/src/components/MigrationFlowHeader/index.tsx b/ui/src/components/MigrationFlowHeader/index.tsx
index 9bb2eaf1b..196c35ad9 100644
--- a/ui/src/components/MigrationFlowHeader/index.tsx
+++ b/ui/src/components/MigrationFlowHeader/index.tsx
@@ -87,12 +87,14 @@ const MigrationFlowHeader = ({
 
   const isProjectStatusThreeAndMapperNotGenerated =
     params?.stepId === '1' &&
-    newMigrationData?.legacy_cms?.projectStatus === 3
+    newMigrationData?.legacy_cms?.projectStatus === 3 &&
+    newMigrationData?.legacy_cms?.uploadedFile?.buttonClicked 
 
   const isStepInvalid =
     params?.stepId &&
     params?.stepId <= '2' &&
-    newMigrationData?.project_current_step?.toString() !== params?.stepId;
+    newMigrationData?.project_current_step?.toString() !== params?.stepId && 
+    parseInt(params?.stepId) < newMigrationData?.project_current_step;
 
   const isExecutionStarted =
     finalExecutionStarted ||
@@ -126,10 +128,9 @@ const MigrationFlowHeader = ({
         disabled={
           isProjectStatusThreeAndMapperNotGenerated ?
             isFileValidated :
-            isPreviousStepDisabled ||
-            isStep4AndNotMigrated ||
-            isStepInvalid ||
-            isExecutionStarted ||
+            isStep4AndNotMigrated || 
+            isStepInvalid || 
+            isExecutionStarted || 
             destinationStackMigrated
         }
       >
diff --git a/ui/src/context/app/app.interface.ts b/ui/src/context/app/app.interface.ts
index 9729ee16a..98d326872 100644
--- a/ui/src/context/app/app.interface.ts
+++ b/ui/src/context/app/app.interface.ts
@@ -68,7 +68,8 @@ export interface IFile {
   file_details?: FileDetails;
   isValidated: boolean;
   reValidate: boolean;
-  cmsType: string
+  cmsType: string;
+  buttonClicked:boolean
 }
 
 export interface ICMSType extends ICardType {
@@ -318,6 +319,7 @@ export const DEFAULT_FILE: IFile = {
   isValidated: false,
   reValidate: false,
   cmsType: '',
+  buttonClicked: false
 };
 
 export const DEFAULT_CMS_TYPE: ICMSType = {
diff --git a/ui/src/hooks/useWarnOnrefresh.tsx b/ui/src/hooks/useWarnOnrefresh.tsx
index ec4acbf98..e78701549 100644
--- a/ui/src/hooks/useWarnOnrefresh.tsx
+++ b/ui/src/hooks/useWarnOnrefresh.tsx
@@ -15,4 +15,5 @@ export function useWarnOnRefresh(isUnsaved : boolean){
         window.removeEventListener('beforeunload', handleBeforeUnload);
     };
 }, [isUnsaved]);
+
 }
\ No newline at end of file
diff --git a/ui/src/pages/Migration/index.tsx b/ui/src/pages/Migration/index.tsx
index 8f554b398..2c7d63721 100644
--- a/ui/src/pages/Migration/index.tsx
+++ b/ui/src/pages/Migration/index.tsx
@@ -74,6 +74,11 @@ type LocalesType = {
   [key: string]: any
 }
 
+/**
+ * Migration component to handle the migration process
+ * It includes steps like selecting legacy CMS, configuring destination stack,
+ * mapping content fields, running test migration, and executing final migration.
+ */
 const Migration = () => {
   const params: Params<string> = useParams();
   const { projectId = '' } = useParams();
@@ -247,6 +252,7 @@ const Migration = () => {
 // funcrion to form upload object from config response
   const getFileInfo = (data: FileDetails) => {
     const newMigrationDataObj = {
+        ...newMigrationData?.legacy_cms?.uploadedFile,
           name: data?.localPath,
           url: data?.localPath,
           isValidated: false,
@@ -353,7 +359,8 @@ const Migration = () => {
             isLocalPath: projectData?.legacy_cms?.is_localPath
           },
           isValidated: projectData?.legacy_cms?.is_fileValid,
-          reValidate: newMigrationData?.legacy_cms?.uploadedFile?.reValidate
+          reValidate: newMigrationData?.legacy_cms?.uploadedFile?.reValidate,
+          buttonClicked: newMigrationData?.legacy_cms?.uploadedFile?.buttonClicked ? true : false,
         } : uploadObj,
         isFileFormatCheckboxChecked: true,
         isRestictedKeywordCheckboxChecked: true,
diff --git a/upload-api/migration-contentful/libs/contentTypeMapper.js b/upload-api/migration-contentful/libs/contentTypeMapper.js
index 0895b88c1..39f350920 100644
--- a/upload-api/migration-contentful/libs/contentTypeMapper.js
+++ b/upload-api/migration-contentful/libs/contentTypeMapper.js
@@ -27,7 +27,7 @@ const uidCorrector = (uid, affix) => {
     newId = uid?.replace?.(uid, `${affix}_${uid}`);
     newId = newId?.replace?.(/[^a-zA-Z0-9]+/g, '_');
   }
-  return newId.replace(/([A-Z])/g, (match) => `_${match?.toLowerCase?.()}`);
+  return newId.replace(/([A-Z])/g, (match) => `${match?.toLowerCase?.()}`);
 };
 
 /**
@@ -319,7 +319,7 @@ const contentTypeMapper = (data, entries) => {
                   }
                 });
               }
-              console.info('contentTypeRefs', contentTypeRefs, contentTypeUid);
+  
               return contentTypeRefs;
 
             }
diff --git a/upload-api/migration-contentful/libs/createInitialMapper.js b/upload-api/migration-contentful/libs/createInitialMapper.js
index 8236222af..331359311 100644
--- a/upload-api/migration-contentful/libs/createInitialMapper.js
+++ b/upload-api/migration-contentful/libs/createInitialMapper.js
@@ -40,7 +40,7 @@ const uidCorrector = (uid, prefix) => {
     newId = uid.replace(uid, `${prefix}_${uid}`);
     newId = newId.replace(/[^a-zA-Z0-9]+/g, '_');
   }
-  return newId.replace(/([A-Z])/g, (match) => `_${match.toLowerCase()}`);
+  return newId.replace(/([A-Z])/g, (match) => `${match.toLowerCase()}`);
 };
 
 /**

From d2d77029a7ff08ebeeb230de5863afb94aaf5a90 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Thu, 31 Jul 2025 15:07:16 +0530
Subject: [PATCH 2/2] reafctor:removed numbering from logs screen

---
 ui/src/components/LogScreen/MigrationLogViewer.tsx | 3 +--
 ui/src/components/LogScreen/index.scss             | 2 +-
 ui/src/components/LogScreen/index.tsx              | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/LogScreen/MigrationLogViewer.tsx b/ui/src/components/LogScreen/MigrationLogViewer.tsx
index 27f55c6af..066dd8522 100644
--- a/ui/src/components/LogScreen/MigrationLogViewer.tsx
+++ b/ui/src/components/LogScreen/MigrationLogViewer.tsx
@@ -297,9 +297,8 @@ const MigrationLogViewer = ({ serverPath }: LogsType) => {
                     ) : (
                       <div
                         style={logStyles[level || ''] || logStyles.info}
-                        className="log-entry logs-bg"
+                        className="log-entry"
                       >
-                        <div className="log-number">{index}</div>
                         <div className="log-time">
                           {timestamp
                             ? new Date(timestamp)?.toTimeString()?.split(' ')[0]
diff --git a/ui/src/components/LogScreen/index.scss b/ui/src/components/LogScreen/index.scss
index 21aa278d9..ff7145efa 100644
--- a/ui/src/components/LogScreen/index.scss
+++ b/ui/src/components/LogScreen/index.scss
@@ -45,7 +45,7 @@
   font-family: 'IBM Plex Mono', monospace;
   font-size: $size-font-large;
   font-weight: $font-weight-medium;
-  padding: 30px 20px;
+  padding: 5px 0;
   position: relative;
 
   &.logs-bg {
diff --git a/ui/src/components/LogScreen/index.tsx b/ui/src/components/LogScreen/index.tsx
index 798d44ea6..a63850450 100644
--- a/ui/src/components/LogScreen/index.tsx
+++ b/ui/src/components/LogScreen/index.tsx
@@ -298,9 +298,8 @@ const TestMigrationLogViewer = ({ serverPath, sendDataToParent, projectId }: Log
                     ) : (
                       <div
                         style={logStyles[level || ''] || logStyles.info}
-                        className="log-entry logs-bg"
+                        className="log-entry"
                       >
-                        <div className="log-number">{index}</div>
                         <div className="log-time">
                           {timestamp
                             ? new Date(timestamp)?.toTimeString()?.split(' ')[0]