@@ -78,6 +79,7 @@ else
@(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] |
@SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") |
@SharedLocalizer["Search.Version"]: @context.Version
+ @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? " | " + SharedLocalizer["Search.Source"] + ": " + new Uri(context.PackageUrl).Host + "" : ""))
@((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 5bab1f8c..d2af52a0 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -1,5 +1,6 @@
@namespace Oqtane.Modules.Admin.Logs
@inherits ModuleBase
+@inject NavigationManager NavigationManager
@inject ILogService LogService
@inject ISettingService SettingService
@inject IStringLocalizer Localizer
@@ -91,19 +92,23 @@ else
}
@code {
- private string _level = "-";
- private string _function = "-";
- private string _rows = "10";
+ private string _level = "-";
+ private string _function = "-";
+ private string _rows = "10";
private int _page = 1;
- private List _logs;
- private string _retention = "";
+ private List _logs;
+ private string _retention = "";
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
- protected override async Task OnInitializedAsync()
- {
- try
- {
+ protected override async Task OnInitializedAsync()
+ {
+ try
+ {
+ if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
+ {
+ NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"id={id}"));
+ }
if (PageState.QueryString.ContainsKey("level"))
{
_level = PageState.QueryString["level"];
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 7825d0e2..68af3ec7 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -35,6 +35,7 @@
@(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] |
@SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") |
@SharedLocalizer["Search.Version"]: @context.Version
+ @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? " | " + SharedLocalizer["Search.Source"] + ": " + new Uri(context.PackageUrl).Host + "" : ""))
@((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))
@@ -114,145 +115,145 @@
@SharedLocalizer["Cancel"]
@code {
- private List _packages;
- private string _price = "free";
- private string _search = "";
- private string _productname = "";
- private string _license = "";
- private string _packageid = "";
- private string _version = "";
+ private List _packages;
+ private string _price = "free";
+ private string _search = "";
+ private string _productname = "";
+ private string _license = "";
+ private string _packageid = "";
+ private string _version = "";
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
- protected override async Task OnInitializedAsync()
- {
- try
- {
- await LoadModuleDefinitions();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
- AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
- }
- }
+ protected override async Task OnInitializedAsync()
+ {
+ try
+ {
+ await LoadModuleDefinitions();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+ AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
+ }
+ }
- private async Task LoadModuleDefinitions()
- {
- var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
- _packages = await PackageService.GetPackagesAsync("module", _search, _price, "");
+ private async Task LoadModuleDefinitions()
+ {
+ var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+ _packages = await PackageService.GetPackagesAsync("module", _search, _price, "");
- if (_packages != null)
- {
- foreach (Package package in _packages.ToArray())
- {
- if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
- {
- _packages.Remove(package);
- }
- }
- }
- }
+ if (_packages != null)
+ {
+ foreach (Package package in _packages.ToArray())
+ {
+ if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
+ {
+ _packages.Remove(package);
+ }
+ }
+ }
+ }
- private async void PriceChanged(ChangeEventArgs e)
- {
- try
- {
- _price = (string)e.Value;
- _search = "";
- await LoadModuleDefinitions();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error On PriceChanged");
- }
- }
+ private async void PriceChanged(ChangeEventArgs e)
+ {
+ try
+ {
+ _price = (string)e.Value;
+ _search = "";
+ await LoadModuleDefinitions();
+ StateHasChanged();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error On PriceChanged");
+ }
+ }
- private async Task Search()
- {
- try
- {
- await LoadModuleDefinitions();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error On Search");
- }
- }
+ private async Task Search()
+ {
+ try
+ {
+ await LoadModuleDefinitions();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error On Search");
+ }
+ }
- private async Task Reset()
- {
- try
- {
- _search = "";
- await LoadModuleDefinitions();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error On Reset");
- }
- }
+ private async Task Reset()
+ {
+ try
+ {
+ _search = "";
+ await LoadModuleDefinitions();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error On Reset");
+ }
+ }
- private void HideModal()
- {
- _productname = "";
- _license = "";
- StateHasChanged();
- }
+ private void HideModal()
+ {
+ _productname = "";
+ _license = "";
+ StateHasChanged();
+ }
- private async Task GetPackage(string packageid, string version)
- {
- try
- {
- var package = await PackageService.GetPackageAsync(packageid, version);
- if (package != null)
- {
- _productname = package.Name;
- if (!string.IsNullOrEmpty(package.License))
- {
- _license = package.License.Replace("\n", "
"); - } - _packageid = package.PackageId; - _version = package.Version; - } - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); - AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); - } - } + private async Task GetPackage(string packageid, string version) + { + try + { + var package = await PackageService.GetPackageAsync(packageid, version); + if (package != null) + { + _productname = package.Name; + if (!string.IsNullOrEmpty(package.License)) + { + _license = package.License.Replace("\n", "
"); + } + _packageid = package.PackageId; + _version = package.Version; + } + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } - private async Task DownloadPackage() - { - try - { - await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder); - await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); - AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); - _productname = ""; - _license = ""; - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); - AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); - } - } + private async Task DownloadPackage() + { + try + { + await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder); + await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); + AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); + _productname = ""; + _license = ""; + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } - private async Task InstallModules() - { - try - { - await ModuleDefinitionService.InstallModuleDefinitionsAsync(); - AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Installing Module"); - } - } + private async Task InstallModules() + { + try + { + await ModuleDefinitionService.InstallModuleDefinitionsAsync(); + AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Installing Module"); + } + } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 049582c6..3cfbcb7e 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -12,11 +12,32 @@ } else { -
+
@@ -30,9 +51,9 @@ else
@if (context.AssemblyName != "Oqtane.Client")
- {
+ {
@context.Name
@context.Version
@@ -65,6 +86,8 @@ else
@code {
private List _moduleDefinitions;
private List _packages;
+ private List _categories = new List();
+ private string _category = "Common";
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
@@ -74,6 +97,7 @@ else
{
_moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
_packages = await PackageService.GetPackagesAsync("module");
+ _categories = _moduleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
}
catch (Exception ex)
{
@@ -115,38 +139,44 @@ else
{
return package.Version;
}
- }
- return version;
- }
+ }
+ return version;
+ }
- private async Task DownloadModule(string packagename, string version)
- {
- try
- {
- await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
- await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
- await ModuleDefinitionService.InstallModuleDefinitionsAsync();
- AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message);
- AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
- }
- }
+ private async Task DownloadModule(string packagename, string version)
+ {
+ try
+ {
+ await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+ await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
+ await ModuleDefinitionService.InstallModuleDefinitionsAsync();
+ AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message);
+ AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+ }
+ }
- private async Task DeleteModule(ModuleDefinition moduleDefinition)
- {
- try
- {
- await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
- AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
- NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
- AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
- }
- }
+ private async Task DeleteModule(ModuleDefinition moduleDefinition)
+ {
+ try
+ {
+ await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
+ AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
+ NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
+ AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
+ }
+ }
+
+ private void CategoryChanged(ChangeEventArgs e)
+ {
+ _category = (string)e.Value;
+ StateHasChanged();
+ }
}
diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index e86ba978..47f4cd45 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -90,116 +90,117 @@
@code {
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
- public override string Title => "Module Settings";
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+ public override string Title => "Module Settings";
- private ElementReference form;
- private bool validated = false;
- private List _themes;
- private List _containers = new List();
- private string _title;
- private string _containerType;
- private string _allPages = "false";
- private string _permissionNames = "";
- private string _permissions = null;
- private string _pageId;
- private PermissionGrid _permissionGrid;
- private Type _moduleSettingsType;
- private object _moduleSettings;
- private string _moduleSettingsTitle = "Module Settings";
- private RenderFragment ModuleSettingsComponent { get; set; }
- private Type _containerSettingsType;
- private object _containerSettings;
- private RenderFragment ContainerSettingsComponent { get; set; }
- private string createdby;
- private DateTime createdon;
- private string modifiedby;
- private DateTime modifiedon;
+ private ElementReference form;
+ private bool validated = false;
+ private List _themes;
+ private List _containers = new List();
+ private string _title;
+ private string _containerType;
+ private string _allPages = "false";
+ private string _permissionNames = "";
+ private string _permissions = null;
+ private string _pageId;
+ private PermissionGrid _permissionGrid;
+ private Type _moduleSettingsType;
+ private object _moduleSettings;
+ private string _moduleSettingsTitle = "Module Settings";
+ private RenderFragment ModuleSettingsComponent { get; set; }
+ private Type _containerSettingsType;
+ private object _containerSettings;
+ private RenderFragment ContainerSettingsComponent { get; set; }
+ private string createdby;
+ private DateTime createdon;
+ private string modifiedby;
+ private DateTime modifiedon;
- protected override async Task OnInitializedAsync()
- {
- _title = ModuleState.Title;
- _themes = await ThemeService.GetThemesAsync();
- _containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
- _containerType = ModuleState.ContainerType;
- _allPages = ModuleState.AllPages.ToString();
- _permissions = ModuleState.Permissions;
- _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
- _pageId = ModuleState.PageId.ToString();
- createdby = ModuleState.CreatedBy;
- createdon = ModuleState.CreatedOn;
- modifiedby = ModuleState.ModifiedBy;
- modifiedon = ModuleState.ModifiedOn;
+ protected override async Task OnInitializedAsync()
+ {
+ _title = ModuleState.Title;
+ _themes = await ThemeService.GetThemesAsync();
+ _containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
+ _containerType = ModuleState.ContainerType;
+ _allPages = ModuleState.AllPages.ToString();
+ _permissions = ModuleState.Permissions;
+ _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
+ _pageId = ModuleState.PageId.ToString();
+ createdby = ModuleState.CreatedBy;
+ createdon = ModuleState.CreatedOn;
+ modifiedby = ModuleState.ModifiedBy;
+ modifiedon = ModuleState.ModifiedOn;
- if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
- {
- // module settings type explicitly declared in IModule interface
- _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
- }
- else
- {
- // legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
- _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
- }
- if (_moduleSettingsType != null)
- {
- var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
- if (!string.IsNullOrEmpty(moduleobject.Title))
- {
- _moduleSettingsTitle = moduleobject.Title;
- }
+ if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+ {
+ // module settings type explicitly declared in IModule interface
+ _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+ }
+ else
+ {
+ // legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
+ _moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
+ }
+ if (_moduleSettingsType != null)
+ {
+ var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
+ if (!string.IsNullOrEmpty(moduleobject.Title))
+ {
+ _moduleSettingsTitle = moduleobject.Title;
+ }
- ModuleSettingsComponent = builder =>
- {
- builder.OpenComponent(0, _moduleSettingsType);
- builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
- builder.CloseComponent();
- };
- }
+ ModuleSettingsComponent = builder =>
+ {
+ builder.OpenComponent(0, _moduleSettingsType);
+ builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
+ builder.CloseComponent();
+ };
+ }
- var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
- if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
- {
- _containerSettingsType = Type.GetType(theme.ContainerSettingsType);
- if (_containerSettingsType != null)
- {
- ContainerSettingsComponent = builder =>
- {
- builder.OpenComponent(0, _containerSettingsType);
- builder.AddComponentReferenceCapture(1, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
- builder.CloseComponent();
- };
- }
- }
- }
+ var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
+ if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
+ {
+ _containerSettingsType = Type.GetType(theme.ContainerSettingsType);
+ if (_containerSettingsType != null)
+ {
+ ContainerSettingsComponent = builder =>
+ {
+ builder.OpenComponent(0, _containerSettingsType);
+ builder.AddComponentReferenceCapture(1, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
+ builder.CloseComponent();
+ };
+ }
+ }
+ }
- private async Task SaveModule()
- {
- validated = true;
- var interop = new Interop(JSRuntime);
- if (await interop.FormValid(form))
- {
- if (!string.IsNullOrEmpty(_title))
- {
- var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
- pagemodule.PageId = int.Parse(_pageId);
- pagemodule.Title = _title;
- pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
- if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
- {
- pagemodule.ContainerType = string.Empty;
- }
- if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
- {
- pagemodule.ContainerType = string.Empty;
- }
- await PageModuleService.UpdatePageModuleAsync(pagemodule);
- await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+ private async Task SaveModule()
+ {
+ validated = true;
+ var interop = new Interop(JSRuntime);
+ if (await interop.FormValid(form))
+ {
+ if (!string.IsNullOrEmpty(_title))
+ {
+ var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+ pagemodule.PageId = int.Parse(_pageId);
+ pagemodule.Title = _title;
+ pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
+ if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
+ {
+ pagemodule.ContainerType = string.Empty;
+ }
+ if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
+ {
+ pagemodule.ContainerType = string.Empty;
+ }
+ await PageModuleService.UpdatePageModuleAsync(pagemodule);
+ await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
- var module = ModuleState;
- module.AllPages = bool.Parse(_allPages);
- module.Permissions = _permissionGrid.GetPermissions();
- await ModuleService.UpdateModuleAsync(module);
+ var module = ModuleState;
+ module.AllPages = bool.Parse(_allPages);
+ module.PageModuleId = ModuleState.PageModuleId;
+ module.Permissions = _permissionGrid.GetPermissions();
+ await ModuleService.UpdateModuleAsync(module);
if (_moduleSettingsType != null)
{
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 40bc1a86..2bb4ac87 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -59,7 +59,7 @@ else
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
_roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
- _roles = _roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+ _roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
}
else
{
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 3d0ce023..77593fcb 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -170,24 +170,54 @@
@if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
-
diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor
index 4b90b902..0fcc3229 100644
--- a/Oqtane.Client/Modules/Admin/Users/Roles.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor
@@ -88,15 +88,17 @@ else
userid = Int32.Parse(PageState.QueryString["id"]);
User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
name = user.DisplayName;
+
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
- roles = roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+ roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
}
else
{
roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
}
+
await GetUserRoles();
}
catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 208e2f54..3ce51e28 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -86,279 +86,296 @@
}
@code {
- private string _id;
- private List _folders;
- private List _files = new List();
- private string _fileinputid = string.Empty;
- private string _progressinfoid = string.Empty;
- private string _progressbarid = string.Empty;
- private string _filter = "*";
- private bool _haseditpermission = false;
- private string _image = string.Empty;
- private File _file = null;
- private string _guid;
- private string _message = string.Empty;
- private MessageType _messagetype;
+ private string _id;
+ private List _folders;
+ private List _files = new List();
+ private string _fileinputid = string.Empty;
+ private string _progressinfoid = string.Empty;
+ private string _progressbarid = string.Empty;
+ private string _filter = "*";
+ private bool _haseditpermission = false;
+ private string _image = string.Empty;
+ private File _file = null;
+ private string _guid;
+ private string _message = string.Empty;
+ private MessageType _messagetype;
- [Parameter]
- public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
+ [Parameter]
+ public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
- [Parameter]
- public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid
+ [Parameter]
+ public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid
- [Parameter]
- public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path
+ [Parameter]
+ public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path
- [Parameter]
- public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+ [Parameter]
+ public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
- [Parameter]
- public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
+ [Parameter]
+ public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
- [Parameter]
- public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
+ [Parameter]
+ public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
- [Parameter]
- public bool ShowUpload { get; set; } = true; // optional - for indicating whether a Upload controls should be displayed - default is true
+ [Parameter]
+ public bool ShowUpload { get; set; } = true; // optional - for indicating whether a Upload controls should be displayed - default is true
- [Parameter]
- public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
+ [Parameter]
+ public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
- [Parameter]
- public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
+ [Parameter]
+ public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
- [Parameter]
- public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
+ [Parameter]
+ public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
- [Parameter]
- public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
+ [Parameter]
+ public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
- [Parameter]
- public EventCallback OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
+ [Parameter]
+ public EventCallback OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
- [Parameter]
- public EventCallback OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
+ [Parameter]
+ public EventCallback OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
- [Parameter]
- public EventCallback OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
+ [Parameter]
+ public EventCallback OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
- protected override async Task OnInitializedAsync()
- {
- if (!string.IsNullOrEmpty(Id))
- {
- _id = Id;
- }
+ protected override async Task OnInitializedAsync()
+ {
+ if (!string.IsNullOrEmpty(Id))
+ {
+ _id = Id;
+ }
- // packages folder is a framework folder for uploading installable nuget packages
- if (Folder == Constants.PackagesFolder)
- {
- ShowFiles = false;
- ShowFolders = false;
- Filter = "nupkg";
- ShowSuccess = true;
- }
+ // packages folder is a framework folder for uploading installable nuget packages
+ if (Folder == Constants.PackagesFolder)
+ {
+ ShowFiles = false;
+ ShowFolders = false;
+ Filter = "nupkg";
+ ShowSuccess = true;
+ }
- if (!ShowFiles)
- {
- ShowImage = false;
- }
+ if (!ShowFiles)
+ {
+ ShowImage = false;
+ }
- _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+ _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
- if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
- {
- Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
- if (folder != null)
- {
- FolderId = folder.FolderId;
- }
- else
- {
- FolderId = -1;
- _message = "Folder Path " + Folder + "Does Not Exist";
- _messagetype = MessageType.Error;
- }
- }
+ if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
+ {
+ Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
+ if (folder != null)
+ {
+ FolderId = folder.FolderId;
+ }
+ else
+ {
+ FolderId = -1;
+ _message = "Folder Path " + Folder + "Does Not Exist";
+ _messagetype = MessageType.Error;
+ }
+ }
- if (FileId != -1)
- {
- File file = await FileService.GetFileAsync(FileId);
- if (file != null)
- {
- FolderId = file.FolderId;
- await OnSelect.InvokeAsync(FileId);
- }
- else
- {
- FileId = -1; // file does not exist
- _message = "FileId " + FileId.ToString() + "Does Not Exist";
- _messagetype = MessageType.Error;
- }
- }
+ if (FileId != -1)
+ {
+ File file = await FileService.GetFileAsync(FileId);
+ if (file != null)
+ {
+ FolderId = file.FolderId;
+ await OnSelect.InvokeAsync(FileId);
+ }
+ else
+ {
+ FileId = -1; // file does not exist
+ _message = "FileId " + FileId.ToString() + "Does Not Exist";
+ _messagetype = MessageType.Error;
+ }
+ }
- await SetImage();
+ await SetImage();
- if (!string.IsNullOrEmpty(Filter))
- {
- _filter = "." + Filter.Replace(",", ",.");
- }
+ if (!string.IsNullOrEmpty(Filter))
+ {
+ _filter = "." + Filter.Replace(",", ",.");
+ }
- await GetFiles();
+ await GetFiles();
- // create unique id for component
- _guid = Guid.NewGuid().ToString("N");
- _fileinputid = _guid + "FileInput";
- _progressinfoid = _guid + "ProgressInfo";
- _progressbarid = _guid + "ProgressBar";
- }
+ // create unique id for component
+ _guid = Guid.NewGuid().ToString("N");
+ _fileinputid = _guid + "FileInput";
+ _progressinfoid = _guid + "ProgressInfo";
+ _progressbarid = _guid + "ProgressBar";
+ }
- private async Task GetFiles()
- {
- _haseditpermission = false;
- if (Folder == Constants.PackagesFolder)
- {
- _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
- _files = new List();
- }
- else
- {
- Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
- if (folder != null)
- {
- _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.Permissions);
- _files = await FileService.GetFilesAsync(FolderId);
- }
- else
- {
- _haseditpermission = false;
- _files = new List();
- }
- }
- if (_filter != "*")
- {
- List filtered = new List();
- foreach (File file in _files)
- {
- if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
- {
- filtered.Add(file);
- }
- }
- _files = filtered;
- }
- }
+ private async Task GetFiles()
+ {
+ _haseditpermission = false;
+ if (Folder == Constants.PackagesFolder)
+ {
+ _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
+ _files = new List();
+ }
+ else
+ {
+ Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
+ if (folder != null)
+ {
+ _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.Permissions);
+ _files = await FileService.GetFilesAsync(FolderId);
+ }
+ else
+ {
+ _haseditpermission = false;
+ _files = new List();
+ }
+ }
+ if (_filter != "*")
+ {
+ List filtered = new List();
+ foreach (File file in _files)
+ {
+ if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+ {
+ filtered.Add(file);
+ }
+ }
+ _files = filtered;
+ }
+ }
- private async Task FolderChanged(ChangeEventArgs e)
- {
- _message = string.Empty;
- try
- {
- FolderId = int.Parse((string)e.Value);
- await GetFiles();
- FileId = -1;
- _file = null;
- _image = string.Empty;
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
- _message = Localizer["Error.File.Load"];
- _messagetype = MessageType.Error;
- }
- }
+ private async Task FolderChanged(ChangeEventArgs e)
+ {
+ _message = string.Empty;
+ try
+ {
+ FolderId = int.Parse((string)e.Value);
+ await GetFiles();
+ FileId = -1;
+ _file = null;
+ _image = string.Empty;
+ StateHasChanged();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
+ _message = Localizer["Error.File.Load"];
+ _messagetype = MessageType.Error;
+ }
+ }
- private async Task FileChanged(ChangeEventArgs e)
- {
- _message = string.Empty;
- FileId = int.Parse((string)e.Value);
- if (FileId != -1)
- {
- await OnSelect.InvokeAsync(FileId);
- }
+ private async Task FileChanged(ChangeEventArgs e)
+ {
+ _message = string.Empty;
+ FileId = int.Parse((string)e.Value);
+ if (FileId != -1)
+ {
+ await OnSelect.InvokeAsync(FileId);
+ }
- await SetImage();
- StateHasChanged();
- }
+ await SetImage();
+ StateHasChanged();
+ }
- private async Task SetImage()
- {
- _image = string.Empty;
- _file = null;
- if (FileId != -1)
- {
- _file = await FileService.GetFileAsync(FileId);
- if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
- {
- var maxwidth = 200;
- var maxheight = 200;
+ private async Task SetImage()
+ {
+ _image = string.Empty;
+ _file = null;
+ if (FileId != -1)
+ {
+ _file = await FileService.GetFileAsync(FileId);
+ if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
+ {
+ var maxwidth = 200;
+ var maxheight = 200;
- var ratioX = (double)maxwidth / (double)_file.ImageWidth;
- var ratioY = (double)maxheight / (double)_file.ImageHeight;
- var ratio = ratioX < ratioY ? ratioX : ratioY;
+ var ratioX = (double)maxwidth / (double)_file.ImageWidth;
+ var ratioY = (double)maxheight / (double)_file.ImageHeight;
+ var ratio = ratioX < ratioY ? ratioX : ratioY;
- _image = "![\""](\"")
";
- }
- }
- }
+ _image = "";
+ }
+ }
+ }
- private async Task UploadFile()
- {
- _message = string.Empty;
- var interop = new Interop(JSRuntime);
- var upload = await interop.GetFiles(_fileinputid);
- if (upload.Length > 0)
- {
- try
- {
- string result;
- if (Folder == Constants.PackagesFolder)
- {
- result = await FileService.UploadFilesAsync(Folder, upload, _guid);
- }
- else
- {
- result = await FileService.UploadFilesAsync(FolderId, upload, _guid);
- }
+ private async Task UploadFile()
+ {
+ _message = string.Empty;
+ var interop = new Interop(JSRuntime);
+ var upload = await interop.GetFiles(_fileinputid);
+ if (upload.Length > 0)
+ {
+ string restricted = "";
+ foreach (var file in upload)
+ {
+ var extension = (file.LastIndexOf(".") != -1) ? file.Substring(file.LastIndexOf(".") + 1) : "";
+ if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
+ {
+ restricted += (restricted == "" ? "" : ",") + extension;
+ }
+ }
+ if (restricted == "")
+ {
+ try
+ {
+ string result;
+ if (Folder == Constants.PackagesFolder)
+ {
+ result = await FileService.UploadFilesAsync(Folder, upload, _guid);
+ }
+ else
+ {
+ result = await FileService.UploadFilesAsync(FolderId, upload, _guid);
+ }
- if (result == string.Empty)
- {
- await logger.LogInformation("File Upload Succeeded {Files}", upload);
- if (ShowSuccess)
- {
- _message = Localizer["Success.File.Upload"];
- _messagetype = MessageType.Success;
- }
+ if (result == string.Empty)
+ {
+ await logger.LogInformation("File Upload Succeeded {Files}", upload);
+ if (ShowSuccess)
+ {
+ _message = Localizer["Success.File.Upload"];
+ _messagetype = MessageType.Success;
+ }
- // set FileId to first file in upload collection
- await GetFiles();
- var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault();
- if (file != null)
- {
- FileId = file.FileId;
- await SetImage();
- await OnUpload.InvokeAsync(FileId);
- }
- StateHasChanged();
- }
- else
- {
- await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
+ // set FileId to first file in upload collection
+ await GetFiles();
+ var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault();
+ if (file != null)
+ {
+ FileId = file.FileId;
+ await SetImage();
+ await OnUpload.InvokeAsync(FileId);
+ }
+ StateHasChanged();
+ }
+ else
+ {
+ await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
- _message = Localizer["Error.File.Upload"];
- _messagetype = MessageType.Error;
- }
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
+ _message = Localizer["Error.File.Upload"];
+ _messagetype = MessageType.Error;
+ }
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
- _message = Localizer["Error.File.Upload"];
- _messagetype = MessageType.Error;
- }
- }
+ _message = Localizer["Error.File.Upload"];
+ _messagetype = MessageType.Error;
+ }
+ }
+ else
+ {
+ _message = string.Format(Localizer["Message.File.Restricted"], restricted);
+ _messagetype = MessageType.Warning;
+ }
+ }
else
{
_message = Localizer["Message.File.NotSelected"];
diff --git a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
index 711504c6..82f0bfba 100644
--- a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
+++ b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
@@ -1,13 +1,13 @@
using System;
using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization;
-using Oqtane.Shared;
namespace Oqtane.Modules.Controls
{
public class LocalizableComponent : ModuleControlBase
{
+ [Inject] public IStringLocalizerFactory LocalizerFactory { get; set; }
+
private IStringLocalizer _localizer;
[Parameter]
@@ -30,22 +30,15 @@ namespace Oqtane.Modules.Controls
var key = $"{ResourceKey}.{propertyName}";
var value = Localize(key);
- if (value == key)
+ if (value == key || value == String.Empty)
{
- // Returns default property value (English version) instead of ResourceKey.PropertyName
+ // return default property value if key does not exist in resource file or value is empty
return propertyValue;
}
else
{
- if (value == String.Empty)
- {
- // Returns default property value (English version)
- return propertyValue;
- }
- else
- {
- return value;
- }
+ // return localized value
+ return value;
}
}
@@ -53,24 +46,15 @@ namespace Oqtane.Modules.Controls
{
IsLocalizable = false;
- if (string.IsNullOrEmpty(ResourceType))
+ if (String.IsNullOrEmpty(ResourceType))
{
ResourceType = ModuleState?.ModuleType;
}
- if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+ if (!String.IsNullOrEmpty(ResourceKey) && !String.IsNullOrEmpty(ResourceType))
{
- var moduleType = Type.GetType(ResourceType);
- if (moduleType != null)
- {
- using (var scope = ServiceActivator.GetScope())
- {
- var localizerFactory = scope.ServiceProvider.GetService();
- _localizer = localizerFactory.Create(moduleType);
-
- IsLocalizable = true;
- }
- }
+ _localizer = LocalizerFactory.Create(ResourceType);
+ IsLocalizable = true;
}
}
}
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index 114e9028..e317f38b 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -1,5 +1,6 @@
@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
+@inject IStringLocalizerFactory LocalizerFactory
@typeparam TableItem
@if (ItemList != null)
@@ -48,7 +49,7 @@
UpdateList(_pages))>
- Page @_page of @_pages
+ @Localizer["PageOfPages", _page, _pages]
}
@@ -156,67 +157,73 @@
UpdateList(_pages))>
- Page @_page of @_pages
+ @Localizer["PageOfPages", _page, _pages]
}
}
@code {
- private int _pages = 0;
- private int _page = 1;
- private int _maxItems = 10;
- private int _displayPages = 5;
- private int _startPage = 0;
- private int _endPage = 0;
- private int _columns = 0;
-
- [Parameter]
- public string Format { get; set; } // Table or Grid
-
- [Parameter]
- public string Toolbar { get; set; } // Top, Bottom or Both
-
- [Parameter]
- public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
-
- [Parameter]
- public RenderFragment Row { get; set; } = null; // required
-
- [Parameter]
- public RenderFragment Detail { get; set; } = null; // only applicable to Table layouts
-
- [Parameter]
- public IEnumerable Items { get; set; } // the IEnumerable data source
-
- [Parameter]
- public string PageSize { get; set; } // number of items to display on a page
-
- [Parameter]
- public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
-
- [Parameter]
- public string CurrentPage { get; set; } // sets the initial page to display
-
- [Parameter]
- public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
-
- [Parameter]
- public string Class { get; set; } // class for the containing element - ie. for Table or
"); - } - _packageid = package.PackageId; - _version = package.Version; - } - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); - AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); - } - } + private async Task GetPackage(string packageid, string version) + { + try + { + var package = await PackageService.GetPackageAsync(packageid, version); + if (package != null) + { + _productname = package.Name; + if (!string.IsNullOrEmpty(package.License)) + { + _license = package.License.Replace("\n", "
"); + } + _packageid = package.PackageId; + _version = package.Version; + } + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } - private async Task DownloadPackage() - { - try - { - await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder); - await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); - AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); - _productname = ""; - _license = ""; - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); - AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); - } - } + private async Task DownloadPackage() + { + try + { + await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder); + await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); + AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); + _productname = ""; + _license = ""; + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } - private async Task InstallModules() - { - try - { - await ModuleDefinitionService.InstallModuleDefinitionsAsync(); - AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Installing Module"); - } - } + private async Task InstallModules() + { + try + { + await ModuleDefinitionService.InstallModuleDefinitionsAsync(); + AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Installing Module"); + } + } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 049582c6..3cfbcb7e 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -12,11 +12,32 @@ } else { -
+
+
+
+
+
+
+
+
+
+
- _databases;
private ElementReference form;
private bool validated = false;
- private string _databaseName = "LocalDB";
+ private string _databaseName;
private Type _databaseConfigType;
private object _databaseConfig;
private RenderFragment DatabaseConfigComponent { get; set; }
-
private List _themeList;
private List _themes = new List();
private List _containers = new List();
@@ -208,7 +200,16 @@ else
_themeList = await ThemeService.GetThemesAsync();
_themes = ThemeService.GetThemeControls(_themeList);
_siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
+
_databases = await DatabaseService.GetDatabasesAsync();
+ if (_databases.Exists(item => item.IsDefault))
+ {
+ _databaseName = _databases.Find(item => item.IsDefault).Name;
+ }
+ else
+ {
+ _databaseName = "LocalDB";
+ }
LoadDatabaseConfigComponent();
}
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 77878a1b..7b3a149f 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -142,6 +142,7 @@
@code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index 4d80e645..b8717647 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -35,6 +35,7 @@ @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | @SharedLocalizer["Search.Version"]: @context.Version + @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? " | " + SharedLocalizer["Search.Source"] + ": " + new Uri(context.PackageUrl).Host + "" : "")) @((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))
-
-
@@ -253,8 +283,9 @@
private List _containers = new List();
private string _name = string.Empty;
private List _aliases;
- private string _defaultalias = string.Empty;
- private string _urls = string.Empty;
+ private int _aliasid = -1;
+ private string _aliasname;
+ private string _defaultalias;
private string _runtime = "";
private string _prerender = "";
private int _logofileid = -1;
@@ -304,10 +335,7 @@
_prerender = site.RenderMode.Replace(_runtime, "");
_isdeleted = site.IsDeleted.ToString();
- if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
- {
- await GetAliases();
- }
+ await GetAliases();
if (site.LogoFileId != null)
{
@@ -409,152 +437,92 @@
{
if (_name != string.Empty && _themetype != "-" && _containertype != "-")
{
- var unique = true;
- if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+ var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
+ if (site != null)
{
- _urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
- var aliases = await AliasService.GetAliasesAsync();
- foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+ bool refresh = false;
+ bool reload = false;
+
+ site.Name = _name;
+ if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
- var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
- if (alias != null && unique)
+ if (site.Runtime != _runtime || site.RenderMode != _runtime + _prerender)
{
- unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
+ site.Runtime = _runtime;
+ site.RenderMode = _runtime + _prerender;
+ reload = true; // needs to be reloaded on server
}
}
- if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
- }
+ site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
- if (unique)
- {
- var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
- if (site != null)
+ site.LogoFileId = null;
+ var logofileid = _logofilemanager.GetFileId();
+ if (logofileid != -1)
{
- bool refresh = false;
- bool reload = false;
-
- site.Name = _name;
- if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
- {
- if (site.Runtime != _runtime || site.RenderMode != _runtime + _prerender)
- {
- site.Runtime = _runtime;
- site.RenderMode = _runtime + _prerender;
- reload = true; // needs to be reloaded on server
- }
- }
- site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
-
- site.LogoFileId = null;
- var logofileid = _logofilemanager.GetFileId();
- if (logofileid != -1)
- {
- site.LogoFileId = logofileid;
- }
- int? faviconFieldId = _faviconfilemanager.GetFileId();
- if (faviconFieldId == -1) faviconFieldId = null;
- if (site.FaviconFileId != faviconFieldId)
- {
- site.FaviconFileId = faviconFieldId;
- reload = true; // needs to be reloaded on server
- }
- if (site.DefaultThemeType != _themetype)
- {
- site.DefaultThemeType = _themetype;
- refresh = true; // needs to be refreshed on client
- }
- if (site.DefaultContainerType != _containertype)
- {
- site.DefaultContainerType = _containertype;
- refresh = true; // needs to be refreshed on client
- }
- site.AdminContainerType = _admincontainertype;
-
- if (site.PwaIsEnabled.ToString() != _pwaisenabled)
- {
- site.PwaIsEnabled = Boolean.Parse(_pwaisenabled);
- reload = true; // needs to be reloaded on server
- }
- int? pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
- if (pwaappiconfileid == -1) pwaappiconfileid = null;
- if (site.PwaAppIconFileId != pwaappiconfileid)
- {
- site.PwaAppIconFileId = pwaappiconfileid;
- reload = true; // needs to be reloaded on server
- }
- int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
- if (pwasplashiconfileid == -1) pwasplashiconfileid = null;
- if (site.PwaSplashIconFileId != pwasplashiconfileid)
- {
- site.PwaSplashIconFileId = pwasplashiconfileid;
- reload = true; // needs to be reloaded on server
- }
-
- site = await SiteService.UpdateSiteAsync(site);
-
- var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
- settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
- settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
- settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
- settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
- settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
- settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
- settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
- await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
-
- if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
- {
- var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
- .Select(sValue => sValue.Trim()).ToArray();
- foreach (Alias alias in _aliases)
- {
- if (!names.Contains(alias.Name.Trim()))
- {
- await AliasService.DeleteAliasAsync(alias.AliasId);
- }
- }
-
- foreach (string name in names)
- {
- var alias = _aliases.Find(item => item.Name.Trim() == name);
- if (alias == null)
- {
- alias = new Alias();
- alias.Name = name;
- alias.TenantId = site.TenantId;
- alias.SiteId = site.SiteId;
- alias.IsDefault = (name == _defaultalias);
- await AliasService.AddAliasAsync(alias);
- }
- else
- {
- if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
- {
- alias.Name = name;
- alias.IsDefault = (name == _defaultalias);
- await AliasService.UpdateAliasAsync(alias);
- }
- }
- }
- await GetAliases();
- }
-
- await logger.LogInformation("Site Settings Saved {Site}", site);
-
- if (refresh || reload)
- {
- NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
- }
- else
- {
- AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
- await interop.ScrollTo(0, 0, "smooth");
- }
+ site.LogoFileId = logofileid;
+ }
+ int? faviconFieldId = _faviconfilemanager.GetFileId();
+ if (faviconFieldId == -1) faviconFieldId = null;
+ if (site.FaviconFileId != faviconFieldId)
+ {
+ site.FaviconFileId = faviconFieldId;
+ reload = true; // needs to be reloaded on server
+ }
+ if (site.DefaultThemeType != _themetype)
+ {
+ site.DefaultThemeType = _themetype;
+ refresh = true; // needs to be refreshed on client
+ }
+ if (site.DefaultContainerType != _containertype)
+ {
+ site.DefaultContainerType = _containertype;
+ refresh = true; // needs to be refreshed on client
+ }
+ site.AdminContainerType = _admincontainertype;
+
+ if (site.PwaIsEnabled.ToString() != _pwaisenabled)
+ {
+ site.PwaIsEnabled = Boolean.Parse(_pwaisenabled);
+ reload = true; // needs to be reloaded on server
+ }
+ int? pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
+ if (pwaappiconfileid == -1) pwaappiconfileid = null;
+ if (site.PwaAppIconFileId != pwaappiconfileid)
+ {
+ site.PwaAppIconFileId = pwaappiconfileid;
+ reload = true; // needs to be reloaded on server
+ }
+ int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
+ if (pwasplashiconfileid == -1) pwasplashiconfileid = null;
+ if (site.PwaSplashIconFileId != pwasplashiconfileid)
+ {
+ site.PwaSplashIconFileId = pwasplashiconfileid;
+ reload = true; // needs to be reloaded on server
+ }
+
+ site = await SiteService.UpdateSiteAsync(site);
+
+ var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+ settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+ settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+ settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+ settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+ settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+ settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+ settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
+ await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+
+ await logger.LogInformation("Site Settings Saved {Site}", site);
+
+ if (refresh || reload)
+ {
+ NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
+ }
+ else
+ {
+ AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+ await interop.ScrollTo(0, 0, "smooth");
}
- }
- else // deuplicate alias or default alias not specified
- {
- AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
}
}
else
@@ -578,19 +546,19 @@
{
try
{
- var sites = await SiteService.GetSitesAsync();
- if (sites.Count > 1)
+ var aliases = await AliasService.GetAliasesAsync();
+ if (aliases.Any(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId))
{
await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
- var aliases = await AliasService.GetAliasesAsync();
- foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+ foreach (Alias alias in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
{
- await AliasService.DeleteAliasAsync(a.AliasId);
+ await AliasService.DeleteAliasAsync(alias.AliasId);
}
- NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+ aliases = await AliasService.GetAliasesAsync();
+ NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliases.First().Name, true);
}
else
{
@@ -637,20 +605,6 @@
}
}
- private async Task GetAliases()
- {
- _urls = string.Empty;
- _defaultalias = string.Empty;
- _aliases = await AliasService.GetAliasesAsync();
- _aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
- foreach (Alias alias in _aliases)
- {
- _urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
- if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
- }
- if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
- }
-
private void ToggleSMTPPassword()
{
if (_smtppasswordtype == "password")
@@ -664,4 +618,84 @@
_togglesmtppassword = SharedLocalizer["ShowPassword"];
}
}
+
+ private async Task GetAliases()
+ {
+ if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+ {
+ _aliases = await AliasService.GetAliasesAsync();
+ _aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+ }
+ }
+
+ private void AddAlias()
+ {
+ _aliases.Add(new Alias { AliasId = 0, Name = "", IsDefault = false });
+ _aliasid = 0;
+ _aliasname = "";
+ _defaultalias = "False";
+ StateHasChanged();
+ }
+
+ private void EditAlias(Alias alias)
+ {
+ _aliasid = alias.AliasId;
+ _aliasname = alias.Name;
+ _defaultalias = alias.IsDefault.ToString();
+ StateHasChanged();
+ }
+
+ private async Task DeleteAlias(Alias alias)
+ {
+ if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+ {
+ await AliasService.DeleteAliasAsync(alias.AliasId);
+ await GetAliases();
+ StateHasChanged();
+ }
+ }
+
+ private async Task SaveAlias()
+ {
+ if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+ {
+ if (!string.IsNullOrEmpty(_aliasname))
+ {
+ var aliases = await AliasService.GetAliasesAsync();
+ var alias = aliases.Where(item => item.Name == _aliasname).FirstOrDefault();
+ bool unique = (alias == null || alias.AliasId == _aliasid);
+ if (unique)
+ {
+ if (_aliasid == 0)
+ {
+ alias = new Alias { SiteId = PageState.Site.SiteId, TenantId = PageState.Site.TenantId, Name = _aliasname, IsDefault = bool.Parse(_defaultalias) };
+ await AliasService.AddAliasAsync(alias);
+ }
+ else
+ {
+ alias = _aliases.Single(item => item.AliasId == _aliasid);
+ alias.Name = _aliasname;
+ alias.IsDefault = bool.Parse(_defaultalias);
+ await AliasService.UpdateAliasAsync(alias);
+ }
+ }
+ else // duplicate alias
+ {
+ AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+ }
+ }
+ await GetAliases();
+ _aliasid = -1;
+ _aliasname = "";
+ StateHasChanged();
+ }
+ }
+
+ private async Task CancelAlias()
+ {
+ await GetAliases();
+ _aliasid = -1;
+ _aliasname = "";
+ StateHasChanged();
+ }
}
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 1c75b701..fe83406a 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -131,14 +131,7 @@ else
@@ -172,12 +165,11 @@ else
private List
-
+
+
-
+
+
-
+
+
+
+
+
+ @Localizer["AliasName"]
+ @Localizer["AliasDefault"]
+
+
+ @if (context.AliasId != _aliasid)
+ {
+
+ @if (_aliasid == -1)
+ {
+
+ }
+
+
+ @if (_aliasid == -1)
+ {
+
+ @context.Name
+ @context.IsDefault
+ }
+ else
+ {
+
+
+
+
+
+
+ }
+
+
+
-
-
-
-
- @code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index 4d80e645..b8717647 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -35,6 +35,7 @@ @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | @SharedLocalizer["Search.Version"]: @context.Version + @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? " | " + SharedLocalizer["Search.Source"] + ": " + new Uri(context.PackageUrl).Host + "" : "")) @((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))