diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index ffc2a160..3d13adff 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -19,6 +19,7 @@ @code { private bool _initialized; private bool _installed; + private PageState PageState { get; set; } protected override async Task OnParametersSetAsync() diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index c1776600..38202300 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -19,13 +19,13 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - - List _pages; + var List _pages; + + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override void OnInitialized() { - Page admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin"); + var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin"); _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList(); } } diff --git a/Oqtane.Client/Modules/Admin/Error/Index.razor b/Oqtane.Client/Modules/Admin/Error/Index.razor index 8ecd898c..9e0df574 100644 --- a/Oqtane.Client/Modules/Admin/Error/Index.razor +++ b/Oqtane.Client/Modules/Admin/Error/Index.razor @@ -3,7 +3,7 @@ @inject IModuleService ModuleService @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } } + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; protected override async Task OnInitializedAsync() { @@ -13,6 +13,7 @@ string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName; AddModuleMessage(message, MessageType.Error); } + await logger.LogCritical("Error Loading Module {Module}", module); } } diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index 65935a72..182f08f7 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -70,11 +70,11 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private string url = string.Empty; + private List _folders; + private int _folderId = -1; - string url = ""; - List _folders; - int _folderId = -1; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -90,7 +90,7 @@ { try { - if (url != "" && _folderId != -1) + if (url != string.Empty && _folderId != -1) { await FileService.UploadFileAsync(url, _folderId); await logger.LogInformation("File Downloaded Successfully From Url {Url}", url); diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index d7bc822c..167c0b3c 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -56,24 +56,25 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - public override string Title { get { return "Folder Management"; } } - - List _folders; - int _folderId = -1; - string _name; - int _parentId = -1; - bool _isSystem; - string _permissions = ""; - string _createdBy; - DateTime _createdOn; - string _modifiedBy; - DateTime _modifiedOn; + private List _folders; + private int _folderId = -1; + private string _name; + private int _parentId = -1; + private bool _isSystem; + private string _permissions = string.Empty; + private string _createdBy; + private DateTime _createdOn; + private string _modifiedBy; + private DateTime _modifiedOn; #pragma warning disable 649 - PermissionGrid _permissionGrid; + private PermissionGrid _permissionGrid; #pragma warning restore 649 + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + + public override string Title => "Folder Management"; + protected override async Task OnInitializedAsync() { try @@ -99,7 +100,7 @@ else { _parentId = _folders[0].FolderId; - _permissions = ""; + _permissions = string.Empty; } } catch (Exception ex) @@ -113,7 +114,7 @@ { try { - if (_name != "" && _parentId != -1) + if (_name != string.Empty && _parentId != -1) { Folder folder; if (_folderId != -1) @@ -126,6 +127,7 @@ } folder.SiteId = PageState.Site.SiteId; + if (_parentId == -1) { folder.ParentId = null; @@ -134,6 +136,7 @@ { folder.ParentId = _parentId; } + folder.Name = _name; folder.IsSystem = _isSystem; folder.Permissions = _permissionGrid.GetPermissions(); @@ -146,6 +149,7 @@ { folder = await FolderService.AddFolderAsync(folder); } + await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId); await logger.LogInformation("Folder Saved {Folder}", folder); NavigationManager.NavigateTo(NavigateUrl()); diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index efe9c33a..d92e0994 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -49,17 +49,18 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private List _folders; + private int _folderId = -1; + private List _files; - List _folders; - int _folderId = -1; - List _files; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnParametersSetAsync() { try { _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId); + if (_folderId == -1 && _folders.Count > 0) { _folderId = _folders[0].FolderId; diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor index a333d0d5..4775f8a0 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor @@ -74,28 +74,29 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private string _name = string.Empty; + private string _jobType = string.Empty; + private string _isEnabled = "True"; + private string _interval = string.Empty; + private string _frequency = string.Empty; + private string _startDate = string.Empty; + private string _endDate = string.Empty; + private string _retentionHistory = "10"; - string _name = ""; - string _jobType = ""; - string _isEnabled = "True"; - string _interval = ""; - string _frequency = ""; - string _startDate = ""; - string _endDate = ""; - string _retentionHistory = "10"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; private async Task SaveJob() { - if (_name != "" && !string.IsNullOrEmpty(_jobType) && _frequency != "" && _interval != "" && _retentionHistory != "") + if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty) { - Job job = new Job(); + var job = new Job(); job.Name = _name; job.JobType = _jobType; job.IsEnabled = Boolean.Parse(_isEnabled); job.Frequency = _frequency; job.Interval = int.Parse(_interval); - if (_startDate == "") + + if (_startDate == string.Empty) { job.StartDate = null; } @@ -103,7 +104,8 @@ { job.StartDate = DateTime.Parse(_startDate); } - if (_endDate == "") + + if (_endDate == string.Empty) { job.EndDate = null; } @@ -111,6 +113,7 @@ { job.EndDate = DateTime.Parse(_endDate); } + job.RetentionHistory = int.Parse(_retentionHistory); job.IsStarted = false; job.IsExecuting = false; diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index 205dda81..5339a226 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -74,17 +74,17 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private int _jobId; + private string _name = string.Empty; + private string _jobType = string.Empty; + private string _isEnabled = "True"; + private string _interval = string.Empty; + private string _frequency = string.Empty; + private string _startDate = string.Empty; + private string _endDate = string.Empty; + private string _retentionHistory = string.Empty; - int _jobId; - string _name = ""; - string _jobType = ""; - string _isEnabled = "True"; - string _interval = ""; - string _frequency = ""; - string _startDate = ""; - string _endDate = ""; - string _retentionHistory = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { @@ -99,8 +99,8 @@ _isEnabled = job.IsEnabled.ToString(); _interval = job.Interval.ToString(); _frequency = job.Frequency; - _startDate = (job.StartDate != null) ? job.StartDate.ToString() : ""; - _endDate = (job.EndDate != null) ? job.EndDate.ToString() : ""; + _startDate = (job.StartDate != null) ? job.StartDate.ToString() : string.Empty; + _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty; _retentionHistory = job.RetentionHistory.ToString(); } } @@ -113,15 +113,16 @@ private async Task SaveJob() { - if (_name != "" && !string.IsNullOrEmpty(_jobType) && _frequency != "" && _interval != "" && _retentionHistory != "") + if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty) { - Job job = await JobService.GetJobAsync(_jobId); + var job = await JobService.GetJobAsync(_jobId); job.Name = _name; job.JobType = _jobType; job.IsEnabled = Boolean.Parse(_isEnabled); job.Frequency = _frequency; job.Interval = int.Parse(_interval); - if (_startDate == "") + + if (_startDate == string.Empty) { job.StartDate = null; } @@ -129,7 +130,8 @@ { job.StartDate = DateTime.Parse(_startDate); } - if (_endDate == "") + + if (_endDate == string.Empty) { job.EndDate = null; } @@ -137,6 +139,7 @@ { job.EndDate = DateTime.Parse(_endDate); } + job.RetentionHistory = int.Parse(_retentionHistory); try diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor index 602708c9..f15c50df 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor @@ -47,10 +47,10 @@ else } @code { + private List _jobs; + public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - List _jobs; - protected override async Task OnParametersSetAsync() { _jobs = await JobService.GetJobsAsync(); @@ -58,7 +58,7 @@ else private string DisplayStatus(bool isEnabled, bool isExecuting) { - string status = ""; + var status = string.Empty; if (!isEnabled) { status = "Disabled"; @@ -81,7 +81,7 @@ else private string DisplayFrequency(int interval, string frequency) { - string result = "Every " + interval.ToString() + " "; + var result = "Every " + interval.ToString() + " "; switch (frequency) { case "m": @@ -97,10 +97,12 @@ else result += "Month"; break; } + if (interval > 1) { result += "s"; } + return result; } diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor index af0d5d5e..9efc1486 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor @@ -28,23 +28,25 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } - - List _jobLogs; + private List _jobLogs; + + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnParametersSetAsync() { _jobLogs = await JobLogService.GetJobLogsAsync(); + if (PageState.QueryString.ContainsKey("id")) { _jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList(); } + _jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList(); } private string DisplayStatus(bool isExecuting, bool? succeeded) { - string status = ""; + var status = string.Empty; if (isExecuting) { status = "Executing"; @@ -60,6 +62,7 @@ else status = "Failed"; } } + return status; } } diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 41f36dc3..098ebcb4 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -5,7 +5,7 @@ @inject IUserService UserService @inject IServiceProvider ServiceProvider -@if (_message != "") +@if (_message != string.Empty) { } @@ -41,14 +41,14 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } } + private string _returnUrl = string.Empty; + private string _message = string.Empty; + private MessageType _type = MessageType.Info; + private string _username = string.Empty; + private string _password = string.Empty; + private bool _remember = false; - string _returnUrl = ""; - string _message = ""; - MessageType _type = MessageType.Info; - string _username = ""; - string _password = ""; - bool _remember = false; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; protected override async Task OnInitializedAsync() { @@ -56,13 +56,15 @@ { _returnUrl = PageState.QueryString["returnurl"]; } + if (PageState.QueryString.ContainsKey("name")) { _username = PageState.QueryString["name"]; } + if (PageState.QueryString.ContainsKey("token")) { - User user = new User(); + var user = new User(); user.SiteId = PageState.Site.SiteId; user.Username = _username; user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]); @@ -84,11 +86,12 @@ if (PageState.Runtime == Runtime.Server) { // server-side Blazor - User user = new User(); + var user = new User(); user.SiteId = PageState.Site.SiteId; user.Username = _username; user.Password = _password; user = await UserService.LoginUserAsync(user, false, false); + if (user.IsAuthenticated) { await logger.LogInformation("Login Successful For Username {Username}", _username); @@ -107,7 +110,7 @@ else { // client-side Blazor - User user = new User(); + var user = new User(); user.SiteId = PageState.Site.SiteId; user.Username = _username; user.Password = _password; @@ -134,9 +137,9 @@ private async Task Forgot() { - if (_username != "") + if (_username != string.Empty) { - User user = await UserService.GetUserAsync(_username, PageState.Site.SiteId); + var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId); if (user != null) { await UserService.ForgotPasswordAsync(user); @@ -152,6 +155,7 @@ { _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again"; } + StateHasChanged(); } - } +} diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index 0fd6333a..2f9c054d 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -48,7 +48,7 @@ - @if (_pageName != "") + @if (_pageName != string.Empty) { @@ -59,7 +59,7 @@ } - @if (_moduleTitle != "") + @if (_moduleTitle != string.Empty) { @@ -70,7 +70,7 @@ } - @if (_username != "") + @if (_username != string.Empty) { @@ -136,30 +136,30 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private int _logId; + private string _logDate = string.Empty; + private string _level = string.Empty; + private string _feature = string.Empty; + private string _function = string.Empty; + private string _category = string.Empty; + private string _pageName = string.Empty; + private string _moduleTitle = string.Empty; + private string _username = string.Empty; + private string _url = string.Empty; + private string _template = string.Empty; + private string _message = string.Empty; + private string _exception = string.Empty; + private string _properties = string.Empty; + private string _server = string.Empty; - int _logId; - string _logDate = ""; - string _level = ""; - string _feature = ""; - string _function = ""; - string _category = ""; - string _pageName = ""; - string _moduleTitle = ""; - string _username = ""; - string _url = ""; - string _template = ""; - string _message = ""; - string _exception = ""; - string _properties = ""; - string _server = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { try { _logId = Int32.Parse(PageState.QueryString["id"]); - Log log = await LogService.GetLogAsync(_logId); + var log = await LogService.GetLogAsync(_logId); if (log != null) { _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture); @@ -167,30 +167,34 @@ _feature = log.Feature; _function = log.Function; _category = log.Category; + if (log.PageId != null) { - Page page = await PageService.GetPageAsync(log.PageId.Value); + var page = await PageService.GetPageAsync(log.PageId.Value); if (page != null) { _pageName = page.Name; } } + if (log.PageId != null && log.ModuleId != null) { - PageModule pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value); + var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value); if (pagemodule != null) { _moduleTitle = pagemodule.Title; } } + if (log.UserId != null) { - User user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId); + var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId); if (user != null) { _username = user.Username; } } + _url = log.Url; _template = log.MessageTemplate; _message = log.Message; diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index 77fd5d4c..e87450bd 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -71,12 +71,12 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private string _level = "-"; + private string _function = "-"; + private string _rows = "10"; + private List _logs; - string _level = "-"; - string _function = "-"; - string _rows = "10"; - List _logs; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -139,12 +139,12 @@ else private async Task GetLogs() { - _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? "" : _level), ((_function == "-") ? "" : _function), int.Parse(_rows)); + _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows)); } private string GetClass(string function) { - string classname = ""; + string classname = string.Empty; switch (function) { case "Create": @@ -163,7 +163,7 @@ else classname = "table-secondary"; break; default: - classname = ""; + classname = string.Empty; break; } return classname; diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor index 087f52ab..b1d72ce0 100644 --- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor @@ -25,11 +25,11 @@ -@code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } +@code { + private string _name = string.Empty; + private string _description = string.Empty; - string _name = ""; - string _description = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override void OnInitialized() { @@ -42,7 +42,7 @@ { if (!string.IsNullOrEmpty(_name)) { - ModuleDefinition moduleDefinition = new ModuleDefinition { Name = _name, Description = _description }; + var moduleDefinition = new ModuleDefinition { Name = _name, Description = _description }; await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition, ModuleState.ModuleId); } else diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index bce9e1eb..a342297b 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -42,16 +42,17 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List _packages; - List _packages; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { try { - List moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); + var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); _packages = await PackageService.GetPackagesAsync("module"); + foreach(Package package in _packages.ToArray()) { if (moduledefinitions.Exists(item => Utilities.GetTypeName(item.ModuleDefinitionName) == package.PackageId)) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index fb6c723e..732d7d5c 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -26,26 +26,26 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - - int _moduleDefinitionId; - string _name; - string _permissions; - string _createdby; - DateTime _createdon; - string _modifiedby; - DateTime _modifiedon; + private int _moduleDefinitionId; + private string _name; + private string _permissions; + private string _createdby; + private DateTime _createdon; + private string _modifiedby; + private DateTime _modifiedon; #pragma warning disable 649 - PermissionGrid _permissionGrid; + private PermissionGrid _permissionGrid; #pragma warning restore 649 + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + protected override async Task OnInitializedAsync() { try { _moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]); - ModuleDefinition moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId); + var moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId); if (moduleDefinition != null) { _name = moduleDefinition.Name; @@ -67,7 +67,7 @@ { try { - ModuleDefinition moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId); + var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId); moduledefinition.Permissions = _permissionGrid.GetPermissions(); await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition); await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition); diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 3efd4ff8..d348ddb4 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -41,10 +41,10 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List _moduleDefinitions; + private List _packages; - List _moduleDefinitions; - List _packages; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { @@ -62,12 +62,13 @@ else private bool UpgradeAvailable(string moduledefinitionname, string version) { - bool upgradeavailable = false; - Package package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault(); + var upgradeavailable = false; + var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault(); if (package != null) { upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); } + return upgradeavailable; } diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor index 5ac95386..77c0ba53 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Export.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor @@ -20,10 +20,11 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - public override string Title { get { return "Export Module"; } } + private string _content = string.Empty; + + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + public override string Title => "Export Module"; - string _content = ""; private async Task ExportModule() { diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index 5fe730fd..2a4d3aa0 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -20,15 +20,14 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - public override string Title { get { return "Import Module"; } } - - string _content = ""; + private string _content = string.Empty; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + public override string Title => "Import Module"; private async Task ImportModule() { - if (_content != "") + if (_content != string.Empty) { try { diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index 3f27530c..a98d015e 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -91,22 +91,21 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } } - public override string Title { get { return "Module Settings"; } } + private Dictionary _containers; + private string _title; + private string _containerType; + private string _permissionNames = ""; + private string _permissions; + private string _pageId; + private PermissionGrid _permissionGrid; + private Type _settingsModuleType; + private string _settingstitle = "Other Settings"; + private object _settings; - Dictionary _containers; - string _title; - string _containerType; - string _permissionNames = ""; - string _permissions; - string _pageId; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit; + public override string Title => "Module Settings"; - PermissionGrid _permissionGrid; - - Type _settingsModuleType; - string _settingstitle = "Other Settings"; - RenderFragment DynamicComponent { get; set; } - object _settings; + private RenderFragment DynamicComponent { get; set; } protected override async Task OnInitializedAsync() { @@ -134,20 +133,21 @@ private async Task SaveModule() { - Module module = ModuleState; + var module = ModuleState; module.Permissions = _permissionGrid.GetPermissions(); await ModuleService.UpdateModuleAsync(module); - PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId); + var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId); pagemodule.PageId = int.Parse(_pageId); pagemodule.Title = _title; pagemodule.ContainerType = _containerType; + await PageModuleService.UpdatePageModuleAsync(pagemodule); await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane); if (_settingsModuleType != null) { - Type moduleType = Type.GetType(ModuleState.ModuleType); + var moduleType = Type.GetType(ModuleState.ModuleType); if (moduleType != null) { moduleType.GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 77af0407..671ce22e 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -118,7 +118,7 @@ - + @foreach (KeyValuePair panelayout in _panelayouts) { @@ -160,30 +160,26 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private Dictionary _themes = new Dictionary(); + private Dictionary _panelayouts = new Dictionary(); + private List _themeList; + private List _pageList; + private string _name; + private string _path = string.Empty; + private string _parentid; + private string _insert = ">>"; + private List _children; + private int _childid = -1; + private string _isnavigation = "True"; + private string _ispersonalizable = "False"; + private string _mode = "view"; + private string _themetype = string.Empty; + private string _layouttype = string.Empty; + private string _icon = string.Empty; + private string _permissions = string.Empty; + private PermissionGrid _permissionGrid; - Dictionary _themes = new Dictionary(); - Dictionary _panelayouts = new Dictionary(); - - List _themeList; - List _pageList; - string _name = ""; - string _title = ""; - string _path = ""; - string _parentid; - string _insert = ">>"; - List _children; - int _childid = -1; - string _url = ""; - string _isnavigation = "True"; - string _ispersonalizable = "False"; - string _mode = "view"; - string _themetype = ""; - string _layouttype = ""; - string _icon = ""; - string _permissions = ""; - - PermissionGrid _permissionGrid; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -199,7 +195,7 @@ _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype); _layouttype = PageState.Site.DefaultLayoutType; - _permissions = ""; + _permissions = string.Empty; } catch (Exception ex) { @@ -235,7 +231,7 @@ try { _themetype = (string)e.Value; - if (_themetype != "") + if (_themetype != string.Empty) { _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype); } @@ -243,6 +239,7 @@ { _panelayouts = new Dictionary(); } + StateHasChanged(); } catch (Exception ex) @@ -257,7 +254,7 @@ Page page = null; try { - if (_name != "" && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype))) + if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype))) { page = new Page(); page.SiteId = PageState.Page.SiteId; @@ -267,10 +264,12 @@ { _path = _name; } + if (_path.Contains("/")) { _path = _path.Substring(_path.LastIndexOf("/") + 1); } + if (string.IsNullOrEmpty(_parentid)) { page.ParentId = null; @@ -279,8 +278,8 @@ else { page.ParentId = Int32.Parse(_parentid); - Page parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault(); - if (parent.Path == "") + var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault(); + if (parent.Path == string.Empty) { page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path); } @@ -289,6 +288,7 @@ page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path); } } + Page child; switch (_insert) { @@ -307,22 +307,25 @@ page.Order = int.MaxValue; break; } + page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation)); page.Url = _url; page.EditMode = (_mode == "edit" ? true : false); page.ThemeType = _themetype; - page.LayoutType = (_layouttype == null ? "" : _layouttype); - page.Icon = (_icon == null ? "" : _icon); + page.LayoutType = (_layouttype == null ? string.Empty : _layouttype); + page.Icon = (_icon == null ? string.Empty : _icon); page.Permissions = _permissionGrid.GetPermissions(); if (page.ThemeType == PageState.Site.DefaultThemeType) { - page.ThemeType = ""; + page.ThemeType = string.Empty; } + if (page.LayoutType == PageState.Site.DefaultLayoutType) { - page.LayoutType = ""; + page.LayoutType = string.Empty; } + page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable)); page.UserId = null; diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 7dc91d72..0422056c 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -129,7 +129,7 @@ - + @foreach (KeyValuePair panelayout in _panelayouts) { @@ -181,41 +181,38 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - - Dictionary _themes = new Dictionary(); - Dictionary _panelayouts = new Dictionary(); - - List _themeList; - List _pageList; - int _pageId; - string _name = ""; - string _title = ""; - string _path = ""; - string _currentparentid; - string _parentid; - string _insert = "="; - List _children; - int _childid = -1; - string _isnavigation; - string _url = ""; - string _ispersonalizable; - string _mode; - string _themetype; - string _layouttype; - string _icon; - string _permissions; - string _createdby; - DateTime _createdon; - string _modifiedby; - DateTime _modifiedon; - string _deletedby; - DateTime? _deletedon; + private Dictionary _themes = new Dictionary(); + private Dictionary _panelayouts = new Dictionary(); + private List _themeList; + private List _pageList; + private int _pageId; + private string _name; + private string _path; + private string _currentparentid; + private string _parentid; + private string _insert = "="; + private List _children; + private int _childid = -1; + private string _isnavigation; + private string _ispersonalizable; + private string _mode; + private string _themetype; + private string _layouttype; + private string _icon; + private string _permissions; + private string _createdby; + private DateTime _createdon; + private string _modifiedby; + private DateTime _modifiedon; + private string _deletedby; + private DateTime? _deletedon; #pragma warning disable 649 - PermissionGrid _permissionGrid; + private PermissionGrid _permissionGrid; #pragma warning restore 649 + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + protected override async Task OnInitializedAsync() { try @@ -227,24 +224,27 @@ _themes = ThemeService.GetThemeTypes(_themeList); _pageId = Int32.Parse(PageState.QueryString["id"]); - Page page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId); + var page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId); if (page != null) { _name = page.Name; _title = page.Title; _path = page.Path; + if (_path.Contains("/")) { _path = _path.Substring(_path.LastIndexOf("/") + 1); } + if (page.ParentId == null) { - _parentid = ""; + _parentid = string.Empty; } else { _parentid = page.ParentId.ToString(); } + _currentparentid = _parentid; _isnavigation = page.IsNavigation.ToString(); _url = page.Url; @@ -305,7 +305,7 @@ try { _themetype = (string)e.Value; - if (_themetype != "") + if (_themetype != string.Empty) { _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype); } @@ -327,7 +327,7 @@ Page page = null; try { - if (_name != "" && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype))) + if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype))) { page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId); string currentPath = page.Path; @@ -335,6 +335,7 @@ page.Name = _name; page.Title = _title; if (_path == "" && _name.ToLower() != "home") + if (_path == string.Empty && _name.ToLower() != "home") { _path = _name; } @@ -351,7 +352,7 @@ { page.ParentId = Int32.Parse(_parentid); Page parent = PageState.Pages.FirstOrDefault(item => item.PageId == page.ParentId); - if (parent.Path == "") + if (parent.Path == string.Empty) { page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path); } @@ -385,24 +386,24 @@ page.Url = _url; page.EditMode = (_mode == "edit"); page.ThemeType = _themetype; - page.LayoutType = _layouttype ?? ""; - page.Icon = _icon ?? ""; + page.LayoutType = _layouttype ?? string.Empty; + page.Icon = _icon ?? string.Empty; page.Permissions = _permissionGrid.GetPermissions(); if (page.ThemeType == PageState.Site.DefaultThemeType) { - page.ThemeType = ""; + page.ThemeType = string.Empty; } if (page.LayoutType == PageState.Site.DefaultLayoutType) { - page.LayoutType = ""; + page.LayoutType = string.Empty; } page.IsPersonalizable = (_ispersonalizable != null && Boolean.Parse(_ispersonalizable)); page.UserId = null; page = await PageService.UpdatePageAsync(page); await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId); - if (_currentparentid == "") + if (_currentparentid == string.Empty) { await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, null); } diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index ce546547..b53f3811 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -22,13 +22,14 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; private async Task DeletePage(Page page) { try { page.IsDeleted = true; + await PageService.UpdatePageAsync(page); await logger.LogInformation("Page Deleted {Page}", page); NavigationManager.NavigateTo(NavigateUrl("admin/pages")); diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index bfba2d25..bcfd2d3f 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -87,19 +87,20 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } - public override string Actions { get { return "Add,Edit"; } } + private int _profileid = -1; + private string _name = string.Empty; + private string _title = string.Empty; + private string _description = string.Empty; + private string _category = string.Empty; + private string _vieworder = "0"; + private string _maxlength = "0"; + private string _defaultvalue = string.Empty; + private string _isrequired = "False"; + private string _isprivate = "False"; - int _profileid = -1; - string _name = ""; - string _title = ""; - string _description = ""; - string _category = ""; - string _vieworder = "0"; - string _maxlength = "0"; - string _defaultvalue = ""; - string _isrequired = "False"; - string _isprivate = "False"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + + public override string Actions => "Add,Edit"; protected override async Task OnInitializedAsync() { @@ -108,7 +109,7 @@ if (PageState.QueryString.ContainsKey("id")) { _profileid = Int32.Parse(PageState.QueryString["id"]); - Profile profile = await ProfileService.GetProfileAsync(_profileid); + var profile = await ProfileService.GetProfileAsync(_profileid); if (profile != null) { _name = profile.Name; @@ -143,6 +144,7 @@ { profile = new Profile(); } + profile.Name = _name; profile.Title = _title; profile.Description = _description; @@ -153,6 +155,7 @@ profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired)); profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate)); profile = await ProfileService.UpdateProfileAsync(profile); + await logger.LogInformation("Profile Saved {Profile}", profile); NavigationManager.NavigateTo(NavigateUrl()); } diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor index 593ccca4..e3cefdaa 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor @@ -25,9 +25,9 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private List _profiles; - List _profiles; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor index 012a5495..27978203 100644 --- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor +++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor @@ -81,10 +81,10 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private List _pages; + private List _modules; - List _pages; - List _modules; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -147,7 +147,7 @@ { try { - PageModule pagemodule = await PageModuleService.GetPageModuleAsync(module.PageModuleId); + var pagemodule = await PageModuleService.GetPageModuleAsync(module.PageModuleId); pagemodule.IsDeleted = false; await PageModuleService.UpdatePageModuleAsync(pagemodule); await logger.LogInformation("Module Restored {Module}", module); @@ -168,10 +168,12 @@ await PageModuleService.DeletePageModuleAsync(module.PageModuleId); // check if there are any remaining module instances in the site _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId); + if (!_modules.Exists(item => item.ModuleId == module.ModuleId)) { await ModuleService.DeleteModuleAsync(module.ModuleId); } + await logger.LogInformation("Module Permanently Deleted {Module}", module); await Load(); StateHasChanged(); diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index 8401c1f0..0bc613ff 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -3,7 +3,7 @@ @inject NavigationManager NavigationManager @inject IUserService UserService -@if (_message != "") +@if (_message != string.Empty) { } @@ -34,31 +34,32 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } } + private string _message = "Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity"; + private string _username = string.Empty; + private string _password = string.Empty; + private string _confirm = string.Empty; + private string _email = string.Empty; + private string _displayName = string.Empty; + + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; - string _message = "Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity"; - string _username = ""; - string _password = ""; - string _confirm = ""; - string _email = ""; - string _displayName = ""; - bool _isEmailValid = false; private async Task Register() { try { - _message = ""; + _message = string.Empty; _isEmailValid = Utilities.IsValidEmail(_email); + if (_username != "" && _password != "" && _confirm != "" && _isEmailValid) { if (_password == _confirm) { - User user = new User + var user = new User { SiteId = PageState.Site.SiteId, Username = _username, - DisplayName = (_displayName == "" ? _username : _displayName), + DisplayName = (_displayName == string.Empty ? _username : _displayName), Email = _email, Password = _password }; @@ -94,6 +95,5 @@ private void Cancel() { - NavigationManager.NavigateTo(NavigateUrl("")); + NavigationManager.NavigateTo(NavigateUrl(string.Empty)); } -} \ No newline at end of file diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor index 3fbb1556..b6e4eb66 100644 --- a/Oqtane.Client/Modules/Admin/Reset/Index.razor +++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor @@ -21,11 +21,11 @@ @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } } + private string _username = string.Empty; + private string _password = string.Empty; + private string _confirm = string.Empty; - string _username = ""; - string _password = ""; - string _confirm = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; protected override void OnInitialized() { @@ -35,7 +35,7 @@ } else { - NavigationManager.NavigateTo(NavigateUrl("")); + NavigationManager.NavigateTo(NavigateUrl(string.Empty)); } } @@ -43,11 +43,11 @@ { try { - if (_username != "" && _password != "" && _confirm != "") + if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty) { if (_password == _confirm) { - User user = new User + var user = new User { SiteId = PageState.Site.SiteId, Username = _username, @@ -85,6 +85,6 @@ private void Cancel() { - NavigationManager.NavigateTo(NavigateUrl("")); + NavigationManager.NavigateTo(NavigateUrl(string.Empty)); } } diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor index 29c248cf..34e93e2d 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Add.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor @@ -35,16 +35,16 @@ Cancel -@code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } +@code { + private string _name = string.Empty; + private string _description = string.Empty; + private string _isautoassigned = "False"; - string _name = ""; - string _description = ""; - string _isautoassigned = "False"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; private async Task SaveRole() { - Role role = new Role(); + var role = new Role(); role.SiteId = PageState.Page.SiteId; role.Name = _name; role.Description = _description; diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor index 9b341e7e..4b0dd0e0 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor @@ -36,19 +36,19 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private int _roleid; + private string _name = string.Empty; + private string _description = string.Empty; + private string _isautoassigned = "False"; - int _roleid; - string _name = ""; - string _description = ""; - string _isautoassigned = "False"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { try { _roleid = Int32.Parse(PageState.QueryString["id"]); - Role role = await RoleService.GetRoleAsync(_roleid); + var role = await RoleService.GetRoleAsync(_roleid); if (role != null) { _name = role.Name; @@ -65,7 +65,7 @@ private async Task SaveRole() { - Role role = await RoleService.GetRoleAsync(_roleid); + var role = await RoleService.GetRoleAsync(_roleid); role.Name = _name; role.Description = _description; role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned)); diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor index 01372e80..0acfa614 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor @@ -25,9 +25,9 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private List _roles; - List _roles; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnParametersSetAsync() { diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 9e36c6ba..6e61f3bf 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -56,7 +56,7 @@ - + @foreach (KeyValuePair panelayout in _panelayouts) { @@ -91,7 +91,7 @@ - + @foreach (KeyValuePair item in _themes) { @@ -65,7 +65,7 @@ else - + @foreach (KeyValuePair container in _containers) { @@ -93,7 +93,7 @@ else - + @foreach (KeyValuePair item in _themes) { if (item.Key == _themetype) @@ -60,7 +60,7 @@ - + @foreach (KeyValuePair container in _containers) { @@ -103,30 +103,28 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private Dictionary _themes; + private Dictionary _panelayouts; + private Dictionary _containers; + private Alias _alias; + private List _themeList; + private string _name = string.Empty; + private List _tenantList; + private string _tenant = string.Empty; + private List _aliasList; + private string _urls = string.Empty; + private string _themetype; + private string _layouttype; + private string _containertype; + private string _createdby; + private DateTime _createdon; + private string _modifiedby; + private DateTime _modifiedon; + private string _deletedby; + private DateTime? _deletedon; + private string _isdeleted; - Dictionary _themes; - Dictionary _panelayouts; - Dictionary _containers; - - Alias _alias; - List _themeList; - string _name = ""; - List _tenantList; - string _tenant = ""; - List _aliasList; - string _urls = ""; - string _themetype; - string _layouttype; - string _containertype; - - string _createdby; - DateTime _createdon; - string _modifiedby; - DateTime _modifiedon; - string _deletedby; - DateTime? _deletedon; - string _isdeleted; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { @@ -136,21 +134,22 @@ _aliasList = await AliasService.GetAliasesAsync(); _alias = _aliasList.Find(item => item.AliasId == Int32.Parse(PageState.QueryString["id"])); - Site site = await SiteService.GetSiteAsync(_alias.SiteId, _alias); + var site = await SiteService.GetSiteAsync(_alias.SiteId, _alias); if (site != null) { _name = site.Name; _tenantList = await TenantService.GetTenantsAsync(); _tenant = _tenantList.Find(item => item.TenantId == site.TenantId).Name; + foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList()) { _urls += alias.Name + "\n"; } + _themetype = site.DefaultThemeType; _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype); _layouttype = site.DefaultLayoutType; _containertype = site.DefaultContainerType; - _createdby = site.CreatedBy; _createdon = site.CreatedOn; _modifiedby = site.ModifiedBy; @@ -165,7 +164,7 @@ } catch (Exception ex) { - await Log(_alias, LogLevel.Error, "", ex, "Error Loading Site {SiteId} {Error}", _alias.SiteId, ex.Message); + await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Loading Site {SiteId} {Error}", _alias.SiteId, ex.Message); AddModuleMessage(ex.Message, MessageType.Error); } } @@ -175,7 +174,7 @@ try { _themetype = (string)e.Value; - if (_themetype != "") + if (_themetype != string.Empty) { _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype); } @@ -183,6 +182,7 @@ { _panelayouts = new Dictionary(); } + StateHasChanged(); } catch (Exception ex) @@ -196,9 +196,9 @@ { try { - if (_name != "" && _urls != "" && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype)) + if (_name != string.Empty && _urls != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype)) { - bool unique = true; + var unique = true; foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) { if (_aliasList.Exists(item => item.Name == name && item.SiteId != _alias.SiteId && item.TenantId != _alias.TenantId)) @@ -206,22 +206,24 @@ unique = false; } } + if (unique) { - Site site = await SiteService.GetSiteAsync(_alias.SiteId, _alias); + var site = await SiteService.GetSiteAsync(_alias.SiteId, _alias); if (site != null) { site.Name = _name; site.LogoFileId = null; site.DefaultThemeType = _themetype; - site.DefaultLayoutType = _layouttype ?? ""; + site.DefaultLayoutType = _layouttype ?? string.Empty; site.DefaultContainerType = _containertype; site.IsDeleted = (_isdeleted == null || Boolean.Parse(_isdeleted)); site = await SiteService.UpdateSiteAsync(site, _alias); _urls = _urls.Replace("\n", ","); - string[] names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList()) { if (!names.Contains(alias.Name)) @@ -229,6 +231,7 @@ await AliasService.DeleteAliasAsync(alias.AliasId); } } + foreach (string name in names) { if (!_aliasList.Exists(item => item.Name == name)) @@ -260,7 +263,7 @@ } catch (Exception ex) { - await Log(_alias, LogLevel.Error, "", ex, "Error Saving Site {SiteId} {Error}", _alias.SiteId, ex.Message); + await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Saving Site {SiteId} {Error}", _alias.SiteId, ex.Message); AddModuleMessage("Error Saving Site", MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index ec06649e..978f7ad3 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -27,17 +27,17 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List _sites; + private string _scheme; - List _sites; - string _scheme; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnParametersSetAsync() { - Uri uri = new Uri(NavigationManager.Uri); + var uri = new Uri(NavigationManager.Uri); _scheme = uri.Scheme + "://"; - List aliases = await AliasService.GetAliasesAsync(); + var aliases = await AliasService.GetAliasesAsync(); _sites = new List(); foreach (Alias alias in aliases) { @@ -56,11 +56,13 @@ else { await SiteService.DeleteSiteAsync(alias.SiteId, alias); await Log(alias, LogLevel.Information, "", null, "Site Deleted {SiteId}", alias.SiteId); - List aliases = await AliasService.GetAliasesAsync(); + + var aliases = await AliasService.GetAliasesAsync(); foreach (Alias a in aliases.Where(item => item.SiteId == alias.SiteId && item.TenantId == alias.TenantId)) { await AliasService.DeleteAliasAsync(a.AliasId); } + NavigationManager.NavigateTo(NavigateUrl()); } else diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index 0f3705c9..4899301c 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -43,12 +43,12 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List _tenants; + private string _tenantid = "-1"; + private string _sql = string.Empty; + private string _results = string.Empty; - List _tenants; - string _tenantid = "-1"; - string _sql = ""; - string _results = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { @@ -59,7 +59,7 @@ else { if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql)) { - SqlQuery sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql }; + var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql }; sqlquery = await SqlService.ExecuteQueryAsync(sqlquery); _results = DisplayResults(sqlquery.Results); } @@ -71,27 +71,33 @@ else private string DisplayResults(List> results) { - string table = ""; + var table = string.Empty; foreach (Dictionary item in results) { - if (table == "") + if (table == string.Empty) { table = "
"; table += ""; + foreach (KeyValuePair kvp in item) { table += ""; } + table += ""; } + table += ""; + foreach (KeyValuePair kvp in item) { table += ""; } + table += ""; } - if (table != "") + + if (table != string.Empty) { table += "
" + kvp.Key + "
" + kvp.Value + "
"; } @@ -99,6 +105,7 @@ else { table = "No Results Returned"; } + return table; } } diff --git a/Oqtane.Client/Modules/Admin/Tenants/Add.razor b/Oqtane.Client/Modules/Admin/Tenants/Add.razor index 9fe32192..5b6492bd 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Add.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Add.razor @@ -72,15 +72,16 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private string name = string.Empty; + private string type = "LocalDB"; + private string server = "(LocalDb)\\MSSQLLocalDB"; + private string database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm"); + private string username = string.Empty; + private string password = string.Empty; + private string schema = string.Empty; + private string integratedsecurity = "display: none;"; - string name = ""; - string type = "LocalDB"; - string server = "(LocalDb)\\MSSQLLocalDB"; - string database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm"); - string username = ""; - string password = ""; - string integratedsecurity = "display: none;"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; private void SetIntegratedSecurity(ChangeEventArgs e) { @@ -90,7 +91,7 @@ } else { - integratedsecurity = ""; + integratedsecurity = string.Empty; } } @@ -100,7 +101,7 @@ { ShowProgressIndicator(); - string connectionString = ""; + var connectionstring = string.Empty; if (type == "LocalDB") { connectionString = "Data Source=" + server + ";AttachDbFilename=|DataDirectory|\\" + database + ".mdf;Initial Catalog=" + database + ";Integrated Security=SSPI;"; @@ -108,6 +109,7 @@ else { connectionString = "Data Source=" + server + ";Initial Catalog=" + database + ";"; + if (integratedsecurity == "display: none;") { connectionString += "Integrated Security=SSPI;"; @@ -125,11 +127,11 @@ ConnectionString = connectionString, }; - Installation installation = await InstallationService.Install(config); + var installation = await InstallationService.Install(config); if (installation.Success) { //TODO : Move to Database Manager - Tenant tenant = new Tenant + var tenant = new Tenant { Name = name, DBConnectionString = connectionString, diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor index afba20e7..aabb0412 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor @@ -26,18 +26,19 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private int tenantid; + private string name = string.Empty; + private string connectionstring = string.Empty; + private string schema = string.Empty; - int tenantid; - string name = ""; - string connectionstring = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { try { tenantid = Int32.Parse(PageState.QueryString["id"]); - Tenant tenant = await TenantService.GetTenantAsync(tenantid); + var tenant = await TenantService.GetTenantAsync(tenantid); if (tenant != null) { name = tenant.Name; @@ -56,11 +57,13 @@ try { connectionstring = connectionstring.Replace("\\\\", "\\"); - Tenant tenant = await TenantService.GetTenantAsync(tenantid); + var tenant = await TenantService.GetTenantAsync(tenantid); if (tenant != null) { tenant.Name = name; tenant.DBConnectionString = connectionstring; + tenant.DBSchema = schema; + await TenantService.UpdateTenantAsync(tenant); await logger.LogInformation("Tenant Saved {TenantId}", tenantid); diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor index 5c22fcbf..07c2f8ad 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -26,9 +26,9 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List tenants; - List tenants; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnParametersSetAsync() { diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index a802b838..d78ab5e5 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -41,14 +41,15 @@ Cancel @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List packages; - List packages; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { - List themes = await ThemeService.GetThemesAsync(); + var themes = await ThemeService.GetThemesAsync(); packages = await PackageService.GetPackagesAsync("theme"); + foreach(Package package in packages.ToArray()) { if (themes.Exists(item => Utilities.GetTypeName(item.ThemeName) == package.PackageId)) diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 09ec9823..4a3113b6 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -39,10 +39,10 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private List themes; + private List packages; - List themes; - List packages; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { @@ -52,12 +52,13 @@ else private bool UpgradeAvailable(string themename, string version) { - bool upgradeavailable = false; - Package package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault(); + var upgradeavailable = false; + var package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault(); if (package != null) { upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); } + return upgradeavailable; } diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index 36dad205..5d55b6aa 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -26,14 +26,14 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } } + private bool upgradeavailable = false; - bool upgradeavailable = false; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { - List packages = await PackageService.GetPackagesAsync("framework"); - Package package = packages.FirstOrDefault(); + var packages = await PackageService.GetPackagesAsync("framework"); + var package = packages.FirstOrDefault(); if (package != null) { upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) > 0); diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor index 5da04ebd..6cf41e3f 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor @@ -46,13 +46,14 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } } - public override string Title { get { return "Send Notification"; } } + private List userroles; + private string userid = "-1"; + private string subject = ""; + private string body = ""; - List userroles; - string userid = "-1"; - string subject = ""; - string body = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View; + + public override string Title => "Send Notification"; protected override async Task OnInitializedAsync() { @@ -71,7 +72,7 @@ private async Task Send() { - Notification notification = new Notification(); + var notification = new Notification(); try { notification.SiteId = PageState.Site.SiteId; diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor index 00c22dbd..6711617a 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor @@ -172,20 +172,20 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } } + private string username = string.Empty; + private string password = string.Empty; + private string confirm = string.Empty; + private string email = string.Empty; + private string displayname = string.Empty; + private FileManager filemanager; + private int photofileid = -1; + private List profiles; + private Dictionary settings; + private string category = string.Empty; + private string filter = "to"; + private List notifications; - string username = ""; - string password = ""; - string confirm = ""; - string email = ""; - string displayname = ""; - FileManager filemanager; - int photofileid = -1; - List profiles; - Dictionary settings; - string category = ""; - string filter = "to"; - List notifications; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View; protected override async Task OnInitializedAsync() { @@ -196,12 +196,15 @@ username = PageState.User.Username; email = PageState.User.Email; displayname = PageState.User.DisplayName; + if (PageState.User.PhotoFileId != null) { photofileid = PageState.User.PhotoFileId.Value; } + profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId); settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId); + await LoadNotificationsAsync(); } else @@ -223,29 +226,29 @@ } private string GetProfileValue(string SettingName, string DefaultValue) - { - return SettingService.GetSetting(settings, SettingName, DefaultValue); - } + => SettingService.GetSetting(settings, SettingName, DefaultValue); private async Task Save() { try { - if (username != "" && email != "") + if (username != string.Empty && email != string.Empty) { if (password == confirm) { - User user = PageState.User; + var user = PageState.User; user.Username = username; user.Password = password; user.Email = email; - user.DisplayName = (displayname == "" ? username : displayname); + user.DisplayName = (displayname == string.Empty ? username : displayname); user.PhotoFileId = null; photofileid = filemanager.GetFileId(); + if (photofileid != -1) { user.PhotoFileId = photofileid; } + await UserService.UpdateUserAsync(user); await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId); await logger.LogInformation("User Profile Saved"); @@ -269,12 +272,12 @@ private void Cancel() { - NavigationManager.NavigateTo(NavigateUrl("")); + NavigationManager.NavigateTo(NavigateUrl(string.Empty)); } private void ProfileChanged(ChangeEventArgs e, string SettingName) { - string value = (string)e.Value; + var value = (string)e.Value; settings = SettingService.SetSetting(settings, SettingName, value); } @@ -291,6 +294,7 @@ { await NotificationService.DeleteNotificationAsync(Notification.NotificationId); } + await logger.LogInformation("Notification Deleted {Notification}", Notification); await LoadNotificationsAsync(); StateHasChanged(); @@ -305,6 +309,7 @@ private async void FilterChanged(ChangeEventArgs e) { filter = (string)e.Value; + await LoadNotificationsAsync(); StateHasChanged(); } diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor index bc018124..07140f63 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor @@ -52,7 +52,7 @@ - @if (reply != "") + @if (reply != string.Empty) { } @@ -70,17 +70,17 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } } - public override string Title { get { return "View Notification"; } } + private int notificationid; + private string title = string.Empty; + private List userroles; + private string userid = "-1"; + private string subject = string.Empty; + private string createdon = string.Empty; + private string body = string.Empty; + private string reply = string.Empty; - int notificationid; - string title = ""; - List userroles; - string userid = "-1"; - string subject = ""; - string createdon = ""; - string body = ""; - string reply = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View; + public override string Title => "View Notification"; protected override async Task OnInitializedAsync() { @@ -110,6 +110,7 @@ userid = notification.ToUserId.ToString(); } } + subject = notification.Subject; createdon = notification.CreatedOn.ToString(); body = notification.Body; @@ -132,11 +133,11 @@ private async Task Send() { - Notification notification = new Notification(); + var notification = new Notification(); notification.SiteId = PageState.Site.SiteId; notification.FromUserId = PageState.User.UserId; notification.ToUserId = int.Parse(userid); - notification.ToEmail = ""; + notification.ToEmail = string.Empty; notification.Subject = subject; notification.Body = body; notification.ParentId = notificationid; diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 66ad5c12..561185f6 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -76,16 +76,16 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private string username = string.Empty; + private string password = string.Empty; + private string confirm = string.Empty; + private string email = string.Empty; + private string displayname = string.Empty; + private List profiles; + private Dictionary settings; + private string category = string.Empty; - string username = ""; - string password = ""; - string confirm = ""; - string email = ""; - string displayname = ""; - List profiles; - Dictionary settings; - string category = ""; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -105,11 +105,11 @@ { try { - if (username != "" && password != "" && confirm != "" && email != "") + if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty) { if (password == confirm) { - User user = new User(); + var user = new User(); user.SiteId = PageState.Site.SiteId; user.Username = username; user.Password = password; @@ -150,7 +150,7 @@ private void ProfileChanged(ChangeEventArgs e, string SettingName) { - string value = (string)e.Value; + var value = (string)e.Value; settings = SettingService.SetSetting(settings, SettingName, value); } diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index 6c072d8c..a0b8370b 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -106,26 +106,26 @@ } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private int userid; + private string username = string.Empty; + private string password = string.Empty; + private string confirm = string.Empty; + private string email = string.Empty; + private string displayname = string.Empty; + private FileManager filemanager; + private int photofileid = -1; + private List profiles; + private Dictionary settings; + private string category = string.Empty; + private string createdby; + private DateTime createdon; + private string modifiedby; + private DateTime modifiedon; + private string deletedby; + private DateTime? deletedon; + private string isdeleted; - int userid; - string username = ""; - string password = ""; - string confirm = ""; - string email = ""; - string displayname = ""; - FileManager filemanager; - int photofileid = -1; - List profiles; - Dictionary settings; - string category = ""; - string createdby; - DateTime createdon; - string modifiedby; - DateTime modifiedon; - string deletedby; - DateTime? deletedon; - string isdeleted; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -134,16 +134,18 @@ profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId); userid = Int32.Parse(PageState.QueryString["id"]); - User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId); + var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId); if (user != null) { username = user.Username; email = user.Email; displayname = user.DisplayName; + if (user.PhotoFileId != null) { photofileid = user.PhotoFileId.Value; } + settings = await SettingService.GetUserSettingsAsync(user.UserId); createdby = user.CreatedBy; createdon = user.CreatedOn; @@ -162,19 +164,17 @@ } private string GetProfileValue(string SettingName, string DefaultValue) - { - return SettingService.GetSetting(settings, SettingName, DefaultValue); - } + => SettingService.GetSetting(settings, SettingName, DefaultValue); private async Task SaveUser() { try { - if (username != "" && password != "" && confirm != "" && email != "") + if (username != string.Empty && password != string.Empty && confirm != string.Empty && email != string.Empty) { if (password == confirm) { - User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId); + var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId); user.SiteId = PageState.Site.SiteId; user.Username = username; user.Password = password; @@ -182,10 +182,12 @@ user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname; user.PhotoFileId = null; photofileid = filemanager.GetFileId(); + if (photofileid != -1) { user.PhotoFileId = photofileid; } + user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted)); user = await UserService.UpdateUserAsync(user); @@ -213,7 +215,7 @@ private void ProfileChanged(ChangeEventArgs e, string SettingName) { - string value = (string)e.Value; + var value = (string)e.Value; settings = SettingService.SetSetting(settings, SettingName, value); } diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index c6e52c6e..a9d4366f 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -28,9 +28,9 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private List userroles; - List userroles; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -42,7 +42,7 @@ else { try { - User user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId); + var user = await UserService.GetUserAsync(UserRole.UserId, PageState.Site.SiteId); if (user != null) { await UserService.DeleteUserAsync(user.UserId); diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 9477bbbd..fa84b46d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -65,14 +65,14 @@ else } @code { - public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } + private int userid; + private List roles; + private int roleid = -1; + private string effectivedate = string.Empty; + private string expirydate = string.Empty; + private List userroles; - int userid; - List roles; - int roleid = -1; - string effectivedate = ""; - string expirydate = ""; - List userroles; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { @@ -109,7 +109,7 @@ else { if (roleid != -1) { - UserRole userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault(); + var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault(); if (userrole != null) { if (string.IsNullOrEmpty(effectivedate)) @@ -120,6 +120,7 @@ else { userrole.EffectiveDate = DateTime.Parse(effectivedate); } + if (string.IsNullOrEmpty(expirydate)) { userrole.ExpiryDate = null; @@ -135,6 +136,7 @@ else userrole = new UserRole(); userrole.UserId = userid; userrole.RoleId = roleid; + if (string.IsNullOrEmpty(effectivedate)) { userrole.EffectiveDate = null; @@ -143,6 +145,7 @@ else { userrole.EffectiveDate = DateTime.Parse(effectivedate); } + if (string.IsNullOrEmpty(expirydate)) { userrole.ExpiryDate = null; @@ -151,8 +154,10 @@ else { userrole.ExpiryDate = DateTime.Parse(expirydate); } + await UserRoleService.AddUserRoleAsync(userrole); } + await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); AddModuleMessage("User Assigned To Role", MessageType.Success); diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor index bd3d5e2c..08b2d77d 100644 --- a/Oqtane.Client/Modules/Controls/ActionDialog.razor +++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor @@ -39,6 +39,11 @@ } @code { + private bool _visible = false; + private bool _editmode = true; + private bool _authorized = false; + private string _iconSpan = string.Empty; + [Parameter] public string Header { get; set; } // required @@ -69,11 +74,6 @@ [Parameter] public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon - bool _visible = false; - bool _editmode = true; - bool _authorized = false; - string _iconSpan = ""; - protected override void OnParametersSet() { if (string.IsNullOrEmpty(Text)) diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index 48b8116e..cf588579 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -15,6 +15,15 @@ } @code { + private string _text = string.Empty; + private string _url = string.Empty; + private string _parameters = string.Empty; + private string _classname = "btn btn-primary"; + private string _style = string.Empty; + private bool _editmode = true; + private bool _authorized = false; + private string _iconSpan = string.Empty; + [Parameter] public string Action { get; set; } // required @@ -42,15 +51,6 @@ [Parameter] public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon - string _text = ""; - string _url = ""; - string _parameters = ""; - string _classname = "btn btn-primary"; - string _style = ""; - bool _editmode = true; - bool _authorized = false; - string _iconSpan = ""; - protected override void OnParametersSet() { _text = Action; @@ -90,14 +90,14 @@ private bool IsAuthorized() { - bool authorized = false; + var authorized = false; if (PageState.EditMode || !_editmode) { - SecurityAccessLevel security = SecurityAccessLevel.Host; + var security = SecurityAccessLevel.Host; if (Security == null) { - string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Action + ","); - Type moduleType = Type.GetType(typename); + var typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ",", Action + ","); + var moduleType = Type.GetType(typename); if (moduleType != null) { var moduleobject = Activator.CreateInstance(moduleType); @@ -113,6 +113,7 @@ { security = Security.Value; } + switch (security) { case SecurityAccessLevel.Anonymous: @@ -132,6 +133,7 @@ break; } } + return authorized; } } diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index 9c0d1a6c..6aa6f470 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -1,12 +1,15 @@ @namespace Oqtane.Modules.Controls @inherits ModuleBase -@if (_text != "") +@if (_text != string.Empty) { @((MarkupString)_text) } @code { + + private string _text = string.Empty; + [Parameter] public string CreatedBy { get; set; } @@ -31,50 +34,57 @@ [Parameter] public string Style { get; set; } - string _text = ""; - protected override void OnParametersSet() { - _text = ""; + _text = string.Empty; if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn != null) { - _text += "

Created "; + _text += "

Created "; + if (!String.IsNullOrEmpty(CreatedBy)) { _text += " by " + CreatedBy + ""; } + if (CreatedOn != null) { _text += " on " + CreatedOn.ToString("MMM dd yyyy HH:mm:ss") + ""; } + _text += "

"; } if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn != null) { - _text += "

Last modified "; + _text += "

Last modified "; + if (!String.IsNullOrEmpty(ModifiedBy)) { _text += " by " + ModifiedBy + ""; } + if (ModifiedOn != null) { _text += " on " + ModifiedOn.ToString("MMM dd yyyy HH:mm:ss") + ""; } + _text += "

"; } if (!String.IsNullOrEmpty(DeletedBy) || DeletedOn.HasValue) { - _text += "

Deleted "; + _text += "

Deleted "; + if (!String.IsNullOrEmpty(DeletedBy)) { _text += " by " + DeletedBy + ""; } + if (DeletedOn != null) { _text += " on " + DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + ""; } + _text += "

"; } } diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor index 17edca5f..474bfb49 100644 --- a/Oqtane.Client/Modules/Controls/FileManager.razor +++ b/Oqtane.Client/Modules/Controls/FileManager.razor @@ -70,7 +70,7 @@ @((MarkupString)_message) } - @if (_image != "") + @if (_image != string.Empty) {
@((MarkupString)_image) @@ -81,6 +81,21 @@ } @code { + private string _id; + private List _folders; + private int _folderid = -1; + private List _files = new List(); + private int _fileid = -1; + private bool _showfiles = true; + private string _fileinputid = string.Empty; + private string _progressinfoid = string.Empty; + private string _progressbarid = string.Empty; + private string _filter = "*"; + private bool _uploadmultiple = false; + private bool _haseditpermission = false; + private string _message = string.Empty; + private string _image = string.Empty; + [Parameter] public string Folder { get; set; } // optional - for setting a specific folder by default @@ -99,21 +114,6 @@ [Parameter] public string UploadMultiple { get; set; } // optional - enable multiple file uploads - default false - string _id; - List _folders; - int _folderid = -1; - List _files = new List(); - int _fileid = -1; - bool _showfiles = true; - string _fileinputid = ""; - string _progressinfoid = ""; - string _progressbarid = ""; - string _filter = "*"; - bool _uploadmultiple = false; - bool _haseditpermission = false; - string _message = ""; - string _image = ""; - protected override async Task OnInitializedAsync() { if (!string.IsNullOrEmpty(Folder)) @@ -205,13 +205,13 @@ private async Task FolderChanged(ChangeEventArgs e) { - _message = ""; + _message = string.Empty; try { _folderid = int.Parse((string)e.Value); await GetFiles(); _fileid = -1; - _image = ""; + _image = string.Empty; StateHasChanged(); } catch (Exception ex) @@ -223,30 +223,31 @@ private async Task FileChanged(ChangeEventArgs e) { - _message = ""; + _message = string.Empty; _fileid = int.Parse((string)e.Value); + await SetImage(); StateHasChanged(); } private async Task SetImage() { - _image = ""; + _image = string.Empty; if (_fileid != -1) { File file = await FileService.GetFileAsync(_fileid); if (file.ImageHeight != 0 && file.ImageWidth != 0) { - int maxwidth = 200; - int maxheight = 200; + var maxwidth = 200; + var maxheight = 200; - double ratioX = (double)maxwidth / (double)file.ImageWidth; - double ratioY = (double)maxheight / (double)file.ImageHeight; - double 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 = "\string.Empty"; } } } @@ -254,7 +255,7 @@ private async Task UploadFile() { var interop = new Interop(JsRuntime); - string[] upload = await interop.GetFiles(_fileinputid); + var upload = await interop.GetFiles(_fileinputid); if (upload.Length > 0) { try @@ -268,14 +269,16 @@ { result = await FileService.UploadFilesAsync(_folderid, upload, _id); } - if (result == "") + + if (result == string.Empty) { await logger.LogInformation("File Upload Succeeded {Files}", upload); _message = "
File Upload Succeeded
"; await GetFiles(); + if (upload.Length == 1) { - File file = _files.Where(item => item.Name == upload[0]).FirstOrDefault(); + var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault(); if (file != null) { _fileid = file.FileId; @@ -304,7 +307,8 @@ private async Task DeleteFile() { - _message = ""; + _message = string.Empty; + try { await FileService.DeleteFileAsync(_fileid); @@ -322,9 +326,6 @@ } } - public int GetFileId() - { - return _fileid; - } + public int GetFileId() => _fileid; } diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor index 6152baa1..af13ea16 100644 --- a/Oqtane.Client/Modules/Controls/Label.razor +++ b/Oqtane.Client/Modules/Controls/Label.razor @@ -11,8 +11,8 @@ else } @code { - string _openLabel = ""; - string _closeLabel = ""; + private string _openLabel = string.Empty; + private string _closeLabel = ""; [Parameter] public RenderFragment ChildContent { get; set; } // required - the title of the label @@ -31,12 +31,14 @@ else _openLabel = " @code { - int _pages = 0; - int _page = 1; - int _maxItems; - int _maxPages; - int _startPage; - int _endPage; + private int _pages = 0; + private int _page = 1; + private int _maxItems; + private int _maxPages; + private int _startPage; + private int _endPage; [Parameter] public string Format { get; set; } @@ -95,7 +95,7 @@ [Parameter] public string Class { get; set; } - IEnumerable ItemList { get; set; } + private IEnumerable ItemList { get; set; } protected override void OnParametersSet() { @@ -103,6 +103,7 @@ { Format = "Table"; } + if (string.IsNullOrEmpty(Class)) { if (Format == "Table") @@ -114,6 +115,7 @@ Class = "container"; } } + if (string.IsNullOrEmpty(PageSize)) { _maxItems = 10; @@ -122,6 +124,7 @@ { _maxItems = int.Parse(PageSize); } + if (string.IsNullOrEmpty(DisplayPages)) { _maxPages = 5; @@ -144,6 +147,7 @@ { ItemList = Items.Skip((currentPage - 1) * _maxItems).Take(_maxItems); _page = currentPage; + StateHasChanged(); } @@ -168,6 +172,7 @@ { _endPage = _pages; } + StateHasChanged(); } else if (direction == "back") @@ -201,6 +206,7 @@ _page -= 1; } } + UpdateList(_page); } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor index 974bd31c..48a3d5b8 100644 --- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor +++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor @@ -74,6 +74,13 @@ } @code { + private string _permissionnames = string.Empty; + private List _roles; + private List _permissions; + private List _users = new List(); + private string _username = string.Empty; + private string _message = string.Empty; + [Parameter] public string EntityName { get; set; } @@ -83,13 +90,6 @@ [Parameter] public string Permissions { get; set; } - string _permissionnames = ""; - List _roles; - List _permissions; - List _users = new List(); - string _username = ""; - string _message = ""; - protected override async Task OnInitializedAsync() { if (string.IsNullOrEmpty(PermissionNames)) @@ -105,6 +105,7 @@ _roles.Insert(0, new Role { Name = Constants.AllUsersRole }); _permissions = new List(); + foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) { // initialize with admin role @@ -120,13 +121,14 @@ { _permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions; } + if (permissionstring.Permissions.Contains("[")) { foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries)) { if (user.Contains("]")) { - int userid = int.Parse(user.Substring(0, user.IndexOf("]"))); + var userid = int.Parse(user.Substring(0, user.IndexOf("]"))); if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null) { _users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId)); @@ -158,16 +160,9 @@ } private bool GetPermissionDisabled(string roleName) - { - if (roleName == Constants.AdminRole) - { - return true; - } - else - { - return false; - } - } + => roleName == Constants.AdminRole + ? true + : false; private async Task AddUser() { @@ -175,7 +170,7 @@ { try { - User user = await UserService.GetUserAsync(_username, ModuleState.SiteId); + var user = await UserService.GetUserAsync(_username, ModuleState.SiteId); if (user != null) { _users.Add(user); @@ -186,16 +181,17 @@ _message = "Username Does Not Exist"; } } - _username = ""; + + _username = string.Empty; } private void PermissionChanged(bool? value, string permissionName, string securityId) { - bool? selected = value; - PermissionString permission = _permissions.Find(item => item.PermissionName == permissionName); + var selected = value; + var permission = _permissions.Find(item => item.PermissionName == permissionName); if (permission != null) { - List ids = permission.Permissions.Split(';').ToList(); + var ids = permission.Permissions.Split(';').ToList(); ids.Remove(securityId); // remove grant permission ids.Remove("!" + securityId); // remove deny permission @@ -211,6 +207,7 @@ case null: break; // permission not specified } + _permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray()); } } diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor index 347c799c..36368c5a 100644 --- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor +++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor @@ -27,6 +27,12 @@
@code { + private ElementReference _editorElement; + private ElementReference _toolBar; + private bool _filemanagervisible = false; + private FileManager _fileManager; + private string _message = string.Empty; + [Parameter] public RenderFragment ToolbarContent { get; set; } @@ -42,12 +48,6 @@ [Parameter] public string DebugLevel { get; set; } = "info"; - private ElementReference _editorElement; - private ElementReference _toolBar; - bool _filemanagervisible = false; - FileManager _fileManager; - string _message = ""; - protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -102,14 +102,14 @@ { if (_filemanagervisible) { - int fileid = _fileManager.GetFileId(); + var fileid = _fileManager.GetFileId(); if (fileid != -1) { await RichTextEditorInterop.InsertImage( JsRuntime, _editorElement, ContentUrl(fileid)); _filemanagervisible = false; - _message = ""; + _message = string.Empty; } else { @@ -119,15 +119,17 @@ else { _filemanagervisible = true; - _message = ""; + _message = string.Empty; } + StateHasChanged(); } public void CloseFileManager() { _filemanagervisible = false; - _message = ""; + _message = string.Empty; + StateHasChanged(); } diff --git a/Oqtane.Client/Modules/Controls/TabControl.razor b/Oqtane.Client/Modules/Controls/TabControl.razor index 366561b6..c65124aa 100644 --- a/Oqtane.Client/Modules/Controls/TabControl.razor +++ b/Oqtane.Client/Modules/Controls/TabControl.razor @@ -16,12 +16,13 @@ @code { + private List _tabPanels = new List(); + // Next line is needed so we are able to add components inside [Parameter] public RenderFragment ChildContent { get; set; } public TabPanel ActiveTabPanel { get; set; } - List _tabPanels = new List(); internal void AddTabPanel(TabPanel tabPanel) { @@ -31,12 +32,12 @@ StateHasChanged(); } - string GetButtonClass(TabPanel tabPanel) - { - return tabPanel == ActiveTabPanel ? "btn-primary" : "btn-secondary"; - } + private string GetButtonClass(TabPanel tabPanel) + => tabPanel == ActiveTabPanel + ? "btn-primary" + : "btn-secondary"; - void ActivateTabPanel(TabPanel tabPanel) + private void ActivateTabPanel(TabPanel tabPanel) { ActiveTabPanel = tabPanel; } diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor index 324c2174..3c056d87 100644 --- a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor +++ b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor @@ -3,6 +3,10 @@ @code { + private bool? _value = null; + private string _title; + private string _src = string.Empty; + [Parameter] public bool? Value { get; set; } @@ -12,10 +16,6 @@ [Parameter] public Action OnChange { get; set; } - bool? _value = null; - string _title; - string _src = ""; - protected override void OnInitialized() { _value = Value; @@ -38,6 +38,7 @@ _value = true; break; } + SetImage(); OnChange(_value); } @@ -57,9 +58,10 @@ break; case null: _src = "images/null.png"; - _title = ""; + _title = string.Empty; break; } + StateHasChanged(); } } diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor index b511cfc0..9be7d4bf 100644 --- a/Oqtane.Client/Modules/Counter/Index.razor +++ b/Oqtane.Client/Modules/Counter/Index.razor @@ -7,9 +7,9 @@ Current count: @currentCount
@code { - int currentCount = 0; + private int currentCount = 0; - void IncrementCount() + private void IncrementCount() { currentCount++; } diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index 3fc446d8..41c55192 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -16,7 +16,7 @@