From d7305e88f05874f4062115911022c265d8ffe8dd Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 19 Jan 2024 13:33:49 +0530 Subject: [PATCH 1/5] Fix: Import flow breaks when there is a taxonomy field in the schema. --- package-lock.json | 4 ++-- packages/contentstack-audit/package.json | 2 +- packages/contentstack-audit/src/config/index.ts | 1 + .../src/modules/content-types.ts | 1 + packages/contentstack-bulk-publish/README.md | 2 +- .../src/import/module-importer.ts | 6 ++++++ packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7cf5847c3..ddfd93b3a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23493,7 +23493,7 @@ "version": "1.12.1", "license": "MIT", "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", @@ -23558,7 +23558,7 @@ }, "packages/contentstack-audit": { "name": "@contentstack/cli-audit", - "version": "1.3.2", + "version": "1.3.3", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index 202e4c6d65..70f1cb1726 100644 --- 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/config/index.ts b/packages/contentstack-audit/src/config/index.ts index fd25645bfb..7a5a773273 100644 --- 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 index 0b544992f5..dc0a672363 100644 --- a/packages/contentstack-audit/src/modules/content-types.ts +++ b/packages/contentstack-audit/src/modules/content-types.ts @@ -379,6 +379,7 @@ export default class ContentType { } }) .filter((val: any) => { + 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; diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md index 2518496f86..d7f25b559d 100644 --- 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/src/import/module-importer.ts b/packages/contentstack-import/src/import/module-importer.ts index 1fd509978e..80119d1274 100755 --- a/packages/contentstack-import/src/import/module-importer.ts +++ b/packages/contentstack-import/src/import/module-importer.ts @@ -1,3 +1,4 @@ +import pick from 'lodash/pick'; import { resolve } from 'path'; import { AuditFix } from '@contentstack/cli-audit'; import messages, { $t } from '@contentstack/cli-audit/lib/messages'; @@ -130,6 +131,11 @@ class ModuleImporter { if (this.importConfig.moduleName) { args.push('--modules', this.importConfig.moduleName); + } else if (this.importConfig.modules.types.length) { + args.push( + '--modules', + pick(this.importConfig.modules.types, ['global-fields', 'content-types', 'entries']).join(), + ); } log(this.importConfig, 'Starting audit process', 'info'); diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 9e4921c8d7..acbde022bf 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -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 index 9cfe8e1a66..d1b21cb8ef 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: packages/contentstack: specifiers: - '@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 @@ -1565,11 +1565,11 @@ packages: resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==} engines: {node: '>=0.1.90'} - /@contentstack/cli-command/1.2.16_typescript@4.9.5: - resolution: {integrity: sha512-u8GecSKkRgMPAmsib1xtfcUF8T/+ZbHe4JKAibRLkVc7jIjwuToq36hPgGFMfUAK4HX/UZ09stS+f3dUN1maOA==} + /@contentstack/cli-command/1.2.17_typescript@4.9.5: + resolution: {integrity: sha512-z5DWK+S+fRAXIZc0eZH1aw/Vb84wqICzYlGi4nKtov56H7QMWHwb+dORmzQvBHCUjbT/5/cZc6wpBZkebAUc7Q==} engines: {node: '>=14.0.0'} dependencies: - '@contentstack/cli-utilities': 1.5.9_typescript@4.9.5 + '@contentstack/cli-utilities': 1.5.10_typescript@4.9.5 contentstack: 3.17.2 transitivePeerDependencies: - '@swc/core' @@ -1584,8 +1584,8 @@ packages: resolution: {integrity: sha512-JMfVLK3846DfaHfZxtvpiy5JZsDsLQjZwZiG9NxQnrN3ZQ1qfz4p8pIppBOf/e25yEF/OZRwuMrdvyB0UY1LXA==} engines: {node: '>=14.0.0'} dependencies: - '@contentstack/cli-command': 1.2.16_typescript@4.9.5 - '@contentstack/cli-utilities': 1.5.9_typescript@4.9.5 + '@contentstack/cli-command': 1.2.17_typescript@4.9.5 + '@contentstack/cli-utilities': 1.5.10_typescript@4.9.5 chalk: 4.1.2 debug: 4.3.4 inquirer: 8.2.4 @@ -1601,8 +1601,8 @@ packages: - typescript dev: true - /@contentstack/cli-utilities/1.5.9_typescript@4.9.5: - resolution: {integrity: sha512-VaLmJdn+4HHhcVLPpMOtlwX8Q8sCoF+gHcSAgPd/eUPOZeksHdC8shjl2ka7RTuT2XVHYusqD1OEVFZztdLlMA==} + /@contentstack/cli-utilities/1.5.10_typescript@4.9.5: + resolution: {integrity: sha512-UMypT6q+XqgeKp3mETcZo6WmSl4IVkz/FDWAqm/agnbHturovSvmbxjFxtSNX/8iLNe9E1bQC3n6KPGmxeWtlQ==} dependencies: '@contentstack/management': 1.13.0_debug@4.3.4 '@contentstack/marketplace-sdk': 1.0.1_debug@4.3.4 From 8d9d31f6996285248f72d183b967709f6ad73881 Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 19 Jan 2024 14:06:32 +0530 Subject: [PATCH 2/5] Module selection fix --- .../contentstack-import/src/import/module-importer.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/contentstack-import/src/import/module-importer.ts b/packages/contentstack-import/src/import/module-importer.ts index 80119d1274..92583bbd13 100755 --- a/packages/contentstack-import/src/import/module-importer.ts +++ b/packages/contentstack-import/src/import/module-importer.ts @@ -1,4 +1,3 @@ -import pick from 'lodash/pick'; import { resolve } from 'path'; import { AuditFix } from '@contentstack/cli-audit'; import messages, { $t } from '@contentstack/cli-audit/lib/messages'; @@ -132,10 +131,11 @@ class ModuleImporter { if (this.importConfig.moduleName) { args.push('--modules', this.importConfig.moduleName); } else if (this.importConfig.modules.types.length) { - args.push( - '--modules', - pick(this.importConfig.modules.types, ['global-fields', 'content-types', 'entries']).join(), - ); + this.importConfig.modules.types + .filter((val) => ['content-types', 'global-fields'].includes(val)) + .forEach((val) => { + args.push('--modules', val); + }); } log(this.importConfig, 'Starting audit process', 'info'); @@ -165,7 +165,6 @@ class ModuleImporter { return true; } catch (error) { - trace(error); log(this.importConfig, `Audit failed with following error. ${error}`, 'error'); } } From 1f1fd1507d013e3feb6989c22a1f9ad6207d066e Mon Sep 17 00:00:00 2001 From: Antony Date: Fri, 19 Jan 2024 14:08:38 +0530 Subject: [PATCH 3/5] Entries added in the audit fix list --- packages/contentstack-import/src/import/module-importer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-import/src/import/module-importer.ts b/packages/contentstack-import/src/import/module-importer.ts index 92583bbd13..95e4bca001 100755 --- a/packages/contentstack-import/src/import/module-importer.ts +++ b/packages/contentstack-import/src/import/module-importer.ts @@ -132,7 +132,7 @@ class ModuleImporter { args.push('--modules', this.importConfig.moduleName); } else if (this.importConfig.modules.types.length) { this.importConfig.modules.types - .filter((val) => ['content-types', 'global-fields'].includes(val)) + .filter((val) => ['content-types', 'global-fields', 'entries'].includes(val)) .forEach((val) => { args.push('--modules', val); }); From 4512c4a946399c1a3ce5e3562f1dccd769c1cf91 Mon Sep 17 00:00:00 2001 From: Antony Date: Mon, 22 Jan 2024 15:59:26 +0530 Subject: [PATCH 4/5] Audit issue fix --- .../src/commands/cm/stacks/audit/index.ts | 1 + packages/contentstack-audit/src/modules/content-types.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts b/packages/contentstack-audit/src/commands/cm/stacks/audit/index.ts index f0dcd81221..57113bd0cb 100644 --- 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/modules/content-types.ts b/packages/contentstack-audit/src/modules/content-types.ts index dc0a672363..8e26bdb6f4 100644 --- a/packages/contentstack-audit/src/modules/content-types.ts +++ b/packages/contentstack-audit/src/modules/content-types.ts @@ -379,9 +379,9 @@ export default class ContentType { } }) .filter((val: any) => { - 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; + 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[]; From 2a175a99b0f5bdea67c830042b405cc068522ef4 Mon Sep 17 00:00:00 2001 From: Antony Date: Tue, 23 Jan 2024 10:14:06 +0530 Subject: [PATCH 5/5] Version bump --- package-lock.json | 6 +++--- packages/contentstack-import/package.json | 2 +- packages/contentstack-seed/package.json | 2 +- packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ddfd93b3a9..4713436802 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23501,7 +23501,7 @@ "@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", @@ -24920,7 +24920,7 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.13.0", + "version": "1.13.1", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "^1.3.2", @@ -25381,7 +25381,7 @@ "version": "1.7.1", "license": "MIT", "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-import/package.json b/packages/contentstack-import/package.json index 185e5a6515..d407057776 100644 --- 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-seed/package.json b/packages/contentstack-seed/package.json index a5998b0e1f..911afc2dd4 100644 --- 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 index acbde022bf..e6fce87d16 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -30,7 +30,7 @@ "@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 index d1b21cb8ef..f4c9785c23 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,7 +18,7 @@ importers: '@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 @@ -984,7 +984,7 @@ importers: packages/contentstack-seed: specifiers: - '@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 '@oclif/plugin-help': ^5.1.19