pr fixes to remove the branches and keep it as seperate type

contentstack · Mar 15, 2024 · 1af72ec · 1af72ec
1 parent 0c503d9
commit 1af72ec
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/packages/contentstack-audit/src/audit-base-command.ts b/packages/contentstack-audit/src/audit-base-command.ts
@@ -13,7 +13,13 @@ import { print } from './util/log';
 import { auditMsg } from './messages';
 import { BaseCommand } from './base-command';
 import { Entries, GlobalField, ContentType, Extensions, Workflows } from './modules';
-import { CommandNames, ContentTypeStruct, OutputColumn, RefErrorReturnType } from './types';
+import {
+  CommandNames,
+  ContentTypeStruct,
+  OutputColumn,
+  RefErrorReturnType,
+  WorkflowExtensionsRefErrorReturnType,
+} from './types';
 
 export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseCommand> {
   private currentCommand!: CommandNames;
@@ -371,14 +377,22 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       const ws = createWriteStream(csvPath).on('error', reject);
       const defaultColumns = Object.keys(OutputColumn);
       const userDefinedColumns = this.sharedConfig.flags.columns ? this.sharedConfig.flags.columns.split(',') : null;
-      let missingRefs: RefErrorReturnType[] = Object.values(listOfMissingRefs).flat();
+      let missingRefs: RefErrorReturnType[] | WorkflowExtensionsRefErrorReturnType[] =
+        Object.values(listOfMissingRefs).flat();
       const columns: (keyof typeof OutputColumn)[] = userDefinedColumns
         ? [...userDefinedColumns, ...defaultColumns.filter((val: string) => !userDefinedColumns.includes(val))]
         : defaultColumns;
 
       if (this.sharedConfig.flags.filter) {
         const [column, value]: [keyof typeof OutputColumn, string] = this.sharedConfig.flags.filter.split('=');
-        missingRefs = missingRefs.filter((row: RefErrorReturnType) => row[OutputColumn[column]] === value);
+        // Filter the missingRefs array
+        missingRefs = missingRefs.filter((row) => {
+          if (OutputColumn[column] in row) {
+            const rowKey = OutputColumn[column] as keyof (RefErrorReturnType | WorkflowExtensionsRefErrorReturnType);
+            return row[rowKey] === value;
+          }
+          return false;
+        });
       }
 
       const rowData: Record<string, string | string[]>[] = [];
@@ -387,7 +401,8 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
 
         for (const column of columns) {
           if (Object.keys(issue).includes(OutputColumn[column])) {
-            row[column] = issue[OutputColumn[column]] as string;
+            const issueKey = OutputColumn[column] as keyof typeof issue;
+            row[column] = issue[issueKey] as string;
             row[column] = typeof row[column] === 'object' ? JSON.stringify(row[column]) : row[column];
           }
         }

diff --git a/packages/contentstack-audit/src/types/content-types.ts b/packages/contentstack-audit/src/types/content-types.ts
@@ -51,9 +51,10 @@ type RefErrorReturnType = {
   uid?: string;
   content_types?: string[];
   title?: string;
-  branches?: string[];
 };
 
+type WorkflowExtensionsRefErrorReturnType = RefErrorReturnType & { branches?: string[] };
+
 // NOTE Type 1
 type ReferenceFieldDataType = CommonDataTypeStruct & {
   reference_to: string[];
@@ -139,4 +140,5 @@ export {
   OutputColumn,
   ContentTypeSchemaType,
   GlobalFieldSchemaTypes,
+  WorkflowExtensionsRefErrorReturnType,
 };