server/AyaNova/Controllers/ReportController.cs

@@ -234,7 +234,7 @@ namespace AyaNova.Api.Controllers
             catch (System.Exception ex)
             {
                 //Don't send the full stack trace, just the initial error message from the javascript eval
-                // "Evaluation failed: ReferenceError: reportdata is not defined\n    at reportPreRender (<anonymous>:5:17)\n    at ayPreRender (C:\\data\\code\\raven\\server\\AyaNova\\resource\\rpt\\ay-report.js:13:12)\n    at __puppeteer_evaluation_script__:10:25"
+                // "Evaluation failed: ReferenceError: reportdata is not defined\n    at ayPrepareData (<anonymous>:5:17)\n    at ayPreRender (C:\\data\\code\\raven\\server\\AyaNova\\resource\\rpt\\ay-report.js:13:12)\n    at __puppeteer_evaluation_script__:10:25"
                 var v = ex.Message;
                 int positionOfNewLine = v.IndexOf("\n    at");
                 if (positionOfNewLine >= 0)

server/AyaNova/biz/ReportBiz.cs

@@ -400,7 +400,10 @@ namespace AyaNova.Biz
                     var clientMeta = "{}";
                     if (reportParam.ClientMeta != null)
                         clientMeta = reportParam.ClientMeta.ToString();
-                    //  await page.AddScriptTagAsync(new AddTagOptions() { Content = $"var ayClientMetaData = {clientMeta}" });
+
+                    //add Server meta data
+                    var serverMeta=$"{{ayApiUrl:`{apiUrl}`}}";
+                   
 
                     //this is how you view the contents of the page
 #if (DEBUG)
@@ -408,8 +411,8 @@ namespace AyaNova.Biz
 
 #endif
                     //compile and run handlebars template              
-
-                    var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta}, ayServerMetaData:{{ayApiUrl:`{apiUrl}`}} }});";
+                    //var compileScript = $"Handlebars.compile(`{report.Template}`)({{ ayReportData:ayPreRender({ReportData}), ayClientMetaData:{clientMeta}, ayServerMetaData:{{ayApiUrl:`{apiUrl}`}} }});";                  
+                    var compileScript = $"Handlebars.compile(`{report.Template}`)(ayPreRender({{ ayReportData:{ReportData}, ayClientMetaData:{clientMeta}, ayServerMetaData:{serverMeta} }}));";
                     var resultHTML = await page.EvaluateExpressionAsync<string>(compileScript);
 
                     //render report as HTML              

server/AyaNova/resource/rpt/ay-report.js

@@ -19,16 +19,17 @@ function ayRegisterHelpers() {
   });
 
   Handlebars.registerHelper("ayLogo", function (size) {
-    var url = `${Handlebars.escapeExpression(this.ayServerMetaData.ayApiUrl)}logo/${size}`;
+    var url = `${Handlebars.escapeExpression(
+      this.ayServerMetaData.ayApiUrl
+    )}logo/${size}`;
     return new Handlebars.SafeString("<img src='" + url + "'/>");
   });
+} //eof
 
-}//eof
-
-function ayPreRender(theReportData) {
-  if (typeof reportPreRender === "function") {
-    return reportPreRender(theReportData);
+async function ayPreRender(ayAllData) {
+  if (typeof ayPrepareData === "function") {
+    return await ayPrepareData(ayAllData);
   } else {
-    return theReportData;
+    return ayAllData;
   }
 }