From 666720c7cc01570a29245485631b827fbcabde7b Mon Sep 17 00:00:00 2001 From: raj pandey Date: Tue, 25 Apr 2023 13:29:39 +0530 Subject: [PATCH 1/6] bugfix-CS-37275 add the error message showing the content_type UID which caused the error --- .../src/lib/import/content-types.js | 2 +- packages/contentstack-import/src/lib/util/index.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/contentstack-import/src/lib/import/content-types.js b/packages/contentstack-import/src/lib/import/content-types.js index ce2d56dcfe..ca2e28603d 100755 --- a/packages/contentstack-import/src/lib/import/content-types.js +++ b/packages/contentstack-import/src/lib/import/content-types.js @@ -127,7 +127,7 @@ class ContentTypesImport { try { await this.stackAPIClient.contentType().create(requestObject.json); } catch (error) { - if (error.error_code === 115 && (error.errors.uid || error.errors.title)) { + if (error.errorCode === 115 && (error.errors.uid || error.errors.title)) { // content type uid already exists // _.remove(self.contentTypes, { uid: uid }); return true; diff --git a/packages/contentstack-import/src/lib/util/index.js b/packages/contentstack-import/src/lib/util/index.js index 4bc45d749a..ca8aa70156 100644 --- a/packages/contentstack-import/src/lib/util/index.js +++ b/packages/contentstack-import/src/lib/util/index.js @@ -187,6 +187,14 @@ exports.getConfig = () => { }; exports.formatError = (error) => { + let message_content_type = ""; + if(error.request!==undefined) { + if(JSON.parse(error.request.data).content_type.uid) { + console.log("thor ",JSON.parse(error.request.data).content_type.uid); + message_content_type = " Due to content type "+JSON.parse(error.request.data).content_type.uid; + } + } + try { if (typeof error === 'string') { error = JSON.parse(error); @@ -205,7 +213,7 @@ exports.formatError = (error) => { message += ' ' + [entity, error.errors[e]].join(' '); }); } - return message; + return message+message_content_type; }; exports.executeTask = (handler, options, tasks = []) => { From 1fc782d1957a1a5e3c6cf96378ff32506ba1497e Mon Sep 17 00:00:00 2001 From: raj pandey Date: Thu, 27 Apr 2023 12:12:02 +0530 Subject: [PATCH 2/6] changed the error message --- packages/contentstack-import/src/lib/util/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-import/src/lib/util/index.js b/packages/contentstack-import/src/lib/util/index.js index ca8aa70156..737beed89d 100644 --- a/packages/contentstack-import/src/lib/util/index.js +++ b/packages/contentstack-import/src/lib/util/index.js @@ -191,7 +191,7 @@ exports.formatError = (error) => { if(error.request!==undefined) { if(JSON.parse(error.request.data).content_type.uid) { console.log("thor ",JSON.parse(error.request.data).content_type.uid); - message_content_type = " Due to content type "+JSON.parse(error.request.data).content_type.uid; + message_content_type = " Due to content type UID - "+JSON.parse(error.request.data).content_type.uid; } } From 166f1d6ae5af68ed4d8b96c52f649f8083f88862 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Fri, 5 May 2023 12:17:41 +0530 Subject: [PATCH 3/6] removed stray console.log from /contentstack-import/src/lib/util/index.js --- packages/contentstack-import/src/lib/util/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/contentstack-import/src/lib/util/index.js b/packages/contentstack-import/src/lib/util/index.js index 737beed89d..5f94d814b6 100644 --- a/packages/contentstack-import/src/lib/util/index.js +++ b/packages/contentstack-import/src/lib/util/index.js @@ -190,7 +190,6 @@ exports.formatError = (error) => { let message_content_type = ""; if(error.request!==undefined) { if(JSON.parse(error.request.data).content_type.uid) { - console.log("thor ",JSON.parse(error.request.data).content_type.uid); message_content_type = " Due to content type UID - "+JSON.parse(error.request.data).content_type.uid; } } From 32e4ca34c29d77b2c301c87664b186b656c569e6 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Fri, 5 May 2023 18:47:04 +0530 Subject: [PATCH 4/6] fixed error when when content_type uid is not there in error message which caused error --- packages/contentstack-import/src/lib/util/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-import/src/lib/util/index.js b/packages/contentstack-import/src/lib/util/index.js index 5f94d814b6..885b699115 100644 --- a/packages/contentstack-import/src/lib/util/index.js +++ b/packages/contentstack-import/src/lib/util/index.js @@ -188,7 +188,7 @@ exports.getConfig = () => { exports.formatError = (error) => { let message_content_type = ""; - if(error.request!==undefined) { + if(error.request!==undefined && JSON.parse(error.request.data).content_type.uid!==undefined) { if(JSON.parse(error.request.data).content_type.uid) { message_content_type = " Due to content type UID - "+JSON.parse(error.request.data).content_type.uid; } From 2586d982ddbe2890d32bfa1c6d54f26a9a99a4b6 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Wed, 24 May 2023 22:04:44 +0530 Subject: [PATCH 5/6] Changed the error message to display the content type due to which error is there --- packages/contentstack-import/src/lib/util/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/contentstack-import/src/lib/util/index.js b/packages/contentstack-import/src/lib/util/index.js index 885b699115..e2e3dcdb5e 100644 --- a/packages/contentstack-import/src/lib/util/index.js +++ b/packages/contentstack-import/src/lib/util/index.js @@ -188,9 +188,11 @@ exports.getConfig = () => { exports.formatError = (error) => { let message_content_type = ""; - if(error.request!==undefined && JSON.parse(error.request.data).content_type.uid!==undefined) { + if(error.request!==undefined && JSON.parse(error.request.data).content_type!==undefined) { if(JSON.parse(error.request.data).content_type.uid) { - message_content_type = " Due to content type UID - "+JSON.parse(error.request.data).content_type.uid; + message_content_type = " Update the content type with content_type_uid - "+JSON.parse(error.request.data).content_type.uid; + } else if (JSON.parse(error.request.data).content_type.title) { + message_content_type = " Update the content type with content_type_title - "+JSON.parse(error.request.data).content_type.title; } } From 19db4d607de474538a6b6d985851e53dae01f266 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Thu, 8 Jun 2023 15:21:10 +0530 Subject: [PATCH 6/6] removed error log code from index to import content_type file --- .../src/lib/import/content-types.js | 12 ++++++++++++ packages/contentstack-import/src/lib/util/index.js | 11 +---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/contentstack-import/src/lib/import/content-types.js b/packages/contentstack-import/src/lib/import/content-types.js index ca2e28603d..ec9a2350c5 100755 --- a/packages/contentstack-import/src/lib/import/content-types.js +++ b/packages/contentstack-import/src/lib/import/content-types.js @@ -112,6 +112,18 @@ class ContentTypesImport { addlogs(this.importConfig, chalk.green('Content types imported successfully'), 'success'); } catch (error) { + let message_content_type = ""; + if (error.request !== undefined && JSON.parse(error.request.data).content_type !== undefined) { + if (JSON.parse(error.request.data).content_type.uid) { + message_content_type = + ' Update the content type with content_type_uid - ' + JSON.parse(error.request.data).content_type.uid; + } else if (JSON.parse(error.request.data).content_type.title) { + message_content_type = + ' Update the content type with content_type_title - ' + JSON.parse(error.request.data).content_type.title; + } + error.errorMessage = error.errorMessage + message_content_type; + } + addlogs(this.importConfig, formatError(error.errorMessage), 'error'); addlogs(this.importConfig, formatError(error), 'error'); throw new Error('Failed to import content types'); } diff --git a/packages/contentstack-import/src/lib/util/index.js b/packages/contentstack-import/src/lib/util/index.js index e2e3dcdb5e..4bc45d749a 100644 --- a/packages/contentstack-import/src/lib/util/index.js +++ b/packages/contentstack-import/src/lib/util/index.js @@ -187,15 +187,6 @@ exports.getConfig = () => { }; exports.formatError = (error) => { - let message_content_type = ""; - if(error.request!==undefined && JSON.parse(error.request.data).content_type!==undefined) { - if(JSON.parse(error.request.data).content_type.uid) { - message_content_type = " Update the content type with content_type_uid - "+JSON.parse(error.request.data).content_type.uid; - } else if (JSON.parse(error.request.data).content_type.title) { - message_content_type = " Update the content type with content_type_title - "+JSON.parse(error.request.data).content_type.title; - } - } - try { if (typeof error === 'string') { error = JSON.parse(error); @@ -214,7 +205,7 @@ exports.formatError = (error) => { message += ' ' + [entity, error.errors[e]].join(' '); }); } - return message+message_content_type; + return message; }; exports.executeTask = (handler, options, tasks = []) => {