Merge pull request #1247 from contentstack/bugfix/CS-43482

CS-43482- Added the case when empty entry is passed
contentstack · Jan 22, 2024 · 31a4323 · 31a4323
2 parents 4f28c08 + cda91a4
commit 31a4323
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 34 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.3.2",
+  "version": "1.3.3",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",

diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
@@ -488,6 +488,9 @@ export default class Entries {
             field as ReferenceFieldDataType,
             entry[uid] as EntryReferenceFieldDataType[],
           );
+          if (!entry[uid]) {
+            delete entry[uid];
+          }
           break;
         case 'blocks':
           entry[uid] = this.fixModularBlocksReferences(
@@ -504,6 +507,7 @@ export default class Entries {
           ) as EntryGroupFieldDataType;
           break;
       }
+
     });
 
     return entry;
@@ -546,12 +550,12 @@ export default class Entries {
     entry: EntryModularBlocksDataType[],
   ) {
     entry = entry
-      .map((block, index) => this.modularBlockRefCheck(tree, blocks, block, index))
+      ?.map((block, index) => this.modularBlockRefCheck(tree, blocks, block, index))
       .filter((val) => !isEmpty(val));
 
     blocks.forEach((block) => {
       entry = entry
-        .map((eBlock) => {
+        ?.map((eBlock) => {
           if (!isEmpty(block.schema)) {
             if (eBlock[block.uid]) {
               eBlock[block.uid] = this.runFixOnSchema(
@@ -666,9 +670,9 @@ export default class Entries {
     field: ReferenceFieldDataType | JsonRTEFieldDataType,
     entry: EntryReferenceFieldDataType[],
   ) {
+
     const missingRefs: Record<string, any>[] = [];
-    entry = entry
-      .map((reference) => {
+    entry = entry?.map((reference) => {
         const { uid } = reference;
         const refExist = find(this.entryMetaData, { uid });
 
@@ -678,8 +682,7 @@ export default class Entries {
         }
 
         return reference;
-      })
-      .filter((val) => val) as EntryReferenceFieldDataType[];
+      }).filter((val) => val) as EntryReferenceFieldDataType[];
 
     if (!isEmpty(missingRefs)) {
       this.missingRefs[this.currentUid].push({

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "^1.3.2",
+    "@contentstack/cli-audit": "^1.3.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.10",
     "@contentstack/management": "~1.13.0",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -22,7 +22,7 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.3.2",
+    "@contentstack/cli-audit": "~1.3.3",
     "@contentstack/cli-auth": "~1.3.17",
     "@contentstack/cli-cm-bootstrap": "~1.7.1",
     "@contentstack/cli-cm-branches": "~1.0.20",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml