Merge pull request #563 from contentstack/dev

Dev

Author: RohitKini

.github/workflows/repo-sync.yml

@@ -101,33 +101,33 @@ jobs:
                 npm install --save-dev eslint @eslint/js globals
 
 
-                # if [ ! -f "eslint.config.cjs" ]; then
-                #     echo "Creating default ESLint config..."
-                #     cat <<EOL > eslint.config.cjs
-                # const js = require("@eslint/js");
-                # const globals = require("globals");
-
-                # module.exports = [
-                # js.configs.recommended,
-                # {
-                #     languageOptions: {
-                #     ecmaVersion: "latest",
-                #     sourceType: "module",
-                #     globals: globals.node,
-                #     },
-                #     rules: {
-                #     "no-unused-vars": "warn",
-                #     "no-console": "off"
-                #     }
-                # }
-                # ];
-                # EOL
-                # fi
+                if [ ! -f "eslint.config.cjs" ]; then
+                    echo "Creating default ESLint config..."
+                    cat <<EOL > eslint.config.cjs
+                const js = require("@eslint/js");
+                const globals = require("globals");
+
+                module.exports = [
+                js.configs.recommended,
+                {
+                    languageOptions: {
+                    ecmaVersion: "latest",
+                    sourceType: "module",
+                    globals: globals.node,
+                    },
+                    rules: {
+                    "no-unused-vars": "warn",
+                    "no-console": "off"
+                    }
+                }
+                ];
+                EOL
+                fi
 
                 # # Remove unused imports and missing file references
-                # echo "Running ESLint to remove unused imports..."
-                # npm install eslint -g
-                # eslint . --fix
+                echo "Running ESLint to remove unused imports..."
+                npm install eslint -g
+                eslint . --fix --ignore-pattern "cli/**"
 
                 # echo "Running autoflake to remove unused imports..."
                 # pip install autoflake

api/src/controllers/migration.controller.ts

@@ -10,7 +10,7 @@ import { migrationService } from "../services/migration.service.js"
  */
 const createTestStack = async (req: Request, res: Response): Promise<void> => {
   const resp = await migrationService.createTestStack(req);
-  res.status(200).json(resp);
+  res.status(resp?.status).json(resp);
 };
 
 /**
@@ -55,12 +55,12 @@ const getLogs = async (req: Request, res: Response): Promise<void> => {
   res.status(200).json(resp);
 };
 
-const saveLocales = async (req:Request, res: Response):Promise<void> =>{
+const saveLocales = async (req: Request, res: Response): Promise<void> => {
   const resp = await migrationService.createSourceLocales(req)
   res.status(200).json(resp);
 }
 
-const saveMappedLocales = async (req:Request, res:Response):Promise<void> =>{
+const saveMappedLocales = async (req: Request, res: Response): Promise<void> => {
   const resp = await migrationService.updateLocaleMapper(req);
   res.status(200).json(resp);
 }

api/src/services/contentful.service.ts

@@ -755,7 +755,7 @@ const createEntry = async (packagePath: any, destination_stack_id: string, proje
       const environmentsId = await readFile(environmentSave, ENVIRONMENTS_FILE_NAME) ?? {};
       const displayField: { [key: string]: any } = {}
       content.map((item: any) => {
-        displayField[item.name.toLowerCase().replace(/[^a-z0-9]+/g, "_")] =
+        displayField[item?.sys?.id] =
         {
           displayField: item.displayField || "untitled",
         };

upload-api/migration-contentful/libs/contentTypeMapper.js

@@ -299,13 +299,13 @@ const contentTypeMapper = (data) => {
             };
 
             // Process validations and content names when data.items is not defined
-            if (!item.items) {
-              if (item.validations?.length > 0) {
+            if (!item?.items) {
+              if (item?.validations?.length > 0) {
                 item.validations.forEach((entries) => {
-                  if (entries.linkContentType?.length) {
-                    commonRef = processLinkContentType(entries.linkContentType);
+                  if (entries?.linkContentType?.length) {
+                    commonRef = processLinkContentType(entries?.linkContentType);
                     referenceFields =
-                      commonRef.length > 0 ? commonRef : item.contentNames?.slice(0, 9);
+                      commonRef?.length > 0 ? commonRef : item?.contentNames?.slice(0, 9);
                   }
                 });
               } else {
@@ -331,7 +331,9 @@ const contentTypeMapper = (data) => {
                     : item?.contentNames?.slice(0, 9);
               }
             }
-            acc.push(createFieldObject(item, 'reference', 'reference', referenceFields));
+            const refFieldData = createFieldObject(item, 'reference', 'reference', referenceFields)
+            refFieldData.refrenceTo = referenceFields;
+            acc.push(refFieldData);
             break;
           }
           case 'checkbox':