Check for other keys in messages object

dnaaun · Dec 11, 2020 · b017417 · b017417
1 parent 8534ac0
commit b017417
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git 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
@@ -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;