Merge pull request #825 from contentstack/dev

Dev to Stage Push

Author: sayalijoshi27

.gitignore

@@ -356,8 +356,14 @@ upload-api/build
 ui/.env
 upload-api/sitecoreMigrationData
 upload-api/cmsMigrationData
-upload-api/extracted_files
+upload-api/extracted_files*
 *copy*
 .qodo
 .vscode
-app.json
+app.json
+# Snyk Security Extension - AI Rules (auto-generated)
+.cursor/rules/snyk_rules.mdc
+*extracted_files*
+*MigrationData*
+*.zip
+app.json

api/.eslintrc.json

@@ -12,7 +12,6 @@
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": 2022,
-    "project": ["./tsconfig.json"],
     "sourceType": "module"
   },
   "plugins": ["@typescript-eslint"],

api/package-lock.json

@@ -25,13 +25,14 @@
   },
   "homepage": "https://github.com/contentstack/migration-v2.git#readme",
   "dependencies": {
-    "@contentstack/cli": "1.41.0",
-    "@contentstack/cli-utilities": "^1.12.0",
-    "@contentstack/json-rte-serializer": "^2.0.7",
-    "@contentstack/marketplace-sdk": "^1.2.4",
+    "@contentstack/cli": "^1.51.1",
+    "@contentstack/cli-utilities": "^1.14.2",
+    "@contentstack/json-rte-serializer": "^3.0.4",
+    "@contentstack/marketplace-sdk": "^1.4.0",
     "axios": "^1.12.0",
     "chokidar": "^3.6.0",
     "cors": "^2.8.5",
+    "dayjs": "^1.11.18",
     "dotenv": "^16.3.1",
     "express": "^4.21.0",
     "express-validator": "^7.3.0",

api/package.json

@@ -55,6 +55,16 @@ const putTestData = async (req: Request) => {
       return { ...item, id, projectId };
     });
 
+    contentTypes?.forEach((items: any) => {
+      items?.fieldMapping?.forEach?.((item: any) => {
+        if (item?.advanced) {
+          item.advanced.initial = structuredClone(item?.advanced);
+        }
+      });
+    });
+
+
+
     /*
     this code snippet iterates over an array of contentTypes and performs 
     some operations on each element. 
@@ -65,7 +75,6 @@ const putTestData = async (req: Request) => {
     Finally, it updates the fieldMapping property of each type in the contentTypes array with the fieldIds array.
     */
     await FieldMapperModel.read();
