Feature/re redux legacy

ui/src/cmsData/region_login.json

@@ -53,7 +53,7 @@
       "_metadata": { "uid": "cs77a3bf15c456afbb" }
     },
     {
-      "region": "EU",
+      "region": "GCP_NA",
       "service_icon": {
           "uid": "blt57dafa9c1472b46f",
           "created_at": "2024-07-29T10:57:59.058Z",
@@ -82,7 +82,7 @@
       }
     },
     {
-      "region": "AZURE_EU",
+      "region": "EU",
       "service_icon": {
         "uid": "bltbe45879eac0025d8",
         "created_at": "2023-10-31T06:59:22.783Z",
@@ -106,7 +106,7 @@
       "_metadata": { "uid": "csf578f8fbea1ae0c0" }
     },
     {
-      "region": "GCP_NA",
+      "region": "AZURE_EU",
       "service_icon": {
         "uid": "blt85d2a7024c613199",
         "created_at": "2023-10-31T07:00:56.567Z",

ui/src/components/ContentMapper/index.tsx

@@ -330,22 +330,52 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
   }, [contentTypeMapped, otherCmsTitle]);
 
   useEffect(() => {
-    const updatedExstingField: ExistingFieldType = {};
     const checkKey = Object.keys(contentTypeMapped).find(key => contentTypeMapped[key] === contentTypeMapped[otherCmsTitle]);
 
-    if (checkKey === otherCmsTitle) {
+    // if (checkKey === otherCmsTitle) {
       tableData?.forEach((row) => {
-        if (row?.contentstackField) {
-          updatedExstingField[row?.uid] = {
-            label: row?.contentstackField,
-            value: row?.contentstackField
-          };
-        }
+        contentTypeSchema?.forEach((schema) => {
+
+          if (row?.contentstackField === schema?.display_name) {
+            updatedExstingField[row?.uid] = {
+              label: schema?.display_name,
+              value: schema
+            };
+          }
+
+          if(schema?.schema) {
+            schema?.schema?.forEach((childSchema) => {
+              if(row?.contentstackField === `${schema?.display_name} > ${childSchema?.display_name}`){
+
+                updatedExstingField[row?.uid] = {
+                  label: `${schema?.display_name} > ${childSchema?.display_name}`,
+                  value: childSchema
+                }
+              }
+            })
+          }
+        });
       });
-      //setExistingField(updatedExstingField);
-    }
+
+      setExistingField(updatedExstingField);
+    // }
   }, [tableData, otherCmsTitle]);
 
+  useEffect(() => {
+    if (isUpdated) {     
+      setTableData(updatedRows);
+      setExistingField(updatedExstingField);
+      setSelectedOptions(updatedSelectedOptions);
+      setSelectedEntries(updatedRows);
+      setIsUpdated(false);
+    }
+    else{
+      setExistingField({});
+      setSelectedOptions([]);
+
+    }
+  }, [isUpdated, otherContentType]);
+
   // To make all the fields checked
   useEffect(() => {
     const selectedId = tableData.reduce<UidMap>((acc, item) => {
@@ -834,7 +864,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
     }
 
 
-    setExistingField((prevOptions) => ({
+    setExistingField((prevOptions: any) => ({
       ...prevOptions,
       [rowIndex]: { label: selectedValue?.label, value: selectedValue?.value }
     }));
@@ -871,15 +901,15 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
         return {
           ...row,
           contentstackField: selectedValue?.label,
+          contentstackFieldUid: selectedValue?.value?.uid,
           advanced: {
             validationRegex: selectedValue?.value?.format,
             Mandatory: selectedValue?.value?.mandatory,
             Multiple: selectedValue?.value?.multiple,
             Unique: selectedValue?.value?.unique,
             NonLocalizable: selectedValue?.value?.non_localizable,
             MinChars: selectedValue?.value?.max,
-            MaxChars: selectedValue?.value?.min,       
-
+            MaxChars: selectedValue?.value?.min
           }
         };
       }
@@ -1130,6 +1160,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
             return {
               ...row,
               contentstackField: OptionsForRow[0]?.value?.display_name ?? '',
+              contentstackFieldUid: OptionsForRow[0]?.value?.uid ?? '',
               advanced: {
                 validationRegex: OptionsForRow[0]?.value?.format ?? '',
                 Mandatory: OptionsForRow[0]?.value?.mandatory,
@@ -1151,7 +1182,9 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
 
         // Check if there's already a matching entry in updatedExstingField
         const hasMatchingEntry = Object.values(updatedExstingField).some(         
-          (entry) =>{ return entry?.label === newLabel }
+          (entry) =>{ 
+            return entry?.label === newLabel 
+          }
         );
 
         if (!hasMatchingEntry) {
@@ -1269,20 +1302,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
   };
 
 
-  useEffect(() => {
-    if (isUpdated) {     
-      setTableData(updatedRows);
-      setExistingField(updatedExstingField);
-      setSelectedOptions(updatedSelectedOptions);
-      setSelectedEntries(updatedRows);
-      setIsUpdated(false);
-    }
-    else{
-      setExistingField({});
-      setSelectedOptions([]);
-
-    }
-  }, [isUpdated, otherContentType]);
+
 
   const handleSaveContentType = async () => {
     const orgId = selectedOrganisation?.uid;