From 8534ac0f7bd1c15b4f01329b789005044249f1ae Mon Sep 17 00:00:00 2001 From: Vidya Akavoor Date: Wed, 9 Dec 2020 10:44:03 -0500 Subject: [PATCH 1/2] Add error handling to LDA page --- services/web/frontend/LDA.html | 4 ++-- services/web/frontend/js/lda.js | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/services/web/frontend/LDA.html b/services/web/frontend/LDA.html index 0d59570..1063dcf 100644 --- a/services/web/frontend/LDA.html +++ b/services/web/frontend/LDA.html @@ -87,8 +87,8 @@

LDA Please enter a number of topics! Please upload a file! Please enter an email address! - An error occurred while creating the topic model - An error occurred while uploading your file + + Your upload was successful! You will receive an email when training is complete. diff --git a/services/web/frontend/js/lda.js b/services/web/frontend/js/lda.js index fbe98c7..b5b8c40 100644 --- a/services/web/frontend/js/lda.js +++ b/services/web/frontend/js/lda.js @@ -68,15 +68,17 @@ $(function() { console.log('success in training file POST'); $('#tm-success-message').removeAttr('hidden'); }, - error: function (err) { - console.log(err); - $('#err-uploading').removeAttr('hidden'); + error: function (xhr, status, err) { + console.log(xhr.responseText); + $('#err-uploading').html(`An error occurred while uploading your file: ${JSON.parse(xhr.responseText).message}`) + .removeAttr('hidden'); } }); }, - error: function (err) { - console.log(err); - $('#err-creating-tm').removeAttr('hidden'); + error: function (xhr, status, err) { + console.log(xhr.responseText); + $('#err-creating-tm').html(`An error occurred while creating the topic model: ${JSON.parse(xhr.responseText).message}`) + .removeAttr('hidden'); } }); } From b0174177a655f37b0e9e45da121c774a67c05a95 Mon Sep 17 00:00:00 2001 From: Vidya Akavoor Date: Fri, 11 Dec 2020 09:50:07 -0500 Subject: [PATCH 2/2] Check for other keys in messages object --- services/web/frontend/js/lda.js | 21 +++++++++++++++++---- services/web/frontend/js/main.js | 25 +++++++++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/services/web/frontend/js/lda.js b/services/web/frontend/js/lda.js index b5b8c40..c596c6c 100644 --- a/services/web/frontend/js/lda.js +++ b/services/web/frontend/js/lda.js @@ -70,15 +70,28 @@ $(function() { }, error: function (xhr, status, err) { console.log(xhr.responseText); - $('#err-uploading').html(`An error occurred while uploading your file: ${JSON.parse(xhr.responseText).message}`) - .removeAttr('hidden'); + let error = getErrorMessage(JSON.parse(xhr.responseText).message); + // if (error.num_topics) { + // $('#err-creating-tm').html(`An error occurred while uploading your file: ${error.num_topics}`) + // .removeAttr('hidden'); + // } else{ + $('#err-creating-tm').html(`An error occurred while uploading your file: ${error}`) + .removeAttr('hidden'); + // } } }); }, error: function (xhr, status, err) { console.log(xhr.responseText); - $('#err-creating-tm').html(`An error occurred while creating the topic model: ${JSON.parse(xhr.responseText).message}`) - .removeAttr('hidden'); + let error = getErrorMessage(JSON.parse(xhr.responseText).message); + // if (error.num_topics) { + // $('#err-creating-tm').html(`An error occurred while creating the topic model: ${error.num_topics}`) + // .removeAttr('hidden'); + // } else{ + $('#err-creating-tm').html(`An error occurred while creating the topic model: ${error}`) + .removeAttr('hidden'); + // } + } }); } diff --git a/services/web/frontend/js/main.js b/services/web/frontend/js/main.js index 4725f6e..473ba4f 100644 --- a/services/web/frontend/js/main.js +++ b/services/web/frontend/js/main.js @@ -14,6 +14,19 @@ $(".other-policy").on("click", function(){ +function getErrorMessage(message) { + if (typeof message === "object") { + let strArr = []; + for (let key of Object.keys(message)) { + strArr.push(message[key]); + } + return strArr.join('; ') + + } else { + return message; + } +} + var stateClassifier_id=''; var stateStatus=''; @@ -32,7 +45,7 @@ async function getFraming() { .then(res => console.log(res)) .catch(err => { console.error(err); - message = err.response.data.message; + message = getErrorMessage(err.response.data.message); }); return message; } @@ -62,7 +75,7 @@ async function postFraming() { // return classifier_id }).catch(err => { console.error(err); - message = err.response.data.message; + message = getErrorMessage(err.response.data.message); }); return message; } @@ -87,7 +100,7 @@ async function upTrainingFile() { }).catch(err => { console.error(err); - message = err.response.data.message; + message = getErrorMessage(err.response.data.message); }); return message; } @@ -145,7 +158,7 @@ async function postTestName() { .then(res => console.log(res)) .catch(err => { console.error(err); - message = err.response.data.message; + message = getErrorMessage(err.response.data.message); }); return message; // getTestId(); @@ -172,7 +185,7 @@ async function getTestId() { }) .catch(err => { console.error(err); - message = err.response.data.message; + message = getErrorMessage(err.response.data.message); }); return message; // upTestingFile(); @@ -201,7 +214,7 @@ async function upTestingFile() { }) .catch(err => { console.error({err}); - message = err.response.data.message; + message = getErrorMessage(err.response.data.message); }); return message;