Merge pull request #2204 from contentstack/fix/merge-conflicts

Fix/merge conflicts and back merge from staging to development

Author: harshithad0703

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 6ff9c8334d085a39cbda0377f9b36f1af3f3735f62d9372c0e51efaa4f4a960e
+  checksum: ca12061eb32da8cb2d0e3be8e10e89b3f23b2351df8d397e811b34040c9d79b5
 - filename: pnpm-lock.yaml
-  checksum: d02a60a70a50b191dcb746ce9644b01202957e6b5fb56cdaa564d7105623bb9d
+  checksum: 45e2fb78b203e512a8a15eb508b82a9bfcbbfaddc461c02edb194a127b5168d9
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bulk-publish",
   "description": "Contentstack CLI plugin for bulk publish actions",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-bulk-publish/package.json

@@ -88,14 +88,20 @@ class PublishEntriesCommand extends Command {
             updatedFlags.destEnv = updatedFlags.environments;
             updatedFlags.environment = updatedFlags['source-env'];
             updatedFlags.onlyEntries = true;
-            if (updatedFlags.locales instanceof Array) {
-              updatedFlags.locales.forEach((locale) => {
-                updatedFlags.locale = locale;
-                publishFunction(startCrossPublish);
-              });
-            } else {
-              updatedFlags.locale = locales;
-              publishFunction(startCrossPublish);
+            if(Array.isArray(updatedFlags.contentTypes) && updatedFlags.contentTypes.length > 0){
+              for (const contentType of updatedFlags.contentTypes) {
+                updatedFlags.contentType = contentType;
+                if (Array.isArray(updatedFlags.locales)) {
+                  for (const locale of updatedFlags.locales) {
+                    updatedFlags.locale = locale;
+                    console.log(`Bulk publish started for content type \x1b[36m${updatedFlags.contentType}\x1b[0m and locale is \x1b[36m${updatedFlags.locale}\x1b[0m`);
+                    await publishFunction(startCrossPublish);
+                  }
+                } else {
+                  updatedFlags.locale = updatedFlags.locales;
+                  publishFunction(startCrossPublish);
+                }
+              }
             }
           } else {
             publishFunction(startPublish);

packages/contentstack-bulk-publish/src/commands/cm/entries/publish.js

@@ -200,17 +200,15 @@ async function getSyncEntries(
       if (queryParamsObj.locale) {
         syncData['locale'] = queryParamsObj.locale;
       }
+      if (filter?.content_type_uid) {
+        syncData['content_type_uid'] = filter.content_type_uid;
+      }
       if (queryParamsObj.type) {
         syncData['type'] = queryParamsObj.type;
       }
+      let entriesResponse;
+      entriesResponse = await Stack.sync(syncData);
 
-      const entriesResponse = await Stack.sync(syncData);
-
-      if (filter?.content_type_uid?.length) {
-        entriesResponse.items = entriesResponse.items.filter((entry) =>
-          filter?.content_type_uid.includes(entry.content_type_uid),
-        );
-      }
 
       if (variantsFlag) {
         for (let index = 0; index < entriesResponse?.items?.length; index++) {
@@ -241,6 +239,7 @@ async function getSyncEntries(
           destEnv,
           apiVersion,
           bulkPublishLimit,
+          variantsFlag,
           entriesResponse.pagination_token,
         );
       }, 3000);
@@ -314,7 +313,7 @@ async function start(
     retryFailed,
     bulkPublish,
     deliveryToken,
-    contentTypes,
+    contentType,
     environment,
     locale,
     onlyAssets,
@@ -372,8 +371,8 @@ async function start(
     };
     if (f_types) filter.type = f_types;
     // filter.type = (f_types) ? f_types : types // types mentioned in the config file (f_types) are given preference
-    if (contentTypes) {
-      filter.content_type_uid = contentTypes;
+    if (contentType) {
+      filter.content_type_uid = contentType;
       filter.type = 'entry_published';
     }
     if (onlyAssets) {

packages/contentstack-bulk-publish/src/producer/cross-publish.js

@@ -12,5 +12,6 @@
   "writeConcurrency": 5,
   "securedAssets": false,
   "maxContentLength": 100000000,
-  "maxBodyLength": 100000000
+  "maxBodyLength": 100000000,
+  "delayMs": 1000
 }

packages/contentstack-export/example_config/auth_config.json

@@ -12,5 +12,6 @@
   "securedAssets": false,
   "createBackupDir": "./temp",
   "maxContentLength": 100000000,
-  "maxBodyLength": 100000000
+  "maxBodyLength": 100000000,
+  "delayMs": 1000
 }

packages/contentstack-export/example_config/management_config.json

@@ -16,5 +16,6 @@
   "createBackupDir": "./temp",
   "cliLogsPath": "./tmp",
   "maxContentLength": 100000000,
-  "maxBodyLength": 100000000
+  "maxBodyLength": 100000000,
+  "delayMs": 1000
 }

packages/contentstack-import/example_config/auth_config.json

@@ -14,5 +14,6 @@
   "developerHubBaseUrl": "",
   "cliLogsPath": "./tmp",
   "maxContentLength": 100000000,
-  "maxBodyLength": 100000000
+  "maxBodyLength": 100000000,
+  "delayMs": 1000
 }

packages/contentstack-import/example_config/management_config.json

@@ -38,6 +38,7 @@ class ManagementSDKInitiator {
             case 401:
             case 429:
             case 408:
+            case 422:
               return true;
 
             default: