Merge branch 'development' into fix/CS-42524

contentstack · Mar 4, 2024 · 3c9e178 · 3c9e178
2 parents df8504b + 63ec8fa
commit 3c9e178
Show file tree

Hide file tree

Showing 22 changed files with 180 additions and 146 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",

diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts
@@ -83,7 +83,13 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     let { ctSchema, gfSchema } = this.getCtAndGfSchema();
     let missingCtRefs, missingGfRefs, missingEntryRefs;
     for (const module of this.sharedConfig.flags.modules || this.sharedConfig.modules) {
-      ux.action.start(this.$t(this.messages.AUDIT_START_SPINNER, { module }));
+      print([
+        {
+          bold: true,
+          color: 'whiteBright',
+          message: this.$t(this.messages.AUDIT_START_SPINNER, { module }),
+        },
+      ]);
 
       const constructorParam = {
         ctSchema,
@@ -109,7 +115,18 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           break;
       }
 
-      ux.action.stop();
+      print([
+        {
+          bold: true,
+          color: 'whiteBright',
+          message: this.$t(this.messages.AUDIT_START_SPINNER, { module }),
+        },
+        {
+          bold: true,
+          message: ' done',
+          color: 'whiteBright',
+        },
+      ]);
     }
 
     return { missingCtRefs, missingGfRefs, missingEntryRefs };

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

diff --git a/packages/contentstack-audit/src/messages/index.ts b/packages/contentstack-audit/src/messages/index.ts
@@ -1,3 +1,5 @@
+import memoize from 'lodash/memoize';
+
 const errors = {};
 
 const tableColumnDescriptions = {
@@ -59,14 +61,18 @@ const messages: typeof errors &
  * @returns a string.
  */
 function $t(msg: string, args: Record<string, string>): string {
-  if (!msg) return '';
+  const transfer = memoize(function (msg: string, args: Record<string, string>) {
+    if (!msg) return '';
+
+    for (const key of Object.keys(args)) {
+      const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      msg = msg.replace(new RegExp(`{${escapedKey}}`, 'g'), args[key] || escapedKey);
+    }
 
-  for (const key of Object.keys(args)) {
-    const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    msg = msg.replace(new RegExp(`{${escapedKey}}`, 'g'), args[key]);
-  }
+    return msg;
+  });
 
-  return msg;
+  return transfer(msg, args);
 }
 
 export default messages;

diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
@@ -35,6 +35,7 @@ import {
   ExtensionOrAppFieldDataType,
   EntryExtensionOrAppFieldDataType,
 } from '../types';
+import { print } from '../util';
 import GlobalField from './global-fields';
 import { MarketplaceAppsInstallationData } from '../types/extension';
 
@@ -106,14 +107,13 @@ export default class Entries {
             }
 
             this.lookForReference([{ locale: code, uid, name: title }], ctSchema, this.entries[entryUid]);
-            this.log(
-              $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, {
-                title,
-                local: code,
-                module: this.config.moduleConfig.entries.name,
-              }),
-              'info',
-            );
+            const message = $t(auditMsg.SCAN_ENTRY_SUCCESS_MSG, {
+              title,
+              local: code,
+              module: this.config.moduleConfig.entries.name,
+            });
+            this.log(message, 'hidden');
+            print([{ message: `info: ${message}`, color: 'green' }]);
           }
 
           if (this.fix) {
@@ -122,7 +122,7 @@ export default class Entries {
         }
       }
     }
-    this.log('', 'info'); // Adding empty line
+    // this.log('', 'info'); // Adding empty line
 
     this.removeEmptyVal();