Merge pull request #1356 from contentstack/bugfix/CS-44565

CS-44565 - Resolved issue when content not overwritten in import backup folder when using audit fix with import
contentstack · Mar 27, 2024 · 44ee4a2 · 44ee4a2
2 parents 77f2b77 + 82bf145
commit 44ee4a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/packages/contentstack-audit/src/modules/extensions.ts b/packages/contentstack-audit/src/modules/extensions.ts
@@ -109,6 +109,7 @@ export default class Extensions {
       this.fix &&
       (this.config.flags['copy-dir'] ||
         this.config.flags['external-config']?.skipConfirm ||
+        this.config.flags.yes ||
         (await ux.confirm(commonMsg.FIX_CONFIRMATION)))
     ) {
       writeFileSync(

diff --git a/packages/contentstack-audit/src/modules/workflows.ts b/packages/contentstack-audit/src/modules/workflows.ts
@@ -57,7 +57,6 @@ export default class Workflows {
       return {};
     }
 
-
     this.workflowPath = join(this.folderPath, this.fileName);
     this.workflowSchema = existsSync(this.workflowPath)
       ? values(JSON.parse(readFileSync(this.workflowPath, 'utf8')) as Workflow[])
@@ -146,8 +145,10 @@ export default class Workflows {
   async writeFixContent(newWorkflowSchema: Record<string, Workflow>) {
     if (
       this.fix &&
-      !(this.config.flags['copy-dir'] || this.config.flags['external-config']?.skipConfirm) &&
-      (this.config.flags.yes || (await ux.confirm(commonMsg.FIX_CONFIRMATION)))
+      (this.config.flags['copy-dir'] ||
+        this.config.flags['external-config']?.skipConfirm ||
+        this.config.flags.yes ||
+        (await ux.confirm(commonMsg.FIX_CONFIRMATION)))
     ) {
       writeFileSync(
         join(this.folderPath, this.config.moduleConfig[this.moduleName].fileName),

diff --git a/packages/contentstack-migration/src/utils/error-helper.js b/packages/contentstack-migration/src/utils/error-helper.js
@@ -86,8 +86,15 @@ module.exports = (errors, filePath) => {
       messages.push(`${fileErrorsMessage}${errorMessages}`);
       logger.log('error', errorLogs);
     }
+    if (errors?.request) {
+      errors.data = errors.request?.data;
+      delete errors.request;
+    }
+    if (errors?.message) {
+      delete errors.message;
+    }
     if (isEmpty(messages) && errors !== undefined && isEmpty(errorsByFile)) {
-      logger.log('error', errors);
+      logger.log('error', { errors: errors });
       console.log(chalk`{bold.red Migration unsuccessful}`);
     } else {
       logger.log('error', { error: messages.join('\n') });