Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

render mode integration

Browse Source
This commit is contained in:
sbwalker
2024-01-31 15:22:21 -05:00
parent 764e1ac35f
commit 8e499d164a
23 changed files with 145 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Installer/Installer.razor
View File

@ -260,7 +260,8 @@
IsNewTenant = true,
SiteName = Constants.DefaultSite,
Register = _register,
SiteTemplate = _template
SiteTemplate = _template,
RenderMode = RenderModes.InteractiveServer
};
var installation = await InstallationService.Install(config);

53
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -311,27 +311,32 @@
<Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
<div class="container">
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="runtime" HelpText="The Blazor runtime hosting model for the site" ResourceKey="Runtime">Runtime: </Label>
<Label Class="col-sm-3" For="rendermode" HelpText="The default render mode for the site" ResourceKey="Rendermode">Render Mode: </Label>
<div class="col-sm-9">
<select id="runtime" class="form-select" @bind="@_runtime" required>
<option value="Server">@SharedLocalizer["BlazorServer"]</option>
<option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
<select id="rendermode" class="form-select" @bind="@_rendermode" required>
<option value="@RenderModes.StaticServer">@SharedLocalizer[@RenderModes.StaticServer]</option>
<option value="@RenderModes.InteractiveServer">@SharedLocalizer[@RenderModes.InteractiveServer]</option>
<option value="@RenderModes.InteractiveWebAssembly">@SharedLocalizer[@RenderModes.InteractiveWebAssembly]</option>
<option value="@RenderModes.InteractiveAuto">@SharedLocalizer[@RenderModes.InteractiveAuto]</option>
</select>
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site should be prerendered (for search crawlers, etc...)" ResourceKey="Prerender">Prerender? </Label>
<div class="col-sm-9">
<select id="prerender" class="form-select" @bind="@_prerender" required>
<option value="Prerendered">@SharedLocalizer["Yes"]</option>
<option value="">@SharedLocalizer["No"]</option>
</select>
@if (_rendermode != "Static")
{
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site supports prerendering" ResourceKey="Prerender">Prerender? </Label>
<div class="col-sm-9">
<select id="prerender" class="form-select" @bind="@_prerender" required>
<option value="True">@SharedLocalizer["Yes"]</option>
<option value="False">@SharedLocalizer["No"]</option>
</select>
</div>
</div>
</div>
}
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="hybridenabled" HelpText="Specifies if the site can be integrated with an external .NET MAUI hybrid application" ResourceKey="HybridEnabled">Hybrid Enabled? </Label>
<Label Class="col-sm-3" For="hybrid" HelpText="Specifies if the site can be integrated with an external .NET MAUI hybrid application" ResourceKey="Hybrid">Hybrid? </Label>
<div class="col-sm-9">
<select id="hybridenabled" class="form-select" @bind="@_hybridenabled" required>
<select id="hybrid" class="form-select" @bind="@_hybrid" required>
<option value="True">@SharedLocalizer["Yes"]</option>
<option value="False">@SharedLocalizer["No"]</option>
</select>
@ -414,9 +419,9 @@
private int _aliasid = -1;
private string _aliasname;
private string _defaultalias;
private string _runtime = "";
private string _prerender = "";
private string _hybridenabled = "";
private string _rendermode = RenderModes.InteractiveServer;
private string _prerender = "True";
private string _hybrid = "False";
private string _tenant = string.Empty;
private string _database = string.Empty;
private string _connectionstring = string.Empty;
@ -500,9 +505,9 @@
await GetAliases();
// hosting model
_runtime = site.Runtime;
_prerender = site.RenderMode.Replace(_runtime, "");
_hybridenabled = site.HybridEnabled.ToString();
_rendermode = site.RenderMode;
_prerender = site.Prerender.ToString();
_hybrid = site.Hybrid.ToString();
// database
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
@ -640,11 +645,11 @@
// hosting model
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
if (site.Runtime != _runtime || site.RenderMode != _runtime + _prerender || site.HybridEnabled != bool.Parse(_hybridenabled))
if (site.RenderMode != _rendermode || site.Prerender != bool.Parse(_prerender) || site.Hybrid != bool.Parse(_hybrid))
{
site.Runtime = _runtime;
site.RenderMode = _runtime + _prerender;
site.HybridEnabled = bool.Parse(_hybridenabled);
site.RenderMode = _rendermode;
site.Prerender = bool.Parse(_prerender);
site.Hybrid = bool.Parse(_hybrid);
reload = true; // needs to be reloaded on serve
}
}

