Merge pull request #339 from davidatbu/frontend-error-handling-2

Add error handling to LDA page
dnaaun · Dec 16, 2020 · 4401125 · 4401125
2 parents db4e596 + b017417
commit 4401125
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 14 deletions.
diff --git a/services/web/frontend/LDA.html b/services/web/frontend/LDA.html
@@ -87,8 +87,8 @@ <h3 class="text-dark display-3" style="	text-shadow: 0px 0px 0px black;"><b>LDA
               <tr><td id="no-number" hidden style="color: red">Please enter a number of topics!</td></tr>
               <tr><td id="no-file" hidden style="color: red">Please upload a file!</td></tr>
               <tr><td id="no-email" hidden style="color: red">Please enter an email address!</td></tr>
-              <tr><td id="err-creating-tm" hidden style="color: red">An error occurred while creating the topic model</td></tr>
-              <tr><td id="err-uploading" hidden style="color: red">An error occurred while uploading your file</td></tr>
+              <tr><td id="err-creating-tm" hidden style="color: red"></td></tr>
+              <tr><td id="err-uploading" hidden style="color: red"></td></tr>
               <tr><td id="tm-success-message" hidden style="color: green">Your upload was successful! You will receive an email when training is complete.</td></tr>
             </tbody>
           </table>

diff --git a/services/web/frontend/js/lda.js b/services/web/frontend/js/lda.js
@@ -68,15 +68,30 @@ $(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);
+                            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 (err) {
-                    console.log(err);
-                    $('#err-creating-tm').removeAttr('hidden');
+                error: function (xhr, status, err) {
+                    console.log(xhr.responseText);
+                    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;