From f826c75d3b5905faa7e9ad55fb6d749379d4b279 Mon Sep 17 00:00:00 2001
From: Sayali Joshi <sayali.joshi@contentstack.com>
Date: Thu, 6 Nov 2025 15:17:29 +0530
Subject: [PATCH 01/15] Debug mapping table loader issue

---
 ui/src/components/ContentMapper/index.scss |  7 +++-
 ui/src/components/ContentMapper/index.tsx  | 37 ++++++++++++----------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index f56ea9682..d8ac18003 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -151,7 +151,12 @@
   }
   .Table {
     border-left: 0 none;
-    // min-height: inherit;
+    min-height: 26.25rem;
+    // &__rowgroup {
+    //   display: flex;
+    //   flex: 1;
+    //   flex-direction: column;
+    // }
     .Table__body__row {
       //   height: auto!important;
       //   min-height: 80px;
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index c7eada3de..9a901bc50 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -760,6 +760,10 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap(itemStatusMap);
+      setLoading(true);
+
+
+      // console.info('loading', loading);
 
       const { data } = await getFieldMapping(contentTypeId || '', 0, 1000, searchText || '', projectId);
 
@@ -769,6 +773,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap({ ...itemStatusMap });
+      setLoading(false);
 
       const validTableData = data?.fieldMapping?.filter((field: FieldMapType) => field?.otherCmsType !== undefined);
 
@@ -777,7 +782,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       setSelectedEntries(validTableData ?? []);
       setTotalCounts(validTableData?.length);
       setInitialRowSelectedData(validTableData?.filter((item: FieldMapType) => !item?.isDeleted))
-      setIsLoading(false);
+      // setIsLoading(false);
       generateSourceGroupSchema(validTableData);
     } catch (error) {
       console.error('fetchData -> error', error);
@@ -800,7 +805,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap({ ...itemStatusMapCopy });
-      setLoading(true);
+      // setLoading(true);
 
       const { data } = await getFieldMapping(contentTypeUid || '', skip, limit, searchText || '', projectId);
 
@@ -2645,20 +2650,20 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                   initialRowSelectedData={initialRowSelectedData}
                   initialSelectedRowIds={rowIds}
                   itemSize={80}
-                  v2Features={{
-                    isNewEmptyState: true
-                  }}
-                  customEmptyState={
-                    <EmptyState
-                      forPage="list"
-                      heading={<div className="empty_search_heading">No Fields available</div>}
-                      moduleIcon="NoSearchResult"
-                      description="Try changing the search query to find what you are looking for."
-                      version="v2"
-                      testId="no-results-found-page"
-                      className="custom-empty-state"
-                    />
-                  }
+                  // v2Features={{
+                  //   isNewEmptyState: true
+                  // }}
+                  // customEmptyState={
+                  //   <EmptyState
+                  //     forPage="list"
+                  //     heading={<div className="empty_search_heading">No Fields available</div>}
+                  //     moduleIcon="NoSearchResult"
+                  //     description="Try changing the search query to find what you are looking for."
+                  //     version="v2"
+                  //     testId="no-results-found-page"
+                  //     className="custom-empty-state"
+                  //   />
+                  // }
                   withExportCta={{
                     component: (
                       <div className='d-flex align-items-center'>

From a3adf5859e27a70c15d7b8620f03e04d9107a688 Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 12 Nov 2025 14:27:14 +0530
Subject: [PATCH 02/15] refactor LegacyCMS componnet: set default affix and
 adjust step completion logic and removed checks for affix

---
 ui/src/components/LegacyCms/Actions/LoadPrefix.tsx     | 10 +++-------
 ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx |  7 +++----
 ui/src/components/LegacyCms/index.tsx                  | 10 ++++------
 .../Stepper/HorizontalStepper/HorizontalStepper.tsx    |  2 +-
 ui/src/services/api/upload.service.ts                  |  2 +-
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index 0b0a736c2..bf876bfff 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -29,7 +29,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
 
   const dispatch = useDispatch();
 
-  const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || '');
+  const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || 'cs');
 
   const [isError, setIsError] = useState<boolean>(false);
   const [errorMessage, setErrorMessage] = useState<string>('');
@@ -76,7 +76,6 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
             isRestictedKeywordCheckboxChecked: isCheckedBoxChecked
           }
         };
-
         dispatch(updateNewMigrationData(newMigrationDataObj));
       } else {
         setPrefix(value);
@@ -93,7 +92,6 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
         };
 
         dispatch(updateNewMigrationData(newMigrationDataObj));
-
         setIsError(false);
 
         //call for Step Change
@@ -101,17 +99,15 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
         return;
       }
     } else {
-      setIsError(true);
-      setErrorMessage('Please enter Affix');
+      setIsError(false);
       const newMigrationDataObj: INewMigration = {
         ...newMigrationData,
         legacy_cms: {
           ...newMigrationData?.legacy_cms,
-          affix: value,
+          affix: 'cs',
           isRestictedKeywordCheckboxChecked: isCheckedBoxChecked
         }
       };
-
       dispatch(updateNewMigrationData(newMigrationDataObj));
     }
   });
diff --git a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
index d626a06b1..502728e03 100644
--- a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
@@ -154,7 +154,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
         setIsDisabled(true);
 
         if (
-          !isEmptyString(newMigrationData?.legacy_cms?.affix) &&
           !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) &&
           !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id)
         ) {
@@ -358,7 +357,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
       setShowMessage(true);
       setValidationMessage('File validated successfully.');
       setIsDisabled(true);
-      !isEmptyString(newMigrationData?.legacy_cms?.affix) ||
         !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) ||
         (!isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) &&
           props.handleStepChange(props?.currentStep, true));