25
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -71,20 +71,13 @@ else
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="runtime" HelpText="The runtime hosting model" ResourceKey="Runtime">Runtime: </Label>
<Label Class="col-sm-3" For="rendermode" HelpText="The default render mode for the site" ResourceKey="Rendermode">Render Mode: </Label>
<div class="col-sm-9">
<select id="runtime" class="form-select" @bind="@_runtime" required>
<option value="Server">@SharedLocalizer["BlazorServer"]</option>
<option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
</select>
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site should be prerendered (for search crawlers, etc...)" ResourceKey="Prerender">Prerender? </Label>
<div class="col-sm-9">
<select id="prerender" class="form-select" @bind="@_prerender" required>
<option value="Prerendered">@SharedLocalizer["Yes"]</option>
<option value="">@SharedLocalizer["No"]</option>
<select id="rendermode" class="form-select" @bind="@_rendermode" required>
<option value="@RenderModes.StaticServer">@SharedLocalizer[@RenderModes.StaticServer]</option>
<option value="@RenderModes.InteractiveServer">@SharedLocalizer[@RenderModes.InteractiveServer]</option>
<option value="@RenderModes.InteractiveWebAssembly">@SharedLocalizer[@RenderModes.InteractiveWebAssembly]</option>
<option value="@RenderModes.InteractiveAuto">@SharedLocalizer[@RenderModes.InteractiveAuto]</option>
</select>
</div>
</div>
@ -201,8 +194,7 @@ else
private string _themetype = "-";
private string _containertype = "-";
private string _sitetemplatetype = "-";
private string _runtime = "Server";
private string _prerender = "Prerendered";
private string _rendermode = RenderModes.InteractiveServer;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
@ -399,8 +391,7 @@ else
config.DefaultContainer = _containertype;
config.DefaultAdminContainer = "";
config.SiteTemplate = _sitetemplatetype;
config.Runtime = _runtime;
config.RenderMode = _runtime + _prerender;
config.RenderMode = _rendermode;
ShowProgressIndicator();

10
Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
View File

@ -277,16 +277,16 @@
<value>Hosting Model</value>
</data>
<data name="Prerender.HelpText" xml:space="preserve">
<value>Specifies if the site should be prerendered (for search crawlers, etc...)</value>
<value>Specifies if the site supports prerendering</value>
</data>
<data name="Prerender.Text" xml:space="preserve">
<value>Prerender? </value>
</data>
<data name="Runtime.HelpText" xml:space="preserve">
<value>The Blazor runtime hosting model for the site</value>
<data name="RenderMode.HelpText" xml:space="preserve">
<value>The default render mode for the site</value>
</data>
<data name="Runtime.Text" xml:space="preserve">
<value>Runtime: </value>
<data name="RenderMode.Text" xml:space="preserve">
<value>Render Mode:</value>
</data>
<data name="Browse" xml:space="preserve">
<value>Browse</value>

10
Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
View File

@ -223,16 +223,16 @@
<value>Error loading Database Configuration Control</value>
</data>
<data name="Prerender.HelpText" xml:space="preserve">
<value>Specifies if the site should be prerendered (for search crawlers, etc...)</value>
<value>Specifies if the site supports prerendering</value>
</data>
<data name="Prerender.Text" xml:space="preserve">
<value>Prerender? </value>
</data>
<data name="Runtime.HelpText" xml:space="preserve">
<value>The Blazor runtime hosting model</value>
<data name="RenderMode.HelpText" xml:space="preserve">
<value>The default render mode for the site</value>
</data>
<data name="Runtime.Text" xml:space="preserve">
<value>Runtime: </value>
<data name="RenderMode.Text" xml:space="preserve">
<value>Render Mode: </value>
</data>
<data name="ConnectionString.HelpText" xml:space="preserve">
<value>Enter a complete connection string including all parameters and delimiters</value>

15
Oqtane.Client/Resources/SharedResources.resx
View File

