From 08e528d333233c205c7887bc70f1574c99f4631e Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 19 Jan 2022 20:27:53 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                  | 1 +
 ayanova/src/api/errorhandler.js           | 6 ++++++
 ayanova/src/components/report-control.vue | 8 ++------
 ayanova/src/main.js                       | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 911420fb..5f09da6c 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -818,6 +818,7 @@ TODO: 1 BETA DOCS:
 		}
 	]
 }
+"Vue error: \nJob failed\ninfo: event handler for \"menu-click\" (Promise/async)"
 
 Vue error: Error - Name:SyntaxError, Message:JSON.parse: unexpected character at line 1 column 1 of the JSON data filename: http://localhost:8080/app.5c05fef9e3087cf58202.hot-update.js 
 lineNumber: 256 info: event handler for "menu-click" (Promise/async) STACK: _callee2$@http://localhost:8080/app.5c05fef9e3087cf58202.hot-update.js:256:42 
diff --git a/ayanova/src/api/errorhandler.js b/ayanova/src/api/errorhandler.js
index d8beacd1..93ba4f56 100644
--- a/ayanova/src/api/errorhandler.js
+++ b/ayanova/src/api/errorhandler.js
@@ -39,6 +39,12 @@ async function dealWithError(msg, vm) {
   //If a form instance was provided (vue instance)
   //and it can display and error then put the error into it
   if (!vm || vm.formState == undefined) {
+    //Special work around to not redundantly display errors when AyaNova job fails
+    // and Vue decides to throw it's own error into the mix when we've already displayed appropriate message
+    if (msg.includes("Vue error") && msg.includes("Job failed")) {
+      return;
+    }
+
     //popup if no place to display it elsewise
     window.$gz.eventBus.$emit("notify-error", msg);
     return;
diff --git a/ayanova/src/components/report-control.vue b/ayanova/src/components/report-control.vue
index d44684ec..cc6f632a 100644
--- a/ayanova/src/components/report-control.vue
+++ b/ayanova/src/components/report-control.vue
@@ -172,11 +172,6 @@ export default {
               `job-operations/logs/${jobId}`
             );
 
-            console.log("report error", {
-              jobStatus,
-              jobLogRes
-            });
-
             //get final entry is error or success
             var finalJobLogMessage = jobLogRes.data[jobLogRes.data.length - 1];
             const finalJobLogObject = JSON.parse(finalJobLogMessage.statusText);
@@ -204,7 +199,7 @@ export default {
                     `${this.$store.state.helpUrl}/ay-report-timeout`
                   );
                   //we're done here
-                  this.reject(this.$ay.t("JobFailed"));
+                  return this.reject(this.$ay.t("JobFailed"));
                 } else {
                   //exception
                   e = `${this.$ay.t("JobFailed")}: ${
@@ -216,6 +211,7 @@ export default {
                   }
                 }
               }
+              console.log("throwing");
               throw new Error(e);
             }
             if (jobStatus == 3) {
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 4e3c894c..34fb9495 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -66,7 +66,7 @@ import chartBarHorizontalControl from "./components/chart-bar-horizontal-control
 //DEVELOPMENT MODE
 //THIS SHOULD BE FALSE IN RELEASE
 //************************************************************
-const DEV_MODE = true;
+const DEV_MODE = false;
 //************************************************************
 //**************************************************************
 //**************************************************************