Merge pull request #4019 from sbwalker/dev

fix #4017 - SiteState being lost in server rendered scenarios
This commit is contained in:
Shaun Walker 2024-03-19 13:53:26 -04:00 committed by GitHub
commit 52121b90ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 3 additions and 15 deletions

View File

@ -99,9 +99,6 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddScoped<IVisitorService, VisitorService>(); services.AddScoped<IVisitorService, VisitorService>();
services.AddScoped<ISyncService, SyncService>(); services.AddScoped<ISyncService, SyncService>();
// alternative used within infrastructure classes
services.AddScoped<Oqtane.Infrastructure.SiteState>();
return services; return services;
} }

View File

@ -1,9 +0,0 @@
using Oqtane.Models;
namespace Oqtane.Infrastructure
{
public class SiteState
{
public Alias Alias { get; set; }
}
}

View File

@ -1,9 +1,9 @@
using System; using System;
using System.IO;
using System.Linq; using System.Linq;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Oqtane.Models; using Oqtane.Models;
using Oqtane.Repository; using Oqtane.Repository;
using Oqtane.Shared;
namespace Oqtane.Infrastructure namespace Oqtane.Infrastructure
{ {

View File

@ -2,10 +2,10 @@ using System.Linq;
using Oqtane.Documentation; using Oqtane.Documentation;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Oqtane.Infrastructure;
using System; using System;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Threading.Tasks; using System.Threading.Tasks;
using Oqtane.Shared;
namespace Oqtane.Modules.HtmlText.Repository namespace Oqtane.Modules.HtmlText.Repository
{ {

View File

@ -4,7 +4,7 @@ using System.Linq;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Oqtane.Models; using Oqtane.Models;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using Oqtane.Infrastructure; using Oqtane.Shared;
namespace Oqtane.Repository namespace Oqtane.Repository
{ {