Conflict resolved

sayalijoshi27 · sayalijoshi27 · commit 60a2875d551c · 2025-03-25T13:15:24.000+05:30
diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml
@@ -101,33 +101,34 @@ 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"
+                    "@typescript-eslint/no-var-requires": '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
diff --git a/api/src/controllers/migration.controller.ts b/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);
 }
diff --git a/api/src/services/contentful.service.ts b/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",
         };
diff --git a/upload-api/migration-contentful/libs/contentTypeMapper.js b/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':
diff --git a/upload-api/migration-sitecore/constants/index.js b/upload-api/migration-sitecore/constants/index.js
@@ -1,46 +1,49 @@
 const MIGRATION_DATA_CONFIG = {
-  DATA: 'cmsMigrationData',
-  DATA_MAPPER_DIR: 'MapperData',
-  DATA_MAPPER_CONFIG: 'configuration',
-  DATA_MAPPER_CONFIG_TREE: 'configurationTree',
-  DATA_MAPPER_CONFIG_FILE: 'configuration.json',
-  DATA_MAPPER_CONFIG_TREE_FILE: 'configurationTree.json',
+    DATA :"cmsMigrationData",
+    DATA_MAPPER_DIR :"MapperData",
+    DATA_MAPPER_CONFIG :"configuration",
+    DATA_MAPPER_CONFIG_TREE :"configurationTree",
+    DATA_MAPPER_CONFIG_FILE :"configuration.json",
+    DATA_MAPPER_CONFIG_TREE_FILE :"configurationTree.json",
+  
+    BACKUP_DATA: "migration-data",
+    BACKUP_LOG_DIR: "logs",
+    BACKUP_FOLDER_NAME: "import",
+    BACKUP_FILE_NAME: "success.log",
+  
+    LOCALE_DIR_NAME : "locale",
+    LOCALE_FILE_NAME : "locales.json",
+    LOCALE_MASTER_LOCALE : "master-locale.json",
+    LOCALE_CF_LANGUAGE : "language.json",
+  
+    CONTENT_TYPES_DIR_NAME : "content_types",
+    CONTENT_TYPES_FILE_NAME : "contenttype.json",
+    CONTENT_TYPES_MASTER_FILE : "contenttypes.json",
+    CONTENT_TYPES_SCHEMA_FILE : "schema.json",
+  
+    REFERENCES_DIR_NAME : "reference",
+    REFERENCES_FILE_NAME : "reference.json",
+  
+    RTE_REFERENCES_DIR_NAME : "rteReference",
+    RTE_REFERENCES_FILE_NAME : "rteReference.json",
+  
+    ASSETS_DIR_NAME : "assets",
+    ASSETS_FILE_NAME : "assets.json",
+    ASSETS_SCHEMA_FILE : "index.json",
+    ASSETS_FAILED_FILE : "cs_failed.json",
+    ASSETS_METADATA_FILE :"metadata.json",
+  
+    ENTRIES_DIR_NAME : "entries",
+    ENTRIES_MASTER_FILE : "index.json",
+  
+    
+    GLOBAL_FIELDS_DIR_NAME : "global_fields",
+    GLOBAL_FIELDS_FILE: "globalfields",
+    GLOBAL_FIELDS_FILE_NAME : "globalfields.json",
+    EXPORT_INFO_FILE: "export-info.json"
+  }
 
-  BACKUP_DATA: 'migration-data',
-  BACKUP_LOG_DIR: 'logs',
-  BACKUP_FOLDER_NAME: 'import',
-  BACKUP_FILE_NAME: 'success.log',
 
-  LOCALE_DIR_NAME: 'locale',
-  LOCALE_FILE_NAME: 'locales.json',
-  LOCALE_MASTER_LOCALE: 'master-locale.json',
-  LOCALE_CF_LANGUAGE: 'language.json',
-
-  CONTENT_TYPES_DIR_NAME: 'content_types',
-  CONTENT_TYPES_FILE_NAME: 'contenttype.json',
-  CONTENT_TYPES_MASTER_FILE: 'contenttypes.json',
-  CONTENT_TYPES_SCHEMA_FILE: 'schema.json',
-
-  REFERENCES_DIR_NAME: 'reference',
-  REFERENCES_FILE_NAME: 'reference.json',
-
-  RTE_REFERENCES_DIR_NAME: 'rteReference',
-  RTE_REFERENCES_FILE_NAME: 'rteReference.json',
-
-  ASSETS_DIR_NAME: 'assets',
-  ASSETS_FILE_NAME: 'assets.json',
-  ASSETS_SCHEMA_FILE: 'index.json',
-  ASSETS_FAILED_FILE: 'cs_failed.json',
-  ASSETS_METADATA_FILE: 'metadata.json',
-
-  ENTRIES_DIR_NAME: 'entries',
-  ENTRIES_MASTER_FILE: 'index.json',
-
-  GLOBAL_FIELDS_DIR_NAME: 'global_fields',
-  GLOBAL_FIELDS_FILE: 'globalfields',
-  GLOBAL_FIELDS_FILE_NAME: 'globalfields.json',
-  EXPORT_INFO_FILE: 'export-info.json'
-};
 
 module.exports = {
   MIGRATION_DATA_CONFIG
diff --git a/upload-api/src/constants/index.ts b/upload-api/src/constants/index.ts
@@ -23,7 +23,8 @@ export const HTTP_TEXTS = {
   ZIP_FILE_SAVE: 'Issue While Saving Zip File.',
   XML_FILE_SAVE: 'Issue While Saving XML File.',
   MAPPER_SAVED: 'Mapping process completed successfull.',
-  LOCALE_SAVED: 'Source locales stored successfully'
+  LOCALE_SAVED: 'Source locales stored successfully',
+  LOCALE_FAILED: 'Unable to create source.',
 };
 
 export const HTTP_RESPONSE_HEADERS = {
@@ -33,46 +34,46 @@ export const HTTP_RESPONSE_HEADERS = {
 };
 
 export const MIGRATION_DATA_CONFIG = {
-  DATA: 'cmsMigrationData',
+  DATA: "cmsMigrationData",
 
   BACKUP_DATA: 'migration-data',
   BACKUP_LOG_DIR: 'logs',
   BACKUP_FOLDER_NAME: 'import',
   BACKUP_FILE_NAME: 'success.log',
 
-  LOCALE_DIR_NAME: 'locale',
-  LOCALE_FILE_NAME: 'locales.json',
-  LOCALE_MASTER_LOCALE: 'master-locale.json',
-  LOCALE_CF_LANGUAGE: 'language.json',
+  LOCALE_DIR_NAME: "locale",
+  LOCALE_FILE_NAME: "locales.json",
+  LOCALE_MASTER_LOCALE: "master-locale.json",
+  LOCALE_CF_LANGUAGE: "language.json",
 
-  WEBHOOKS_DIR_NAME: 'webhooks',
-  WEBHOOKS_FILE_NAME: 'webhooks.json',
+  WEBHOOKS_DIR_NAME: "webhooks",
+  WEBHOOKS_FILE_NAME: "webhooks.json",
 
-  ENVIRONMENTS_DIR_NAME: 'environments',
-  ENVIRONMENTS_FILE_NAME: 'environments.json',
+  ENVIRONMENTS_DIR_NAME: "environments",
+  ENVIRONMENTS_FILE_NAME: "environments.json",
 
-  CONTENT_TYPES_DIR_NAME: 'content_types',
-  CONTENT_TYPES_FILE_NAME: 'contenttype.json',
-  CONTENT_TYPES_MASTER_FILE: 'contenttypes.json',
-  CONTENT_TYPES_SCHEMA_FILE: 'schema.json',
+  CONTENT_TYPES_DIR_NAME: "content_types",
+  CONTENT_TYPES_FILE_NAME: "contenttype.json",
+  CONTENT_TYPES_MASTER_FILE: "contenttypes.json",
+  CONTENT_TYPES_SCHEMA_FILE: "schema.json",
 
-  REFERENCES_DIR_NAME: 'reference',
-  REFERENCES_FILE_NAME: 'reference.json',
+  REFERENCES_DIR_NAME: "reference",
+  REFERENCES_FILE_NAME: "reference.json",
 
-  RTE_REFERENCES_DIR_NAME: 'rteReference',
-  RTE_REFERENCES_FILE_NAME: 'rteReference.json',
+  RTE_REFERENCES_DIR_NAME: "rteReference",
+  RTE_REFERENCES_FILE_NAME: "rteReference.json",
 
-  ASSETS_DIR_NAME: 'assets',
-  ASSETS_FILE_NAME: 'assets.json',
-  ASSETS_SCHEMA_FILE: 'index.json',
-  ASSETS_FAILED_FILE: 'cs_failed.json',
-  ASSETS_METADATA_FILE: 'metadata.json',
+  ASSETS_DIR_NAME: "assets",
+  ASSETS_FILE_NAME: "assets.json",
+  ASSETS_SCHEMA_FILE: "index.json",
+  ASSETS_FAILED_FILE: "cs_failed.json",
+  ASSETS_METADATA_FILE: "metadata.json",
 
-  ENTRIES_DIR_NAME: 'entries',
-  ENTRIES_MASTER_FILE: 'index.json',
+  ENTRIES_DIR_NAME: "entries",
+  ENTRIES_MASTER_FILE: "index.json",
 
-  GLOBAL_FIELDS_DIR_NAME: 'global_fields',
-  GLOBAL_FIELDS_FILE_NAME: 'globalfields.json',
+  GLOBAL_FIELDS_DIR_NAME: "global_fields",
+  GLOBAL_FIELDS_FILE_NAME: "globalfields.json",
 
   EXPORT_INFO_FILE: 'export-info.json'
 };
diff --git a/upload-api/src/controllers/sitecore/index.ts b/upload-api/src/controllers/sitecore/index.ts
@@ -14,11 +14,39 @@ const {
   GLOBAL_FIELDS_FILE_NAME
 } = MIGRATION_DATA_CONFIG;
 
+const createLocaleSource = async ({ app_token, localeData, projectId }: { app_token: string | string[], localeData: any, projectId: string | string[] }) => {
+  const mapperConfig = {
+    method: 'post',
+    maxBodyLength: Infinity,
+    url: `${process.env.NODE_BACKEND_API}/v2/migration/localeMapper/${projectId}`,
+    headers: {
+      app_token,
+      'Content-Type': 'application/json'
+    },
+    data: {
+      locale: Array?.from?.(localeData) ?? []
+    },
+  };
+  const mapRes = await axios?.request?.(mapperConfig);
+  if (mapRes?.status == 200) {
+    logger.info('Legacy CMS', {
+      status: HTTP_CODES?.OK,
+      message: HTTP_TEXTS?.LOCALE_SAVED,
+    });
+  } else {
+    logger.warn('Legacy CMS  error:', {
+      status: HTTP_CODES?.UNAUTHORIZED,
+      message: HTTP_TEXTS?.LOCALE_FAILED,
+    });
+  }
+}
+
 const createSitecoreMapper = async (filePath: string = "", projectId: string | string[], app_token: string | string[], affix: string | string[], config: object) => {
   try {
     const newPath = path.join(filePath, 'items');
     await ExtractFiles(newPath);
     const localeData = await extractLocales(path.join(filePath, 'items', 'master', 'sitecore', 'content'));
+    await createLocaleSource?.({ app_token, localeData, projectId });
     await ExtractConfiguration(newPath);
     await contentTypes(newPath, affix, config);
     const infoMap = await reference();
@@ -56,25 +84,6 @@ const createSitecoreMapper = async (filePath: string = "", projectId: string | s
           status: HTTP_CODES?.OK,
           message: HTTP_TEXTS?.MAPPER_SAVED,
         });
-        const mapperConfig = {
-          method: 'post',
-          maxBodyLength: Infinity,
-          url: `${process.env.NODE_BACKEND_API}/v2/migration/localeMapper/${projectId}`,
-          headers: {
-            app_token,
-            'Content-Type': 'application/json'
-          },
-          data: {
-            locale: Array?.from?.(localeData) ?? []
-          },
-        };
-        const mapRes = await axios.request(mapperConfig);
-        if (mapRes?.status == 200) {
-          logger.info('Legacy CMS', {
-            status: HTTP_CODES?.OK,
-            message: HTTP_TEXTS?.LOCALE_SAVED,
-          });
-        }
       }
     }
   } catch (err: any) {

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ const createEntry = async (packagePath: any, destination_stack_id: string, proje`
`755`	`755`	`const environmentsId = await readFile(environmentSave, ENVIRONMENTS_FILE_NAME) ?? {};`
`756`	`756`	`const displayField: { [key: string]: any } = {}`
`757`	`757`	`content.map((item: any) => {`
`758`		`- displayField[item.name.toLowerCase().replace(/[^a-z0-9]+/g, "_")] =`
	`758`	`+ displayField[item?.sys?.id] =`
`759`	`759`	`{`
`760`	`760`	`displayField: item.displayField \|\| "untitled",`
`761`	`761`	`};`