Merge pull request #1404 from contentstack/development

Development-to-staging | DX | 13-05-2024 | Release
contentstack · May 8, 2024 · 39abdd6 · 39abdd6
2 parents a023894 + d3f46c1
commit 39abdd6
Show file tree

Hide file tree

Showing 23 changed files with 2,159 additions and 1,475 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.5.4 darwin-arm64 node-v21.6.2
+@contentstack/cli-audit/1.6.0 darwin-arm64 node-v21.6.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "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
@@ -48,8 +48,15 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     await this.createBackUp();
     this.sharedConfig.reportPath = resolve(this.flags['report-path'] || process.cwd(), 'audit-report');
 
-    const { missingCtRefs, missingGfRefs, missingEntryRefs, missingCtRefsInExtensions, missingCtRefsInWorkflow } =
-      await this.scanAndFix();
+    const {
+      missingCtRefs,
+      missingGfRefs,
+      missingEntryRefs,
+      missingCtRefsInExtensions,
+      missingCtRefsInWorkflow,
+      missingSelectFeild,
+      missingMandatoryFields,
+    } = await this.scanAndFix();
 
     this.showOutputOnScreen([
       { module: 'Content types', missingRefs: missingCtRefs },
@@ -58,12 +65,17 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     ]);
     this.showOutputOnScreenWorkflowsAndExtension([{ module: 'Extensions', missingRefs: missingCtRefsInExtensions }]);
     this.showOutputOnScreenWorkflowsAndExtension([{ module: 'Workflows', missingRefs: missingCtRefsInWorkflow }]);
+    this.showOutputOnScreenWorkflowsAndExtension([{ module: 'Entries Select Field', missingRefs: missingSelectFeild }]);
+    this.showOutputOnScreenWorkflowsAndExtension([
+      { module: 'Entries Mandatory Field', missingRefs: missingMandatoryFields },
+    ]);
     if (
       !isEmpty(missingCtRefs) ||
       !isEmpty(missingGfRefs) ||
       !isEmpty(missingEntryRefs) ||
       !isEmpty(missingCtRefsInWorkflow) ||
-      !isEmpty(missingCtRefsInExtensions)
+      !isEmpty(missingCtRefsInExtensions) ||
+      !isEmpty(missingSelectFeild)
     ) {
       if (this.currentCommand === 'cm:stacks:audit') {
         this.log(this.$t(auditMsg.FINAL_REPORT_PATH, { path: this.sharedConfig.reportPath }), 'warn');
@@ -89,7 +101,8 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       !isEmpty(missingGfRefs) ||
       !isEmpty(missingEntryRefs) ||
       !isEmpty(missingCtRefsInWorkflow) ||
-      !isEmpty(missingCtRefsInExtensions)
+      !isEmpty(missingCtRefsInExtensions) ||
+      !isEmpty(missingSelectFeild)
     );
   }
 
