This commit is contained in:
@@ -6,9 +6,14 @@
|
|||||||
PUBLISH TO DEVOPS STEPS
|
PUBLISH TO DEVOPS STEPS
|
||||||
|
|
||||||
CLIENT
|
CLIENT
|
||||||
|
=-=-=-=
|
||||||
|
|
||||||
- TURN OFF DEV MODE IN MAIN.JS
|
- TURN OFF DEV MODE IN MAIN.JS
|
||||||
|
|
||||||
|
- BUMP PACKAGE.JSON version number
|
||||||
|
|
||||||
- BUMP CLIENT VERSION NUMBER
|
- BUMP CLIENT VERSION NUMBER
|
||||||
|
|
||||||
- BUILD RELEASE
|
- BUILD RELEASE
|
||||||
- Now all automated, just run buildrelease.bat in client project folder
|
- Now all automated, just run buildrelease.bat in client project folder
|
||||||
- OLD MANUAL STEPS:
|
- OLD MANUAL STEPS:
|
||||||
@@ -19,7 +24,10 @@ CLIENT
|
|||||||
- Copy build from C:\data\code\raven\app\ayanova\dist to server wwwRoot folder: C:\data\code\raven\server\AyaNova\wwwroot
|
- Copy build from C:\data\code\raven\app\ayanova\dist to server wwwRoot folder: C:\data\code\raven\server\AyaNova\wwwroot
|
||||||
|
|
||||||
SERVER
|
SERVER
|
||||||
- BUMP VERSION NUMBER FIRST
|
=-=-=-
|
||||||
|
|
||||||
|
- BUMP VERSION NUMBER
|
||||||
|
|
||||||
- BUILD RELEASE
|
- BUILD RELEASE
|
||||||
- Now automated, run buildrelease.bat in server project folder
|
- Now automated, run buildrelease.bat in server project folder
|
||||||
- OLD MANUAL STEPS:
|
- OLD MANUAL STEPS:
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ namespace AyaNova.Biz
|
|||||||
newObject.Name = newUniqueName;
|
newObject.Name = newUniqueName;
|
||||||
// This was stupid considering JObject can serialize directly to a report type
|
// This was stupid considering JObject can serialize directly to a report type
|
||||||
//but leaving in for a little while just to be sure it's all good
|
//but leaving in for a little while just to be sure it's all good
|
||||||
|
|
||||||
// newObject.Active = (bool)o["Active"];
|
// newObject.Active = (bool)o["Active"];
|
||||||
// newObject.JsHelpers = (string)o["JsHelpers"];
|
// newObject.JsHelpers = (string)o["JsHelpers"];
|
||||||
// newObject.JsPrerender = (string)o["JsPrerender"];
|
// newObject.JsPrerender = (string)o["JsPrerender"];
|
||||||
@@ -417,15 +417,40 @@ namespace AyaNova.Biz
|
|||||||
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
|
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
System.Text.StringBuilder PageLog = new System.Text.StringBuilder();
|
||||||
|
|
||||||
//API DOCS http://www.puppeteersharp.com/api/index.html
|
//API DOCS http://www.puppeteersharp.com/api/index.html
|
||||||
log.LogDebug($"Launching headless Chrome now:");
|
log.LogDebug($"Launching headless Chrome now:");
|
||||||
using (var browser = await Puppeteer.LaunchAsync(lo))
|
using (var browser = await Puppeteer.LaunchAsync(lo))
|
||||||
using (var page = await browser.NewPageAsync())
|
using (var page = await browser.NewPageAsync())
|
||||||
{
|
{
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//info and error logging
|
||||||
|
page.Console += async (sender, args) =>
|
||||||
|
{
|
||||||
|
switch (args.Message.Type)
|
||||||
|
{
|
||||||
|
case ConsoleType.Error:
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var errorArgs = await Task.WhenAll(args.Message.Args.Select(arg => arg.ExecutionContext.EvaluateFunctionAsync("(arg) => arg instanceof Error ? arg.message : arg", arg)));
|
||||||
|
PageLog.AppendLine($"ERROR: {args.Message.Text} args: [{string.Join<object>(", ", errorArgs)}]");
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
break;
|
||||||
|
case ConsoleType.Warning:
|
||||||
|
PageLog.AppendLine($"WARNING: {args.Message.Text}");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
PageLog.AppendLine($"INFO: {args.Message.Text}");
|
||||||
|
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
log.LogDebug($"Preparing page: adding base reporting scripts to page");
|
log.LogDebug($"Preparing page: adding base reporting scripts to page");
|
||||||
|
|
||||||
@@ -618,10 +643,6 @@ namespace AyaNova.Biz
|
|||||||
log.LogDebug($"Calling render page contents to PDF");
|
log.LogDebug($"Calling render page contents to PDF");
|
||||||
await page.PdfAsync(outputFullPath, PdfOptions);
|
await page.PdfAsync(outputFullPath, PdfOptions);
|
||||||
|
|
||||||
//close the browser
|
|
||||||
// log.LogDebug($"Closing browser");
|
|
||||||
// await browser.CloseAsync();
|
|
||||||
|
|
||||||
log.LogDebug($"Completed, returning results");
|
log.LogDebug($"Completed, returning results");
|
||||||
return outputFileName;
|
return outputFileName;
|
||||||
}
|
}
|
||||||
@@ -635,12 +656,17 @@ namespace AyaNova.Biz
|
|||||||
//This is the error when a helper is used on the template but doesn't exist:
|
//This is the error when a helper is used on the template but doesn't exist:
|
||||||
//Evaluation failed: d
|
//Evaluation failed: d
|
||||||
//(it might also mean other things wrong with template)
|
//(it might also mean other things wrong with template)
|
||||||
|
if (PageLog.Length > 0)
|
||||||
|
{
|
||||||
|
log.LogInformation($"Error rendering report \"{report.Name}\": ");
|
||||||
|
log.LogInformation(PageLog.ToString());
|
||||||
|
}
|
||||||
// var v=await page.GetContentAsync();
|
// var v=await page.GetContentAsync();
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
log.LogDebug($"Closing browser");
|
||||||
await browser.CloseAsync();
|
await browser.CloseAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ namespace AyaNova.Util
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal static class AyaNovaVersion
|
internal static class AyaNovaVersion
|
||||||
{
|
{
|
||||||
public const string VersionString = "8.0.0-alpha.19";
|
public const string VersionString = "8.0.0-alpha.20";
|
||||||
public const string FullNameAndVersion = "AyaNova server " + VersionString;
|
public const string FullNameAndVersion = "AyaNova server " + VersionString;
|
||||||
}//eoc
|
}//eoc
|
||||||
}//eons
|
}//eons
|
||||||
Reference in New Issue
Block a user