@@ -366,7 +364,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
     if (newMigrationData?.legacy_cms?.uploadedFile?.reValidate) {
       setValidationMessage('');
     }
-    if(!isEmptyString(newMigrationData?.legacy_cms?.affix) && !newMigrationData?.legacy_cms?.uploadedFile?.isValidated && !newMigrationData?.legacy_cms?.uploadedFile?.reValidate){
+    if(!newMigrationData?.legacy_cms?.uploadedFile?.isValidated && !newMigrationData?.legacy_cms?.uploadedFile?.reValidate){
       setIsDisabled(false);
     }
     setReValidate(newMigrationData?.legacy_cms?.uploadedFile?.reValidate || false);
@@ -376,6 +374,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
     // }
   }, [isValidated, newMigrationData]);
 
+
   useEffect(() => {
     if (newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) {
       setFileFormat(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id);
@@ -448,7 +447,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
             isLoading={isLoading}
             loadingColor="#6c5ce7"
             version="v2"
-            disabled={!(reValidate || (!isDisabled && !isEmptyString(newMigrationData?.legacy_cms?.affix)))}
+            disabled={!(reValidate || (!isDisabled))}
           > 
             Validate File
           </Button>
diff --git a/ui/src/components/LegacyCms/index.tsx b/ui/src/components/LegacyCms/index.tsx
index ef300b931..448fab6b1 100644
--- a/ui/src/components/LegacyCms/index.tsx
+++ b/ui/src/components/LegacyCms/index.tsx
@@ -142,7 +142,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll
       }
   
       //Make Step 2 complete
-      if (!isEmptyString(selectedCmsData?.cms_id) && (!isEmptyString(legacyCMSData?.affix) || !isEmptyString(newMigrationData?.legacy_cms?.affix))) {
+      if (!isEmptyString(selectedCmsData?.cms_id) && (!isEmptyString(legacyCMSData?.affix) )) {
         setInternalActiveStepIndex(1);
       }
   
@@ -197,13 +197,12 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll
 
       //Make Step 2 complete
       if (
-        !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) &&
-        !isEmptyString(newMigrationData?.legacy_cms?.affix)
+        !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id)
       ) {
         setInternalActiveStepIndex(1);
       }
 
-    if(!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && !isEmptyString(newMigrationData?.legacy_cms?.affix) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){
+    if(!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){
       setInternalActiveStepIndex(3);
     }
     setisProjectMapped(newMigrationData?.isprojectMapped)
@@ -211,8 +210,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll
   },[newMigrationData]);
   
   useEffect(()=>{
-   if(! isEmptyString(newMigrationData?.legacy_cms?.affix) 
-      && !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.title) &&
+   if( !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.title) &&
     ! isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.title) && 
     newMigrationData?.legacy_cms?.uploadedFile?.isValidated){
       setIsAllStepsCompleted(true);
diff --git a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
index 78db8e418..de67b07ab 100644
--- a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
+++ b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
@@ -163,7 +163,7 @@ const HorizontalStepper = forwardRef(
         -1 < newMigrationData?.legacy_cms?.currentStep &&
         newMigrationData?.legacy_cms?.currentStep < 2
       ) {
-        showNotification(newMigrationData?.legacy_cms?.currentStep + 1);
+        // showNotification(newMigrationData?.legacy_cms?.currentStep + 1);
       } else if (
         newMigrationData?.destination_stack?.selectedStack === undefined ||
         newMigrationData?.destination_stack?.selectedStack === null ||
diff --git a/ui/src/services/api/upload.service.ts b/ui/src/services/api/upload.service.ts
index 851866c5c..c1c9e092b 100644
--- a/ui/src/services/api/upload.service.ts
+++ b/ui/src/services/api/upload.service.ts
@@ -40,7 +40,7 @@ export const uploadFilePath = () => {
   return `${UPLOAD_FILE_RELATIVE_URL}upload`;
 };
 
-export const fileValidation = async (projectId: string, affix: string) => {
+export const fileValidation = async (projectId: string, affix = 'cs') => {
   try {
     const options = {
       headers: {

From d6bb94a039ffcf0c14bc8d967e2f072c8ff6cb74 Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Fri, 14 Nov 2025 15:30:21 +0530
Subject: [PATCH 03/15] implement default affix handling on blur and chnaged
 the affix description

---
 ui/src/cmsData/legacyCms.json                 |  2 +-
 .../LegacyCms/Actions/LoadPrefix.tsx          | 19 ++++++++++++++++++-
 .../VerticalStepper/AutoVerticalStepper.tsx   |  7 ++++++-
 upload-api/src/config/index.ts                |  4 ++--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ui/src/cmsData/legacyCms.json b/ui/src/cmsData/legacyCms.json
index 38c23d588..c5c4c327e 100644
--- a/ui/src/cmsData/legacyCms.json
+++ b/ui/src/cmsData/legacyCms.json
@@ -338,7 +338,7 @@
         "uid": "cs6c761d71844ac800"
       },
       "title": "Add Source Affix",
-      "description": "Add a 2–5 character affix for the source name. Use only letters, no numbers or special characters",
+      "description": "Add a 2–5 letter-only affix for the source name. The affix will function as a prefix if the content type UID matches with <a href=\"https://www.contentstack.com/docs/developers/create-content-types/restricted-keywords-for-uids\" target=\"_blank\">restricted UIDs</a>. The affix will function as a suffix for field UIDs. If left blank, \"cs\" will be used by default. Avoid numbers, special characters, and restricted keywords",
       "step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration",
       "lock": false,
       "active": false,
diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index bf876bfff..84343f755 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -100,6 +100,18 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
       }
     } else {
       setIsError(false);
+      setErrorMessage('');
+      setIsRestrictedKey(false);
+      setPrefix('');
+    }
+  });
+
+  const handleOnBlur = (value: string) => {
+    if (isEmptyString(value?.trim())) {
+      setIsError(false);
+      setErrorMessage('');
+      setIsRestrictedKey(false);
+      setPrefix('cs');
       const newMigrationDataObj: INewMigration = {
         ...newMigrationData,
         legacy_cms: {
@@ -110,7 +122,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
       };
       dispatch(updateNewMigrationData(newMigrationDataObj));
     }
-  });
+  }
 
   /****  ALL USEEffects  HERE  ****/
 
@@ -132,6 +144,11 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
           aria-label="affix"
           disabled={newMigrationData?.legacy_cms?.uploadedFile?.isValidated}
           isReadOnly={newMigrationData?.legacy_cms?.uploadedFile?.isValidated}
+          onBlur={(e: React.FocusEvent<HTMLInputElement>) => {
+            handleOnBlur(e.target.value);
+            
+          }}
+          
         />
         {isError && <p className="errorMessage">{errorMessage}</p>}
       </div>
diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
index 6706bac6a..7923a7632 100644
--- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
+++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
@@ -93,7 +93,12 @@ const AutoVerticalStepper = React.forwardRef<
               </Tooltip>
             ) : null} */}
           </div>