@@ -101,7 +114,15 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
    */
   async scanAndFix() {
     let { ctSchema, gfSchema } = this.getCtAndGfSchema();
-    let missingCtRefs, missingGfRefs, missingEntryRefs, missingCtRefsInExtensions, missingCtRefsInWorkflow;
+    let missingCtRefs,
+      missingGfRefs,
+      missingEntryRefs,
+      missingCtRefsInExtensions,
+      missingCtRefsInWorkflow,
+      missingSelectFeild,
+      missingEntry,
+      missingMandatoryFields;
+
     for (const module of this.sharedConfig.flags.modules || this.sharedConfig.modules) {
       print([
         {
@@ -129,8 +150,15 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           await this.prepareReport(module, missingGfRefs);
           break;
         case 'entries':
-          missingEntryRefs = await new Entries(cloneDeep(constructorParam)).run();
+          missingEntry = await new Entries(cloneDeep(constructorParam)).run();
+          missingEntryRefs = missingEntry.missingEntryRefs ?? {};
+          missingSelectFeild = missingEntry.missingSelectFeild ?? {};
+          missingMandatoryFields = missingEntry.missingMandatoryFields ?? {};
           await this.prepareReport(module, missingEntryRefs);
+
+          await this.prepareReport(`Entries_Select_feild`, missingSelectFeild);
+
+          await this.prepareReport('Entries_Mandatory_feild', missingMandatoryFields);
           break;
         case 'workflows':
           missingCtRefsInWorkflow = await new Workflows({
@@ -162,7 +190,15 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       ]);
     }
 
-    return { missingCtRefs, missingGfRefs, missingEntryRefs, missingCtRefsInExtensions, missingCtRefsInWorkflow };
+    return {
+      missingCtRefs,
+      missingGfRefs,
+      missingEntryRefs,
+      missingCtRefsInExtensions,
+      missingCtRefsInWorkflow,
+      missingSelectFeild,
+      missingMandatoryFields,
+    };
   }
 
   /**
@@ -297,26 +333,31 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     }
     this.log(''); // Adding a new line
 
-    for (const { module, missingRefs } of allMissingRefs) {
+    for (let { module, missingRefs } of allMissingRefs) {
       if (isEmpty(missingRefs)) {
         continue;
       }
 
       print([{ bold: true, color: 'cyan', message: ` ${module}` }]);
 
       const tableValues = Object.values(missingRefs).flat();
-
+      missingRefs = Object.values(missingRefs).flat();
       const tableKeys = Object.keys(missingRefs[0]);
       const arrayOfObjects = tableKeys.map((key) => {
-        if (['title', 'name', 'uid', 'content_types', 'branches', 'fixStatus'].includes(key)) {
+        if (config.OutputTableKeys.includes(key)) {
           return {
             [key]: {
               minWidth: 7,
               header: key,
               get: (row: Record<string, unknown>) => {
                 if (key === 'fixStatus') {
                   return chalk.green(typeof row[key] === 'object' ? JSON.stringify(row[key]) : row[key]);
-                } else if (key === 'content_types' || key === 'branches') {
+                } else if (
+                  key === 'content_types' ||
+                  key === 'branches' ||
+                  key === 'missingCTSelectFieldValues' ||
+                  key === 'missingFieldUid'
+                ) {
                   return chalk.red(typeof row[key] === 'object' ? JSON.stringify(row[key]) : row[key]);
                 } else {
                   return chalk.white(typeof row[key] === 'object' ? JSON.stringify(row[key]) : row[key]);
@@ -344,7 +385,10 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
    * reference name and the value represents additional information about the missing reference.
    * @returns The function `prepareReport` returns a Promise that resolves to `void`.
    */
-  prepareReport(moduleName: keyof typeof config.moduleConfig, listOfMissingRefs: Record<string, any>): Promise<void> {
+  prepareReport(
+    moduleName: keyof typeof config.moduleConfig | keyof typeof config.ReportTitleForEntries,
+    listOfMissingRefs: Record<string, any>,
+  ): Promise<void> {
     if (isEmpty(listOfMissingRefs)) return Promise.resolve(void 0);
 
     if (!existsSync(this.sharedConfig.reportPath)) {
@@ -368,7 +412,10 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
    * corresponding value is an array of objects that contain details about the missing reference.
    * @returns The function `prepareCSV` returns a Promise that resolves to `void`.
    */
-  prepareCSV(moduleName: keyof typeof config.moduleConfig, listOfMissingRefs: Record<string, any>): Promise<void> {
+  prepareCSV(
+    moduleName: keyof typeof config.moduleConfig | keyof typeof config.ReportTitleForEntries,
+    listOfMissingRefs: Record<string, any>,
+  ): Promise<void> {
     const csvPath = join(this.sharedConfig.reportPath, `${moduleName}.csv`);
 
     return new Promise<void>((resolve, reject) => {

diff --git a/packages/contentstack-audit/src/config/index.ts b/packages/contentstack-audit/src/config/index.ts
@@ -54,6 +54,28 @@ const config = {
       'publish_details',
     ],
   },
+  //These keys will be used output the modules with issues and fixes on console
+  OutputTableKeys: [
+    'title',
+    'name',
+    'uid',
+    'content_types',
+    'branches',
+    'fixStatus',
+    'tree',
+    'display_name',
+    'display_type',
+    'missingRefs',
+    'treeStr',
+    'missingCTSelectFieldValues',
+    'min_instance',
+    'missingFieldUid',
+    'isPublished',
+  ],
+  ReportTitleForEntries: {
+    Entries_Select_feild: 'Entries_Select_feild',
+    Entries_Mandatory_feild: 'Entries_Mandatory_feild',
+  },
 };
 
 export default config;
diff --git a/packages/contentstack-audit/src/messages/index.ts b/packages/contentstack-audit/src/messages/index.ts
@@ -46,6 +46,8 @@ const auditFixMsg = {
   EMPTY_FIX_MSG: 'Successfully removed the empty field/block found at {path} from the schema.',
   AUDIT_FIX_CMD_DESCRIPTION: 'Perform audits and fix possible errors in the exported Contentstack data.',
   WF_FIX_MSG: 'Successfully removed the workflow {uid} named {name}.',
+  ENTRY_MANDATORY_FIELD_FIX: `Removing the publish details from entry uid '{uid}' from locale '{locale}'`,
+  ENTRY_SELECT_FIELD_FIX: `Adding the value '{value}' in select field of uid '{uid}'`
 };
 
 const messages: typeof errors &

diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
@@ -183,8 +183,8 @@ export default class ContentType {
             ...this.validateReferenceField(
               [...tree, { uid: field.uid, name: child.display_name }],
               child as ReferenceFieldDataType,
-            ),
-          );
+          ),
+        );
           break;
         case 'global_field':
           await this.validateGlobalField(