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

revert prerender changes and change default

Browse Source
This commit is contained in:
sbwalker 2024-05-10 16:28:19 -04:00
parent c597b293b8
commit d57c1e7ff0
6 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@
<div class="row mb-1 align-items-center">
<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="rendermode" class="form-select" @bind="@_rendermode" required>
<select id="rendermode" class="form-select" value="@_rendermode" @onchange="(e => RenderModeChanged(e))" required>
<option value="@RenderModes.Interactive">@(SharedLocalizer["RenderMode" + @RenderModes.Interactive])</option>
<option value="@RenderModes.Static">@(SharedLocalizer["RenderMode" + @RenderModes.Static])</option>
<option value="@RenderModes.Headless">@(SharedLocalizer["RenderMode" + @RenderModes.Headless])</option>
@ -337,11 +337,11 @@
</div>
</div>
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="prerender" HelpText="Specifies if interactive components should prerender their output. The default is Auto which determines if a component should be prerendered at runtime based on the environment." ResourceKey="Prerender">Prerendering: </Label>
<Label Class="col-sm-3" For="prerender" HelpText="Specifies if interactive components should prerender their output on the server" ResourceKey="Prerender">Prerender: </Label>
<div class="col-sm-9">
<select id="prerender" class="form-select" @bind="@_prerender" required>
<option value="True">@SharedLocalizer["Auto"]</option>
<option value="False">@SharedLocalizer["Disabled"]</option>
<option value="True">@SharedLocalizer["Yes"]</option>
<option value="False">@SharedLocalizer["No"]</option>
</select>
</div>
</div>
@ -572,6 +572,23 @@
}
}
private void RenderModeChanged(ChangeEventArgs e)
{
_rendermode = (string)e.Value;
switch (_rendermode)
{
case RenderModes.Interactive:
_prerender = "True";
break;
case RenderModes.Static:
_prerender = "False";
break;
case RenderModes.Headless:
_prerender = "False";
break;
}
}
private async Task SaveSite()
{
validated = true;

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

@ -277,10 +277,10 @@
<value>UI Component Settings</value>
</data>
<data name="Prerender.HelpText" xml:space="preserve">
<value>Specifies if interactive components should prerender their output. The default is Auto which determines if a component should be prerendered at runtime based on the environment.</value>
<value>Specifies if interactive components should prerender their output on the server</value>
</data>
<data name="Prerender.Text" xml:space="preserve">
<value>Prerendering: </value>
<value>Prerender: </value>
</data>
<data name="RenderMode.HelpText" xml:space="preserve">
<value>The default render mode for the site</value>

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

@ -453,9 +453,6 @@
<data name="RenderModeStatic" xml:space="preserve">
<value>Static</value>
</data>
<data name="Auto" xml:space="preserve">
<value>Auto</value>
</data>
<data name="Disabled" xml:space="preserve">
<value>Disabled</value>
</data>

2
Oqtane.Client/UI/ModuleInstance.razor
View File

@ -29,7 +29,7 @@
protected override void OnParametersSet()
{
_prerender = ModuleState.Prerender ?? (PageState.Site.Prerender && PageState.User == null);
_prerender = ModuleState.Prerender ?? PageState.Site.Prerender;
_comment = "<!-- rendermode: ";
if (PageState.RenderMode == RenderModes.Static && ModuleState.RenderMode == RenderModes.Static)
{

2
Oqtane.Server/Components/App.razor
View File

@ -139,7 +139,7 @@
{
_renderMode = site.RenderMode;
_runtime = site.Runtime;
_prerender = site.Prerender && !Context.User.Identity.IsAuthenticated;
_prerender = site.Prerender;
Route route = new Route(url, alias.Path);
var page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));

8
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -539,6 +539,8 @@ namespace Oqtane.Infrastructure
var identityUserManager = scope.ServiceProvider.GetRequiredService<UserManager<IdentityUser>>();
var tenant = tenants.GetTenants().FirstOrDefault(item => item.Name == install.TenantName);
var rendermode = (!string.IsNullOrEmpty(install.RenderMode)) ? install.RenderMode : _configManager.GetSection("RenderMode").Value;
var runtime = (!string.IsNullOrEmpty(install.Runtime)) ? install.Runtime : _configManager.GetSection("Runtime").Value;
site = new Site
{
@ -556,9 +558,9 @@ namespace Oqtane.Infrastructure
DefaultContainerType = (!string.IsNullOrEmpty(install.DefaultContainer)) ? install.DefaultContainer : Constants.DefaultContainer,
AdminContainerType = (!string.IsNullOrEmpty(install.DefaultAdminContainer)) ? install.DefaultAdminContainer : Constants.DefaultAdminContainer,
SiteTemplateType = install.SiteTemplate,
RenderMode = (!string.IsNullOrEmpty(install.RenderMode)) ? install.RenderMode : _configManager.GetSection("RenderMode").Value,
Runtime = (!string.IsNullOrEmpty(install.Runtime)) ? install.Runtime : _configManager.GetSection("Runtime").Value,
Prerender = true,
RenderMode = rendermode,
Runtime = runtime,
Prerender = (rendermode == RenderModes.Interactive),
Hybrid = false
};
site = sites.AddSite(site);