diff --git a/Marco.Pms.Model/AppMenu/WebMenuSection.cs b/Marco.Pms.Model/AppMenu/WebMenuSection.cs index 121d918..1ccfcab 100644 --- a/Marco.Pms.Model/AppMenu/WebMenuSection.cs +++ b/Marco.Pms.Model/AppMenu/WebMenuSection.cs @@ -10,7 +10,7 @@ namespace Marco.Pms.Model.AppMenu public Guid Id { get; set; } = Guid.NewGuid(); public string? Header { get; set; } - public string? Title { get; set; } + public string? Name { get; set; } public List Items { get; set; } = new List(); [BsonRepresentation(BsonType.String)] diff --git a/Marco.Pms.Model/AppMenu/WebSideMenuItem.cs b/Marco.Pms.Model/AppMenu/WebSideMenuItem.cs index 50483da..d9e76ef 100644 --- a/Marco.Pms.Model/AppMenu/WebSideMenuItem.cs +++ b/Marco.Pms.Model/AppMenu/WebSideMenuItem.cs @@ -11,7 +11,7 @@ namespace Marco.Pms.Model.AppMenu [BsonRepresentation(BsonType.String)] public Guid? ParentMenuId { get; set; } - public string? Text { get; set; } + public string? Name { get; set; } public string? Icon { get; set; } public bool Available { get; set; } = true; public string Link { get; set; } = string.Empty; diff --git a/Marco.Pms.Model/Dtos/AppMenu/CreateMenuItemDto.cs b/Marco.Pms.Model/Dtos/AppMenu/CreateMenuItemDto.cs deleted file mode 100644 index a932aa9..0000000 --- a/Marco.Pms.Model/Dtos/AppMenu/CreateMenuItemDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Marco.Pms.Model.Dtos.AppMenu -{ - public class CreateMenuItemDto - { - public required string Text { get; set; } - public required string Icon { get; set; } - public bool Available { get; set; } = true; - - public required string Link { get; set; } - public string? MobileLink { get; set; } - - // Changed from string → List - public List PermissionIds { get; set; } = new List(); - - public List Submenu { get; set; } = new List(); - } -} diff --git a/Marco.Pms.Model/Dtos/AppMenu/CreateMenuSectionDto.cs b/Marco.Pms.Model/Dtos/AppMenu/CreateMenuSectionDto.cs deleted file mode 100644 index e64c137..0000000 --- a/Marco.Pms.Model/Dtos/AppMenu/CreateMenuSectionDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Marco.Pms.Model.Dtos.AppMenu -{ - public class CreateMenuSectionDto - { - public required string Header { get; set; } - public required string Title { get; set; } - public List Items { get; set; } = new List(); - } -} \ No newline at end of file diff --git a/Marco.Pms.Model/Dtos/AppMenu/CreateSubMenuItemDto.cs b/Marco.Pms.Model/Dtos/AppMenu/CreateSubMenuItemDto.cs deleted file mode 100644 index 60eb92c..0000000 --- a/Marco.Pms.Model/Dtos/AppMenu/CreateSubMenuItemDto.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Marco.Pms.Model.Dtos.AppMenu -{ - public class CreateSubMenuItemDto - { - public required string Text { get; set; } - public bool Available { get; set; } = true; - - public required string Link { get; set; } = string.Empty; - public string? MobileLink { get; set; } - // Changed from string → List - public List PermissionIds { get; set; } = new List(); - } -} diff --git a/Marco.Pms.Model/Dtos/AppMenu/UpdateMenuItemDto.cs b/Marco.Pms.Model/Dtos/AppMenu/UpdateMenuItemDto.cs deleted file mode 100644 index b3433f7..0000000 --- a/Marco.Pms.Model/Dtos/AppMenu/UpdateMenuItemDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Marco.Pms.Model.Dtos.AppMenu -{ - public class UpdateMenuItemDto - { - public required Guid Id { get; set; } - - public required string Text { get; set; } - public required string Icon { get; set; } - public bool Available { get; set; } = true; - - public required string Link { get; set; } - public string? MobileLink { get; set; } - - // Changed from string → List - public List PermissionIds { get; set; } = new List(); - } -} diff --git a/Marco.Pms.Model/Dtos/AppMenu/UpdateMenuSectionDto.cs b/Marco.Pms.Model/Dtos/AppMenu/UpdateMenuSectionDto.cs deleted file mode 100644 index f42794e..0000000 --- a/Marco.Pms.Model/Dtos/AppMenu/UpdateMenuSectionDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Marco.Pms.Model.Dtos.AppMenu -{ - public class UpdateMenuSectionDto - { - public required Guid Id { get; set; } - public required string Header { get; set; } - public required string Title { get; set; } - } -} diff --git a/Marco.Pms.Model/Dtos/AppMenu/UpdateSubMenuItemDto.cs b/Marco.Pms.Model/Dtos/AppMenu/UpdateSubMenuItemDto.cs deleted file mode 100644 index 746e1f4..0000000 --- a/Marco.Pms.Model/Dtos/AppMenu/UpdateSubMenuItemDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Marco.Pms.Model.Dtos.AppMenu -{ - public class UpdateSubMenuItemDto - { - public Guid Id { get; set; } - - public string? Text { get; set; } - public bool Available { get; set; } = true; - - public string Link { get; set; } = string.Empty; - public string? MobileLink { get; set; } - - // Changed from string → List - public List PermissionIds { get; set; } = new List(); - } -} diff --git a/Marco.Pms.Model/ViewModels/DocumentManager/MenuItemVM.cs b/Marco.Pms.Model/ViewModels/DocumentManager/MenuItemVM.cs deleted file mode 100644 index 5925fe0..0000000 --- a/Marco.Pms.Model/ViewModels/DocumentManager/MenuItemVM.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Marco.Pms.Model.ViewModels.DocumentManager -{ - public class MenuItemVM - { - public Guid Id { get; set; } - - public string? Name { get; set; } - public string? Icon { get; set; } - public bool Available { get; set; } - public string? Link { get; set; } - public List Submenu { get; set; } = new List(); - } -} diff --git a/Marco.Pms.Model/ViewModels/DocumentManager/MenuSectionVM.cs b/Marco.Pms.Model/ViewModels/DocumentManager/MenuSectionVM.cs deleted file mode 100644 index cae8e50..0000000 --- a/Marco.Pms.Model/ViewModels/DocumentManager/MenuSectionVM.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Marco.Pms.Model.ViewModels.DocumentManager -{ - public class MenuSectionVM - { - public Guid Id { get; set; } - - public string? Header { get; set; } - public string? Name { get; set; } - public List Items { get; set; } = new List(); - } -} diff --git a/Marco.Pms.Model/ViewModels/DocumentManager/SubMenuItemVM.cs b/Marco.Pms.Model/ViewModels/DocumentManager/SubMenuItemVM.cs deleted file mode 100644 index ef14686..0000000 --- a/Marco.Pms.Model/ViewModels/DocumentManager/SubMenuItemVM.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Marco.Pms.Model.ViewModels.DocumentManager -{ - public class SubMenuItemVM - { - public Guid Id { get; set; } - - public string? Name { get; set; } - public bool Available { get; set; } - - public string? Link { get; set; } - } -} diff --git a/Marco.Pms.Services/Controllers/AppMenuController.cs b/Marco.Pms.Services/Controllers/AppMenuController.cs index 0e8a09f..2fe63dd 100644 --- a/Marco.Pms.Services/Controllers/AppMenuController.cs +++ b/Marco.Pms.Services/Controllers/AppMenuController.cs @@ -239,7 +239,6 @@ namespace Marco.Pms.Services.Controllers } } - [HttpPost("add/side-menu")] public async Task AddMenuItemAsync([FromBody] List model) { diff --git a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs index b190bc0..865e668 100644 --- a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs +++ b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs @@ -564,45 +564,22 @@ namespace Marco.Pms.Services.MappingProfiles #endregion #region ======================================================= AppMenu ======================================================= - CreateMap(); CreateMap(); - CreateMap(); - CreateMap() - .ForMember( - dest => dest.Name, - opt => opt.MapFrom(src => src.Title)); CreateMap() - .ForMember( - dest => dest.Name, - opt => opt.MapFrom(src => src.Title)) .ForMember( dest => dest.Items, opt => opt.MapFrom(src => new List())); - CreateMap(); + CreateMap() .ForMember( dest => dest.Id, opt => opt.MapFrom(src => src.Id.HasValue ? src.Id.Value : Guid.NewGuid())); - CreateMap(); - CreateMap() - .ForMember( - dest => dest.Name, - opt => opt.MapFrom(src => src.Text)); - CreateMap() - .ForMember( - dest => dest.Name, - opt => opt.MapFrom(src => src.Text)); + CreateMap(); - CreateMap(); - CreateMap(); - CreateMap() - .ForMember( - dest => dest.Name, - opt => opt.MapFrom(src => src.Text)); #endregion #region ======================================================= Directory =======================================================