diff --git a/.talismanrc b/.talismanrc index b451ca8eba..5a4fcb7f9c 100644 --- a/.talismanrc +++ b/.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 diff --git a/package-lock.json b/package-lock.json index 7b2f0f0c98..933ecfc69e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1819,9 +1819,9 @@ } }, "node_modules/@contentstack/utils": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/@contentstack/utils/-/utils-1.4.4.tgz", - "integrity": "sha512-Lk+7WxhBc8SdpRACnCjPg0RTzObT02o+4sZjcW2b5GxTzkVt1vsGwAU16mVxD6UkpLOYuoas7nmZX7Jjce3UEg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@contentstack/utils/-/utils-1.5.0.tgz", + "integrity": "sha512-tL1pcC4hJ+zcrvHq9c/ShTLjCVg8ACWahLDZvqT5VAalTsnR5Ik7QltjEcRsfpz/ucLQ1GVyRQRpezELCIon4A==", "license": "MIT" }, "node_modules/@cspotcode/source-map-support": { @@ -26563,14 +26563,14 @@ }, "packages/contentstack": { "name": "@contentstack/cli", - "version": "1.51.0", + "version": "1.51.1", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.15.0", "@contentstack/cli-auth": "~1.6.1", "@contentstack/cli-cm-bootstrap": "~1.16.1", "@contentstack/cli-cm-branches": "~1.6.0", - "@contentstack/cli-cm-bulk-publish": "~1.10.1", + "@contentstack/cli-cm-bulk-publish": "~1.10.2", "@contentstack/cli-cm-clone": "~1.16.1", "@contentstack/cli-cm-export": "~1.20.1", "@contentstack/cli-cm-export-to-csv": "~1.9.1", @@ -26975,7 +26975,7 @@ }, "packages/contentstack-bulk-publish": { "name": "@contentstack/cli-cm-bulk-publish", - "version": "1.10.1", + "version": "1.10.2", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.6.1", diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index acd3ebb087..e16e5ecec2 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.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": { diff --git a/packages/contentstack-bulk-publish/src/commands/cm/entries/publish.js b/packages/contentstack-bulk-publish/src/commands/cm/entries/publish.js index ec7f275989..92ec008a82 100644 --- a/packages/contentstack-bulk-publish/src/commands/cm/entries/publish.js +++ b/packages/contentstack-bulk-publish/src/commands/cm/entries/publish.js @@ -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); diff --git a/packages/contentstack-bulk-publish/src/producer/cross-publish.js b/packages/contentstack-bulk-publish/src/producer/cross-publish.js index 1fa8828a49..3a13f35ee4 100644 --- a/packages/contentstack-bulk-publish/src/producer/cross-publish.js +++ b/packages/contentstack-bulk-publish/src/producer/cross-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) { diff --git a/packages/contentstack-export/example_config/auth_config.json b/packages/contentstack-export/example_config/auth_config.json index 360db3e69b..47043d7bb3 100644 --- a/packages/contentstack-export/example_config/auth_config.json +++ b/packages/contentstack-export/example_config/auth_config.json @@ -12,5 +12,6 @@ "writeConcurrency": 5, "securedAssets": false, "maxContentLength": 100000000, - "maxBodyLength": 100000000 + "maxBodyLength": 100000000, + "delayMs": 1000 } diff --git a/packages/contentstack-export/example_config/management_config.json b/packages/contentstack-export/example_config/management_config.json index ac57de7244..bbd71c6efd 100644 --- a/packages/contentstack-export/example_config/management_config.json +++ b/packages/contentstack-export/example_config/management_config.json @@ -12,5 +12,6 @@ "securedAssets": false, "createBackupDir": "./temp", "maxContentLength": 100000000, - "maxBodyLength": 100000000 + "maxBodyLength": 100000000, + "delayMs": 1000 } diff --git a/packages/contentstack-import/example_config/auth_config.json b/packages/contentstack-import/example_config/auth_config.json index b84231306b..38a5990e00 100644 --- a/packages/contentstack-import/example_config/auth_config.json +++ b/packages/contentstack-import/example_config/auth_config.json @@ -16,5 +16,6 @@ "createBackupDir": "./temp", "cliLogsPath": "./tmp", "maxContentLength": 100000000, - "maxBodyLength": 100000000 + "maxBodyLength": 100000000, + "delayMs": 1000 } diff --git a/packages/contentstack-import/example_config/management_config.json b/packages/contentstack-import/example_config/management_config.json index 8587aa714f..da6407778b 100644 --- a/packages/contentstack-import/example_config/management_config.json +++ b/packages/contentstack-import/example_config/management_config.json @@ -14,5 +14,6 @@ "developerHubBaseUrl": "", "cliLogsPath": "./tmp", "maxContentLength": 100000000, - "maxBodyLength": 100000000 + "maxBodyLength": 100000000, + "delayMs": 1000 } diff --git a/packages/contentstack-utilities/src/contentstack-management-sdk.ts b/packages/contentstack-utilities/src/contentstack-management-sdk.ts index c75911ecb9..f2257b4def 100644 --- a/packages/contentstack-utilities/src/contentstack-management-sdk.ts +++ b/packages/contentstack-utilities/src/contentstack-management-sdk.ts @@ -38,6 +38,7 @@ class ManagementSDKInitiator { case 401: case 429: case 408: + case 422: return true; default: diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 6250b12a52..2617db1b73 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli", "description": "Command-line tool (CLI) to interact with Contentstack", - "version": "1.51.0", + "version": "1.51.1", "author": "Contentstack", "bin": { "csdx": "./bin/run.js" @@ -26,7 +26,7 @@ "@contentstack/cli-auth": "~1.6.1", "@contentstack/cli-cm-bootstrap": "~1.16.1", "@contentstack/cli-cm-branches": "~1.6.0", - "@contentstack/cli-cm-bulk-publish": "~1.10.1", + "@contentstack/cli-cm-bulk-publish": "~1.10.2", "@contentstack/cli-cm-clone": "~1.16.1", "@contentstack/cli-cm-export": "~1.20.1", "@contentstack/cli-cm-export-to-csv": "~1.9.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b57aa186b..af7de0265a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: '@contentstack/cli-auth': ~1.6.1 '@contentstack/cli-cm-bootstrap': ~1.16.1 '@contentstack/cli-cm-branches': ~1.6.0 - '@contentstack/cli-cm-bulk-publish': ~1.10.1 + '@contentstack/cli-cm-bulk-publish': ~1.10.2 '@contentstack/cli-cm-clone': ~1.16.1 '@contentstack/cli-cm-export': ~1.20.1 '@contentstack/cli-cm-export-to-csv': ~1.9.1 @@ -2072,7 +2072,7 @@ packages: resolution: {integrity: sha512-WS4k2i+chuwmOrHqJC2N4aWOEpQ+DxrHXtMhya2uMwH25ES203C0o4hm+NwD2gi7Ea5AQycBoi8JHOF0vAQ4WA==} engines: {node: '>=14.0.0'} dependencies: - '@contentstack/cli-utilities': 1.14.3_debug@4.4.3 + '@contentstack/cli-utilities': 1.14.4_debug@4.4.3 '@oclif/core': 4.7.2 '@oclif/plugin-help': 6.2.34 contentstack: 3.26.2 @@ -2087,7 +2087,7 @@ packages: dependencies: '@apollo/client': 3.14.0_graphql@16.11.0 '@contentstack/cli-command': 1.6.1_debug@4.4.3 - '@contentstack/cli-utilities': 1.14.3_debug@4.4.3 + '@contentstack/cli-utilities': 1.14.4_debug@4.4.3 '@oclif/core': 4.7.2 '@oclif/plugin-help': 6.2.34 '@oclif/plugin-plugins': 5.4.51 @@ -2122,10 +2122,10 @@ packages: - typescript dev: false - /@contentstack/cli-utilities/1.14.3_debug@4.4.3: - resolution: {integrity: sha512-FQGw3wKqFRWXl8wfrCKEcUis/pG4wz74fBBjG9qp2mp4n4h4SyPu80QthYYebXi1RroZ+WJnUJ2PcRkreDaMcw==} + /@contentstack/cli-utilities/1.14.4_debug@4.4.3: + resolution: {integrity: sha512-Pg124tYh/p688aerqVgk8lEsCF8F5Ky35yes3KO23Wzt44Hvzps7X27psOTHs/aD4jhZkw3aB+jTItQlL84b8g==} dependencies: - '@contentstack/management': 1.22.0_debug@4.4.3 + '@contentstack/management': 1.25.1_debug@4.4.3 '@contentstack/marketplace-sdk': 1.4.0_debug@4.4.3 '@oclif/core': 4.7.2 axios: 1.12.2_debug@4.4.3 @@ -2224,6 +2224,23 @@ packages: - debug dev: false + /@contentstack/management/1.25.1_debug@4.4.3: + resolution: {integrity: sha512-454V3zGw4nrxnlYxXm82Z+yNjuechiN+TRE7SXWyHFUsexYVpKNyGyKZCvG6b4JymRTVUZpy/KnFixo01GP9Sg==} + engines: {node: '>=8.0.0'} + dependencies: + assert: 2.1.0 + axios: 1.12.2_debug@4.4.3 + buffer: 6.0.3 + form-data: 4.0.4 + husky: 9.1.7 + lodash: 4.17.21 + otplib: 12.0.1 + qs: 6.14.0 + stream-browserify: 3.0.0 + transitivePeerDependencies: + - debug + dev: false + /@contentstack/marketplace-sdk/1.4.0: resolution: {integrity: sha512-vUi9hoSh5ytr2KmuIKx+g7QDJqevIsM7UX12deCsCTdYH1q7eSrYwpv+jFH+TfrDQUYa71T/xrIF0QiTMUMqdA==} dependencies: