kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2430 from sbwalker/dev

Browse Source 
Add Blazor Server reconnect script, fix event log direct link from notification email, add more validation to Pager, improve browser refresh script to wait for server availability
This commit is contained in:
Shaun Walker 2022-09-24 08:38:54 -04:00 committed by GitHub
commit 2d95fe294c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 70 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -109,7 +109,7 @@ else
// external link to log item will display Details component // external link to log item will display Details component
if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id)) if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
{ {
NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"id={id}")); NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"/{id}"));
} }
if (UrlParameters.ContainsKey("level")) if (UrlParameters.ContainsKey("level"))

1
Oqtane.Client/Modules/Controls/Pager.razor
View File

@ -293,6 +293,7 @@
{ {
_page = 1; _page = 1;
} }
if (_page < 1) _page = 1;
_startPage = 0; _startPage = 0;
_endPage = 0; _endPage = 0;

1
Oqtane.Server/Pages/_Host.cshtml
View File

@ -49,6 +49,7 @@
@if (Model.Runtime == "Server") @if (Model.Runtime == "Server")
{ {
<script src="_framework/blazor.server.js"></script> <script src="_framework/blazor.server.js"></script>
@Html.Raw(Model.ReconnectScript)
} }
@if (!string.IsNullOrEmpty(Model.PWAScript)) @if (!string.IsNullOrEmpty(Model.PWAScript))
{ {

91
Oqtane.Server/Pages/_Host.cshtml.cs
View File

@ -69,6 +69,7 @@ namespace Oqtane.Pages
public string Meta = ""; public string Meta = "";
public string FavIcon = "favicon.ico"; public string FavIcon = "favicon.ico";
public string PWAScript = ""; public string PWAScript = "";
public string ReconnectScript = "";
public string Message = ""; public string Message = "";
public IActionResult OnGet() public IActionResult OnGet()
@ -128,6 +129,10 @@ namespace Oqtane.Pages
{ {
FavIcon = Utilities.FileUrl(alias, site.FaviconFileId.Value); FavIcon = Utilities.FileUrl(alias, site.FaviconFileId.Value);
} }
if (Runtime == "Server")
{
ReconnectScript = CreateReconnectScript();
}
if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null) if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null)
{ {
PWAScript = CreatePWAScript(alias, site, route); PWAScript = CreatePWAScript(alias, site, route);
@ -374,40 +379,60 @@ namespace Oqtane.Pages
private string CreatePWAScript(Alias alias, Site site, Route route) private string CreatePWAScript(Alias alias, Site site, Route route)
{ {
return return
"<script id=\"app-pwa\">" + "<script>" + Environment.NewLine +
"setTimeout(() => { " + " // PWA Manifest" + Environment.NewLine +
"var manifest = { " + " setTimeout(() => {" + Environment.NewLine +
"\"name\": \"" + site.Name + "\", " + " var manifest = {" + Environment.NewLine +
"\"short_name\": \"" + site.Name + "\", " + " \"name\": \"" + site.Name + "\"," + Environment.NewLine +
"\"start_url\": \"" + route.SiteUrl + "/\", " + " \"short_name\": \"" + site.Name + "\"," + Environment.NewLine +
"\"display\": \"standalone\", " + " \"start_url\": \"" + route.SiteUrl + "/\"," + Environment.NewLine +
"\"background_color\": \"#fff\", " + " \"display\": \"standalone\"," + Environment.NewLine +
"\"description\": \"" + site.Name + "\", " + " \"background_color\": \"#fff\"," + Environment.NewLine +
"\"icons\": [{ " + " \"description\": \"" + site.Name + "\"," + Environment.NewLine +
"\"src\": \"" + route.RootUrl + Utilities.FileUrl(alias, site.PwaAppIconFileId.Value) + "\", " + " \"icons\": [{" + Environment.NewLine +
"\"sizes\": \"192x192\", " + " \"src\": \"" + route.RootUrl + Utilities.FileUrl(alias, site.PwaAppIconFileId.Value) + "\"," + Environment.NewLine +
"\"type\": \"image/png\" " + " \"sizes\": \"192x192\"," + Environment.NewLine +
"}, { " + " \"type\": \"image/png\"" + Environment.NewLine +
"\"src\": \"" + route.RootUrl + Utilities.FileUrl(alias, site.PwaSplashIconFileId.Value) + "\", " + " }, {" + Environment.NewLine +
"\"sizes\": \"512x512\", " + " \"src\": \"" + route.RootUrl + Utilities.FileUrl(alias, site.PwaSplashIconFileId.Value) + "\"," + Environment.NewLine +
"\"type\": \"image/png\" " + " \"sizes\": \"512x512\"," + Environment.NewLine +
"}] " + " \"type\": \"image/png\"" + Environment.NewLine +
"}; " + " }]" + Environment.NewLine +
"const serialized = JSON.stringify(manifest); " + " };" + Environment.NewLine +
"const blob = new Blob([serialized], {type: 'application/javascript'}); " + " const serialized = JSON.stringify(manifest);" + Environment.NewLine +
"const url = URL.createObjectURL(blob); " + " const blob = new Blob([serialized], {type: 'application/javascript'});" + Environment.NewLine +
"document.getElementById('app-manifest').setAttribute('href', url); " + " const url = URL.createObjectURL(blob);" + Environment.NewLine +
"} " + " document.getElementById('app-manifest').setAttribute('href', url);" + Environment.NewLine +
", 1000);" + " }, 1000);" + Environment.NewLine +
"</script>" + Environment.NewLine + "</script>" + Environment.NewLine +
"<script id=\"app-serviceworker\">" + "<script>" + Environment.NewLine +
"if ('serviceWorker' in navigator) { " + " // PWA Service Worker" + Environment.NewLine +
"navigator.serviceWorker.register('/service-worker.js').then(function(registration) { " + " if ('serviceWorker' in navigator) {" + Environment.NewLine +
"console.log('ServiceWorker Registration Successful'); " + " navigator.serviceWorker.register('/service-worker.js').then(function(registration) {" + Environment.NewLine +
"}).catch (function(err) { " + " console.log('ServiceWorker Registration Successful');" + Environment.NewLine +
"console.log('ServiceWorker Registration Failed ', err); " + " }).catch (function(err) {" + Environment.NewLine +
"}); " + " console.log('ServiceWorker Registration Failed ', err);" + Environment.NewLine +
"};" + " });" + Environment.NewLine +
" };" + Environment.NewLine +
"</script>";
}
private string CreateReconnectScript()
{
return
"<script>" + Environment.NewLine +
" // Blazor Server Reconnect" + Environment.NewLine +
" new MutationObserver((mutations, observer) => {" + Environment.NewLine +
" if (document.querySelector('#components-reconnect-modal h5 a')) {" + Environment.NewLine +
" async function attemptReload() {" + Environment.NewLine +
" await fetch('');" + Environment.NewLine +
" location.reload();" + Environment.NewLine +
" }" + Environment.NewLine +
" observer.disconnect();" + Environment.NewLine +
" attemptReload();" + Environment.NewLine +
" setInterval(attemptReload, 5000);" + Environment.NewLine +
" }" + Environment.NewLine +
" }).observe(document.body, { childList: true, subtree: true });" + Environment.NewLine +
"</script>"; "</script>";
} }

13
Oqtane.Server/wwwroot/js/interop.js
View File

@ -356,10 +356,15 @@ Oqtane.Interop = {
} }
} }
}, },
refreshBrowser: function (reload, wait) { refreshBrowser: function (verify, wait) {
setInterval(function () { async function attemptReload (verify) {
window.location.reload(reload); if (verify) {
}, wait * 1000); await fetch('');
}
window.location.reload();
}
attemptReload(verify);
setInterval(attemptReload, wait * 1000);
}, },
redirectBrowser: function (url, wait) { redirectBrowser: function (url, wait) {
setInterval(function () { setInterval(function () {