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

Merge pull request #5842 from sbwalker/dev

Browse Source 
add Enhanced Navigation option in Site Settings
This commit is contained in:
Shaun Walker
2025-11-25 14:44:10 -05:00
committed by GitHub
parent 44103c1311 fb6e8bb233
commit 4e63c9ce9d
4 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,6 +411,18 @@
</select> </select>
</div> </div>
</div> </div>
@if (_rendermode == RenderModes.Static)
{
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="enhancednavigation" HelpText="Indicates if enhanced navigation should be used with static rendering" ResourceKey="EnhancedNavigation">Enhanced Navigation: </Label>
<div class="col-sm-9">
<select id="enhancednavigation" class="form-select" @bind="@_enhancednavigation" required>
<option value="True">@SharedLocalizer["Yes"]</option>
<option value="False">@SharedLocalizer["No"]</option>
</select>
</div>
</div>
}
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="runtime" HelpText="The render mode for UI components which require interactivity" ResourceKey="Runtime">Interactivity: </Label> <Label Class="col-sm-3" For="runtime" HelpText="The render mode for UI components which require interactivity" ResourceKey="Runtime">Interactivity: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
@@ -537,6 +549,7 @@
private string _defaultalias; private string _defaultalias;
private string _rendermode = RenderModes.Interactive; private string _rendermode = RenderModes.Interactive;
private string _enhancednavigation = "True";
private string _runtime = Runtimes.Server; private string _runtime = Runtimes.Server;
private string _prerender = "True"; private string _prerender = "True";
private string _hybrid = "False"; private string _hybrid = "False";
@@ -660,6 +673,7 @@
// hosting model // hosting model
_rendermode = site.RenderMode; _rendermode = site.RenderMode;
_enhancednavigation = site.EnhancedNavigation.ToString();
_runtime = site.Runtime; _runtime = site.Runtime;
_prerender = site.Prerender.ToString(); _prerender = site.Prerender.ToString();
_hybrid = site.Hybrid.ToString(); _hybrid = site.Hybrid.ToString();
@@ -807,13 +821,11 @@
// hosting model // hosting model
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{ {
if (site.RenderMode != _rendermode || site.Runtime != _runtime || site.Prerender != bool.Parse(_prerender) || site.Hybrid != bool.Parse(_hybrid)) site.RenderMode = _rendermode;
{ site.EnhancedNavigation = bool.Parse(_enhancednavigation);
site.RenderMode = _rendermode; site.Runtime = _runtime;
site.Runtime = _runtime; site.Prerender = bool.Parse(_prerender);
site.Prerender = bool.Parse(_prerender); site.Hybrid = bool.Parse(_hybrid);
site.Hybrid = bool.Parse(_hybrid);
}
} }
site = await SiteService.UpdateSiteAsync(site); site = await SiteService.UpdateSiteAsync(site);

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

@@ -60,7 +60,7 @@
} }
@((MarkupString)_headResources) @((MarkupString)_headResources)
</head> </head>
<body> <body data-enhance-nav="@_enhancedNavigation.ToString().ToLower()">
@if (string.IsNullOrEmpty(_message)) @if (string.IsNullOrEmpty(_message))
{ {
@if (_renderMode == RenderModes.Static) @if (_renderMode == RenderModes.Static)
@@ -97,6 +97,7 @@
private string _renderMode = RenderModes.Interactive; private string _renderMode = RenderModes.Interactive;
private string _runtime = Runtimes.Server; private string _runtime = Runtimes.Server;
private bool _prerender = true; private bool _prerender = true;
private bool _enhancedNavigation = true;
private string _fingerprint = ""; private string _fingerprint = "";
private int _visitorId = -1; private int _visitorId = -1;
private string _antiForgeryToken = ""; private string _antiForgeryToken = "";
@@ -141,6 +142,7 @@
_renderMode = site.RenderMode; _renderMode = site.RenderMode;
_runtime = site.Runtime; _runtime = site.Runtime;
_prerender = site.Prerender; _prerender = site.Prerender;
_enhancedNavigation = site.EnhancedNavigation;
_fingerprint = site.Fingerprint; _fingerprint = site.Fingerprint;
var cookieConsentSettings = SettingService.GetSetting(site.Settings, "CookieConsent", string.Empty); var cookieConsentSettings = SettingService.GetSetting(site.Settings, "CookieConsent", string.Empty);

29
Oqtane.Server/Migrations/Tenant/10000101_AddSiteEnhancedNavigation.cs Normal file
View File

@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations.EntityBuilders;
using Oqtane.Repository;
namespace Oqtane.Migrations.Tenant
{
[DbContext(typeof(TenantDBContext))]
[Migration("Tenant.10.00.01.01")]
public class AddSiteEnhancedNavigation : MultiDatabaseMigration
{
public AddSiteEnhancedNavigation(IDatabase database) : base(database)
{
}
protected override void Up(MigrationBuilder migrationBuilder)
{
var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
siteEntityBuilder.AddBooleanColumn("EnhancedNavigation", true);
siteEntityBuilder.UpdateData("EnhancedNavigation", true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
// not implemented
}
}
}

6
Oqtane.Shared/Models/Site.cs
View File

@@ -115,6 +115,11 @@ namespace Oqtane.Models
/// </summary> /// </summary>
public bool Hybrid { get; set; } public bool Hybrid { get; set; }
/// <summary>
/// Indicates if enhanced navigation should be used with static rendering
/// </summary>
public bool EnhancedNavigation { get; set; }
/// <summary> /// <summary>
/// Keeps track of site configuration changes and is used by the ISiteMigration interface /// Keeps track of site configuration changes and is used by the ISiteMigration interface
/// </summary> /// </summary>
@@ -222,6 +227,7 @@ namespace Oqtane.Models
Runtime = Runtime, Runtime = Runtime,
Prerender = Prerender, Prerender = Prerender,
Hybrid = Hybrid, Hybrid = Hybrid,
EnhancedNavigation = EnhancedNavigation,
Version = Version, Version = Version,
HomePageId = HomePageId, HomePageId = HomePageId,
HeadContent = HeadContent, HeadContent = HeadContent,