Merge branch 'development' into feat/dx-2394

Author: sunil-lakshman

.github/workflows/release.yml

@@ -15,7 +15,16 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
-          cache: 'pnpm'
+      
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Install pnpm
+        run: corepack prepare pnpm@7 --activate
+
+      - name: Install root dependencies
+        run: pnpm install
+        
       - name: Reading Configuration
         id: release_config
         uses: rgarcia-phi/json-to-variables@v1.1.0

.github/workflows/unit-test.yml

@@ -27,6 +27,14 @@ jobs:
       - name: Run tests for Contentstack Config
         working-directory: ./packages/contentstack-config
         run: npm run test
+
+      - name: Run tests for Contentstack Migrate RTE
+        working-directory: ./packages/contentstack-migrate-rte
+        run: npm run test
+
+      - name: Run tests for Contentstack Migration
+        working-directory: ./packages/contentstack-migration
+        run: npm run test
       # - name: Fetch latest references
       #   run: |
       #     git fetch --prune

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",

packages/contentstack-audit/package.json

@@ -13,6 +13,7 @@ const config = {
     'field-rules',
   ],
   'fix-fields': ['reference', 'global_field', 'json:rte', 'json:extension', 'blocks', 'group', 'content_types'],
+  'schema-fields-data-type': ['blocks','group','global_field'],
   moduleConfig: {
     'content-types': {
       name: 'content type',

packages/contentstack-audit/src/config/index.ts

@@ -185,7 +185,6 @@ export default class ContentType {
       field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
     }
     for (let child of field.schema ?? []) {
-      
       if (!fixTypes.includes(child.data_type) && child.data_type !== 'json') continue;
 
       switch (child.data_type) {
@@ -487,8 +486,13 @@ export default class ContentType {
       })
       .filter((val: any) => {
         if (this.config.skipFieldTypes.includes(val?.data_type)) return true;
-        if (val?.schema && isEmpty(val?.schema)) return false;
-        if (val?.reference_to && isEmpty(val?.reference_to)) return false;
+        if (
+          val?.schema &&
+          isEmpty(val?.schema) &&
+          (!val?.data_type || this.config['schema-fields-data-type'].includes(val.data_type))
+        )
+          return false;
+        if (val?.reference_to && isEmpty(val?.reference_to) && val.data_type === 'reference') return false;
 
         return !!val;
       }) as ContentTypeSchemaType[];

packages/contentstack-audit/src/modules/content-types.ts

@@ -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

@@ -7,7 +7,7 @@
   "dependencies": {
     "@colors/colors": "^1.6.0",
     "@contentstack/cli-cm-export": "~1.16.0",
-    "@contentstack/cli-cm-import": "~1.21.1",
+    "@contentstack/cli-cm-import": "~1.21.3",
     "@contentstack/cli-command": "~1.5.0",
     "@contentstack/cli-utilities": "~1.11.0",
     "chalk": "^4.1.2",