-          {data.description && <div className="stepper-discription"> {data.description}</div>}
+          {data.description && (
+            <div 
+              className="stepper-discription" 
+              dangerouslySetInnerHTML={{ __html: data.description }}
+            />
+          )}
         </>
       );
     };
diff --git a/upload-api/src/config/index.ts b/upload-api/src/config/index.ts
index 9bd6fb1ae..fffe68869 100644
--- a/upload-api/src/config/index.ts
+++ b/upload-api/src/config/index.ts
@@ -2,7 +2,7 @@ export default {
   plan: {
     dropdown: { optionLimit: 100 }
   },
-  cmsType: process.env.CMS_TYPE || 'cmsType',
+  cmsType: process.env.CMS_TYPE || 'aem',
   isLocalPath: true,
   awsData: {
     awsRegion: 'us-east-2',
@@ -12,5 +12,5 @@ export default {
     bucketName: '',
     bucketKey: ''
   },
-  localPath: process.env.CONTAINER_PATH || 'localPath'
+  localPath: process.env.CONTAINER_PATH || '/Users/yash.shinde/Documents/Migration/Expample-Data/AEM/aem_data_structure/templates'
 };

From cd52fc7b5cbd415a2468dce83dfd33adcde46f6f Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 12 Nov 2025 14:27:14 +0530
Subject: [PATCH 04/15] refactor LegacyCMS componnet: set default affix and
 adjust step completion logic and removed checks for affix

---
 ui/src/components/LegacyCms/Actions/LoadPrefix.tsx     | 10 +++-------
 ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx |  7 +++----
 ui/src/components/LegacyCms/index.tsx                  | 10 ++++------
 .../Stepper/HorizontalStepper/HorizontalStepper.tsx    |  2 +-
 ui/src/services/api/upload.service.ts                  |  2 +-
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index 0b0a736c2..bf876bfff 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -29,7 +29,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
 
   const dispatch = useDispatch();
 
-  const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || '');
+  const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || 'cs');
 
   const [isError, setIsError] = useState<boolean>(false);
   const [errorMessage, setErrorMessage] = useState<string>('');
@@ -76,7 +76,6 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
             isRestictedKeywordCheckboxChecked: isCheckedBoxChecked
           }
         };
-
         dispatch(updateNewMigrationData(newMigrationDataObj));
       } else {
         setPrefix(value);
@@ -93,7 +92,6 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
         };
 
         dispatch(updateNewMigrationData(newMigrationDataObj));
-
         setIsError(false);
 
         //call for Step Change
@@ -101,17 +99,15 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
         return;
       }
     } else {
-      setIsError(true);
-      setErrorMessage('Please enter Affix');
+      setIsError(false);
       const newMigrationDataObj: INewMigration = {
         ...newMigrationData,
         legacy_cms: {
           ...newMigrationData?.legacy_cms,
-          affix: value,
+          affix: 'cs',
           isRestictedKeywordCheckboxChecked: isCheckedBoxChecked
         }
       };
-
       dispatch(updateNewMigrationData(newMigrationDataObj));
     }
   });
diff --git a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
index d626a06b1..502728e03 100644
--- a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
@@ -154,7 +154,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
         setIsDisabled(true);
 
         if (
-          !isEmptyString(newMigrationData?.legacy_cms?.affix) &&
           !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) &&
           !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id)
         ) {
@@ -358,7 +357,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
       setShowMessage(true);
       setValidationMessage('File validated successfully.');
       setIsDisabled(true);
-      !isEmptyString(newMigrationData?.legacy_cms?.affix) ||
         !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) ||
         (!isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) &&
           props.handleStepChange(props?.currentStep, true));
@@ -366,7 +364,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
     if (newMigrationData?.legacy_cms?.uploadedFile?.reValidate) {
       setValidationMessage('');
     }
-    if(!isEmptyString(newMigrationData?.legacy_cms?.affix) && !newMigrationData?.legacy_cms?.uploadedFile?.isValidated && !newMigrationData?.legacy_cms?.uploadedFile?.reValidate){
+    if(!newMigrationData?.legacy_cms?.uploadedFile?.isValidated && !newMigrationData?.legacy_cms?.uploadedFile?.reValidate){
       setIsDisabled(false);
     }
     setReValidate(newMigrationData?.legacy_cms?.uploadedFile?.reValidate || false);
@@ -376,6 +374,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
     // }
   }, [isValidated, newMigrationData]);
 
