Merge pull request #1254 from contentstack/fix/CS-43552

Fix: Import flow breaks when there is a taxonomy field in the schema [CS-43552]
contentstack · Jan 23, 2024 · d0da4af · d0da4af
2 parents 8b70c15 + a9037b1
commit d0da4af
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 17 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/commands/cm/stacks/audit/index.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts
@@ -42,6 +42,7 @@ export default class Audit extends AuditBaseCommand {
     try {
       await this.start('cm:stacks:audit');
     } catch (error) {
+      console.trace(error);
       this.log(error instanceof Error ? error.message : error, 'error');
       ux.action.stop('Process failed.!');
       this.exit(1);

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

diff --git a/packages/contentstack-audit/src/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts
@@ -379,8 +379,9 @@ export default class ContentType {
         }
       })
       .filter((val: any) => {
-        if (val?.schema && isEmpty(val.schema)) return false;
-        if (val?.reference_to && isEmpty(val.reference_to)) return false;
+        if (this.config.skipFieldTypes.includes(val?.data_type)) return true;
+        if (val?.schema && isEmpty(val?.schema)) return false;
+        if (val?.reference_to && isEmpty(val?.reference_to)) return false;
 
         return !!val;
       }) as ContentTypeSchemaType[];

diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bulk-publish/1.4.0 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-bulk-publish/1.4.0 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-import/src/import/module-importer.ts b/packages/contentstack-import/src/import/module-importer.ts
@@ -130,6 +130,12 @@ class ModuleImporter {
 
       if (this.importConfig.moduleName) {
         args.push('--modules', this.importConfig.moduleName);
+      } else if (this.importConfig.modules.types.length) {
+        this.importConfig.modules.types
+          .filter((val) => ['content-types', 'global-fields', 'entries'].includes(val))
+          .forEach((val) => {
+            args.push('--modules', val);
+          });
       }
 
       log(this.importConfig, 'Starting audit process', 'info');
@@ -159,7 +165,6 @@ class ModuleImporter {
 
       return true;
     } catch (error) {
-      trace(error);
       log(this.importConfig, `Audit failed with following error. ${error}`, 'error');
     }
   }

diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.13.0",
+    "@contentstack/cli-cm-import": "~1.13.1",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.5.10",
     "inquirer": "8.2.4",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -22,15 +22,15 @@
     "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.21",
     "@contentstack/cli-cm-bulk-publish": "~1.4.0",
     "@contentstack/cli-cm-clone": "~1.9.0",
     "@contentstack/cli-cm-export": "~1.10.2",
     "@contentstack/cli-cm-export-to-csv": "~1.6.2",
-    "@contentstack/cli-cm-import": "~1.13.0",
+    "@contentstack/cli-cm-import": "~1.13.1",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.1",
     "@contentstack/cli-command": "~1.2.17",

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