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

Localization fixes - table definition, SQL script naming, SQL script not marked as Embedded Resource, changed column name from IsCurrrent to IsDefault to reflect intent, set default language for site in _Host

Browse Source
This commit is contained in:
Shaun Walker 2021-01-21 17:09:34 -05:00
parent 82a118b603
commit c0ed7c7934
14 changed files with 178 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Oqtane.Client/Modules/Admin/Languages/Add.razor
View File

@ -7,41 +7,48 @@
@inject ILanguageService LanguageService
@inject IStringLocalizer<Add> Localizer
<table class="table table-borderless">
<tr>
<td>
<Label For="name" HelpText="Name Of The Langauage" ResourceKey="Name">Name:</Label>
</td>
<td>
@if (_supportedCultures?.Count() > 1)
{
<select id="_code" class="form-control" @bind="@_code">
@foreach (var culture in _supportedCultures)
{
<option value="@culture.Name">@culture.DisplayName</option>
}
</select>
}
</td>
</tr>
<tr>
<td>
<Label For="isCurrent" HelpText="Indicates Whether Or Not This Language Is The Default One." ResourceKey="IsCurrent">Default?</Label>
</td>
<td>
<select id="isCurrent" class="form-control" @bind="@_isCurrent">
<option value="True">@Localizer["Yes"]</option>
<option value="False">@Localizer["No"]</option>
</select>
</td>
</tr>
</table>
<button type="button" class="btn btn-success @(_supportedCultures?.Count() > 1 ? String.Empty : "disabled")" @onclick="SaveLanguage">@Localizer["Save"]</button>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
@if (_supportedCultures == null)
{
<p><em>@Localizer["Loading..."]</em></p>
}
else
{
@if (_supportedCultures?.Count() > 1)
{
<table class="table table-borderless">
<tr>
<td>
<Label For="name" HelpText="Name Of The Langauage" ResourceKey="Name">Name:</Label>
</td>
<td>
<select id="_code" class="form-control" @bind="@_code">
@foreach (var culture in _supportedCultures)
{
<option value="@culture.Name">@culture.DisplayName</option>
}
</select>
</td>
</tr>
<tr>
<td>
<Label For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
</td>
<td>
<select id="default" class="form-control" @bind="@_isDefault">
<option value="True">@Localizer["Yes"]</option>
<option value="False">@Localizer["No"]</option>
</select>
</td>
</tr>
</table>
<button type="button" class="btn btn-success" @onclick="SaveLanguage">@Localizer["Save"]</button>
}
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
}
@code {
private string _code = string.Empty;
private string _isCurrent = "False";
private string _isDefault = "False";
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@ -50,6 +57,10 @@
protected override async Task OnParametersSetAsync()
{
_supportedCultures = await LocalizationService.GetCulturesAsync();
if (_supportedCultures.Count() <= 1)
{
AddModuleMessage(Localizer["The Only Supported Culture That Has Been Defined Is English"], MessageType.Warning);
}
}
private async Task SaveLanguage()
@ -59,14 +70,14 @@
SiteId = PageState.Page.SiteId,
Name = CultureInfo.GetCultureInfo(_code).DisplayName,
Code = _code,
IsCurrent = (_isCurrent == null ? false : Boolean.Parse(_isCurrent))
IsDefault = (_isDefault == null ? false : Boolean.Parse(_isDefault))
};
try
{
language = await LanguageService.AddLanguageAsync(language);
if (language.IsCurrent)
if (language.IsDefault)
{
await SetCultureAsync(language.Code);
}
@ -78,7 +89,6 @@
catch (Exception ex)
{
await logger.LogError(ex, "Error Adding Language {Language} {Error}", language, ex.Message);
AddModuleMessage(Localizer["Error Adding Language"], MessageType.Error);
}
}

6
Oqtane.Client/Modules/Admin/Languages/Index.razor
View File

