Merge branch 'development' into feat/CS-43112-gcp-support

contentstack · Jan 24, 2024 · d67cc8a · d67cc8a
2 parents 2d287d8 + bbba92a
commit d67cc8a
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 44 deletions.
diff --git a/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
@@ -42,6 +42,7 @@ export default class Audit extends AuditBaseCommand {
     try {
       await this.start('cm:stacks:audit');
     } catch (error) {
+      console.trace(error);
       this.log(error instanceof Error ? error.message : error, 'error');
       ux.action.stop('Process failed.!');
       this.exit(1);

diff --git a/packages/contentstack-audit/src/config/index.ts b/packages/contentstack-audit/src/config/index.ts
@@ -1,6 +1,7 @@
 const config = {
   showTerminalOutput: true,
   skipRefs: ['sys_assets'],
+  skipFieldTypes: ['taxonomy'],
   modules: ['content-types', 'global-fields', 'entries'],
   'fix-fields': ['reference', 'global_field', 'json:rte', 'json:custom-field', 'blocks', 'group'],
   moduleConfig: {

diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
@@ -379,8 +379,9 @@ export default class ContentType {
         }
       })
       .filter((val: any) => {
-        if (val?.schema && isEmpty(val.schema)) return false;
-        if (val?.reference_to && isEmpty(val.reference_to)) return false;
+        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;
 
         return !!val;
       }) as ContentTypeSchemaType[];

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.10.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/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-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bulk-publish/1.4.0 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-bulk-publish/1.4.0 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-import/src/import/module-importer.ts b/packages/contentstack-import/src/import/module-importer.ts
@@ -130,6 +130,12 @@ class ModuleImporter {
 
       if (this.importConfig.moduleName) {
         args.push('--modules', this.importConfig.moduleName);
+      } else if (this.importConfig.modules.types.length) {
+        this.importConfig.modules.types
+          .filter((val) => ['content-types', 'global-fields', 'entries'].includes(val))
+          .forEach((val) => {
+            args.push('--modules', val);
+          });
       }
 
       log(this.importConfig, 'Starting audit process', 'info');
@@ -159,7 +165,6 @@ class ModuleImporter {
 
       return true;
     } catch (error) {
-      trace(error);
       log(this.importConfig, `Audit failed with following error. ${error}`, 'error');
     }
   }

diff --git a/packages/contentstack-import/src/utils/content-type-helper.ts b/packages/contentstack-import/src/utils/content-type-helper.ts
@@ -147,6 +147,16 @@ export const removeReferenceFields = async function (
       flag.supressed = true;
       schema[i].reference_to = ['sys_assets'];
     }
+    else if (
+      // handling entry references in rte
+      schema[i].data_type === 'text' &&
+      schema[i].field_metadata.rich_text_type &&
+      schema[i].field_metadata.embed_entry &&
+      schema[i].reference_to.length >= 1
+    ) {
+      flag.supressed = true;
+      schema[i].reference_to = ['sys_assets'];
+    }
   }
 };
 

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`