Merge pull request #1231 from contentstack/fix/CS-43247

fix: create, update , create-update entry migration script
contentstack · Jan 9, 2024 · 51ced51 · 51ced51
2 parents f92c5dc + 732bca5
commit 51ced51
Show file tree

Hide file tree

Showing 10 changed files with 476 additions and 206 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.19 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-branches/1.0.20 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-branches/src/branch/merge-handler.ts b/packages/contentstack-branches/src/branch/merge-handler.ts
@@ -1,3 +1,4 @@
+import os from 'os';
 import path from 'path';
 import forEach from 'lodash/forEach';
 import { cliux } from '@contentstack/cli-utilities';
@@ -275,7 +276,7 @@ export default class MergeHandler {
           deleted: [],
         };
 
-        selectedMergeItems.forEach((item) => {
+        selectedMergeItems?.forEach((item) => {
           mergeContent.content_types[item.status].push(item.value);
         });
         break;
@@ -290,10 +291,16 @@ export default class MergeHandler {
     if (scriptFolderPath !== undefined) {
       cliux.success(`\nSuccess! We have generated entry migration files in the folder ${scriptFolderPath}`);
       cliux.print('\nWARNING!!! Migration is not intended to be run more than once. Migrated(entries/assets) will be duplicated if run more than once', {color: 'yellow'});
-
-      const migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath}} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
+
+      let migrationCommand: string;
+      if(os.platform() === 'win32'){
+        migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
+      }else{
+        migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath}} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
+      }
+
       cliux.print(
-        `\nKindly follow the steps in the guide "https://www.contentstack.com/docs/developers/cli/migrate-branch-entries" to update the migration scripts, and then run the command:\n\n${migrationCommand}`,
+        `\nKindly follow the steps in the guide "https://www.contentstack.com/docs/developers/cli/entry-migration" to update the migration scripts, and then run the command:\n\n${migrationCommand}`,
         { color: 'blue' },
       );
     }

diff --git a/packages/contentstack-branches/src/utils/create-merge-scripts.ts b/packages/contentstack-branches/src/utils/create-merge-scripts.ts
@@ -30,7 +30,6 @@ export function generateMergeScripts(mergeSummary, mergeJobUID) {
       merge_existing_new: entryCreateUpdateScript,
       merge_existing: entryUpdateScript,
       merge_new: entryCreateScript,
-      ignore: entryCreateUpdateScript,
     };
 
     const processContentTypes = (contentTypes, messageType) => {
@@ -66,6 +65,8 @@ export function getContentTypeMergeStatus(status) {
     return 'created';
   } else if (status === 'merge_existing_new') {
     return 'created_updated';
+  } else if (status === 'ignore') {
+    return;
   } else {
     return '';
   }