diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs index 1e7e69d4c3..56d01956e4 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs @@ -1,6 +1,5 @@ using Localization.Resources.AbpUi; using Volo.Abp.AspNetCore.Components.Web.Theming; -using Volo.Abp.AutoMapper; using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Localization; @@ -9,7 +8,6 @@ namespace Volo.Abp.PermissionManagement.Blazor; [DependsOn( typeof(AbpAspNetCoreComponentsWebThemingModule), - typeof(AbpAutoMapperModule), typeof(AbpPermissionManagementApplicationContractsModule) )] public class AbpPermissionManagementBlazorModule : AbpModule diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj index 4983eaa9f8..1506afa4eb 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj @@ -9,7 +9,6 @@ - diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebAutoMapperProfile.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebAutoMapperProfile.cs deleted file mode 100644 index f9baa8befd..0000000000 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebAutoMapperProfile.cs +++ /dev/null @@ -1,18 +0,0 @@ -using AutoMapper; -using Volo.Abp.AutoMapper; -using Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement; - -namespace Volo.Abp.PermissionManagement.Web; - -public class AbpPermissionManagementWebAutoMapperProfile : Profile -{ - public AbpPermissionManagementWebAutoMapperProfile() - { - CreateMap().Ignore(p => p.IsAllPermissionsGranted); - - CreateMap() - .ForMember(p => p.Depth, opts => opts.Ignore()); - - CreateMap(); - } -} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebMappers.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebMappers.cs new file mode 100644 index 0000000000..950a3972f0 --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebMappers.cs @@ -0,0 +1,33 @@ +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; +using static Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement.PermissionManagementModal; + +namespace Volo.Abp.PermissionManagement.Web; + +[Mapper] +public partial class PermissionGroupDtoToPermissionGroupViewModelMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(PermissionGroupViewModel.IsAllPermissionsGranted))] + public override partial PermissionGroupViewModel Map(PermissionGroupDto source); + + [MapperIgnoreTarget(nameof(PermissionGroupViewModel.IsAllPermissionsGranted))] + public override partial void Map(PermissionGroupDto source, PermissionGroupViewModel destination); +} + +[Mapper] +public partial class PermissionGrantInfoDtoToPermissionGrantInfoViewModelMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(PermissionGrantInfoViewModel.Depth))] + public override partial PermissionGrantInfoViewModel Map(PermissionGrantInfoDto source); + + [MapperIgnoreTarget(nameof(PermissionGrantInfoViewModel.Depth))] + public override partial void Map(PermissionGrantInfoDto source, PermissionGrantInfoViewModel destination); +} + +[Mapper] +public partial class ProviderInfoDtoToProviderInfoViewModelMapper : MapperBase +{ + public override partial ProviderInfoViewModel Map(ProviderInfoDto source); + + public override partial void Map(ProviderInfoDto source, ProviderInfoViewModel destination); +} \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs index 5219fafbbf..2159a6107c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; -using Volo.Abp.AutoMapper; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.Localization; using Volo.Abp.VirtualFileSystem; @@ -11,7 +11,7 @@ namespace Volo.Abp.PermissionManagement.Web; [DependsOn(typeof(AbpPermissionManagementApplicationContractsModule))] [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))] -[DependsOn(typeof(AbpAutoMapperModule))] +[DependsOn(typeof(AbpMapperlyModule))] public class AbpPermissionManagementWebModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) @@ -34,11 +34,7 @@ public class AbpPermissionManagementWebModule : AbpModule options.FileSets.AddEmbedded(); }); - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); Configure(options => { diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj index 1c80dda96c..9f58d70303 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj @@ -31,7 +31,7 @@ - +