diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/Profile/Index.razor index 32cebad4..cf68fdf6 100644 --- a/Oqtane.Client/Modules/Admin/Profile/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profile/Index.razor @@ -11,7 +11,7 @@ -@if (profiles != null) +@if (PageState.User != null && profiles != null) { @@ -55,6 +55,7 @@
+

} @code { @@ -71,10 +72,17 @@ { try { - displayname = PageState.User.DisplayName; - email = PageState.User.Email; - profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId); - settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId); + if (PageState.User != null) + { + displayname = PageState.User.DisplayName; + email = PageState.User.Email; + profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId); + settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId); + } + else + { + message = "Current User Is Not Logged In"; + } } catch (Exception ex) { @@ -89,23 +97,30 @@ private async Task SaveUser() { - User user = PageState.User; - user.DisplayName = displayname; - user.Email = email; - await UserService.UpdateUserAsync(user); - - foreach (Profile profile in profiles) + try { - string value = SettingService.GetSetting(settings, profile.Name, ""); - await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId, profile.Name, value); - } + User user = PageState.User; + user.DisplayName = displayname; + user.Email = email; + await UserService.UpdateUserAsync(user); - UriHelper.NavigateTo(""); + foreach (Profile profile in profiles) + { + string value = SettingService.GetSetting(settings, profile.Name, ""); + await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId, profile.Name, value); + } + + UriHelper.NavigateTo(""); + } + catch (Exception ex) + { + message = ex.Message; + } } private void Cancel() { - UriHelper.NavigateTo(NavigateUrl("")); // navigate to home + UriHelper.NavigateTo(NavigateUrl("")); } private void ProfileChanged(UIChangeEventArgs e, string SettingName) diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index d894894b..264a02bd 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -34,7 +34,7 @@ string style = ""; bool authorized = false; - protected override void OnInitialized() + protected override void OnParametersSet() { text = Action; if (!String.IsNullOrEmpty(Text)) @@ -49,39 +49,42 @@ if (!string.IsNullOrEmpty(Class)) { - classname = Class; + classname = Class; } if (!string.IsNullOrEmpty(Style)) { - style = Style; + style = Style; } url = EditUrl(Action, parameters); - string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameClass(ModuleState.ModuleType) + ",", Action + ","); - Type moduleType = Type.GetType(typename); - if (moduleType != null) + if (PageState.EditMode) { - var moduleobject = Activator.CreateInstance(moduleType); - SecurityAccessLevel SecurityAccessLevel = (SecurityAccessLevel)moduleType.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null); - switch (SecurityAccessLevel) + string typename = ModuleState.ModuleType.Replace(Utilities.GetTypeNameClass(ModuleState.ModuleType) + ",", Action + ","); + Type moduleType = Type.GetType(typename); + if (moduleType != null) { - case SecurityAccessLevel.Anonymous: - authorized = true; - break; - case SecurityAccessLevel.View: - authorized = UserSecurity.IsAuthorized(PageState.User, "View", ModuleState.Permissions); - break; - case SecurityAccessLevel.Edit: - authorized = UserSecurity.IsAuthorized(PageState.User, "Edit", ModuleState.Permissions); - break; - case SecurityAccessLevel.Admin: - authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole); - break; - case SecurityAccessLevel.Host: - authorized = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole); - break; + var moduleobject = Activator.CreateInstance(moduleType); + SecurityAccessLevel SecurityAccessLevel = (SecurityAccessLevel)moduleType.GetProperty("SecurityAccessLevel").GetValue(moduleobject, null); + switch (SecurityAccessLevel) + { + case SecurityAccessLevel.Anonymous: + authorized = true; + break; + case SecurityAccessLevel.View: + authorized = UserSecurity.IsAuthorized(PageState.User, "View", ModuleState.Permissions); + break; + case SecurityAccessLevel.Edit: + authorized = UserSecurity.IsAuthorized(PageState.User, "Edit", ModuleState.Permissions); + break; + case SecurityAccessLevel.Admin: + authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole); + break; + case SecurityAccessLevel.Host: + authorized = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole); + break; + } } } } diff --git a/Oqtane.Client/Shared/Container.razor b/Oqtane.Client/Shared/Container.razor index 92aa6e62..6a1233bb 100644 --- a/Oqtane.Client/Shared/Container.razor +++ b/Oqtane.Client/Shared/Container.razor @@ -18,7 +18,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInitialized() + protected override void OnParametersSet() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor index 8eb83f48..d1f8ef2e 100644 --- a/Oqtane.Client/Shared/ModuleInstance.razor +++ b/Oqtane.Client/Shared/ModuleInstance.razor @@ -13,7 +13,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInitialized() + protected override void OnParametersSet() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Shared/PageState.cs b/Oqtane.Client/Shared/PageState.cs index 1de78738..8e70bd82 100644 --- a/Oqtane.Client/Shared/PageState.cs +++ b/Oqtane.Client/Shared/PageState.cs @@ -19,6 +19,7 @@ namespace Oqtane.Shared public Dictionary QueryString { get; set; } public int ModuleId { get; set; } public string Control { get; set; } + public bool EditMode { get; set; } public int Reload { get; set; } } } diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor index 93b27c41..bf40cd24 100644 --- a/Oqtane.Client/Shared/Pane.razor +++ b/Oqtane.Client/Shared/Pane.razor @@ -26,9 +26,9 @@ string paneadminborder = ""; string panetitle = ""; - protected override void OnInitialized() + protected override void OnParametersSet() { - if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions) && Name != Constants.AdminPane) + if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions) && Name != Constants.AdminPane) { paneadminborder = "pane-admin-border"; panetitle = "
" + Name + " Pane
"; diff --git a/Oqtane.Client/Shared/PaneLayout.razor b/Oqtane.Client/Shared/PaneLayout.razor index 9fe4f572..268d9ecc 100644 --- a/Oqtane.Client/Shared/PaneLayout.razor +++ b/Oqtane.Client/Shared/PaneLayout.razor @@ -9,7 +9,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInitialized() + protected override void OnParametersSet() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor index b57a545e..fad531c3 100644 --- a/Oqtane.Client/Shared/SiteRouter.razor +++ b/Oqtane.Client/Shared/SiteRouter.razor @@ -86,11 +86,13 @@ List modules; int moduleid = -1; string control = ""; + bool editmode = false; int reload = 0; if (PageState != null) { reload = PageState.Reload; + editmode = PageState.EditMode; } if (PageState == null || reload == Constants.ReloadApplication) @@ -188,6 +190,7 @@ { page = pages.Where(item => item.Path == path).FirstOrDefault(); reload = Constants.ReloadPage; + editmode = false; } user = null; @@ -238,6 +241,7 @@ modules = PageState.Modules; } pagestate.Modules = modules; + pagestate.EditMode = editmode; pagestate.Reload = 0; OnStateChange?.Invoke(pagestate); diff --git a/Oqtane.Client/Shared/Theme.razor b/Oqtane.Client/Shared/Theme.razor index ad9abdc9..fd29a0df 100644 --- a/Oqtane.Client/Shared/Theme.razor +++ b/Oqtane.Client/Shared/Theme.razor @@ -8,7 +8,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInitialized() + protected override void OnParametersSet() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor index 9eb030bf..3372fb8f 100644 --- a/Oqtane.Client/Themes/Controls/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor @@ -12,67 +12,83 @@ @inject IModuleService ModuleService @inject IPageModuleService PageModuleService -
- x -
-
    -
  • - Add Page -
    • -
  • - Edit Page -
    • -
  • - Delete Page -
    • -
-
-
-
- - @if (moduledefinitions != null) - { - + + @foreach (var moduledefinition in moduledefinitions) + { + + } + + } +
+
+ + - } +
+
+ + +
+
+ + +
+
-
- - -
-
- - -
-
- - -
-
- - + + @if (PageState.EditMode) + { + + + } + else + { + + } + +} @code { - string display = "display: none"; List moduledefinitions; Dictionary containers = new Dictionary(); int pagemanagementmoduleid = -1; @@ -83,45 +99,47 @@ protected override async Task OnInitializedAsync() { - moduledefinitions = PageState.ModuleDefinitions; - containers = ThemeService.GetContainerTypes(PageState.Themes); - List modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, Constants.PageManagementModule); - if (modules.Count > 0) - { - pagemanagementmoduleid = modules.FirstOrDefault().ModuleId; - } if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) { - display = "display: inline"; + moduledefinitions = PageState.ModuleDefinitions; + containers = ThemeService.GetContainerTypes(PageState.Themes); + List modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, Constants.PageManagementModule); + if (modules.Count > 0) + { + pagemanagementmoduleid = modules.FirstOrDefault().ModuleId; + } } } private async Task AddModule() { - Module module = new Module(); - module.SiteId = PageState.Site.SiteId; - module.ModuleDefinitionName = moduledefinitionname; - module.Permissions = PageState.Page.Permissions; - await ModuleService.AddModuleAsync(module); - - List modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, moduledefinitionname); - int ModuleId = modules.LastOrDefault().ModuleId; - - PageModule pagemodule = new PageModule(); - pagemodule.PageId = PageState.Page.PageId; - pagemodule.ModuleId = ModuleId; - if (title == "") + if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) { - title = moduledefinitions.Where(item => item.ModuleDefinitionName == moduledefinitionname).FirstOrDefault().Name; - } - pagemodule.Title = title; - pagemodule.Pane = pane; - pagemodule.Order = 0; - pagemodule.ContainerType = containertype; - await PageModuleService.AddPageModuleAsync(pagemodule); + Module module = new Module(); + module.SiteId = PageState.Site.SiteId; + module.ModuleDefinitionName = moduledefinitionname; + module.Permissions = PageState.Page.Permissions; + await ModuleService.AddModuleAsync(module); - PageState.Reload = Constants.ReloadPage; - UriHelper.NavigateTo(NavigateUrl()); + List modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, moduledefinitionname); + int ModuleId = modules.LastOrDefault().ModuleId; + + PageModule pagemodule = new PageModule(); + pagemodule.PageId = PageState.Page.PageId; + pagemodule.ModuleId = ModuleId; + if (title == "") + { + title = moduledefinitions.Where(item => item.ModuleDefinitionName == moduledefinitionname).FirstOrDefault().Name; + } + pagemodule.Title = title; + pagemodule.Pane = pane; + pagemodule.Order = 0; + pagemodule.ContainerType = containertype; + await PageModuleService.AddPageModuleAsync(pagemodule); + + PageState.Reload = Constants.ReloadPage; + UriHelper.NavigateTo(NavigateUrl()); + } } private string PageUrl(string action) @@ -144,4 +162,21 @@ } return url; } + + private void EditMode() + { + if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) + { + if (PageState.EditMode) + { + PageState.EditMode = false; + } + else + { + PageState.EditMode = true; + } + PageState.Reload = Constants.ReloadPage; + UriHelper.NavigateTo(NavigateUrl(PageState.Page.Path, "edit=" + PageState.EditMode.ToString().ToLower())); + } + } } \ No newline at end of file diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor index a37dec34..f1d62b4b 100644 --- a/Oqtane.Client/Themes/Controls/ModuleActions.razor +++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor @@ -8,75 +8,78 @@ @inject IUserService UserService @inject IPageModuleService PageModuleService -
- -
- @foreach (var action in actions) - { - @action.Name - } +@if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, "Edit", ModuleState.Permissions)) +{ +
+ +
+ @foreach (var action in actions) + { + @action.Name + } +
-
+} @code { - string display = "display: none"; List actions; - protected override void OnInitialized() + protected override void OnParametersSet() { - actions = new List(); - if (ModuleState.PaneModuleIndex > 0) + if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, "Edit", ModuleState.Permissions)) { - actions.Add(new ActionViewModel { Action = "up", Name = "Move Up" }); - } - if (ModuleState.PaneModuleIndex < (ModuleState.PaneModuleCount - 1)) - { - actions.Add(new ActionViewModel { Action = "down", Name = "Move Down" }); - } - foreach (string pane in PageState.Page.Panes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) - { - if (pane != ModuleState.Pane) + actions = new List(); + if (ModuleState.PaneModuleIndex > 0) { - actions.Add(new ActionViewModel { Action = pane, Name = "Move To " + pane + " Pane" }); + actions.Add(new ActionViewModel { Action = "up", Name = "Move Up" }); } - } - actions.Add(new ActionViewModel { Action = "settings", Name = "Settings" }); - actions.Add(new ActionViewModel { Action = "delete", Name = "Delete" }); - - if (UserSecurity.IsAuthorized(PageState.User, "Edit", ModuleState.Permissions)) - { - display = "display: inline"; + if (ModuleState.PaneModuleIndex < (ModuleState.PaneModuleCount - 1)) + { + actions.Add(new ActionViewModel { Action = "down", Name = "Move Down" }); + } + foreach (string pane in PageState.Page.Panes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) + { + if (pane != ModuleState.Pane) + { + actions.Add(new ActionViewModel { Action = pane, Name = "Move To " + pane + " Pane" }); + } + } + actions.Add(new ActionViewModel { Action = "settings", Name = "Settings" }); + actions.Add(new ActionViewModel { Action = "delete", Name = "Delete" }); } } protected async Task ModuleAction(string action) { - PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId); - - string url = NavigateUrl(); - switch (action) + if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, "Edit", ModuleState.Permissions)) { - case "up": - pagemodule.Order += -1; - await PageModuleService.UpdatePageModuleAsync(pagemodule); - break; - case "down": - pagemodule.Order += 1; - await PageModuleService.UpdatePageModuleAsync(pagemodule); - break; - case "settings": - url = EditUrl(pagemodule.ModuleId, "Settings"); - break; - case "delete": - await PageModuleService.DeletePageModuleAsync(pagemodule.PageModuleId); - break; - default: // move to pane - pagemodule.Pane = action; - await PageModuleService.UpdatePageModuleAsync(pagemodule); - break; + PageModule pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId); + + string url = NavigateUrl(); + switch (action) + { + case "up": + pagemodule.Order += -1; + await PageModuleService.UpdatePageModuleAsync(pagemodule); + break; + case "down": + pagemodule.Order += 1; + await PageModuleService.UpdatePageModuleAsync(pagemodule); + break; + case "settings": + url = EditUrl(pagemodule.ModuleId, "Settings"); + break; + case "delete": + await PageModuleService.DeletePageModuleAsync(pagemodule.PageModuleId); + break; + default: // move to pane + pagemodule.Pane = action; + await PageModuleService.UpdatePageModuleAsync(pagemodule); + break; + } + PageState.Reload = Constants.ReloadPage; + UriHelper.NavigateTo(url); } - PageState.Reload = Constants.ReloadPage; - UriHelper.NavigateTo(url); } public class ActionViewModel diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs index b6902dda..df895fe9 100644 --- a/Oqtane.Server/Repository/ProfileRepository.cs +++ b/Oqtane.Server/Repository/ProfileRepository.cs @@ -21,7 +21,7 @@ namespace Oqtane.Repository public IEnumerable GetProfiles(int SiteId) { - return db.Profile.Where(item => item.SiteId == SiteId); + return db.Profile.Where(item => item.SiteId == SiteId || item.SiteId == null); } public Profile AddProfile(Profile Profile) diff --git a/Oqtane.Server/Scripts/00.00.00.sql b/Oqtane.Server/Scripts/00.00.00.sql index 406e9a23..19c460a4 100644 --- a/Oqtane.Server/Scripts/00.00.00.sql +++ b/Oqtane.Server/Scripts/00.00.00.sql @@ -383,28 +383,28 @@ GO SET IDENTITY_INSERT [dbo].[Profile] ON GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (1, 1, 'FirstName', 'First Name', 'Your First Or Given Name', 'Name', 1, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (1, null, 'FirstName', 'First Name', 'Your First Or Given Name', 'Name', 1, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (2, 1, 'LastName', 'Last Name', 'Your Last Or family Name', 'Name', 2, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (2, null, 'LastName', 'Last Name', 'Your Last Or family Name', 'Name', 2, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (3, 1, 'Street', 'Street', 'Street Or Building Address', 'Address', 3, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (3, null, 'Street', 'Street', 'Street Or Building Address', 'Address', 3, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (4, 1, 'City', 'City', 'City', 'Address', 4, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (4, null, 'City', 'City', 'City', 'Address', 4, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (5, 1, 'Region', 'Region', 'State Or Province', 'Address', 5, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (5, null, 'Region', 'Region', 'State Or Province', 'Address', 5, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (6, 1, 'Country', 'Country', 'Country', 'Address', 6, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (6, null, 'Country', 'Country', 'Country', 'Address', 6, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (7, 1, 'PostalCode', 'Postal Code', 'Postal Code Or Zip Code', 'Address', 7, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (7, null, 'PostalCode', 'Postal Code', 'Postal Code Or Zip Code', 'Address', 7, 50, '', 1, 0, '', getdate(), '', getdate()) GO INSERT [dbo].[Profile]([ProfileId], [SiteId], [Name], [Title], [Description], [Category], [ViewOrder], [MaxLength], [DefaultValue], [IsRequired], [IsPrivate], [CreatedBy], [CreatedOn], [ModifiedBy], [ModifiedOn]) -VALUES (8, 1, 'Phone', 'Phone Number', 'Phone Number', 'Contact', 8, 50, '', 1, 0, '', getdate(), '', getdate()) +VALUES (8, null, 'Phone', 'Phone Number', 'Phone Number', 'Contact', 8, 50, '', 1, 0, '', getdate(), '', getdate()) GO SET IDENTITY_INSERT [dbo].[Profile] OFF GO diff --git a/Oqtane.Shared/Models/Profile.cs b/Oqtane.Shared/Models/Profile.cs index cd82553f..11ecec07 100644 --- a/Oqtane.Shared/Models/Profile.cs +++ b/Oqtane.Shared/Models/Profile.cs @@ -5,7 +5,7 @@ namespace Oqtane.Models public class Profile : IAuditable { public int ProfileId { get; set; } - public int SiteId { get; set; } + public int? SiteId { get; set; } public string Name { get; set; } public string Title { get; set; } public string Description { get; set; }