diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor index d731b99e..070afde9 100644 --- a/Oqtane.Client/Themes/Controls/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor @@ -11,7 +11,8 @@ @if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) { -
+
+
Control Panel @@ -20,132 +21,137 @@
-
    - @if (UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole)) - { -
    • -
  •  
    • -
    • -
    • - } -
  • - - @if (deleteconfirmation) - { -
    -
    • -
-
- - - - - - - - - - - - - - - - - -
- - - - @if (moduletype == "new") - { - @if (moduledefinitions != null) - { - - - } - } - else - { - - + + + } +
+
+
+ + + @if (_moduleType == "new") + { + @if (_moduleDefinitions != null) + { + + } -
- - - -
- - - + + @foreach (Page p in _pages) { - + } -
- - - + + @foreach (Module module in _modules) { - + } -
+ } +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ - @((MarkupString)@message) + @((MarkupString) _message)
@@ -184,6 +190,7 @@ } @code { + [Parameter] public string ButtonClass { get; set; } @@ -196,22 +203,22 @@ [Parameter] public string BodyClass { get; set; } - bool deleteconfirmation = false; - string moduletype = "new"; - List categories = new List(); - List ModuleDefinitions; - List moduledefinitions; - List pages = new List(); - string pageid = "-"; - string moduleid = "-"; - List modules = new List(); - Dictionary containers = new Dictionary(); - string moduledefinitionname = "-"; - string pane = ""; - string title = ""; - string containertype = ""; - string display = "display: none;"; - string message = ""; + bool _deleteConfirmation = false; + string _moduleType = "new"; + List _categories = new List(); + List _allModuleDefinitions; + List _moduleDefinitions; + List _pages = new List(); + string _pageId = "-"; + string _moduleId = "-"; + List _modules = new List(); + Dictionary _containers = new Dictionary(); + string _moduleDefinitionName = "-"; + string _pane = ""; + string _title = ""; + string _containerType = ""; + string _display = "display: none;"; + string _message = ""; protected override async Task OnParametersSetAsync() { @@ -234,68 +241,68 @@ if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) { - pages?.Clear(); + _pages?.Clear(); - ModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); - foreach (ModuleDefinition moduledefinition in ModuleDefinitions) + _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); + foreach (ModuleDefinition moduledefinition in _allModuleDefinitions) { if (moduledefinition.Categories != "") { foreach (string category in moduledefinition.Categories.Split(',')) { - if (!categories.Contains(category)) + if (!_categories.Contains(category)) { - categories.Add(category); + _categories.Add(category); } } } } - moduledefinitions = ModuleDefinitions.Where(item => item.Categories == "").ToList(); + _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories == "").ToList(); foreach (Page p in PageState.Pages) { if (UserSecurity.IsAuthorized(PageState.User, "View", p.Permissions)) { - pages.Add(p); + _pages.Add(p); } } - var panes = PageState.Page.Panes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - pane = panes.Count() == 1 ? panes.SingleOrDefault() : ""; + var panes = PageState.Page.Panes.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries); + _pane = panes.Count() == 1 ? panes.SingleOrDefault() : ""; List themes = await ThemeService.GetThemesAsync(); - containers = ThemeService.GetContainerTypes(themes); - containertype = PageState.Site.DefaultContainerType; + _containers = ThemeService.GetContainerTypes(themes); + _containerType = PageState.Site.DefaultContainerType; } } private void CategoryChanged(ChangeEventArgs e) { - string category = (string)e.Value; + string category = (string) e.Value; if (category == "-") { - moduledefinitions = ModuleDefinitions.Where(item => item.Categories == "").ToList(); + _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories == "").ToList(); } else { - moduledefinitions = ModuleDefinitions.Where(item => item.Categories.Contains(category)).ToList(); + _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(category)).ToList(); } - moduledefinitionname = "-"; + _moduleDefinitionName = "-"; StateHasChanged(); } private void PageChanged(ChangeEventArgs e) { - pageid = (string)e.Value; - modules?.Clear(); - if (pageid != "-") + _pageId = (string) e.Value; + _modules?.Clear(); + if (_pageId != "-") { - foreach (Module module in PageState.Modules.Where(item => item.PageId == int.Parse(pageid) && !item.IsDeleted)) + foreach (Module module in PageState.Modules.Where(item => item.PageId == int.Parse(_pageId) && !item.IsDeleted)) { if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions)) { - modules.Add(module); + _modules.Add(module); } } } - moduleid = "-"; + _moduleId = "-"; StateHasChanged(); } @@ -303,65 +310,67 @@ { if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) { - if ((moduletype == "new" && moduledefinitionname != "-") || (moduletype != "new" && moduleid != "-")) + if ((_moduleType == "new" && _moduleDefinitionName != "-") || (_moduleType != "new" && _moduleId != "-")) { - if (moduletype == "new") + if (_moduleType == "new") { Module module = new Module(); module.SiteId = PageState.Site.SiteId; module.PageId = PageState.Page.PageId; - module.ModuleDefinitionName = moduledefinitionname; + module.ModuleDefinitionName = _moduleDefinitionName; module.Permissions = PageState.Page.Permissions; module = await ModuleService.AddModuleAsync(module); - moduleid = module.ModuleId.ToString(); + _moduleId = module.ModuleId.ToString(); } - PageModule pagemodule = new PageModule(); - pagemodule.PageId = (pageid == "-") ? PageState.Page.PageId : int.Parse(pageid); - pagemodule.ModuleId = int.Parse(moduleid); - pagemodule.Title = title; - if (pagemodule.Title == "") + var pageModule = new PageModule { - if (moduletype == "new") + PageId = (_pageId == "-") ? PageState.Page.PageId : int.Parse(_pageId), + ModuleId = int.Parse(_moduleId), + Title = _title + }; + if (pageModule.Title == "") + { + if (_moduleType == "new") { - pagemodule.Title = moduledefinitions.Where(item => item.ModuleDefinitionName == moduledefinitionname).FirstOrDefault().Name; + pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == _moduleDefinitionName)?.Name; } else { - pagemodule.Title = modules.Where(item => item.ModuleId == int.Parse(moduleid)).FirstOrDefault().Title; + pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(_moduleId))?.Title; } } - pagemodule.Pane = pane; - pagemodule.Order = int.MaxValue; - pagemodule.ContainerType = containertype; + pageModule.Pane = _pane; + pageModule.Order = int.MaxValue; + pageModule.ContainerType = _containerType; - if (pagemodule.ContainerType == PageState.Site.DefaultContainerType) + if (pageModule.ContainerType == PageState.Site.DefaultContainerType) { - pagemodule.ContainerType = ""; + pageModule.ContainerType = ""; } - await PageModuleService.AddPageModuleAsync(pagemodule); - await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane); + await PageModuleService.AddPageModuleAsync(pageModule); + await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane); - message = "
Module Added To Page
"; + _message = "
Module Added To Page
"; - moduledefinitionname = "-"; - pane = ""; - title = ""; - containertype = ""; - pageid = "-"; - moduleid = "-"; + _moduleDefinitionName = "-"; + _pane = ""; + _title = ""; + _containerType = ""; + _pageId = "-"; + _moduleId = "-"; NavigationManager.NavigateTo(NavigateUrl(Reload.Page)); } else { - message = "
You Must Select A Module
"; + _message = "
You Must Select A Module
"; } } else { - message = "
Not Authorized
"; + _message = "
Not Authorized
"; } } @@ -392,15 +401,15 @@ private void ShowControlPanel() { - message = ""; - display = "width: 25%;"; + _message = ""; + _display = "width: 25%; minwidth:300px"; StateHasChanged(); } private void HideControlPanel() { - message = ""; - display = "width: 0%;"; + _message = ""; + _display = "width: 0%;"; StateHasChanged(); } @@ -411,8 +420,8 @@ switch (location) { case "Admin": - // get admin dashboard moduleid - module = PageState.Modules.Where(item => item.ModuleDefinitionName == Constants.AdminDashboardModule).FirstOrDefault(); + // get admin dashboard moduleid + module = PageState.Modules.FirstOrDefault(item => item.ModuleDefinitionName == Constants.AdminDashboardModule); if (module != null) { NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, module.ModuleId, "Index", "")); @@ -421,8 +430,8 @@ case "Add": case "Edit": string url = ""; - // get page management moduleid - module = PageState.Modules.Where(item => item.ModuleDefinitionName == Constants.PageManagementModule).FirstOrDefault(); + // get page management moduleid + module = PageState.Modules.FirstOrDefault(item => item.ModuleDefinitionName == Constants.PageManagementModule); if (module != null) { switch (location) @@ -445,7 +454,7 @@ private void ConfirmDelete() { - deleteconfirmation = !deleteconfirmation; + _deleteConfirmation = !_deleteConfirmation; StateHasChanged(); } @@ -474,4 +483,5 @@ await logger.Log(page.PageId, null, PageState.User.UserId, GetType().AssemblyQualifiedName, "ControlPanel", LogFunction.Delete, LogLevel.Information, ex, "Page Deleted {Page} {Error}", page, ex.Message); } } + }