diff --git a/ayanova/src/components/report-control.vue b/ayanova/src/components/report-control.vue index 25db260b..2940aaeb 100644 --- a/ayanova/src/components/report-control.vue +++ b/ayanova/src/components/report-control.vue @@ -179,19 +179,6 @@ export default { var finalEntry = jobLogRes.data[jobLogRes.data.length - 1]; console.log("final entry:", finalEntry); - // if (Array.isArray(jobLogRes.data)) { - // //walk the array backwards as it's probably the final entry in the log - // for (var i = jobLogRes.data.length - 1; i >= 0; i--) { - // var v = jobLogRes.data[i].statusText; - // if (v.includes("reportfilename")) { - // const o = JSON.parse(v); - // reportUrl = window.$gz.api.reportDownloadUrl( - // o.reportfilename - // ); - // } - // } - // } - if (jobStatus == 4 || jobStatus == 0) { /* report template processing error example @@ -200,11 +187,17 @@ export default { "statusText": "rendererror:exception,\"PuppeteerSharp -> Evaluation failed: TypeError: Assignment to constant variable.\n at ayPrepareData (:7:2)\n at ayPreRender (C:\\data\\code\\raven\\server\\AyaNova\\resource\\rpt\\ay-report.js:8:38)\n at eval (eval at waitForPredicatePageFunction (:3:23), :3:9)\n at onRaf (__puppeteer_evaluation_script__:50:35)\n at pollRaf (__puppeteer_evaluation_script__:43:15)\n at waitForPredicatePageFunction (__puppeteer_evaluation_script__:8:22)\r\n\"", "jobId": "3deeac20-b49d-46d8-a5f6-891b7d1049f8" } - + "{\"rendererror\":{\"pagelog\":null,\"exception\":\"PuppeteerSharp -> Evaluation failed: TypeError: Assignment to constant variable.\n at ayPrepareData (:7:2)\n at ayPreRender (C:\\data\\code\\raven\\server\\AyaNova\\resource\\rpt\\ay-report.js:8:38)\n at eval (eval at waitForPredicatePageFunction (:3:23), :3:9)\n at onRaf (__puppeteer_evaluation_script__:50:35)\n at pollRaf (__puppeteer_evaluation_script__:43:15)\n at waitForPredicatePageFunction (__puppeteer_evaluation_script__:8:22)\r\n\"}}" */ const o = JSON.parse(finalEntry.statusText); console.log("Error object", o); - throw new Error(o); + + var e = `${this.$ay.t("Error")}: ${o.rendererror.exception}`; + if (o.rendererror.pagelog) { + e += "\n---------\n" + o.rendererror.pagelog; + } + + throw new Error(e); } if (jobStatus == 3) { /*