@ -16,13 +16,13 @@ else
<th style="width: 1px;">&nbsp;</th>
<th>@Localizer["Name"]</th>
<th>@Localizer["Code"]</th>
<th>@Localizer["Is Current"]</th>
<th>@Localizer["Default?"]</th>
</Header>
<Row>
<td><ActionDialog Header="Delete Langauge" Message="@Localizer["Are You Sure You Wish To Delete The {0} Language?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@(context.IsCurrent)" ResourceKey="DeleteLanguage" /></td>
<td><ActionDialog Header="Delete Langauge" Message="@Localizer["Are You Sure You Wish To Delete The {0} Language?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@(context.IsDefault)" ResourceKey="DeleteLanguage" /></td>
<td>@context.Name</td>
<td>@context.Code</td>
<td><TriStateCheckBox Value="@(context.IsCurrent)" Disabled="true"></TriStateCheckBox></td>
<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
</Row>
</Pager>
}

21
Oqtane.Server/Controllers/AliasController.cs
View File

@ -50,29 +50,13 @@ namespace Oqtane.Controllers
[HttpGet("name/{**name}")]
public Alias Get(string name, string sync)
{
List<Alias> aliases = _aliases.GetAliases().ToList(); // cached
Alias alias = null;
if (_accessor.HttpContext != null)
{
name = (name == "~") ? "" : name;
name = _accessor.HttpContext.Request.Host.Value + "/" + WebUtility.UrlDecode(name);
var segments = name.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
// iterate segments in reverse order
for (int i = segments.Length; i > 0; i--)
{
name = string.Join("/", segments, 0, i);
alias = aliases.Find(item => item.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
if (alias != null)
{
break; // found a matching alias
}
}
}
if (alias == null && aliases.Any())
{
// use first alias if name does not exist
alias = aliases.FirstOrDefault();
alias = _aliases.GetAlias(name);
}
// get sync events
@ -81,6 +65,7 @@ namespace Oqtane.Controllers
alias.SyncDate = DateTime.UtcNow;
alias.SyncEvents = _syncManager.GetSyncEvents(alias.TenantId, DateTime.ParseExact(sync, "yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
}
return alias;
}

1
Oqtane.Server/Oqtane.Server.csproj
View File

@ -35,6 +35,7 @@
<EmbeddedResource Include="Scripts\Tenant.01.00.02.01.sql" />
<EmbeddedResource Include="Scripts\Tenant.02.00.00.01.sql" />
<EmbeddedResource Include="Scripts\Tenant.02.00.01.01.sql" />
<EmbeddedResource Include="Scripts\Tenant.02.00.01.02.sql" />
<EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.1.0.0.sql" />
<EmbeddedResource Include="Modules\HtmlText\Scripts\HtmlText.Uninstall.sql" />
</ItemGroup>

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

@ -7,11 +7,28 @@ using Oqtane.Themes;
using System;
using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Http.Extensions;
using Oqtane.Repository;
using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.Configuration;
namespace Oqtane.Pages
{
public class HostModel : PageModel
{
private IConfiguration _configuration;
private readonly SiteState _state;
private readonly IAliasRepository _aliases;
private readonly ILanguageRepository _languages;
public HostModel(IConfiguration configuration, SiteState state, IAliasRepository aliases, ILanguageRepository languages)
{
_configuration = configuration;
_state = state;
_aliases = aliases;
_languages = languages;
}
public string HeadResources = "";
public string BodyResources = "";
@ -24,6 +41,24 @@ namespace Oqtane.Pages
ProcessModuleControls(assembly);
ProcessThemeControls(assembly);
}
// if framework is installed
if (!string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
{
Uri uri = new Uri(Request.GetDisplayUrl());
var alias = _aliases.GetAlias(uri.Authority + "/" + uri.LocalPath.Substring(1));
_state.Alias = alias;
// set default language for site
var language = _languages.GetLanguages(alias.SiteId).Where(item => item.IsDefault).FirstOrDefault();
if (language != null)
{
HttpContext.Response.Cookies.Append(
CookieRequestCultureProvider.DefaultCookieName,
CookieRequestCultureProvider.MakeCookieValue(
new RequestCulture(language.Code)));
}
}
}
private void ProcessHostResources(Assembly assembly)

23
Oqtane.Server/Repository/AliasRepository.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
@ -48,6 +48,27 @@ namespace Oqtane.Repository
return _db.Alias.Find(aliasId);
}
public Alias GetAlias(string name)
{
Alias alias = null;
List<Alias> aliases = GetAliases().ToList();
var segments = name.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
// iterate segments in reverse order
for (int i = segments.Length; i > 0; i--)
{
name = string.Join("/", segments, 0, i);
alias = aliases.Find(item => item.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
if (alias != null)
{
break; // found a matching alias
}
}
return alias;
}
public void DeleteAlias(int aliasId)
{
Alias alias = _db.Alias.Find(aliasId);

16
Oqtane.Server/Repository/Context/DBContextBase.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
@ -10,20 +10,24 @@ namespace Oqtane.Repository
{
public class DBContextBase : IdentityUserContext<IdentityUser>
{
private Tenant _tenant;
private ITenantResolver _tenantResolver;
private IHttpContextAccessor _accessor;
public DBContextBase(ITenantResolver tenantResolver, IHttpContextAccessor accessor)
{
_tenant = tenantResolver.GetTenant();
_tenantResolver = tenantResolver;
_accessor = accessor;
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.UseSqlServer(_tenant.DBConnectionString
.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
);
var tenant = _tenantResolver.GetTenant();
if (tenant != null)
{
optionsBuilder.UseSqlServer(tenant.DBConnectionString
.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
);
}
base.OnConfiguring(optionsBuilder);
}

18
Oqtane.Server/Repository/Context/MasterDBContext.cs
View File

@ -1,18 +1,32 @@
using System;
using System;
using System.Linq;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Oqtane.Models;
using Microsoft.Extensions.Configuration;
namespace Oqtane.Repository
{
public class MasterDBContext : DbContext
{
private IHttpContextAccessor _accessor;
private IConfiguration _configuration;
public MasterDBContext(DbContextOptions<MasterDBContext> options, IHttpContextAccessor accessor) : base(options)
public MasterDBContext(DbContextOptions<MasterDBContext> options, IHttpContextAccessor accessor, IConfiguration configuration) : base(options)
{
_accessor = accessor;
_configuration = configuration;
}
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
if (!string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
{
optionsBuilder.UseSqlServer(_configuration.GetConnectionString("DefaultConnection")
.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
);
}
base.OnConfiguring(optionsBuilder);
}
public virtual DbSet<Alias> Alias { get; set; }

3
Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Oqtane.Models;
namespace Oqtane.Repository
@ -9,6 +9,7 @@ namespace Oqtane.Repository
Alias AddAlias(Alias alias);
Alias UpdateAlias(Alias alias);
Alias GetAlias(int aliasId);
Alias GetAlias(string name);
void DeleteAlias(int aliasId);
}
}

4
Oqtane.Server/Repository/LanguageRepository.cs
View File

@ -17,10 +17,10 @@ namespace Oqtane.Repository
public Language AddLanguage(Language language)
{
if (language.IsCurrent)
if (language.IsDefault)
{
// Ensure all other languages are not set to current
_db.Language.ToList().ForEach(l => l.IsCurrent = false);
_db.Language.ToList().ForEach(l => l.IsDefault = false);
}
_db.Language.Add(language);

54
Oqtane.Server/Repository/TenantResolver.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Http;
@ -9,24 +9,49 @@ namespace Oqtane.Repository
{
public class TenantResolver : ITenantResolver
{
private readonly Alias _alias;
private readonly Tenant _tenant;
private readonly IHttpContextAccessor _accessor;
private readonly IAliasRepository _aliasRepository;
private readonly ITenantRepository _tenantRepository;
private readonly SiteState _siteState;
private Alias _alias;
private Tenant _tenant;
public TenantResolver(IHttpContextAccessor accessor, IAliasRepository aliasRepository, ITenantRepository tenantRepository, SiteState siteState)
{
int aliasId = -1;
_accessor = accessor;
_aliasRepository = aliasRepository;
_tenantRepository = tenantRepository;
_siteState = siteState;
}
if (siteState != null && siteState.Alias != null)
public Alias GetAlias()
{
if (_alias == null) ResolveTenant();
return _alias;
}
public Tenant GetTenant()
{
if (_tenant == null) ResolveTenant();
return _tenant;
}
private void ResolveTenant()
{
if (_siteState != null && _siteState.Alias != null)
{
// background processes can pass in an alias using the SiteState service
_alias = siteState.Alias;
_alias = _siteState.Alias;
}
else
{
int aliasId = -1;
// get aliasid identifier based on request
if (accessor.HttpContext != null)
if (_accessor.HttpContext != null)
{
string[] segments = accessor.HttpContext.Request.Path.Value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
string[] segments = _accessor.HttpContext.Request.Path.Value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
if (segments.Length > 1 && (segments[1] == "api" || segments[1] == "pages") && segments[0] != "~")
{
aliasId = int.Parse(segments[0]);
@ -34,7 +59,7 @@ namespace Oqtane.Repository
}
// get the alias
IEnumerable<Alias> aliases = aliasRepository.GetAliases().ToList(); // cached
IEnumerable<Alias> aliases = _aliasRepository.GetAliases().ToList(); // cached
if (aliasId != -1)
{
_alias = aliases.FirstOrDefault(item => item.AliasId == aliasId);
@ -44,19 +69,10 @@ namespace Oqtane.Repository
if (_alias != null)
{
// get the tenant
IEnumerable<Tenant> tenants = tenantRepository.GetTenants(); // cached
IEnumerable<Tenant> tenants = _tenantRepository.GetTenants(); // cached
_tenant = tenants.FirstOrDefault(item => item.TenantId == _alias.TenantId);
}
}
public Alias GetAlias()
{
return _alias;
}
public Tenant GetTenant()
{
return _tenant;
}
}
}

4
Oqtane.Server/Scripts/Tenant.02.00.02.00.sql → Oqtane.Server/Scripts/Tenant.02.00.01.02.sql
View File

@ -8,8 +8,8 @@ CREATE TABLE [dbo].[Language](
[LanguageId] [int] IDENTITY(1,1) NOT NULL,
[Name] [nvarchar](100) NOT NULL,
[Code] [nvarchar](10) NOT NULL,
[IsCurrent] [bit] NOT NULL,
[SiteId] [int],
[IsDefault] [bit] NOT NULL,
[SiteId] [int] NOT NULL,
[CreatedBy] [nvarchar](256) NOT NULL,
[CreatedOn] [datetime] NOT NULL,
[ModifiedBy] [nvarchar](256) NOT NULL,

5
Oqtane.Server/Startup.cs
View File

@ -132,10 +132,7 @@ namespace Oqtane
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
services.AddDbContext<MasterDBContext>(options =>
options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")
.Replace("|DataDirectory|", AppContext.GetData("DataDirectory")?.ToString())
));
services.AddDbContext<MasterDBContext>(options => { });
services.AddDbContext<TenantDBContext>(options => { });
services.AddIdentityCore<IdentityUser>(options => { })

2
Oqtane.Shared/Models/Language.cs
View File

@ -12,7 +12,7 @@ namespace Oqtane.Models
public string Code { get; set; }
public bool IsCurrent { get; set; }
public bool IsDefault { get; set; }
public string CreatedBy { get; set; }