Merge pull request #1255 from contentstack/fix/CS-43404-entry-migrati…

…on-windows-issue Fix entry migration windows issue
contentstack · Jan 23, 2024 · 34afabe · 34afabe
2 parents e87f8aa + 2f48a18
commit 34afabe
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 54 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.20 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-branches/1.0.21 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.20",
+  "version": "1.0.21",
   "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
@@ -241,7 +241,6 @@ export default class MergeHandler {
   async executeEntryExpFlow(mergeJobUID: string, mergePayload) {
     const { mergeContent } = this.mergeSettings;
     let mergePreference = await selectContentMergePreference();
-    let selectedMergePreference;
 
     const updateEntryMergeStrategy = (items, mergeStrategy) => {
       items &&
@@ -250,25 +249,16 @@ export default class MergeHandler {
         });
     };
 
-    switch (mergePreference) {
-      case 'existing_new':
-        selectedMergePreference = 'merge_existing_new';
-        updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
-        updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
-        break;
-
-      case 'new':
-        selectedMergePreference = 'merge_new';
-        updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
-        break;
-
-      case 'existing':
-        selectedMergePreference = 'merge_existing';
-        updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
-        break;
+    const mergePreferencesMap = {
+      'existing_new': 'merge_existing_new',
+      'new': 'merge_new',
+      'existing': 'merge_existing',
+      'ask_preference': 'custom',
+    };
+    const selectedMergePreference = mergePreferencesMap[mergePreference];
 
-      case 'ask_preference':
-        selectedMergePreference = 'custom';
+    if (selectedMergePreference) {
+      if (selectedMergePreference === 'custom') {
         const selectedMergeItems = await selectContentMergeCustomPreferences(mergeContent.content_types);
         mergeContent.content_types = {
           added: [],
@@ -279,23 +269,25 @@ export default class MergeHandler {
         selectedMergeItems?.forEach((item) => {
           mergeContent.content_types[item.status].push(item.value);
         });
-        break;
-
-      default:
-        cliux.error(`error: Invalid preference ${mergePreference}`);
-        process.exit(1);
+      } else {
+        updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
+        updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
+      }
+    } else {
+      cliux.error(`error: Invalid preference ${mergePreference}`);
+      process.exit(1);
     }
 
     let scriptFolderPath = generateMergeScripts(mergeContent.content_types, mergeJobUID);
 
     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'});
+      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' });
 
       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{
+      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}`;
       }
 

diff --git a/packages/contentstack-branches/src/utils/create-merge-scripts.ts b/packages/contentstack-branches/src/utils/create-merge-scripts.ts
@@ -34,21 +34,20 @@ export function generateMergeScripts(mergeSummary, mergeJobUID) {
 
     const processContentTypes = (contentTypes, messageType) => {
       if (contentTypes && contentTypes.length > 0) {
-        processContentType(
-          { type: 'assets', uid: '', entry_merge_strategy: '' },
-          mergeStrategies['asset_create_folder'],
-        );
         contentTypes.forEach((contentType) => {
           const mergeStrategy = contentType.entry_merge_strategy;
           if (mergeStrategies.hasOwnProperty(mergeStrategy)) {
             processContentType(contentType, mergeStrategies[mergeStrategy]);
           }
         });
-      } else {
-        cliux.print(`No ${messageType} entries selected for merge`, { color: 'yellow' });
+        cliux.print(`Info: Entries of ${messageType} content types selected for the migration`, { color: 'blue' });
       }
     };
-
+
+    processContentType(
+      { type: 'assets', uid: '', entry_merge_strategy: '' },
+      mergeStrategies['asset_create_folder'],
+    );
     processContentTypes(mergeSummary.modified, 'Modified');
     processContentTypes(mergeSummary.added, 'New');
 
@@ -93,10 +92,11 @@ export function createMergeScripts(contentType: CreateMergeScriptsProps, mergeJo
         fs.mkdirSync(fullPath);
       }
       let filePath: string;
+      let milliSeconds = date.getMilliseconds().toString().padStart(3, '0')
       if (contentType.type === 'assets') {
-        filePath = `${fullPath}/${fileCreatedAt}_create_assets_folder.js`;
+        filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_create_assets_folder.js`;
       } else {
-        filePath = `${fullPath}/${fileCreatedAt}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${
+        filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${
           contentType.uid
         }.js`;
       }

diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.12.1 darwin-arm64 node-v20.8.0
+@contentstack/cli/1.12.2 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -3217,7 +3217,7 @@ DESCRIPTION
   Display help for csdx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.14/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.20/src/commands/help.ts)_
 
 ## `csdx launch`
 

diff --git 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.12.1",
+  "version": "1.12.2",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -25,7 +25,7 @@
     "@contentstack/cli-audit": "~1.3.2",
     "@contentstack/cli-auth": "~1.3.17",
     "@contentstack/cli-cm-bootstrap": "~1.7.1",
-    "@contentstack/cli-cm-branches": "~1.0.20",
+    "@contentstack/cli-cm-branches": "~1.0.21",
     "@contentstack/cli-cm-bulk-publish": "~1.4.0",
     "@contentstack/cli-cm-clone": "~1.9.0",
     "@contentstack/cli-cm-export": "~1.10.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml