Merge branch 'development' into fix/DX-2894

Author: cs-raj

package-lock.json

@@ -2,6 +2,7 @@ import os from 'os';
 import path from 'path';
 import forEach from 'lodash/forEach';
 import { cliux } from '@contentstack/cli-utilities';
+import chalk from 'chalk';
 import { MergeInputOptions, MergeSummary } from '../interfaces';
 import {
   selectMergeStrategy,
@@ -107,6 +108,10 @@ export default class MergeHandler {
           deleted: [],
         };
         const selectedItems = await selectCustomPreferences(module, this.branchCompareData[module]);
+        if (!selectedItems.length) {
+          cliux.print(chalk.red('No items were selected'));
+          process.exit(1);
+        }
         forEach(selectedItems, (item) => {
           this.mergeSettings.mergeContent[module][item.status].push(item.value);
           this.mergeSettings.itemMergeStrategies.push(item.value);
@@ -132,8 +137,11 @@ export default class MergeHandler {
     } else if (this.strategy === 'overwrite_with_compare') {
       this.mergeSettings.strategy = 'overwrite_with_compare';
     }
-
-    await this.displayMergeSummary();
+    if (this.checkEmptySelection()) {
+      cliux.print(chalk.red('No items selected'));
+    } else {
+      await this.displayMergeSummary();
+    }
 
     if (!this.executeOption) {
       const executionResponse = await selectMergeExecution();
@@ -152,6 +160,17 @@ export default class MergeHandler {
     }
   }
 
+  checkEmptySelection() {
+    for (let module in this.branchCompareData) {
+      if (this.mergeSettings.mergeContent[module]?.modified?.length
+        || this.mergeSettings.mergeContent[module]?.added?.length
+        || this.mergeSettings.mergeContent[module]?.deleted?.length) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   displayMergeSummary() {
     if (this.mergeSettings.strategy !== 'ignore') {
       for (let module in this.branchCompareData) {

packages/contentstack-branches/src/branch/merge-handler.ts

@@ -13,6 +13,7 @@ export interface BranchDiffRes {
   title: string;
   type: string;
   status: string;
+  merge_strategy?: string;
 }
 
 export interface BranchDiffSummary {

packages/contentstack-branches/src/interfaces/index.ts

@@ -196,15 +196,21 @@ function printCompactTextView(branchTextRes: BranchCompactTextRes): void {
   if (branchTextRes.modified?.length || branchTextRes.added?.length || branchTextRes.deleted?.length) {
     cliux.print(' ');
     forEach(branchTextRes.added, (diff: BranchDiffRes) => {
-      cliux.print(chalk.green(`+ '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      if (diff.merge_strategy !== 'ignore') {
+        cliux.print(chalk.green(`+ '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      }
     });
 
     forEach(branchTextRes.modified, (diff: BranchDiffRes) => {
-      cliux.print(chalk.blue(`± '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      if (diff.merge_strategy !== 'ignore') {
+        cliux.print(chalk.blue(`± '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      }
     });
 
     forEach(branchTextRes.deleted, (diff: BranchDiffRes) => {
-      cliux.print(chalk.red(`- '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      if (diff.merge_strategy !== 'ignore') {
+        cliux.print(chalk.red(`- '${diff.title}' ${startCase(camelCase(diff.type))}`));
+      }
     });
   }
 }

packages/contentstack-branches/src/utils/branch-diff-utility.ts

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.40.0",
+  "version": "1.40.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -67,13 +67,13 @@
     "@types/sinon": "^10.0.20",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.44",
+    "eslint-config-oclif": "^6.0.46",
     "eslint-config-oclif-typescript": "^3.1.13",
     "globby": "^10.0.2",
     "mocha": "10.8.2",
     "nock": "^13.5.6",
     "nyc": "^15.1.0",
-    "oclif": "^4.17.44",
+    "oclif": "^4.17.46",
     "rimraf": "^5.0.10",
     "shelljs": "^0.9.2",
     "sinon": "^19.0.5",