+
   useEffect(() => {
     if (newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) {
       setFileFormat(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id);
@@ -448,7 +447,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
             isLoading={isLoading}
             loadingColor="#6c5ce7"
             version="v2"
-            disabled={!(reValidate || (!isDisabled && !isEmptyString(newMigrationData?.legacy_cms?.affix)))}
+            disabled={!(reValidate || (!isDisabled))}
           > 
             Validate File
           </Button>
diff --git a/ui/src/components/LegacyCms/index.tsx b/ui/src/components/LegacyCms/index.tsx
index ef300b931..448fab6b1 100644
--- a/ui/src/components/LegacyCms/index.tsx
+++ b/ui/src/components/LegacyCms/index.tsx
@@ -142,7 +142,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll
       }
   
       //Make Step 2 complete
-      if (!isEmptyString(selectedCmsData?.cms_id) && (!isEmptyString(legacyCMSData?.affix) || !isEmptyString(newMigrationData?.legacy_cms?.affix))) {
+      if (!isEmptyString(selectedCmsData?.cms_id) && (!isEmptyString(legacyCMSData?.affix) )) {
         setInternalActiveStepIndex(1);
       }
   
@@ -197,13 +197,12 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll
 
       //Make Step 2 complete
       if (
-        !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) &&
-        !isEmptyString(newMigrationData?.legacy_cms?.affix)
+        !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id)
       ) {
         setInternalActiveStepIndex(1);
       }
 
-    if(!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && !isEmptyString(newMigrationData?.legacy_cms?.affix) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){
+    if(!isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) && newMigrationData?.legacy_cms?.uploadedFile?.isValidated){
       setInternalActiveStepIndex(3);
     }
     setisProjectMapped(newMigrationData?.isprojectMapped)
@@ -211,8 +210,7 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAll
   },[newMigrationData]);
   
   useEffect(()=>{
-   if(! isEmptyString(newMigrationData?.legacy_cms?.affix) 
-      && !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.title) &&
+   if( !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.title) &&
     ! isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.title) && 
     newMigrationData?.legacy_cms?.uploadedFile?.isValidated){
       setIsAllStepsCompleted(true);
diff --git a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
index 78db8e418..de67b07ab 100644
--- a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
+++ b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
@@ -163,7 +163,7 @@ const HorizontalStepper = forwardRef(
         -1 < newMigrationData?.legacy_cms?.currentStep &&
         newMigrationData?.legacy_cms?.currentStep < 2
       ) {
-        showNotification(newMigrationData?.legacy_cms?.currentStep + 1);
+        // showNotification(newMigrationData?.legacy_cms?.currentStep + 1);
       } else if (
         newMigrationData?.destination_stack?.selectedStack === undefined ||
         newMigrationData?.destination_stack?.selectedStack === null ||
diff --git a/ui/src/services/api/upload.service.ts b/ui/src/services/api/upload.service.ts
index 851866c5c..c1c9e092b 100644
--- a/ui/src/services/api/upload.service.ts
+++ b/ui/src/services/api/upload.service.ts
@@ -40,7 +40,7 @@ export const uploadFilePath = () => {
   return `${UPLOAD_FILE_RELATIVE_URL}upload`;
 };
 
-export const fileValidation = async (projectId: string, affix: string) => {
+export const fileValidation = async (projectId: string, affix = 'cs') => {
   try {
     const options = {
       headers: {

From 4cc217d9ff5ed5932b4dc1969301bad39eef91da Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Fri, 14 Nov 2025 15:30:21 +0530
Subject: [PATCH 05/15] implement default affix handling on blur and chnaged
 the affix description

---
 ui/src/cmsData/legacyCms.json                 |  2 +-
 .../LegacyCms/Actions/LoadPrefix.tsx          | 19 ++++++++++++++++++-
 .../VerticalStepper/AutoVerticalStepper.tsx   |  7 ++++++-
 upload-api/src/config/index.ts                |  4 ++--
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ui/src/cmsData/legacyCms.json b/ui/src/cmsData/legacyCms.json
index 38c23d588..c5c4c327e 100644
--- a/ui/src/cmsData/legacyCms.json
+++ b/ui/src/cmsData/legacyCms.json
@@ -338,7 +338,7 @@
         "uid": "cs6c761d71844ac800"
       },
       "title": "Add Source Affix",
-      "description": "Add a 2–5 character affix for the source name. Use only letters, no numbers or special characters",
+      "description": "Add a 2–5 letter-only affix for the source name. The affix will function as a prefix if the content type UID matches with <a href=\"https://www.contentstack.com/docs/developers/create-content-types/restricted-keywords-for-uids\" target=\"_blank\">restricted UIDs</a>. The affix will function as a suffix for field UIDs. If left blank, \"cs\" will be used by default. Avoid numbers, special characters, and restricted keywords",
       "step_lock_text": "Editing this step is currently disabled. To make changes in Draft mode, please deactivate the migration",
       "lock": false,
       "active": false,
diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index bf876bfff..84343f755 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -100,6 +100,18 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
       }
     } else {
       setIsError(false);
+      setErrorMessage('');
+      setIsRestrictedKey(false);
+      setPrefix('');
+    }
+  });
+
+  const handleOnBlur = (value: string) => {
+    if (isEmptyString(value?.trim())) {
+      setIsError(false);
+      setErrorMessage('');
+      setIsRestrictedKey(false);
+      setPrefix('cs');
       const newMigrationDataObj: INewMigration = {
         ...newMigrationData,
         legacy_cms: {
@@ -110,7 +122,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
       };
       dispatch(updateNewMigrationData(newMigrationDataObj));
     }
-  });
+  }
 
   /****  ALL USEEffects  HERE  ****/
 
@@ -132,6 +144,11 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
           aria-label="affix"
           disabled={newMigrationData?.legacy_cms?.uploadedFile?.isValidated}
           isReadOnly={newMigrationData?.legacy_cms?.uploadedFile?.isValidated}
+          onBlur={(e: React.FocusEvent<HTMLInputElement>) => {
+            handleOnBlur(e.target.value);
+            
+          }}
+          
         />
         {isError && <p className="errorMessage">{errorMessage}</p>}
       </div>
diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
index 6706bac6a..7923a7632 100644
--- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
+++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
@@ -93,7 +93,12 @@ const AutoVerticalStepper = React.forwardRef<
               </Tooltip>
             ) : null} */}
           </div>
-          {data.description && <div className="stepper-discription"> {data.description}</div>}
+          {data.description && (
+            <div 
+              className="stepper-discription" 
+              dangerouslySetInnerHTML={{ __html: data.description }}
+            />
+          )}
         </>
       );
     };
diff --git a/upload-api/src/config/index.ts b/upload-api/src/config/index.ts
index 9bd6fb1ae..fffe68869 100644
--- a/upload-api/src/config/index.ts
+++ b/upload-api/src/config/index.ts
@@ -2,7 +2,7 @@ export default {
   plan: {
     dropdown: { optionLimit: 100 }
   },
-  cmsType: process.env.CMS_TYPE || 'cmsType',
+  cmsType: process.env.CMS_TYPE || 'aem',
   isLocalPath: true,
   awsData: {
     awsRegion: 'us-east-2',
@@ -12,5 +12,5 @@ export default {
     bucketName: '',
     bucketKey: ''
   },
-  localPath: process.env.CONTAINER_PATH || 'localPath'
+  localPath: process.env.CONTAINER_PATH || '/Users/yash.shinde/Documents/Migration/Expample-Data/AEM/aem_data_structure/templates'
 };

From 041ac1ceedeebaeb8676995d01b5b904bb5f823e Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 12 Nov 2025 14:27:14 +0530
Subject: [PATCH 06/15] refactor LegacyCMS componnet: set default affix and
 adjust step completion logic and removed checks for affix

---
 ui/src/components/LegacyCms/Actions/LoadPrefix.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index 84343f755..65d2b48c2 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -29,6 +29,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
 
   const dispatch = useDispatch();
 
+  const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || 'cs');
   const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || 'cs');
 
   const [isError, setIsError] = useState<boolean>(false);

From 172c21e5c9cf963aa8cd4fb4e289b043b06a7b7b Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 19 Nov 2025 11:10:13 +0530
Subject: [PATCH 07/15] dev merged

---
 ui/src/components/LegacyCms/Actions/LoadPrefix.tsx | 1 -
 upload-api/src/config/index.ts                     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index 65d2b48c2..84343f755 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -29,7 +29,6 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
 
   const dispatch = useDispatch();
 
-  const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || 'cs');
   const [prefix, setPrefix] = useState<string>(newMigrationData?.legacy_cms?.affix || 'cs');
 
   const [isError, setIsError] = useState<boolean>(false);
diff --git a/upload-api/src/config/index.ts b/upload-api/src/config/index.ts
index fffe68869..9bd6fb1ae 100644
--- a/upload-api/src/config/index.ts
+++ b/upload-api/src/config/index.ts
@@ -2,7 +2,7 @@ export default {
   plan: {
     dropdown: { optionLimit: 100 }
   },
-  cmsType: process.env.CMS_TYPE || 'aem',
+  cmsType: process.env.CMS_TYPE || 'cmsType',
   isLocalPath: true,
   awsData: {
     awsRegion: 'us-east-2',
@@ -12,5 +12,5 @@ export default {
     bucketName: '',
     bucketKey: ''
   },
-  localPath: process.env.CONTAINER_PATH || '/Users/yash.shinde/Documents/Migration/Expample-Data/AEM/aem_data_structure/templates'
+  localPath: process.env.CONTAINER_PATH || 'localPath'
 };

From 0e2fc7e98120c09961f40b6e492b502cb76a8f17 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Wed, 19 Nov 2025 12:09:12 +0530
Subject: [PATCH 08/15] refactor: Added backupFieldUid to group for resetting
 issue

---
 upload-api/migration-sitecore/libs/contenttypes.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upload-api/migration-sitecore/libs/contenttypes.js b/upload-api/migration-sitecore/libs/contenttypes.js
index 7d632d3a7..8802e039b 100644
--- a/upload-api/migration-sitecore/libs/contenttypes.js
+++ b/upload-api/migration-sitecore/libs/contenttypes.js
@@ -413,7 +413,8 @@ const groupFlat = (data, item) => {
       contentstackField: item?.meta?.name,
       contentstackFieldUid: data?.uid, // Use the corrected UID from groupSchema
       contentstackFieldType: 'group',
-      backupFieldType: 'group'
+      backupFieldType: 'group',
+      backupFieldUid: data?.uid
     };
     flat?.push(group);
     data?.schema?.forEach((element) => {

From d926e588d8c03bfbb2cec44fa9f0e6b8c32aa92c Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 19 Nov 2025 12:12:51 +0530
Subject: [PATCH 09/15] bugfix: null check added

---
 .../components/Stepper/VerticalStepper/AutoVerticalStepper.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
index 7923a7632..c09abaad1 100644
--- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
+++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
@@ -96,7 +96,7 @@ const AutoVerticalStepper = React.forwardRef<
           {data.description && (
             <div 
               className="stepper-discription" 
-              dangerouslySetInnerHTML={{ __html: data.description }}
+              dangerouslySetInnerHTML={{ __html: data?.description }}
             />
           )}
         </>

From 67036660fc7a47b442b0084cc6b65f3f92013ff5 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Wed, 19 Nov 2025 12:31:25 +0530
Subject: [PATCH 10/15] fix: Enhance resetToInitialMapping to include
 contentTypeId in field mapping retrieval

---
 api/src/services/contentMapper.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/services/contentMapper.service.ts b/api/src/services/contentMapper.service.ts
index bef1b1a5f..6943c700d 100644
--- a/api/src/services/contentMapper.service.ts
+++ b/api/src/services/contentMapper.service.ts
@@ -751,7 +751,7 @@ const resetToInitialMapping = async (req: Request) => {
   const fieldMappingData = contentTypeData.fieldMapping.map((itemId: any) => {
     const fieldData = FieldMapperModel.chain
       .get("field_mapper")
-      .find({ id: itemId, projectId: projectId })
+      .find({ id: itemId, projectId: projectId , contentTypeId: contentTypeId})
       .value();
     return fieldData;
   });
@@ -771,7 +771,7 @@ const resetToInitialMapping = async (req: Request) => {
       //await FieldMapperModel.read();
       (fieldMappingData || []).forEach((field: any) => {
         const fieldIndex = FieldMapperModel.data.field_mapper.findIndex(
-          (f: any) => f?.id === field?.id
+          (f: any) => f?.id === field?.id  && f?.projectId === projectId &&  f?.contentTypeId === contentTypeId
         );
         if (fieldIndex > -1) {
           FieldMapperModel.update((data: any) => {

From 3cc0630fe55150a32f9ecb0ecde28c84ed414486 Mon Sep 17 00:00:00 2001
From: AishDani <aishwarya.dani@contentstack.com>
Date: Wed, 19 Nov 2025 12:51:00 +0530
Subject: [PATCH 11/15] fix: made a consistent uidCorrector function for embed
 objects

---
 api/src/services/sitecore.service.ts        | 32 +++++++++++++++------
 api/src/utils/content-type-creator.utils.ts | 31 ++++++++++++++++----
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/api/src/services/sitecore.service.ts b/api/src/services/sitecore.service.ts
index 3b3775078..03da4b23a 100644
--- a/api/src/services/sitecore.service.ts
+++ b/api/src/services/sitecore.service.ts
@@ -105,16 +105,32 @@ async function writeFiles(
     console.error('Error writing files:', error);
   }
 }
+const uidCorrector = ({ uid } :{uid : string}) => {
+  if (!uid || typeof uid !== 'string') {
+    return '';
+  }
+
+  let newUid = uid;
+
+  // Note: UIDs starting with numbers and restricted keywords are handled externally in Sitecore
+  // The prefix is applied in contentTypeMaker function when needed
 
-const uidCorrector = ({ uid }: any) => {
-  if (startsWithNumber(uid)) {
-    return `${append}_${_.replace(
-      uid,
-      new RegExp('[ -]', 'g'),
-      '_'
-    )?.toLowerCase()}`;
+  // Clean up the UID
+  newUid = newUid
+    .replace(/[ -]/g, '_') // Replace spaces and hyphens with underscores
+    .replace(/[^a-zA-Z0-9_]+/g, '_') // Replace non-alphanumeric characters (except underscore)
+    .replace(/\$/g, '') // Remove dollar signs
+    .toLowerCase() // Convert to lowercase
+    .replace(/([A-Z])/g, (match) => `_${match.toLowerCase()}`) // Handle camelCase
+    .replace(/_+/g, '_') // Replace multiple underscores with single
+    .replace(/^_|_$/g, ''); // Remove leading/trailing underscores
+
+  // Ensure UID doesn't start with underscore (Contentstack requirement)
+  if (newUid.startsWith('_')) {
+    newUid = newUid.substring(1);
   }
-  return _.replace(uid, new RegExp('[ -]', 'g'), '_')?.toLowerCase();
+
+  return newUid;
 };
 
 const createAssets = async ({
diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index 60ed055ce..503281331 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -74,12 +74,33 @@ function startsWithNumber(str: string) {
   return /^\d/.test(str);
 }
 
-const uidCorrector = ({ uid }: any) => {
-  if (startsWithNumber(uid)) {
-    return `a_${_.replace(uid, new RegExp("[ -]", "g"), '_')?.toLowerCase()}`
+const uidCorrector = ({ uid } : {uid : string}) => {
+  if (!uid || typeof uid !== 'string') {
+    return '';
   }
-  return _.replace(uid, new RegExp("[ -]", "g"), '_')?.toLowerCase()
-}
+
+  let newUid = uid;
+
+  // Note: UIDs starting with numbers and restricted keywords are handled externally in Sitecore
+  // The prefix is applied in contentTypeMaker function when needed
+
+  // Clean up the UID
+  newUid = newUid
+    .replace(/[ -]/g, '_') // Replace spaces and hyphens with underscores
+    .replace(/[^a-zA-Z0-9_]+/g, '_') // Replace non-alphanumeric characters (except underscore)
+    .replace(/\$/g, '') // Remove dollar signs
+    .toLowerCase() // Convert to lowercase
+    .replace(/([A-Z])/g, (match) => `_${match.toLowerCase()}`) // Handle camelCase
+    .replace(/_+/g, '_') // Replace multiple underscores with single
+    .replace(/^_|_$/g, ''); // Remove leading/trailing underscores
+
+  // Ensure UID doesn't start with underscore (Contentstack requirement)
+  if (newUid.startsWith('_')) {
+    newUid = newUid.substring(1);
+  }
+
+  return newUid;
+};
 
 
 function buildFieldSchema(item: any, marketPlacePath: string, parentUid = ''): any {

From 7775cd337af82a7fccc57e5dbd91bef9f59d866d Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 19 Nov 2025 14:45:12 +0530
Subject: [PATCH 12/15] comment resolved: null check added

---
 .../components/Stepper/VerticalStepper/AutoVerticalStepper.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
index c09abaad1..d9de0f8b1 100644
--- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
+++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
@@ -93,7 +93,7 @@ const AutoVerticalStepper = React.forwardRef<
               </Tooltip>
             ) : null} */}
           </div>
-          {data.description && (
+          {data?.description && (
             <div 
               className="stepper-discription" 
               dangerouslySetInnerHTML={{ __html: data?.description }}

From ee926691269b38d852da7c5183f276b593117fe0 Mon Sep 17 00:00:00 2001
From: yashin4112 <yash.shinde@contentstack.com>
Date: Wed, 19 Nov 2025 17:40:48 +0530
Subject: [PATCH 13/15] code added to set content type default value for link
 datatype

---
 api/src/utils/content-type-creator.utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index 503281331..a6c7d63d7 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -598,8 +598,8 @@ const convertToSchemaFormate = ({ field, advanced = false, marketPlacePath, keyM
         "field_metadata": {
           description: "",
           "default_value": {
-            "title": "",
-            "url": '',
+            "title": field?.advanced?.title ?? '',
+            "url": field?.advanced?.url ?? '',
           }
         },
         "format": field?.advanced?.validationRegex ?? '',

From 616ac45693362e98b206132874cc15ab4718f8ed Mon Sep 17 00:00:00 2001
From: Sayali Joshi <sayali.joshi@contentstack.com>
Date: Wed, 19 Nov 2025 18:00:14 +0530
Subject: [PATCH 14/15] table loader fixes

---
 ui/src/components/ContentMapper/index.tsx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 320ce4715..61077da89 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -762,12 +762,8 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       setItemStatusMap(itemStatusMap);
       setLoading(true);
 
-
-      // console.info('loading', loading);
-
       const { data } = await getFieldMapping(contentTypeId || '', 0, 1000, searchText || '', projectId);
 
-
       for (let index = 0; index <= 1000; index++) {
         itemStatusMap[index] = 'loaded';
       }
@@ -782,7 +778,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       setSelectedEntries(validTableData ?? []);
       setTotalCounts(validTableData?.length);
       setInitialRowSelectedData(validTableData?.filter((item: FieldMapType) => !item?.isDeleted))
-      // setIsLoading(false);
       generateSourceGroupSchema(validTableData);
     } catch (error) {
       console.error('fetchData -> error', error);
@@ -805,7 +800,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap({ ...itemStatusMapCopy });
-      // setLoading(true);
+      setLoading(true);
 
       const { data } = await getFieldMapping(contentTypeUid || '', skip, limit, searchText || '', projectId);
 
@@ -816,15 +811,15 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       }
 
       setItemStatusMap({ ...updateditemStatusMapCopy });
+      setLoading(false);
 
       const validTableData = data?.fieldMapping?.filter((field: FieldMapType) => field?.otherCmsType !== undefined);
 
       // eslint-disable-next-line no-unsafe-optional-chaining
-      setTableData([...tableData, ...validTableData ?? tableData]);
-      setTotalCounts([...tableData, ...validTableData ?? tableData]?.length);
-      setIsLoading(false);
+      setTableData(validTableData ?? []);
+      setSelectedEntries(validTableData ?? []);
+      setTotalCounts(validTableData?.length);
       setIsAllCheck(true);
-
     } catch (error) {
       console.error('loadMoreItems -> error', error);
     }

From 72bb064938b7ab6943f4d2385139be16e1f1c08c Mon Sep 17 00:00:00 2001
From: Sayali Joshi <sayali.joshi@contentstack.com>
Date: Wed, 19 Nov 2025 18:32:13 +0530
Subject: [PATCH 15/15] copilot comments resolved

---
 api/src/services/contentMapper.service.ts          |  4 ++--
 api/src/services/sitecore.service.ts               |  3 +--
 api/src/utils/content-type-creator.utils.ts        |  3 +--
 ui/src/components/ContentMapper/index.scss         |  7 -------
 ui/src/components/ContentMapper/index.tsx          | 14 --------------
 ui/src/components/LegacyCms/Actions/LoadPrefix.tsx |  4 +---
 .../LegacyCms/Actions/LoadUploadFile.tsx           | 11 +++++------
 .../HorizontalStepper/HorizontalStepper.tsx        |  5 -----
 8 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/api/src/services/contentMapper.service.ts b/api/src/services/contentMapper.service.ts
index 6943c700d..13692542a 100644
--- a/api/src/services/contentMapper.service.ts
+++ b/api/src/services/contentMapper.service.ts
@@ -751,7 +751,7 @@ const resetToInitialMapping = async (req: Request) => {
   const fieldMappingData = contentTypeData.fieldMapping.map((itemId: any) => {
     const fieldData = FieldMapperModel.chain
       .get("field_mapper")
-      .find({ id: itemId, projectId: projectId , contentTypeId: contentTypeId})
+      .find({ id: itemId, projectId: projectId, contentTypeId: contentTypeId})
       .value();
     return fieldData;
   });
@@ -771,7 +771,7 @@ const resetToInitialMapping = async (req: Request) => {
       //await FieldMapperModel.read();
       (fieldMappingData || []).forEach((field: any) => {
         const fieldIndex = FieldMapperModel.data.field_mapper.findIndex(
-          (f: any) => f?.id === field?.id  && f?.projectId === projectId &&  f?.contentTypeId === contentTypeId
+          (f: any) => f?.id === field?.id && f?.projectId === projectId && f?.contentTypeId === contentTypeId
         );
         if (fieldIndex > -1) {
           FieldMapperModel.update((data: any) => {
diff --git a/api/src/services/sitecore.service.ts b/api/src/services/sitecore.service.ts
index 03da4b23a..7247dff20 100644
--- a/api/src/services/sitecore.service.ts
+++ b/api/src/services/sitecore.service.ts
@@ -119,9 +119,8 @@ const uidCorrector = ({ uid } :{uid : string}) => {
   newUid = newUid
     .replace(/[ -]/g, '_') // Replace spaces and hyphens with underscores
     .replace(/[^a-zA-Z0-9_]+/g, '_') // Replace non-alphanumeric characters (except underscore)
-    .replace(/\$/g, '') // Remove dollar signs
-    .toLowerCase() // Convert to lowercase
     .replace(/([A-Z])/g, (match) => `_${match.toLowerCase()}`) // Handle camelCase
+    .toLowerCase() // Convert to lowercase
     .replace(/_+/g, '_') // Replace multiple underscores with single
     .replace(/^_|_$/g, ''); // Remove leading/trailing underscores
 
diff --git a/api/src/utils/content-type-creator.utils.ts b/api/src/utils/content-type-creator.utils.ts
index a6c7d63d7..9bc51d83a 100644
--- a/api/src/utils/content-type-creator.utils.ts
+++ b/api/src/utils/content-type-creator.utils.ts
@@ -88,9 +88,8 @@ const uidCorrector = ({ uid } : {uid : string}) => {
   newUid = newUid
     .replace(/[ -]/g, '_') // Replace spaces and hyphens with underscores
     .replace(/[^a-zA-Z0-9_]+/g, '_') // Replace non-alphanumeric characters (except underscore)
-    .replace(/\$/g, '') // Remove dollar signs
-    .toLowerCase() // Convert to lowercase
     .replace(/([A-Z])/g, (match) => `_${match.toLowerCase()}`) // Handle camelCase
+    .toLowerCase() // Convert to lowercase
     .replace(/_+/g, '_') // Replace multiple underscores with single
     .replace(/^_|_$/g, ''); // Remove leading/trailing underscores
 
diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index d8ac18003..37eb6355b 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -152,14 +152,7 @@
   .Table {
     border-left: 0 none;
     min-height: 26.25rem;
-    // &__rowgroup {
-    //   display: flex;
-    //   flex: 1;
-    //   flex-direction: column;
-    // }
     .Table__body__row {
-      //   height: auto!important;
-      //   min-height: 80px;
         .Table-select-body {
          >.checkbox-wrapper {
           align-items: flex-start;
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 61077da89..71dbd7b3b 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -2645,20 +2645,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                   initialRowSelectedData={initialRowSelectedData}
                   initialSelectedRowIds={rowIds}
                   itemSize={80}
-                  // v2Features={{
-                  //   isNewEmptyState: true
-                  // }}
-                  // customEmptyState={
-                  //   <EmptyState
-                  //     forPage="list"
-                  //     heading={<div className="empty_search_heading">No Fields available</div>}
-                  //     moduleIcon="NoSearchResult"
-                  //     description="Try changing the search query to find what you are looking for."
-                  //     version="v2"
-                  //     testId="no-results-found-page"
-                  //     className="custom-empty-state"
-                  //   />
-                  // }
                   withExportCta={{
                     component: (
                       <div className='d-flex align-items-center'>
diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index 84343f755..29369aac5 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -122,7 +122,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
       };
       dispatch(updateNewMigrationData(newMigrationDataObj));
     }
-  }
+  };
 
   /****  ALL USEEffects  HERE  ****/
 
@@ -146,9 +146,7 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
           isReadOnly={newMigrationData?.legacy_cms?.uploadedFile?.isValidated}
           onBlur={(e: React.FocusEvent<HTMLInputElement>) => {
             handleOnBlur(e.target.value);
-            
           }}
-          
         />
         {isError && <p className="errorMessage">{errorMessage}</p>}
       </div>
diff --git a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
index 502728e03..dfd29427d 100644
--- a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
@@ -357,9 +357,12 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
       setShowMessage(true);
       setValidationMessage('File validated successfully.');
       setIsDisabled(true);
+      if (
         !isEmptyString(newMigrationData?.legacy_cms?.selectedCms?.cms_id) ||
-        (!isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id) &&
-          props.handleStepChange(props?.currentStep, true));
+        !isEmptyString(newMigrationData?.legacy_cms?.selectedFileFormat?.fileformat_id)
+      ) {
+        props.handleStepChange(props?.currentStep, true);
+      }
     }
     if (newMigrationData?.legacy_cms?.uploadedFile?.reValidate) {
       setValidationMessage('');
@@ -368,10 +371,6 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
       setIsDisabled(false);
     }
     setReValidate(newMigrationData?.legacy_cms?.uploadedFile?.reValidate || false);
-   
-    // else{
-    //   setIsValidated(false);
-    // }
   }, [isValidated, newMigrationData]);
 
 
diff --git a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
index de67b07ab..3a1be8f44 100644
--- a/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
+++ b/ui/src/components/Stepper/HorizontalStepper/HorizontalStepper.tsx
@@ -159,11 +159,6 @@ const HorizontalStepper = forwardRef(
             shouldCloseOnOverlayClick: false
           }
         });
-      } else if (
-        -1 < newMigrationData?.legacy_cms?.currentStep &&
-        newMigrationData?.legacy_cms?.currentStep < 2
-      ) {
-        // showNotification(newMigrationData?.legacy_cms?.currentStep + 1);
       } else if (
         newMigrationData?.destination_stack?.selectedStack === undefined ||
         newMigrationData?.destination_stack?.selectedStack === null ||