-
     contentTypes.map((type: any, index: any) => {
       const fieldIds: string[] = [];
       const fields = Array?.isArray?.(type?.fieldMapping) ? type?.fieldMapping?.filter((field: any) => field)?.map?.((field: any) => {
@@ -265,7 +274,15 @@ const getFieldMapping = async (req: Request) => {
 
       return fieldMapper;
     });
-    const fieldMapping: any = fieldData;
+
+    const fieldMapping: any = fieldData?.map((field: any) => {
+      if (field?.advanced?.initial) {
+        const { initial, ...restAdvanced } = field?.advanced;
+        return { ...field, advanced: restAdvanced };
+      }
+      return field;
+    });
+
     if (!isEmpty(fieldMapping)) {
       if (search) {
         filteredResult = fieldMapping?.filter?.((item: any) =>
@@ -633,8 +650,16 @@ const updateContentType = async (req: Request) => {
         );
         if (fieldIndex > -1 && field?.contentstackFieldType !== "") {
           FieldMapperModel.update((data: any) => {
+            const existingField = data?.field_mapper?.[fieldIndex];
+            const preservedInitial = existingField?.advanced?.initial;
+            
+
             data.field_mapper[fieldIndex] = field;
-            //data.field_mapper[fieldIndex].isDeleted = false;
+            
+
+            if (preservedInitial && field?.advanced) {
+              data.field_mapper[fieldIndex].advanced.initial = preservedInitial;
+            }
           });
         }
       });
@@ -750,12 +775,17 @@ const resetToInitialMapping = async (req: Request) => {
         );
         if (fieldIndex > -1) {
           FieldMapperModel.update((data: any) => {
-            data.field_mapper[fieldIndex] = {
-              ...field,
-              contentstackField: field?.otherCmsField,
-              contentstackFieldUid: field?.backupFieldUid,
-              contentstackFieldType: field?.backupFieldType,
-            };
+            
+              data.field_mapper[fieldIndex] = {
+                ...field,
+                contentstackField: field?.otherCmsField,
+                contentstackFieldUid: field?.backupFieldUid,
+                contentstackFieldType: field?.backupFieldType,
+                advanced: {
+                  ...field?.advanced?.initial,
+                  initial: field?.advanced?.initial,
+                }
+              }
           });
         }
       });

api/src/services/contentMapper.service.ts

@@ -1,18 +1,16 @@
 import path from 'path';
 import fs from 'fs';
-import getAuthtoken from "../utils/auth.utils.js";
+import getAuthtoken from '../utils/auth.utils.js';
 import { MIGRATION_DATA_CONFIG, KEYTOREMOVE } from '../constants/index.js';
 import { getAppManifestAndAppConfig } from '../utils/market-app.utils.js';
-import { v4 as uuidv4 } from "uuid";
-
+import { v4 as uuidv4 } from 'uuid';
 
 const {
   EXTENSIONS_MAPPER_DIR_NAME,
   MARKETPLACE_APPS_DIR_NAME,
-  MARKETPLACE_APPS_FILE_NAME
+  MARKETPLACE_APPS_FILE_NAME,
 } = MIGRATION_DATA_CONFIG;
 
-
 const groupByAppUid = (data: any) => {
   return data?.reduce?.((acc: any, item: any) => {
     if (!acc[item.appUid]) {
@@ -21,85 +19,114 @@ const groupByAppUid = (data: any) => {
     acc[item.appUid].push(item.extensionUid);
     return acc;
   }, {});
-}
+};
 const removeKeys = (obj: any, keysToRemove: any) => {
   return Object.fromEntries(
     Object.entries(obj).filter(([key]) => !keysToRemove.includes(key))
   );
-}
+};
 
 const writeManifestFile = async ({ destinationStackId, appManifest }: any) => {
-  const dirPath = path.join(process.cwd(), MIGRATION_DATA_CONFIG.DATA, destinationStackId, MARKETPLACE_APPS_DIR_NAME);
+  const dirPath = path.join(
+    process.cwd(),
+    MIGRATION_DATA_CONFIG.DATA,
+    destinationStackId,
+    MARKETPLACE_APPS_DIR_NAME
+  );
   try {
     await fs.promises.access(dirPath);
   } catch (err) {
     try {
       await fs.promises.mkdir(dirPath, { recursive: true });
     } catch (mkdirErr) {
-      console.error("🚀 ~ fs.mkdir ~ err:", mkdirErr);
+      console.error('🚀 ~ fs.mkdir ~ err:', mkdirErr);
       return;
     }
   }
   try {
     const filePath = path.join(dirPath, MARKETPLACE_APPS_FILE_NAME);
     await fs.promises.writeFile(filePath, JSON.stringify(appManifest, null, 2));
   } catch (writeErr) {
-    console.error("🚀 ~ fs.writeFile ~ err:", writeErr);
+    console.error('🚀 ~ fs.writeFile ~ err:', writeErr);
   }
-}
+};
 
-
-
-const createAppManifest = async ({ destinationStackId, region, userId, orgId }: any) => {
+const createAppManifest = async ({
+  destinationStackId,
+  region,
+  userId,
+  orgId,
+}: any) => {
   const authtoken = await getAuthtoken(region, userId);
-  const marketPlacePath = path.join(MIGRATION_DATA_CONFIG.DATA, destinationStackId, EXTENSIONS_MAPPER_DIR_NAME);
-  const AppMapper: any = await fs.promises.readFile(marketPlacePath, "utf-8").catch(async () => { });
+  const marketPlacePath = path.join(
+    MIGRATION_DATA_CONFIG.DATA,
+    destinationStackId,
+    EXTENSIONS_MAPPER_DIR_NAME
+  );
+  const AppMapper: any = await fs.promises
+    .readFile(marketPlacePath, 'utf-8')
+    .catch(async () => {});
   if (AppMapper !== undefined) {
     const appManifest: any = [];
     const groupUids: any = groupByAppUid(JSON.parse(AppMapper));
     for await (const [key, value] of Object?.entries?.(groupUids) || {}) {
-      const data: any = await getAppManifestAndAppConfig({ organizationUid: orgId, authtoken, region, manifestUid: key });
+      const data: any = await getAppManifestAndAppConfig({
+        organizationUid: orgId,
+        authtoken,
+        region,
+        manifestUid: key,
+      });
       data.manifest = removeKeys(data, KEYTOREMOVE);
-      const extensionUids: any = new Set(value) ?? [];
+      const extensionUids: any = new Set(Array.isArray(value) ? value : []);
       const locations: any = [];
-      for (const ext of extensionUids ?? []) {
+      for (const ext of extensionUids) {
         const seprateUid = ext?.split?.('-');
         const type: string = seprateUid?.[1];
         const extUid: string = seprateUid?.[0];
         for (const loc of data?.ui_location?.locations ?? []) {
           if (loc?.type === type) {
-            const isPresent = locations?.meta?.findIndex((item: any) => item?.extension_uid === extUid);
+            const isPresent = locations?.meta?.findIndex(
+              (item: any) => item?.extension_uid === extUid
+            );
             if (isPresent === undefined) {
               locations?.push({
                 type,
-                meta: [{ ...(loc?.meta?.[0] || {}), extension_uid: extUid }]
-              })
+                meta: [{ ...(loc?.meta?.[0] || {}), extension_uid: extUid }],
+              });
             }
           }
         }
       }
-      const configData = data?.ui_location?.locations?.find((ele: any) => ele?.type === 'cs.cm.stack.config');
+      const configData = data?.ui_location?.locations?.find(
+        (ele: any) => ele?.type === 'cs.cm.stack.config'
+      );
       if (configData) {
         locations?.push({
           type: configData?.type,
-          meta: [{ ...(configData?.meta?.[0] || {}), name: 'Config', extension_uid: uuidv4() }]
-        })
+          meta: [
+            {
+              ...(configData?.meta?.[0] || {}),
+              name: 'Config',
+              extension_uid: uuidv4(),
+            },
+          ],
+        });
       }
       data.ui_location.locations = locations;
-      data.status = "installed";
+      data.status = 'installed';
       data.target = {
-        "type": "stack",
-        "uid": destinationStackId
+        type: 'stack',
+        uid: destinationStackId,
       };
       data.installation_uid = data?.uid;
-      data.configuration = "";
-      data.server_configuration = "";
+      data.configuration = '';
+      data.server_configuration = '';
       appManifest?.push(removeKeys(data, KEYTOREMOVE));
     }
     await writeManifestFile({ destinationStackId, appManifest });
   }
-}
+};
 
 export const marketPlaceAppService = {
-  createAppManifest
-}
+  createAppManifest,
+};