@ -312,14 +312,14 @@
<data name="Not Specified" xml:space="preserve">
<value>Not Specified</value>
</data>
<data name="BlazorServer" xml:space="preserve">
<value>Blazor Server</value>
<data name="InteractiveServer" xml:space="preserve">
<value>Interactive Server Rendering</value>
</data>
<data name="BlazorWebAssembly" xml:space="preserve">
<value>Blazor WebAssembly</value>
<data name="InteractiveWebAssembly" xml:space="preserve">
<value>Interactive WebAssembly Rendering</value>
</data>
<data name="BlazorHybrid" xml:space="preserve">
<value>Blazor Hybrid</value>
<data name="StaticServer" xml:space="preserve">
<value>Static Server Rendering</value>
</data>
<data name="Settings" xml:space="preserve">
<value>Settings</value>
@ -441,4 +441,7 @@
<data name="Message.EffectiveExpiryDateError" xml:space="preserve">
<value>Effective Date cannot be after Expiry Date.</value>
</data>
<data name="InteractiveAuto" xml:space="preserve">
<value>Interactive Auto Rendering</value>
</data>
</root>

5
Oqtane.Client/Routes.razor
View File

@ -16,7 +16,7 @@
<div style="@_display">
<CascadingAuthenticationState>
<CascadingValue Value="@PageState">
<SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
<SiteRouter Runtime="Web" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
</CascadingValue>
</CascadingAuthenticationState>
</div>
@ -34,9 +34,6 @@
[Parameter]
public string AntiForgeryToken { get; set; }
[Parameter]
public string Runtime { get; set; }
[Parameter]
public string RenderMode { get; set; }

1
Oqtane.Client/UI/PageState.cs
View File

@ -19,6 +19,7 @@ namespace Oqtane.UI
public bool EditMode { get; set; }
public DateTime LastSyncDate { get; set; }
public Shared.Runtime Runtime { get; set; }
public string RenderMode { get; set; }
public int VisitorId { get; set; }
public string RemoteIPAddress { get; set; }
public string ReturnUrl { get; set; }

11
Oqtane.Client/Utilities/RenderModes.cs → Oqtane.Client/UI/RenderMode.cs
View File

@ -1,19 +1,20 @@
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components;
using Oqtane.Shared;
namespace Oqtane.Client.Utilities
namespace Oqtane.UI
{
public static class RenderModes
public static class RenderMode
{
public static IComponentRenderMode GetInteractiveRenderMode(string interactiveRenderMode, bool prerender)
{
switch (interactiveRenderMode)
{
case "InteractiveServer":
case RenderModes.InteractiveServer:
return new InteractiveServerRenderMode(prerender);
case "InteractiveWebAssembly":
case RenderModes.InteractiveWebAssembly:
return new InteractiveWebAssemblyRenderMode(prerender);
case "InteractiveAuto":
case RenderModes.InteractiveAuto:
return new InteractiveAutoRenderMode(prerender);
}
return null;

11
Oqtane.Client/UI/Runtime.cs
View File

@ -1,11 +0,0 @@
using System;
namespace Oqtane.UI
{
[Obsolete("This enum is deprecated and will be removed in the upcoming major release, please use Oqtane.Shared.Runtime instead.")]
public enum Runtime
{
Server,
WebAssembly
}
}

6
Oqtane.Client/UI/SiteRouter.razor
View File

@ -100,7 +100,6 @@
var editmode = false;
var refresh = false;
var lastsyncdate = DateTime.MinValue;
var runtime = (Shared.Runtime)Enum.Parse(typeof(Shared.Runtime), Runtime);
_error = "";
Route route = new Route(_absoluteUri, SiteState.Alias.Path);
@ -286,7 +285,8 @@
Action = action,
EditMode = editmode,
LastSyncDate = lastsyncdate,
Runtime = runtime,
Runtime = Shared.Runtime.Hybrid,
RenderMode = RenderMode,
VisitorId = VisitorId,
RemoteIPAddress = SiteState.RemoteIPAddress,
ReturnUrl = returnurl,
@ -425,7 +425,7 @@
{
var typename = Constants.ErrorModule;
if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(Runtime)))
if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(RenderMode)))
{
typename = module.ModuleDefinition.ControlTypeTemplate;