diff --git a/api/.config/dotnet-tools.json b/api/.config/dotnet-tools.json index b81281f..fe3b70d 100644 --- a/api/.config/dotnet-tools.json +++ b/api/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "volo.abp.cli": { - "version": "9.0.2", + "version": "10.0.0", "commands": [ "abp" ] diff --git a/api/Sozsoft.Platform.DbMigrator.Dockerfile b/api/Sozsoft.Platform.DbMigrator.Dockerfile index 8cc499b..7f35c67 100644 --- a/api/Sozsoft.Platform.DbMigrator.Dockerfile +++ b/api/Sozsoft.Platform.DbMigrator.Dockerfile @@ -1,7 +1,13 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false WORKDIR /app +COPY global.json ./ +COPY common.props ./ +COPY "modules/Sozsoft.Languages/common.props" "modules/Sozsoft.Languages/" +COPY "modules/Sozsoft.Notifications/common.props" "modules/Sozsoft.Notifications/" +COPY "modules/Sozsoft.Settings/common.props" "modules/Sozsoft.Settings/" +COPY "modules/Sozsoft.SqlQueryManager/common.props" "modules/Sozsoft.SqlQueryManager/" COPY "modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj" "modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/" COPY "modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj" "modules/Sozsoft.Languages/Sozsoft.Languages.Domain/" COPY "modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj" "modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/" @@ -30,7 +36,7 @@ RUN dotnet restore "src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator. COPY . . RUN dotnet publish "src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj" -c Release -o /app/publish --no-restore -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final +FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final # DevExpress License Key - runtime'da da gerekli ARG DevExpress_License diff --git a/api/Sozsoft.Platform.HttpApi.Host.Dockerfile b/api/Sozsoft.Platform.HttpApi.Host.Dockerfile index 8b291e3..ccaadb6 100644 --- a/api/Sozsoft.Platform.HttpApi.Host.Dockerfile +++ b/api/Sozsoft.Platform.HttpApi.Host.Dockerfile @@ -1,9 +1,15 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false WORKDIR /app RUN apk update && apk upgrade RUN apk add nodejs~=24 npm~=11 +COPY global.json ./ +COPY common.props ./ +COPY "modules/Sozsoft.Languages/common.props" "modules/Sozsoft.Languages/" +COPY "modules/Sozsoft.Notifications/common.props" "modules/Sozsoft.Notifications/" +COPY "modules/Sozsoft.Settings/common.props" "modules/Sozsoft.Settings/" +COPY "modules/Sozsoft.SqlQueryManager/common.props" "modules/Sozsoft.SqlQueryManager/" COPY .config/dotnet-tools.json .config/dotnet-tools.json RUN dotnet tool restore ENV PATH="/root/.dotnet/tools:/app/.config/dotnet/tools:${PATH}" @@ -54,7 +60,7 @@ RUN mkdir -p publish RUN dotnet publish "src/Sozsoft.Platform.HttpApi.Host/Sozsoft.Platform.HttpApi.Host.csproj" -c Release -o /app/publish --no-restore RUN dotnet publish "src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj" -c Release -o /app/migrator -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final +FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final # DevExpress License Key - runtime'da da gerekli ARG DevExpress_License diff --git a/api/common.props b/api/common.props index 7e89c3a..94a2ab4 100644 --- a/api/common.props +++ b/api/common.props @@ -16,4 +16,10 @@ - \ No newline at end of file + + + + + + + diff --git a/api/global.json b/api/global.json index 27cae65..4633f06 100644 --- a/api/global.json +++ b/api/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.101", + "version": "10.0.300", "rollForward": "latestMajor" } } diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj index 6ca9bb9..0b5cd5e 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj @@ -3,13 +3,13 @@ - net9.0 + net10.0 Sozsoft.Languages - - + + diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationAutoMapperProfile.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationAutoMapperProfile.cs deleted file mode 100644 index a90b794..0000000 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,29 +0,0 @@ -using AutoMapper; -using Sozsoft.Languages.Entities; -using Volo.Abp.AutoMapper; -using Volo.Abp.Localization; - -namespace Sozsoft.Languages; - -public class LanguagesApplicationAutoMapperProfile : Profile -{ - public LanguagesApplicationAutoMapperProfile() - { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - - CreateMap() - .IgnoreAllPropertiesWithAnInaccessibleSetter() - .ForMember(dest => dest.LanguageKey, opt => opt.Ignore()); - - CreateMap() - .ForMember(d => d.Key, o => o.MapFrom(s => s.Key)) - .ForMember(d => d.ResourceName, o => o.MapFrom(s => s.ResourceName)) - .ForAllMembers(o => o.Ignore()); - - } -} - diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs new file mode 100644 index 0000000..0bad436 --- /dev/null +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs @@ -0,0 +1,122 @@ +using Sozsoft.Languages.Entities; +using Volo.Abp.Localization; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Languages; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageToLanguageInfoMapper : MapperBase +{ + public override partial LanguageInfo Map(Language source); + + public override partial void Map(Language source, LanguageInfo destination); + + public override void BeforeMap(Language source) + { + } + + public override void AfterMap(Language source, LanguageInfo destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageToLanguageDtoMapper : MapperBase +{ + public override partial LanguageDto Map(Language source); + + public override partial void Map(Language source, LanguageDto destination); + + public override void BeforeMap(Language source) + { + } + + public override void AfterMap(Language source, LanguageDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageKeyToLanguageKeyDtoMapper : MapperBase +{ + public override partial LanguageKeyDto Map(LanguageKey source); + + public override partial void Map(LanguageKey source, LanguageKeyDto destination); + + public override void BeforeMap(LanguageKey source) + { + } + + public override void AfterMap(LanguageKey source, LanguageKeyDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageTextToLanguageTextDtoMapper : MapperBase +{ + public override partial LanguageTextDto Map(LanguageText source); + + public override partial void Map(LanguageText source, LanguageTextDto destination); + + public override void BeforeMap(LanguageText source) + { + } + + public override void AfterMap(LanguageText source, LanguageTextDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageTextToLanguageTextEtoMapper : MapperBase +{ + public override partial LanguageTextEto Map(LanguageText source); + + public override partial void Map(LanguageText source, LanguageTextEto destination); + + public override void BeforeMap(LanguageText source) + { + } + + public override void AfterMap(LanguageText source, LanguageTextEto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageTextCreateUpdateDtoToLanguageTextMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(LanguageText.LanguageKey))] + public override partial LanguageText Map(LanguageTextCreateUpdateDto source); + + [MapperIgnoreTarget(nameof(LanguageText.LanguageKey))] + public override partial void Map(LanguageTextCreateUpdateDto source, LanguageText destination); + + public override void BeforeMap(LanguageTextCreateUpdateDto source) + { + } + + public override void AfterMap(LanguageTextCreateUpdateDto source, LanguageText destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class LanguageKeyToLanguageTextTranslatedDtoMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(LanguageTextTranslatedDto.Id))] + public override partial LanguageTextTranslatedDto Map(LanguageKey source); + + [MapperIgnoreTarget(nameof(LanguageTextTranslatedDto.Id))] + public override partial void Map(LanguageKey source, LanguageTextTranslatedDto destination); + + public override void BeforeMap(LanguageKey source) + { + } + + public override void AfterMap(LanguageKey source, LanguageTextTranslatedDto destination) + { + } +} diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationModule.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationModule.cs index c19eed4..9644708 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationModule.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationModule.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; namespace Sozsoft.Languages; @@ -9,18 +9,13 @@ namespace Sozsoft.Languages; typeof(LanguagesDomainModule), typeof(LanguagesApplicationContractsModule), typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule) + typeof(AbpMapperlyModule) )] public class LanguagesApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddMaps(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); } } diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/Sozsoft.Languages.Application.csproj b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/Sozsoft.Languages.Application.csproj index dd7f6ae..e5a5764 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/Sozsoft.Languages.Application.csproj +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/Sozsoft.Languages.Application.csproj @@ -3,14 +3,14 @@ - net9.0 + net10.0 Sozsoft.Languages - - - + + + diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj index 62dd4df..e050e5a 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj @@ -1,19 +1,19 @@ - + - net9.0 + net10.0 true - - + + - + diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj index 7e775c5..37a3df6 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj @@ -3,13 +3,13 @@ - net9.0 + net10.0 Sozsoft.Languages - - + + diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/Sozsoft.Languages.EntityFrameworkCore.csproj b/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/Sozsoft.Languages.EntityFrameworkCore.csproj index 6f36fcd..adbd03b 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/Sozsoft.Languages.EntityFrameworkCore.csproj +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/Sozsoft.Languages.EntityFrameworkCore.csproj @@ -3,12 +3,12 @@ - net9.0 + net10.0 Sozsoft.Languages - + diff --git a/api/modules/Sozsoft.Languages/common.props b/api/modules/Sozsoft.Languages/common.props index 87cf88d..021ac2f 100644 --- a/api/modules/Sozsoft.Languages/common.props +++ b/api/modules/Sozsoft.Languages/common.props @@ -7,11 +7,14 @@ - - + + All runtime; build; native; contentfiles; analyzers + + + @@ -21,4 +24,4 @@ - \ No newline at end of file + diff --git a/api/modules/Sozsoft.MailQueue/Application/MailQueueAutoMapperProfile.cs b/api/modules/Sozsoft.MailQueue/Application/MailQueueAutoMapperProfile.cs deleted file mode 100644 index 975e6ee..0000000 --- a/api/modules/Sozsoft.MailQueue/Application/MailQueueAutoMapperProfile.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AutoMapper; - -namespace Sozsoft.MailQueue.Application; - -public class MailQueueAutoMapperProfile : Profile -{ - public MailQueueAutoMapperProfile() - { - - - } -} - diff --git a/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs b/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs new file mode 100644 index 0000000..a2adf99 --- /dev/null +++ b/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs @@ -0,0 +1 @@ +namespace Sozsoft.MailQueue.Application; diff --git a/api/modules/Sozsoft.MailQueue/Sozsoft.MailQueue.csproj b/api/modules/Sozsoft.MailQueue/Sozsoft.MailQueue.csproj index 2a13c59..b14a514 100644 --- a/api/modules/Sozsoft.MailQueue/Sozsoft.MailQueue.csproj +++ b/api/modules/Sozsoft.MailQueue/Sozsoft.MailQueue.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable true $(NoWarn);CS8632 @@ -19,22 +19,25 @@ - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs b/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs index 3324733..d2affe6 100644 --- a/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs +++ b/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs @@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; using Volo.Abp.Authorization; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Domain; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Localization; @@ -22,7 +22,7 @@ namespace Sozsoft.MailQueue; typeof(AbpDddDomainModule), typeof(AbpDddApplicationModule), typeof(AbpDddApplicationContractsModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpAuthorizationModule), typeof(AbpEntityFrameworkCoreModule), typeof(AbpTextTemplatingRazorModule), @@ -32,11 +32,7 @@ public class ErpMailQueueModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddMaps(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); Configure(options => { diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Sozsoft.Notifications.Application.Contracts.csproj b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Sozsoft.Notifications.Application.Contracts.csproj index 737fc47..e4efc7c 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Sozsoft.Notifications.Application.Contracts.csproj +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Sozsoft.Notifications.Application.Contracts.csproj @@ -3,14 +3,14 @@ - net9.0 + net10.0 enable Sozsoft.Notifications - - + + diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationAutoMapperProfile.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationAutoMapperProfile.cs deleted file mode 100644 index 84bb7b8..0000000 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,19 +0,0 @@ -using AutoMapper; -using Sozsoft.Notifications.Entities; -using Sozsoft.Notifications.NotificationRules; - -namespace Sozsoft.Notifications.Application; - -public class NotificationApplicationAutoMapperProfile : Profile -{ - public NotificationApplicationAutoMapperProfile() - { - CreateMap(); - CreateMap(); - CreateMap() - .ForMember(d => d.CreatorFullname, o => o.Ignore()) - .ForMember(d => d.TenantId, o => o.Ignore()); - CreateMap(MemberList.Source); - } -} - diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs new file mode 100644 index 0000000..f14431b --- /dev/null +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs @@ -0,0 +1,90 @@ +using Sozsoft.Notifications.Entities; +using Sozsoft.Notifications.Domain; +using Sozsoft.Notifications.NotificationRules; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Notifications.Application; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class NotificationTypeToNotificationTypeDtoMapper : MapperBase +{ +public override partial NotificationTypeDto Map(NotificationType source); + + public override partial void Map(NotificationType source, NotificationTypeDto destination); + + public override void BeforeMap(NotificationType source) + { + } + + public override void AfterMap(NotificationType source, NotificationTypeDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class NotificationRuleToNotificationRuleDtoMapper : MapperBase +{ +public override partial NotificationRuleDto Map(NotificationRule source); + + public override partial void Map(NotificationRule source, NotificationRuleDto destination); + + public override void BeforeMap(NotificationRule source) + { + } + + public override void AfterMap(NotificationRule source, NotificationRuleDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class NotificationToNotificationDtoMapper : MapperBase +{ +[MapperIgnoreTarget(nameof(NotificationDto.CreatorFullname))] + [MapperIgnoreTarget(nameof(NotificationDto.TenantId))] + public override partial NotificationDto Map(Notification source); + + [MapperIgnoreTarget(nameof(NotificationDto.CreatorFullname))] + [MapperIgnoreTarget(nameof(NotificationDto.TenantId))] + public override partial void Map(Notification source, NotificationDto destination); + + public override void BeforeMap(Notification source) + { + } + + public override void AfterMap(Notification source, NotificationDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CreateUpdateNotificationRuleDtoToNotificationRuleMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(NotificationRule.RecipientType))] + public override NotificationRule Map(CreateUpdateNotificationRuleDto source) + { + var destination = new NotificationRule + { + RecipientType = NotificationRecipientTypes.All, + Channel = source.Channel, + NotificationTypeId = source.NotificationTypeId, + IsActive = source.IsActive + }; + + AfterMap(source, destination); + + return destination; + } + + [MapperIgnoreTarget(nameof(NotificationRule.RecipientType))] + public override partial void Map(CreateUpdateNotificationRuleDto source, NotificationRule destination); + + public override void BeforeMap(CreateUpdateNotificationRuleDto source) + { + } + + public override void AfterMap(CreateUpdateNotificationRuleDto source, NotificationRule destination) + { + } +} diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs index 6ae471f..2aea3d3 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs @@ -1,7 +1,7 @@ using Sozsoft.Notifications.Domain; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; namespace Sozsoft.Notifications.Application; @@ -10,17 +10,13 @@ namespace Sozsoft.Notifications.Application; typeof(NotificationDomainModule), typeof(NotificationApplicationContractsModule), typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule) + typeof(AbpMapperlyModule) )] public class NotificationApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddMaps(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); } } diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/Sozsoft.Notifications.Application.csproj b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/Sozsoft.Notifications.Application.csproj index 0eb2e7d..5296122 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/Sozsoft.Notifications.Application.csproj +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/Sozsoft.Notifications.Application.csproj @@ -3,14 +3,14 @@ - net9.0 + net10.0 enable Sozsoft.Notifications - - + + diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Sozsoft.Notifications.Domain.Shared.csproj b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Sozsoft.Notifications.Domain.Shared.csproj index b700bda..3fe59da 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Sozsoft.Notifications.Domain.Shared.csproj +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Sozsoft.Notifications.Domain.Shared.csproj @@ -3,19 +3,19 @@ - net9.0 + net10.0 enable Sozsoft.Notifications true - - + + - + diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Sozsoft.Notifications.Domain.csproj b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Sozsoft.Notifications.Domain.csproj index 3aaea4c..5423f66 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Sozsoft.Notifications.Domain.csproj +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Sozsoft.Notifications.Domain.csproj @@ -3,16 +3,16 @@ - net9.0 + net10.0 enable Sozsoft.Notifications $(NoWarn);CS8632 - - - + + + diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/Sozsoft.Notifications.EntityFrameworkCore.csproj b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/Sozsoft.Notifications.EntityFrameworkCore.csproj index fe1a724..ed562b1 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/Sozsoft.Notifications.EntityFrameworkCore.csproj +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/Sozsoft.Notifications.EntityFrameworkCore.csproj @@ -3,13 +3,13 @@ - net9.0 + net10.0 enable Sozsoft.Notifications - + diff --git a/api/modules/Sozsoft.Notifications/common.props b/api/modules/Sozsoft.Notifications/common.props index 87cf88d..021ac2f 100644 --- a/api/modules/Sozsoft.Notifications/common.props +++ b/api/modules/Sozsoft.Notifications/common.props @@ -7,11 +7,14 @@ - - + + All runtime; build; native; contentfiles; analyzers + + + @@ -21,4 +24,4 @@ - \ No newline at end of file + diff --git a/api/modules/Sozsoft.Sender/Sozsoft.Sender.csproj b/api/modules/Sozsoft.Sender/Sozsoft.Sender.csproj index 36b1f39..151de32 100644 --- a/api/modules/Sozsoft.Sender/Sozsoft.Sender.csproj +++ b/api/modules/Sozsoft.Sender/Sozsoft.Sender.csproj @@ -1,17 +1,20 @@  - net9.0 + net10.0 enable - - - - - + + + + + + + + diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Sozsoft.Settings.Application.Contracts.csproj b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Sozsoft.Settings.Application.Contracts.csproj index 8d3e739..5304c8e 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Sozsoft.Settings.Application.Contracts.csproj +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Sozsoft.Settings.Application.Contracts.csproj @@ -3,14 +3,14 @@ - net9.0 + net10.0 Sozsoft.Settings - - - + + + diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsApplicationModule.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsApplicationModule.cs index 3528937..fba5c90 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsApplicationModule.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsApplicationModule.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; using Volo.Abp.SettingManagement; @@ -10,18 +10,14 @@ namespace Sozsoft.Settings; typeof(SettingsDomainModule), typeof(SettingsApplicationContractsModule), typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpSettingManagementApplicationModule) )] public class SettingsApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddMaps(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); } } diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsAutoMapperProfile.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsAutoMapperProfile.cs deleted file mode 100644 index e38093d..0000000 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsAutoMapperProfile.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AutoMapper; -using Sozsoft.Settings.Entities; - -namespace Sozsoft.Settings; - -public class SettingsAutoMapperProfile : Profile -{ - public SettingsAutoMapperProfile() - { - CreateMap().ReverseMap(); - } -} - diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs new file mode 100644 index 0000000..10e806a --- /dev/null +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs @@ -0,0 +1,33 @@ +using Sozsoft.Settings.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Settings; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SettingDefinitionToSettingDefinitionDtoMapper : TwoWayMapperBase +{ +public override partial SettingDefinitionDto Map(SettingDefinition source); + + public override partial void Map(SettingDefinition source, SettingDefinitionDto destination); + + public override void BeforeMap(SettingDefinition source) + { + } + + public override void AfterMap(SettingDefinition source, SettingDefinitionDto destination) + { + } + + public override partial SettingDefinition ReverseMap(SettingDefinitionDto destination); + + public override partial void ReverseMap(SettingDefinitionDto destination, SettingDefinition source); + + public override void BeforeReverseMap(SettingDefinitionDto destination) + { + } + + public override void AfterReverseMap(SettingDefinitionDto destination, SettingDefinition source) + { + } +} diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/Sozsoft.Settings.Application.csproj b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/Sozsoft.Settings.Application.csproj index b7c7f05..1266770 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/Sozsoft.Settings.Application.csproj +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/Sozsoft.Settings.Application.csproj @@ -3,14 +3,14 @@ - net9.0 + net10.0 Sozsoft.Settings - - - + + + diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/Sozsoft.Settings.Domain.Shared.csproj b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/Sozsoft.Settings.Domain.Shared.csproj index 0eabfb1..c07ea26 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/Sozsoft.Settings.Domain.Shared.csproj +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/Sozsoft.Settings.Domain.Shared.csproj @@ -3,19 +3,19 @@ - net9.0 + net10.0 Sozsoft.Settings true - - - + + + - + diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Sozsoft.Settings.Domain.csproj b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Sozsoft.Settings.Domain.csproj index e1b6266..1f0fc04 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Sozsoft.Settings.Domain.csproj +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Sozsoft.Settings.Domain.csproj @@ -3,13 +3,13 @@ - net9.0 + net10.0 Sozsoft.Settings - - + + diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/Sozsoft.Settings.EntityFrameworkCore.csproj b/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/Sozsoft.Settings.EntityFrameworkCore.csproj index ca1b6ec..dbc38b8 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/Sozsoft.Settings.EntityFrameworkCore.csproj +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/Sozsoft.Settings.EntityFrameworkCore.csproj @@ -3,12 +3,12 @@ - net9.0 + net10.0 Sozsoft.Settings - + diff --git a/api/modules/Sozsoft.Settings/common.props b/api/modules/Sozsoft.Settings/common.props index 87cf88d..021ac2f 100644 --- a/api/modules/Sozsoft.Settings/common.props +++ b/api/modules/Sozsoft.Settings/common.props @@ -7,11 +7,14 @@ - - + + All runtime; build; native; contentfiles; analyzers + + + @@ -21,4 +24,4 @@ - \ No newline at end of file + diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/Sozsoft.SqlQueryManager.Application.Contracts.csproj b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/Sozsoft.SqlQueryManager.Application.Contracts.csproj index b4e9b01..6aaa880 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/Sozsoft.SqlQueryManager.Application.Contracts.csproj +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/Sozsoft.SqlQueryManager.Application.Contracts.csproj @@ -1,15 +1,15 @@ - + - net9.0 + net10.0 Sozsoft.SqlQueryManager - - + + diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/Sozsoft.SqlQueryManager.Application.csproj b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/Sozsoft.SqlQueryManager.Application.csproj index a037988..215bae2 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/Sozsoft.SqlQueryManager.Application.csproj +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/Sozsoft.SqlQueryManager.Application.csproj @@ -1,16 +1,16 @@ - + - net9.0 + net10.0 Sozsoft.SqlQueryManager - - - + + + diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerApplicationModule.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerApplicationModule.cs index 7b439c5..9e21fad 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerApplicationModule.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerApplicationModule.cs @@ -1,6 +1,6 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; namespace Sozsoft.SqlQueryManager; @@ -9,17 +9,12 @@ namespace Sozsoft.SqlQueryManager; typeof(SqlQueryManagerDomainModule), typeof(SqlQueryManagerApplicationContractsModule), typeof(AbpDddApplicationModule), - typeof(AbpAutoMapperModule) + typeof(AbpMapperlyModule) )] public class SqlQueryManagerApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddMaps(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); } } diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerAutoMapperProfile.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerAutoMapperProfile.cs deleted file mode 100644 index eea6a87..0000000 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerAutoMapperProfile.cs +++ /dev/null @@ -1,12 +0,0 @@ -using AutoMapper; - -namespace Sozsoft.SqlQueryManager.Application; - -// No entity-to-DTO mappings needed; SQL objects are no longer persisted in this module. -public class SqlQueryManagerAutoMapperProfile : Profile -{ - public SqlQueryManagerAutoMapperProfile() - { - // intentionally empty - } -} diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs new file mode 100644 index 0000000..44c9865 --- /dev/null +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs @@ -0,0 +1 @@ +namespace Sozsoft.SqlQueryManager.Application; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/Sozsoft.SqlQueryManager.Domain.Shared.csproj b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/Sozsoft.SqlQueryManager.Domain.Shared.csproj index 3104a0f..fa3721f 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/Sozsoft.SqlQueryManager.Domain.Shared.csproj +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/Sozsoft.SqlQueryManager.Domain.Shared.csproj @@ -1,20 +1,20 @@ - + - net9.0 + net10.0 true Sozsoft.SqlQueryManager - - + + - + diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Sozsoft.SqlQueryManager.Domain.csproj b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Sozsoft.SqlQueryManager.Domain.csproj index 8c488ac..609d22d 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Sozsoft.SqlQueryManager.Domain.csproj +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Sozsoft.SqlQueryManager.Domain.csproj @@ -1,14 +1,14 @@ - + - net9.0 + net10.0 Sozsoft.SqlQueryManager - + diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/Sozsoft.SqlQueryManager.EntityFrameworkCore.csproj b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/Sozsoft.SqlQueryManager.EntityFrameworkCore.csproj index bc6aa81..ff96a2c 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/Sozsoft.SqlQueryManager.EntityFrameworkCore.csproj +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/Sozsoft.SqlQueryManager.EntityFrameworkCore.csproj @@ -1,14 +1,14 @@ - + - net9.0 + net10.0 Sozsoft.SqlQueryManager - + diff --git a/api/modules/Sozsoft.SqlQueryManager/common.props b/api/modules/Sozsoft.SqlQueryManager/common.props index 87cf88d..021ac2f 100644 --- a/api/modules/Sozsoft.SqlQueryManager/common.props +++ b/api/modules/Sozsoft.SqlQueryManager/common.props @@ -7,11 +7,14 @@ - - + + All runtime; build; native; contentfiles; analyzers + + + @@ -21,4 +24,4 @@ - \ No newline at end of file + diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Sozsoft.Platform.Application.Contracts.csproj b/api/src/Sozsoft.Platform.Application.Contracts/Sozsoft.Platform.Application.Contracts.csproj index 67bd20a..b1096c3 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Sozsoft.Platform.Application.Contracts.csproj +++ b/api/src/Sozsoft.Platform.Application.Contracts/Sozsoft.Platform.Application.Contracts.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 Sozsoft.Platform $(NoWarn);CS8632 @@ -16,12 +16,12 @@ - - - - - - + + + + + + diff --git a/api/src/Sozsoft.Platform.Application/AiBots/AiBotAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/AiBots/AiBotAutoMapperProfile.cs deleted file mode 100644 index c1836c9..0000000 --- a/api/src/Sozsoft.Platform.Application/AiBots/AiBotAutoMapperProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.AiBots; - -public class AiBotAutoMapperProfile : Profile -{ - public AiBotAutoMapperProfile() - { - CreateMap().ReverseMap(); - - } -} - diff --git a/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs b/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs new file mode 100644 index 0000000..64474d8 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs @@ -0,0 +1,33 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.AiBots; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class AiBotToAiBotDtoMapper : TwoWayMapperBase +{ +public override partial AiBotDto Map(AiBot source); + + public override partial void Map(AiBot source, AiBotDto destination); + + public override void BeforeMap(AiBot source) + { + } + + public override void AfterMap(AiBot source, AiBotDto destination) + { + } + + public override partial AiBot ReverseMap(AiBotDto destination); + + public override partial void ReverseMap(AiBotDto destination, AiBot source); + + public override void BeforeReverseMap(AiBotDto destination) + { + } + + public override void AfterReverseMap(AiBotDto destination, AiBot source) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogAutoMapperProfile.cs deleted file mode 100644 index 031be95..0000000 --- a/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogAutoMapperProfile.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AutoMapper; -using Volo.Abp.AuditLogging; - -namespace Sozsoft.Platform.AuditLogs; - -public class AuditLogAutoMapperProfile : Profile -{ - public AuditLogAutoMapperProfile() - { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs b/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs new file mode 100644 index 0000000..1214ad3 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs @@ -0,0 +1,69 @@ +using Volo.Abp.AuditLogging; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.AuditLogs; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class AuditLogToAuditLogDtoMapper : MapperBase +{ +public override partial AuditLogDto Map(AuditLog source); + + public override partial void Map(AuditLog source, AuditLogDto destination); + + public override void BeforeMap(AuditLog source) + { + } + + public override void AfterMap(AuditLog source, AuditLogDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class AuditLogActionToAuditLogActionDtoMapper : MapperBase +{ +public override partial AuditLogActionDto Map(AuditLogAction source); + + public override partial void Map(AuditLogAction source, AuditLogActionDto destination); + + public override void BeforeMap(AuditLogAction source) + { + } + + public override void AfterMap(AuditLogAction source, AuditLogActionDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class EntityChangeToEntityChangeDtoMapper : MapperBase +{ +public override partial EntityChangeDto Map(EntityChange source); + + public override partial void Map(EntityChange source, EntityChangeDto destination); + + public override void BeforeMap(EntityChange source) + { + } + + public override void AfterMap(EntityChange source, EntityChangeDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class EntityPropertyChangeToEntityPropertyChangeDtoMapper : MapperBase +{ +public override partial EntityPropertyChangeDto Map(EntityPropertyChange source); + + public override partial void Map(EntityPropertyChange source, EntityPropertyChangeDto destination); + + public override void BeforeMap(EntityPropertyChange source) + { + } + + public override void AfterMap(EntityPropertyChange source, EntityPropertyChangeDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Branch/BranchAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Branch/BranchAutoMapperProfile.cs deleted file mode 100644 index bf9034d..0000000 --- a/api/src/Sozsoft.Platform.Application/Branch/BranchAutoMapperProfile.cs +++ /dev/null @@ -1,12 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Branchs; - -public class BranchAutoMapperProfile : Profile -{ - public BranchAutoMapperProfile() - { - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs b/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs new file mode 100644 index 0000000..521ac11 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs @@ -0,0 +1,37 @@ +using Sozsoft.Platform.Branchs; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Branchs; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BranchSeedResultToBranchSeedResultDtoMapper : MapperBase +{ +public override partial BranchSeedResultDto Map(BranchSeedResult source); + + public override partial void Map(BranchSeedResult source, BranchSeedResultDto destination); + + public override void BeforeMap(BranchSeedResult source) + { + } + + public override void AfterMap(BranchSeedResult source, BranchSeedResultDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BranchSeedDetailToSeedDetailDtoMapper : MapperBase +{ +public override partial SeedDetailDto Map(BranchSeedDetail source); + + public override partial void Map(BranchSeedDetail source, SeedDetailDto destination); + + public override void BeforeMap(BranchSeedDetail source) + { + } + + public override void AfterMap(BranchSeedDetail source, SeedDetailDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAutoMapperProfile.cs deleted file mode 100644 index 4637e2c..0000000 --- a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAutoMapperProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.DataSources; - -public class DataSourceAutoMapperProfile : Profile -{ - public DataSourceAutoMapperProfile() - { - CreateMap().ReverseMap(); - - } -} - diff --git a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs new file mode 100644 index 0000000..835915a --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs @@ -0,0 +1,33 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.DataSources; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class DataSourceToDataSourceDtoMapper : TwoWayMapperBase +{ +public override partial DataSourceDto Map(DataSource source); + + public override partial void Map(DataSource source, DataSourceDto destination); + + public override void BeforeMap(DataSource source) + { + } + + public override void AfterMap(DataSource source, DataSourceDto destination) + { + } + + public override partial DataSource ReverseMap(DataSourceDto destination); + + public override partial void ReverseMap(DataSourceDto destination, DataSource source); + + public override void BeforeReverseMap(DataSourceDto destination) + { + } + + public override void AfterReverseMap(DataSourceDto destination, DataSource source) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitAutoMapperProfile.cs deleted file mode 100644 index b9722fe..0000000 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitAutoMapperProfile.cs +++ /dev/null @@ -1,22 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.DeveloperKit; - -public class DeveloperKitAutoMapperProfile : Profile -{ - public DeveloperKitAutoMapperProfile() - { - // CustomComponent mappings - CreateMap(); - CreateMap(); - - // GeneratedEndpoint mappings - CreateMap(); - CreateMap(); - - CreateMap() - .ForMember(dest => dest.CompilationStatus, opt => opt.MapFrom(src => src.CompilationStatus.ToString())); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs new file mode 100644 index 0000000..f2d4fc4 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs @@ -0,0 +1,86 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.DeveloperKit; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CustomComponentToCustomComponentDtoMapper : MapperBase +{ +public override partial CustomComponentDto Map(CustomComponent source); + + public override partial void Map(CustomComponent source, CustomComponentDto destination); + + public override void BeforeMap(CustomComponent source) + { + } + + public override void AfterMap(CustomComponent source, CustomComponentDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CreateUpdateCustomComponentDtoToCustomComponentMapper : MapperBase +{ +public override partial CustomComponent Map(CreateUpdateCustomComponentDto source); + + public override partial void Map(CreateUpdateCustomComponentDto source, CustomComponent destination); + + public override void BeforeMap(CreateUpdateCustomComponentDto source) + { + } + + public override void AfterMap(CreateUpdateCustomComponentDto source, CustomComponent destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CrudEndpointToCrudEndpointDtoMapper : MapperBase +{ +public override partial CrudEndpointDto Map(CrudEndpoint source); + + public override partial void Map(CrudEndpoint source, CrudEndpointDto destination); + + public override void BeforeMap(CrudEndpoint source) + { + } + + public override void AfterMap(CrudEndpoint source, CrudEndpointDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CreateUpdateCrudEndpointDtoToCrudEndpointMapper : MapperBase +{ +public override partial CrudEndpoint Map(CreateUpdateCrudEndpointDto source); + + public override partial void Map(CreateUpdateCrudEndpointDto source, CrudEndpoint destination); + + public override void BeforeMap(CreateUpdateCrudEndpointDto source) + { + } + + public override void AfterMap(CreateUpdateCrudEndpointDto source, CrudEndpoint destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class DynamicServiceToDynamicServiceDtoMapper : MapperBase +{ +public override partial DynamicServiceDto Map(DynamicService source); + + public override partial void Map(DynamicService source, DynamicServiceDto destination); + + public override void BeforeMap(DynamicService source) + { + } + + public override void AfterMap(DynamicService source, DynamicServiceDto destination) + { + destination.CompilationStatus = source.CompilationStatus.ToString(); + } +} diff --git a/api/src/Sozsoft.Platform.Application/Forum/ForumAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Forum/ForumAutoMapperProfile.cs deleted file mode 100644 index df2c7ab..0000000 --- a/api/src/Sozsoft.Platform.Application/Forum/ForumAutoMapperProfile.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Forum; - -namespace Sozsoft.Platform; - -public class ForumAutoMapperProfile : Profile -{ - public ForumAutoMapperProfile() - { - // Blog mappings - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs b/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs new file mode 100644 index 0000000..56b205a --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs @@ -0,0 +1,89 @@ +using Sozsoft.Platform.Forum; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ForumCategoryToForumCategoryDtoMapper : TwoWayMapperBase +{ +public override partial ForumCategoryDto Map(ForumCategory source); + + public override partial void Map(ForumCategory source, ForumCategoryDto destination); + + public override void BeforeMap(ForumCategory source) + { + } + + public override void AfterMap(ForumCategory source, ForumCategoryDto destination) + { + } + + public override partial ForumCategory ReverseMap(ForumCategoryDto destination); + + public override partial void ReverseMap(ForumCategoryDto destination, ForumCategory source); + + public override void BeforeReverseMap(ForumCategoryDto destination) + { + } + + public override void AfterReverseMap(ForumCategoryDto destination, ForumCategory source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ForumPostToForumPostDtoMapper : TwoWayMapperBase +{ +public override partial ForumPostDto Map(ForumPost source); + + public override partial void Map(ForumPost source, ForumPostDto destination); + + public override void BeforeMap(ForumPost source) + { + } + + public override void AfterMap(ForumPost source, ForumPostDto destination) + { + } + + public override partial ForumPost ReverseMap(ForumPostDto destination); + + public override partial void ReverseMap(ForumPostDto destination, ForumPost source); + + public override void BeforeReverseMap(ForumPostDto destination) + { + } + + public override void AfterReverseMap(ForumPostDto destination, ForumPost source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ForumTopicToForumTopicDtoMapper : TwoWayMapperBase +{ +public override partial ForumTopicDto Map(ForumTopic source); + + public override partial void Map(ForumTopic source, ForumTopicDto destination); + + public override void BeforeMap(ForumTopic source) + { + } + + public override void AfterMap(ForumTopic source, ForumTopicDto destination) + { + } + + public override partial ForumTopic ReverseMap(ForumTopicDto destination); + + public override partial void ReverseMap(ForumTopicDto destination, ForumTopic source); + + public override void BeforeReverseMap(ForumTopicDto destination) + { + } + + public override void AfterReverseMap(ForumTopicDto destination, ForumTopic source) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Hr/HrAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Hr/HrAutoMapperProfile.cs deleted file mode 100644 index 83a7020..0000000 --- a/api/src/Sozsoft.Platform.Application/Hr/HrAutoMapperProfile.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Hr; - -namespace Sozsoft.Platform.Intranet; - -public class HrAutoMapperProfile : Profile -{ - public HrAutoMapperProfile() - { - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs b/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs new file mode 100644 index 0000000..892fc09 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs @@ -0,0 +1,38 @@ +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Hr; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Intranet; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class DepartmentToDepartmentDtoMapper : MapperBase +{ +public override partial DepartmentDto Map(Department source); + + public override partial void Map(Department source, DepartmentDto destination); + + public override void BeforeMap(Department source) + { + } + + public override void AfterMap(Department source, DepartmentDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class JobPositionToJobPositionDtoMapper : MapperBase +{ +public override partial JobPositionDto Map(JobPosition source); + + public override partial void Map(JobPosition source, JobPositionDto destination); + + public override void BeforeMap(JobPosition source) + { + } + + public override void AfterMap(JobPosition source, JobPositionDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Identity/IdentityAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Identity/IdentityAutoMapperProfile.cs deleted file mode 100644 index 4a9c20d..0000000 --- a/api/src/Sozsoft.Platform.Application/Identity/IdentityAutoMapperProfile.cs +++ /dev/null @@ -1,29 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Identity.Dto; -using Sozsoft.Platform.OrganizationUnits; -using Sozsoft.Platform.Tenants; -using Volo.Abp.Identity; -using Volo.Abp.TenantManagement; - -namespace Sozsoft.Platform.Identity; - -public class IdentityAutoMapperProfile : Profile -{ - public IdentityAutoMapperProfile() - { - CreateMap() - .ForMember(dest => dest.Roles, opt => opt.Ignore()) - .ForMember(dest => dest.Branches, opt => opt.Ignore()) - .ForMember(dest => dest.Claims, opt => opt.Ignore()) - .ForMember(dest => dest.WorkHours, opt => opt.Ignore()) - .ForMember(dest => dest.Departments, opt => opt.Ignore()) - .ForMember(dest => dest.JobPositions, opt => opt.Ignore()) - .ForMember(dest => dest.userRoleNames, opt => opt.Ignore()) - .AfterMap((source, destination) => destination.MapIdentityExtraProperties(source)); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap().ForMember(dest => dest.IsAssigned, opt => opt.Ignore()); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs b/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs new file mode 100644 index 0000000..a17eea4 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs @@ -0,0 +1,106 @@ +using Sozsoft.Platform.Identity.Dto; +using Sozsoft.Platform.OrganizationUnits; +using Sozsoft.Platform.Tenants; +using Volo.Abp.Identity; +using Volo.Abp.TenantManagement; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Identity; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class IdentityUserToUserInfoViewModelMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(UserInfoViewModel.Roles))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.Branches))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.Claims))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.WorkHours))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.Departments))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.JobPositions))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.userRoleNames))] + public override partial UserInfoViewModel Map(IdentityUser source); + + [MapperIgnoreTarget(nameof(UserInfoViewModel.Roles))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.Branches))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.Claims))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.WorkHours))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.Departments))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.JobPositions))] + [MapperIgnoreTarget(nameof(UserInfoViewModel.userRoleNames))] + public override partial void Map(IdentityUser source, UserInfoViewModel destination); + + public override void BeforeMap(IdentityUser source) + { + } + + public override void AfterMap(IdentityUser source, UserInfoViewModel destination) + { + destination.MapIdentityExtraProperties(source); + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class OrganizationUnitToOrganizationUnitDtoMapper : MapperBase +{ + public override partial OrganizationUnitDto Map(OrganizationUnit source); + + public override partial void Map(OrganizationUnit source, OrganizationUnitDto destination); + + public override void BeforeMap(OrganizationUnit source) + { + } + + public override void AfterMap(OrganizationUnit source, OrganizationUnitDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CreateUpdateOrganizationUnitDtoToOrganizationUnitMapper : MapperBase +{ + public override partial OrganizationUnit Map(CreateUpdateOrganizationUnitDto source); + + public override partial void Map(CreateUpdateOrganizationUnitDto source, OrganizationUnit destination); + + public override void BeforeMap(CreateUpdateOrganizationUnitDto source) + { + } + + public override void AfterMap(CreateUpdateOrganizationUnitDto source, OrganizationUnit destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class TenantToCustomTenantDtoMapper : MapperBase +{ + public override partial CustomTenantDto Map(Tenant source); + + public override partial void Map(Tenant source, CustomTenantDto destination); + + public override void BeforeMap(Tenant source) + { + } + + public override void AfterMap(Tenant source, CustomTenantDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class IdentityRoleDtoToAssignedRoleViewModelMapper : MapperBase +{ + [MapperIgnoreTarget(nameof(AssignedRoleViewModel.IsAssigned))] + public override partial AssignedRoleViewModel Map(IdentityRoleDto source); + + [MapperIgnoreTarget(nameof(AssignedRoleViewModel.IsAssigned))] + public override partial void Map(IdentityRoleDto source, AssignedRoleViewModel destination); + + public override void BeforeMap(IdentityRoleDto source) + { + } + + public override void AfterMap(IdentityRoleDto source, AssignedRoleViewModel destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Intranet/IntranetAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Intranet/IntranetAutoMapperProfile.cs deleted file mode 100644 index a82385c..0000000 --- a/api/src/Sozsoft.Platform.Application/Intranet/IntranetAutoMapperProfile.cs +++ /dev/null @@ -1,25 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.Intranet; - -public class IntranetAutoMapperProfile : Profile -{ - public IntranetAutoMapperProfile() - { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs b/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs new file mode 100644 index 0000000..a4272ef --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs @@ -0,0 +1,197 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Intranet; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class AnnouncementToAnnouncementDtoMapper : MapperBase +{ + public override partial AnnouncementDto Map(Announcement source); + + public override partial void Map(Announcement source, AnnouncementDto destination); + + public override void BeforeMap(Announcement source) + { + } + + public override void AfterMap(Announcement source, AnnouncementDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SurveyToSurveyDtoMapper : MapperBase +{ + public override partial SurveyDto Map(Survey source); + + public override partial void Map(Survey source, SurveyDto destination); + + public override void BeforeMap(Survey source) + { + } + + public override void AfterMap(Survey source, SurveyDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SurveyQuestionToSurveyQuestionDtoMapper : MapperBase +{ + public override partial SurveyQuestionDto Map(SurveyQuestion source); + + public override partial void Map(SurveyQuestion source, SurveyQuestionDto destination); + + public override void BeforeMap(SurveyQuestion source) + { + } + + public override void AfterMap(SurveyQuestion source, SurveyQuestionDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SurveyQuestionOptionToSurveyQuestionOptionDtoMapper : MapperBase +{ + public override partial SurveyQuestionOptionDto Map(SurveyQuestionOption source); + + public override partial void Map(SurveyQuestionOption source, SurveyQuestionOptionDto destination); + + public override void BeforeMap(SurveyQuestionOption source) + { + } + + public override void AfterMap(SurveyQuestionOption source, SurveyQuestionOptionDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SurveyResponseToSurveyResponseDtoMapper : MapperBase +{ + public override partial SurveyResponseDto Map(SurveyResponse source); + + public override partial void Map(SurveyResponse source, SurveyResponseDto destination); + + public override void BeforeMap(SurveyResponse source) + { + } + + public override void AfterMap(SurveyResponse source, SurveyResponseDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SurveyAnswerToSurveyAnswerDtoMapper : MapperBase +{ + public override partial SurveyAnswerDto Map(SurveyAnswer source); + + public override partial void Map(SurveyAnswer source, SurveyAnswerDto destination); + + public override void BeforeMap(SurveyAnswer source) + { + } + + public override void AfterMap(SurveyAnswer source, SurveyAnswerDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SocialPostToSocialPostDtoMapper : MapperBase +{ + public override partial SocialPostDto Map(SocialPost source); + + public override partial void Map(SocialPost source, SocialPostDto destination); + + public override void BeforeMap(SocialPost source) + { + } + + public override void AfterMap(SocialPost source, SocialPostDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SocialLocationToSocialLocationDtoMapper : MapperBase +{ + public override partial SocialLocationDto Map(SocialLocation source); + + public override partial void Map(SocialLocation source, SocialLocationDto destination); + + public override void BeforeMap(SocialLocation source) + { + } + + public override void AfterMap(SocialLocation source, SocialLocationDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SocialMediaToSocialMediaDtoMapper : MapperBase +{ + public override partial SocialMediaDto Map(SocialMedia source); + + public override partial void Map(SocialMedia source, SocialMediaDto destination); + + public override void BeforeMap(SocialMedia source) + { + } + + public override void AfterMap(SocialMedia source, SocialMediaDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SocialPollOptionToSocialPollOptionDtoMapper : MapperBase +{ + public override partial SocialPollOptionDto Map(SocialPollOption source); + + public override partial void Map(SocialPollOption source, SocialPollOptionDto destination); + + public override void BeforeMap(SocialPollOption source) + { + } + + public override void AfterMap(SocialPollOption source, SocialPollOptionDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SocialCommentToSocialCommentDtoMapper : MapperBase +{ + public override partial SocialCommentDto Map(SocialComment source); + + public override partial void Map(SocialComment source, SocialCommentDto destination); + + public override void BeforeMap(SocialComment source) + { + } + + public override void AfterMap(SocialComment source, SocialCommentDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SocialLikeToSocialLikeDtoMapper : MapperBase +{ + public override partial SocialLikeDto Map(SocialLike source); + + public override partial void Map(SocialLike source, SocialLikeDto destination); + + public override void BeforeMap(SocialLike source) + { + } + + public override void AfterMap(SocialLike source, SocialLikeDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormAutoMapperProfile.cs deleted file mode 100644 index cd47dbb..0000000 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormAutoMapperProfile.cs +++ /dev/null @@ -1,50 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.ListForms.Customization; -using Sozsoft.Platform.ListForms.Select; -using Sozsoft.Platform.Queries; - -namespace Sozsoft.Platform.ListForms; - -public class ListFormAutoMapperProfile : Profile -{ - public ListFormAutoMapperProfile() - { - CreateMap(); - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); //TODO: DTO -> ValueObject dogru mu bakılacak? - CreateMap().ReverseMap(); - CreateMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap() - .ForMember(dest => dest.Items, opt => opt.MapFrom(src => src.Items)); - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); - CreateMap(); - - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - - CreateMap(); - - CreateMap(); - CreateMap(); - CreateMap(); - - CreateMap(); - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs new file mode 100644 index 0000000..bdd7fbe --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs @@ -0,0 +1,592 @@ +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.ListForms.Customization; +using Sozsoft.Platform.ListForms.Select; +using Sozsoft.Platform.Queries; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.ListForms; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormFieldToColumnFormatDtoMapper : MapperBase +{ + public override partial ColumnFormatDto Map(ListFormField source); + + public override partial void Map(ListFormField source, ColumnFormatDto destination); + + public override void BeforeMap(ListFormField source) + { + } + + public override void AfterMap(ListFormField source, ColumnFormatDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormFieldToColumnFormatEditDtoMapper : TwoWayMapperBase +{ + public override partial ColumnFormatEditDto Map(ListFormField source); + + public override partial void Map(ListFormField source, ColumnFormatEditDto destination); + + public override void BeforeMap(ListFormField source) + { + } + + public override void AfterMap(ListFormField source, ColumnFormatEditDto destination) + { + } + + public override partial ListFormField ReverseMap(ColumnFormatEditDto destination); + + public override partial void ReverseMap(ColumnFormatEditDto destination, ListFormField source); + + public override void BeforeReverseMap(ColumnFormatEditDto destination) + { + } + + public override void AfterReverseMap(ColumnFormatEditDto destination, ListFormField source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormFieldToAddListFormFieldDtoMapper : MapperBase +{ + public override partial AddListFormFieldDto Map(ListFormField source); + + public override partial void Map(ListFormField source, AddListFormFieldDto destination); + + public override void BeforeMap(ListFormField source) + { + } + + public override void AfterMap(ListFormField source, AddListFormFieldDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormToListFormsDtoMapper : MapperBase +{ + public override partial ListFormsDto Map(ListForm source); + + public override partial void Map(ListForm source, ListFormsDto destination); + + public override void BeforeMap(ListForm source) + { + } + + public override void AfterMap(ListForm source, ListFormsDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormToGridOptionsDtoMapper : MapperBase +{ + public override partial GridOptionsDto Map(ListForm source); + + public override partial void Map(ListForm source, GridOptionsDto destination); + + public override void BeforeMap(ListForm source) + { + } + + public override void AfterMap(ListForm source, GridOptionsDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormToGridOptionsEditDtoMapper : MapperBase +{ + public override partial GridOptionsEditDto Map(ListForm source); + + public override partial void Map(ListForm source, GridOptionsEditDto destination); + + public override void BeforeMap(ListForm source) + { + } + + public override void AfterMap(ListForm source, GridOptionsEditDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SelectRequestDtoToQueryParametersMapper : MapperBase +{ + public override partial QueryParameters Map(SelectRequestDto source); + + public override partial void Map(SelectRequestDto source, QueryParameters destination); + + public override void BeforeMap(SelectRequestDto source) + { + } + + public override void AfterMap(SelectRequestDto source, QueryParameters destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormCustomizationToListFormCustomizationDtoMapper : TwoWayMapperBase +{ + public override partial ListFormCustomizationDto Map(ListFormCustomization source); + + public override partial void Map(ListFormCustomization source, ListFormCustomizationDto destination); + + public override void BeforeMap(ListFormCustomization source) + { + } + + public override void AfterMap(ListFormCustomization source, ListFormCustomizationDto destination) + { + } + + public override partial ListFormCustomization ReverseMap(ListFormCustomizationDto destination); + + public override partial void ReverseMap(ListFormCustomizationDto destination, ListFormCustomization source); + + public override void BeforeReverseMap(ListFormCustomizationDto destination) + { + } + + public override void AfterReverseMap(ListFormCustomizationDto destination, ListFormCustomization source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormCustomizationToListFormCustomizationForUserDtoMapper : MapperBase +{ + public override partial ListFormCustomizationForUserDto Map(ListFormCustomization source); + + public override partial void Map(ListFormCustomization source, ListFormCustomizationForUserDto destination); + + public override void BeforeMap(ListFormCustomization source) + { + } + + public override void AfterMap(ListFormCustomization source, ListFormCustomizationForUserDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class FieldsDefaultValueDtoToFieldsDefaultValueMapper : TwoWayMapperBase +{ + public override partial FieldsDefaultValue Map(FieldsDefaultValueDto source); + + public override partial void Map(FieldsDefaultValueDto source, FieldsDefaultValue destination); + + public override void BeforeMap(FieldsDefaultValueDto source) + { + } + + public override void AfterMap(FieldsDefaultValueDto source, FieldsDefaultValue destination) + { + } + + public override partial FieldsDefaultValueDto ReverseMap(FieldsDefaultValue destination); + + public override partial void ReverseMap(FieldsDefaultValue destination, FieldsDefaultValueDto source); + + public override void BeforeReverseMap(FieldsDefaultValue destination) + { + } + + public override void AfterReverseMap(FieldsDefaultValue destination, FieldsDefaultValueDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CommandColumnDtoToCommandColumnMapper : TwoWayMapperBase +{ + public override partial CommandColumn Map(CommandColumnDto source); + + public override partial void Map(CommandColumnDto source, CommandColumn destination); + + public override void BeforeMap(CommandColumnDto source) + { + } + + public override void AfterMap(CommandColumnDto source, CommandColumn destination) + { + } + + public override partial CommandColumnDto ReverseMap(CommandColumn destination); + + public override partial void ReverseMap(CommandColumn destination, CommandColumnDto source); + + public override void BeforeReverseMap(CommandColumn destination) + { + } + + public override void AfterReverseMap(CommandColumn destination, CommandColumnDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SubFormDtoToSubFormMapper : TwoWayMapperBase +{ + public override partial SubForm Map(SubFormDto source); + + public override partial void Map(SubFormDto source, SubForm destination); + + public override void BeforeMap(SubFormDto source) + { + } + + public override void AfterMap(SubFormDto source, SubForm destination) + { + } + + public override partial SubFormDto ReverseMap(SubForm destination); + + public override partial void ReverseMap(SubForm destination, SubFormDto source); + + public override void BeforeReverseMap(SubForm destination) + { + } + + public override void AfterReverseMap(SubForm destination, SubFormDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class SubFormRelationDtoToSubFormRelationMapper : TwoWayMapperBase +{ + public override partial SubFormRelation Map(SubFormRelationDto source); + + public override partial void Map(SubFormRelationDto source, SubFormRelation destination); + + public override void BeforeMap(SubFormRelationDto source) + { + } + + public override void AfterMap(SubFormRelationDto source, SubFormRelation destination) + { + } + + public override partial SubFormRelationDto ReverseMap(SubFormRelation destination); + + public override partial void ReverseMap(SubFormRelation destination, SubFormRelationDto source); + + public override void BeforeReverseMap(SubFormRelation destination) + { + } + + public override void AfterReverseMap(SubFormRelation destination, SubFormRelationDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class WidgetEditDtoToWidgetMapper : TwoWayMapperBase +{ + public override partial Widget Map(WidgetEditDto source); + + public override partial void Map(WidgetEditDto source, Widget destination); + + public override void BeforeMap(WidgetEditDto source) + { + } + + public override void AfterMap(WidgetEditDto source, Widget destination) + { + } + + public override partial WidgetEditDto ReverseMap(Widget destination); + + public override partial void ReverseMap(Widget destination, WidgetEditDto source); + + public override void BeforeReverseMap(Widget destination) + { + } + + public override void AfterReverseMap(Widget destination, WidgetEditDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ExtraFilterDtoToExtraFilterMapper : TwoWayMapperBase +{ + public override partial ExtraFilter Map(ExtraFilterDto source); + + public override partial void Map(ExtraFilterDto source, ExtraFilter destination); + + public override void BeforeMap(ExtraFilterDto source) + { + } + + public override void AfterMap(ExtraFilterDto source, ExtraFilter destination) + { + } + + public override partial ExtraFilterDto ReverseMap(ExtraFilter destination); + + public override partial void ReverseMap(ExtraFilter destination, ExtraFilterDto source); + + public override void BeforeReverseMap(ExtraFilter destination) + { + } + + public override void AfterReverseMap(ExtraFilter destination, ExtraFilterDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ExtraFilterEditDtoToExtraFilterDtoMapper : MapperBase +{ + public override partial ExtraFilterDto Map(ExtraFilterEditDto source); + + public override partial void Map(ExtraFilterEditDto source, ExtraFilterDto destination); + + public override void BeforeMap(ExtraFilterEditDto source) + { + } + + public override void AfterMap(ExtraFilterEditDto source, ExtraFilterDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ExtraFilterEditDtoToExtraFilterMapper : TwoWayMapperBase +{ + public override partial ExtraFilter Map(ExtraFilterEditDto source); + + public override partial void Map(ExtraFilterEditDto source, ExtraFilter destination); + + public override void BeforeMap(ExtraFilterEditDto source) + { + } + + public override void AfterMap(ExtraFilterEditDto source, ExtraFilter destination) + { + } + + public override partial ExtraFilterEditDto ReverseMap(ExtraFilter destination); + + public override partial void ReverseMap(ExtraFilter destination, ExtraFilterEditDto source); + + public override void BeforeReverseMap(ExtraFilter destination) + { + } + + public override void AfterReverseMap(ExtraFilter destination, ExtraFilterEditDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartSeriesDtoToChartSeriesMapper : TwoWayMapperBase +{ + public override partial ChartSeries Map(ChartSeriesDto source); + + public override partial void Map(ChartSeriesDto source, ChartSeries destination); + + public override void BeforeMap(ChartSeriesDto source) + { + } + + public override void AfterMap(ChartSeriesDto source, ChartSeries destination) + { + } + + public override partial ChartSeriesDto ReverseMap(ChartSeries destination); + + public override partial void ReverseMap(ChartSeries destination, ChartSeriesDto source); + + public override void BeforeReverseMap(ChartSeries destination) + { + } + + public override void AfterReverseMap(ChartSeries destination, ChartSeriesDto source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartLabelDtoToChartLabelMapper : MapperBase +{ + public override partial ChartLabel Map(ChartLabelDto source); + + public override partial void Map(ChartLabelDto source, ChartLabel destination); + + public override void BeforeMap(ChartLabelDto source) + { + } + + public override void AfterMap(ChartLabelDto source, ChartLabel destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartValueAxisDtoToChartValueAxisMapper : MapperBase +{ + public override partial ChartValueAxis Map(ChartValueAxisDto source); + + public override partial void Map(ChartValueAxisDto source, ChartValueAxis destination); + + public override void BeforeMap(ChartValueAxisDto source) + { + } + + public override void AfterMap(ChartValueAxisDto source, ChartValueAxis destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartAxisGridDtoToChartAxisGridMapper : MapperBase +{ + public override partial ChartAxisGrid Map(ChartAxisGridDto source); + + public override partial void Map(ChartAxisGridDto source, ChartAxisGrid destination); + + public override void BeforeMap(ChartAxisGridDto source) + { + } + + public override void AfterMap(ChartAxisGridDto source, ChartAxisGrid destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BreakStyleDtoToBreakStyleMapper : MapperBase +{ + public override partial BreakStyle Map(BreakStyleDto source); + + public override partial void Map(BreakStyleDto source, BreakStyle destination); + + public override void BeforeMap(BreakStyleDto source) + { + } + + public override void AfterMap(BreakStyleDto source, BreakStyle destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BreakDtoToBreakMapper : MapperBase +{ + public override partial Break Map(BreakDto source); + + public override partial void Map(BreakDto source, Break destination); + + public override void BeforeMap(BreakDto source) + { + } + + public override void AfterMap(BreakDto source, Break destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartPanesDtoToChartPanesMapper : MapperBase +{ + public override partial ChartPanes Map(ChartPanesDto source); + + public override partial void Map(ChartPanesDto source, ChartPanes destination); + + public override void BeforeMap(ChartPanesDto source) + { + } + + public override void AfterMap(ChartPanesDto source, ChartPanes destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartAnnotationDtoToChartAnnotationMapper : MapperBase +{ + public override partial ChartAnnotation Map(ChartAnnotationDto source); + + public override partial void Map(ChartAnnotationDto source, ChartAnnotation destination); + + public override void BeforeMap(ChartAnnotationDto source) + { + } + + public override void AfterMap(ChartAnnotationDto source, ChartAnnotation destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartBorderDtoToChartBorderMapper : MapperBase +{ + public override partial ChartBorder Map(ChartBorderDto source); + + public override partial void Map(ChartBorderDto source, ChartBorder destination); + + public override void BeforeMap(ChartBorderDto source) + { + } + + public override void AfterMap(ChartBorderDto source, ChartBorder destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ChartFontDtoToChartFontMapper : MapperBase +{ + public override partial ChartFont Map(ChartFontDto source); + + public override partial void Map(ChartFontDto source, ChartFont destination); + + public override void BeforeMap(ChartFontDto source) + { + } + + public override void AfterMap(ChartFontDto source, ChartFont destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormImportToListFormsImportDtoMapper : MapperBase +{ + public override partial ListFormsImportDto Map(ListFormImport source); + + public override partial void Map(ListFormImport source, ListFormsImportDto destination); + + public override void BeforeMap(ListFormImport source) + { + } + + public override void AfterMap(ListFormImport source, ListFormsImportDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ListFormImportLogToListFormImportLogDtoMapper : MapperBase +{ + public override partial ListFormImportLogDto Map(ListFormImportLog source); + + public override partial void Map(ListFormImportLog source, ListFormImportLogDto destination); + + public override void BeforeMap(ListFormImportLog source) + { + } + + public override void AfterMap(ListFormImportLog source, ListFormImportLogDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Menu/MenuAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Menu/MenuAutoMapperProfile.cs deleted file mode 100644 index 4a17880..0000000 --- a/api/src/Sozsoft.Platform.Application/Menu/MenuAutoMapperProfile.cs +++ /dev/null @@ -1,14 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.Menus; - -public class MenuAutoMapperProfile : Profile -{ - public MenuAutoMapperProfile() - { - CreateMap().ReverseMap(); - - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs b/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs new file mode 100644 index 0000000..905e584 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs @@ -0,0 +1,33 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Menus; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class MenuToMenuDtoMapper : TwoWayMapperBase +{ +public override partial MenuDto Map(Menu source); + + public override partial void Map(Menu source, MenuDto destination); + + public override void BeforeMap(Menu source) + { + } + + public override void AfterMap(Menu source, MenuDto destination) + { + } + + public override partial Menu ReverseMap(MenuDto destination); + + public override partial void ReverseMap(MenuDto destination, Menu source); + + public override void BeforeReverseMap(MenuDto destination) + { + } + + public override void AfterReverseMap(MenuDto destination, Menu source) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Note/NoteAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Note/NoteAutoMapperProfile.cs deleted file mode 100644 index b02ef1c..0000000 --- a/api/src/Sozsoft.Platform.Application/Note/NoteAutoMapperProfile.cs +++ /dev/null @@ -1,27 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.Notes; - -public class NoteAutoMapperProfile : Profile -{ - public NoteAutoMapperProfile() - { - // Map from Note to NoteDto - CreateMap() - .ForMember(dest => dest.FilesJson, opt => opt.MapFrom(src => src.FilesJson)) - .ForMember(dest => dest.Files, opt => opt.Ignore()); // Ignore Files property as we handle it manually - - // Mapping from NoteDto to Note - CreateMap() - .ForMember(dest => dest.TenantId, opt => opt.MapFrom(src => src.TenantId)) - .ForMember(dest => dest.EntityName, opt => opt.MapFrom(src => src.EntityName)) - .ForMember(dest => dest.EntityId, opt => opt.MapFrom(src => src.EntityId)) - .ForMember(dest => dest.Type, opt => opt.MapFrom(src => src.Type)) - .ForMember(dest => dest.Subject, opt => opt.MapFrom(src => src.Subject)) - .ForMember(dest => dest.Content, opt => opt.MapFrom(src => src.Content)) - // Handling the FilesJson field (as a JSON string) - .ForMember(dest => dest.FilesJson, opt => opt.MapFrom(src => src.FilesJson)); // Adjust the mapping as needed - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs b/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs new file mode 100644 index 0000000..4bba508 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs @@ -0,0 +1,39 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Notes; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class NoteToNoteDtoMapper : MapperBase +{ +[MapperIgnoreTarget(nameof(NoteDto.Files))] + public override partial NoteDto Map(Note source); + + [MapperIgnoreTarget(nameof(NoteDto.Files))] + public override partial void Map(Note source, NoteDto destination); + + public override void BeforeMap(Note source) + { + } + + public override void AfterMap(Note source, NoteDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class NoteDtoToNoteMapper : MapperBase +{ +public override partial Note Map(NoteDto source); + + public override partial void Map(NoteDto source, Note destination); + + public override void BeforeMap(NoteDto source) + { + } + + public override void AfterMap(NoteDto source, Note destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs b/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs index c26dffb..301aa7f 100644 --- a/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs +++ b/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs @@ -4,7 +4,7 @@ using Sozsoft.Settings; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Account; using Volo.Abp.Auditing; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; using Volo.Abp.Modularity; @@ -29,11 +29,7 @@ public class PlatformApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddMaps(); - }); + context.Services.AddMapperlyObjectMapper(); Configure(options => { diff --git a/api/src/Sozsoft.Platform.Application/Public/PublicAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Public/PublicAutoMapperProfile.cs deleted file mode 100644 index 305ee21..0000000 --- a/api/src/Sozsoft.Platform.Application/Public/PublicAutoMapperProfile.cs +++ /dev/null @@ -1,26 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Demos; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.Public; - -public class PublicAutoMapperProfile : Profile -{ - public PublicAutoMapperProfile() - { - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap().ReverseMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs b/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs new file mode 100644 index 0000000..4b67c6e --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs @@ -0,0 +1,238 @@ +using Sozsoft.Platform.Demos; +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.Public; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class DemoToDemoDtoMapper : TwoWayMapperBase +{ +public override partial DemoDto Map(Demo source); + + public override partial void Map(Demo source, DemoDto destination); + + public override void BeforeMap(Demo source) + { + } + + public override void AfterMap(Demo source, DemoDto destination) + { + } + + public override partial Demo ReverseMap(DemoDto destination); + + public override partial void ReverseMap(DemoDto destination, Demo source); + + public override void BeforeReverseMap(DemoDto destination) + { + } + + public override void AfterReverseMap(DemoDto destination, Demo source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ServiceToServiceDtoMapper : MapperBase +{ +public override partial ServiceDto Map(Service source); + + public override partial void Map(Service source, ServiceDto destination); + + public override void BeforeMap(Service source) + { + } + + public override void AfterMap(Service source, ServiceDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BlogCategoryToBlogCategoryDtoMapper : MapperBase +{ +public override partial BlogCategoryDto Map(BlogCategory source); + + public override partial void Map(BlogCategory source, BlogCategoryDto destination); + + public override void BeforeMap(BlogCategory source) + { + } + + public override void AfterMap(BlogCategory source, BlogCategoryDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BlogPostToBlogPostDtoMapper : MapperBase +{ +public override partial BlogPostDto Map(BlogPost source); + + public override partial void Map(BlogPost source, BlogPostDto destination); + + public override void BeforeMap(BlogPost source) + { + } + + public override void AfterMap(BlogPost source, BlogPostDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class BlogPostToBlogPostListDtoMapper : MapperBase +{ +public override partial BlogPostListDto Map(BlogPost source); + + public override partial void Map(BlogPost source, BlogPostListDto destination); + + public override void BeforeMap(BlogPost source) + { + } + + public override void AfterMap(BlogPost source, BlogPostListDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ProductToProductDtoMapper : TwoWayMapperBase +{ +public override partial ProductDto Map(Product source); + + public override partial void Map(Product source, ProductDto destination); + + public override void BeforeMap(Product source) + { + } + + public override void AfterMap(Product source, ProductDto destination) + { + } + + public override partial Product ReverseMap(ProductDto destination); + + public override partial void ReverseMap(ProductDto destination, Product source); + + public override void BeforeReverseMap(ProductDto destination) + { + } + + public override void AfterReverseMap(ProductDto destination, Product source) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class PaymentMethodToPaymentMethodDtoMapper : MapperBase +{ +public override partial PaymentMethodDto Map(PaymentMethod source); + + public override partial void Map(PaymentMethod source, PaymentMethodDto destination); + + public override void BeforeMap(PaymentMethod source) + { + } + + public override void AfterMap(PaymentMethod source, PaymentMethodDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class InstallmentOptionToInstallmentOptionDtoMapper : MapperBase +{ +public override partial InstallmentOptionDto Map(InstallmentOption source); + + public override partial void Map(InstallmentOption source, InstallmentOptionDto destination); + + public override void BeforeMap(InstallmentOption source) + { + } + + public override void AfterMap(InstallmentOption source, InstallmentOptionDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class OrderToOrderDtoMapper : MapperBase +{ +public override partial OrderDto Map(Order source); + + public override partial void Map(Order source, OrderDto destination); + + public override void BeforeMap(Order source) + { + } + + public override void AfterMap(Order source, OrderDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class AboutToAboutDtoMapper : MapperBase +{ +public override partial AboutDto Map(About source); + + public override partial void Map(About source, AboutDto destination); + + public override void BeforeMap(About source) + { + } + + public override void AfterMap(About source, AboutDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class HomeToHomeDtoMapper : MapperBase +{ +public override partial HomeDto Map(Home source); + + public override partial void Map(Home source, HomeDto destination); + + public override void BeforeMap(Home source) + { + } + + public override void AfterMap(Home source, HomeDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class ContactToContactDtoMapper : MapperBase +{ +public override partial ContactDto Map(Contact source); + + public override partial void Map(Contact source, ContactDto destination); + + public override void BeforeMap(Contact source) + { + } + + public override void AfterMap(Contact source, ContactDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class CountryToCountryDtoMapper : MapperBase +{ +public override partial CountryDto Map(Country source); + + public override partial void Map(Country source, CountryDto destination); + + public override void BeforeMap(Country source) + { + } + + public override void AfterMap(Country source, CountryDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Routes/RouteAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Routes/RouteAutoMapperProfile.cs deleted file mode 100644 index 9cbf1b2..0000000 --- a/api/src/Sozsoft.Platform.Application/Routes/RouteAutoMapperProfile.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Routes; - -namespace Sozsoft.Platform; - -public class RouteAutoMapperProfile : Profile -{ - public RouteAutoMapperProfile() - { - // Blog mappings - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs b/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs new file mode 100644 index 0000000..0c83a13 --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs @@ -0,0 +1,22 @@ +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Routes; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class RouteToRouteDtoMapper : MapperBase +{ +public override partial RouteDto Map(Route source); + + public override partial void Map(Route source, RouteDto destination); + + public override void BeforeMap(Route source) + { + } + + public override void AfterMap(Route source, RouteDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.Application/Sozsoft.Platform.Application.csproj b/api/src/Sozsoft.Platform.Application/Sozsoft.Platform.Application.csproj index 0c979a9..a0f17ec 100644 --- a/api/src/Sozsoft.Platform.Application/Sozsoft.Platform.Application.csproj +++ b/api/src/Sozsoft.Platform.Application/Sozsoft.Platform.Application.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable Sozsoft.Platform @@ -21,14 +21,14 @@ - - - - - + + + + + - + diff --git a/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomAutoMapperProfile.cs b/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomAutoMapperProfile.cs deleted file mode 100644 index 36459ee..0000000 --- a/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomAutoMapperProfile.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AutoMapper; -using Sozsoft.Platform.Entities; - -namespace Sozsoft.Platform.VideoRooms; - -public class VideoroomAutoMapperProfile : Profile -{ - public VideoroomAutoMapperProfile() - { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs b/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs new file mode 100644 index 0000000..fee535f --- /dev/null +++ b/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs @@ -0,0 +1,69 @@ +using Sozsoft.Platform.Entities; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Sozsoft.Platform.VideoRooms; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class VideoroomToVideoroomDtoMapper : MapperBase +{ +public override partial VideoroomDto Map(Videoroom source); + + public override partial void Map(Videoroom source, VideoroomDto destination); + + public override void BeforeMap(Videoroom source) + { + } + + public override void AfterMap(Videoroom source, VideoroomDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class VideoroomAttandanceToVideoroomAttendanceDtoMapper : MapperBase +{ +public override partial VideoroomAttendanceDto Map(VideoroomAttandance source); + + public override partial void Map(VideoroomAttandance source, VideoroomAttendanceDto destination); + + public override void BeforeMap(VideoroomAttandance source) + { + } + + public override void AfterMap(VideoroomAttandance source, VideoroomAttendanceDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class VideoroomParticipantToVideoroomParticipantDtoMapper : MapperBase +{ +public override partial VideoroomParticipantDto Map(VideoroomParticipant source); + + public override partial void Map(VideoroomParticipant source, VideoroomParticipantDto destination); + + public override void BeforeMap(VideoroomParticipant source) + { + } + + public override void AfterMap(VideoroomParticipant source, VideoroomParticipantDto destination) + { + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class VideoroomChatToVideoroomChatDtoMapper : MapperBase +{ +public override partial VideoroomChatDto Map(VideoroomChat source); + + public override partial void Map(VideoroomChat source, VideoroomChatDto destination); + + public override void BeforeMap(VideoroomChat source) + { + } + + public override void AfterMap(VideoroomChat source, VideoroomChatDto destination) + { + } +} diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index 6366ef3..af79237 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -184,7 +184,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ExportJson = DefaultExportJson, IsSubForm = false, ShowNote = true, - LayoutJson = DefaultLayoutJson(), + LayoutJson = DefaultLayoutJson("tree"), CultureName = LanguageCodes.En, ListFormCode = listFormName, Name = listFormName, @@ -211,6 +211,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnOptionJson = DefaultColumnOptionJson(), PermissionJson = DefaultPermissionJson(AbpIdentity.Permissions.Create, listFormName, AbpIdentity.Permissions.Update, AbpIdentity.Permissions.Delete, AbpIdentity.Permissions.Export, AbpIdentity.Permissions.Import, AbpIdentity.Permissions.Note), PagerOptionJson = DefaultPagerOptionJson, + TreeOptionJson = DefaultTreeOptionJson("Name", "ParentName", true), EditingOptionJson = DefaultEditingOptionJson(listFormName, 600, 600, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { @@ -236,7 +237,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep #region Permission Fields await _listFormFieldRepository.InsertManyAsync( [ - new() { + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -255,22 +256,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "GroupName", - CaptionName = "App.Listform.ListformField.GroupName", + FieldName = "Name", + CaptionName = "App.Listform.ListformField.Name", Width = 0, ListOrderNo = 2, Visible = true, IsActive = true, - SortIndex = 1, - SortDirection = GridColumnOptions.SortOrderAsc, AllowSearch = true, - LookupJson = JsonSerializer.Serialize(new LookupDto { - DataSourceType = UiLookupDataSourceTypeEnum.Query, - DisplayExpr = "Name", - ValueExpr = "Key", - LookupQuery = LookupQueryValues.PermissionGroupValues - }), ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -301,14 +294,22 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Name", - CaptionName = "App.Listform.ListformField.Name", + FieldName = "GroupName", + CaptionName = "App.Listform.ListformField.GroupName", Width = 0, ListOrderNo = 4, Visible = true, IsActive = true, + SortIndex = 1, + SortDirection = GridColumnOptions.SortOrderAsc, AllowSearch = true, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.PermissionGroupValues + }), ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson diff --git a/api/src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj b/api/src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj index eeb435a..d96c6ae 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj +++ b/api/src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj @@ -4,7 +4,7 @@ Exe - net9.0 + net10.0 467bbc0f-83d0-40d0-a9f2-230c8620bdad @@ -88,17 +88,18 @@ - + - + - - - + + + + diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Sozsoft.Platform.Domain.Shared.csproj b/api/src/Sozsoft.Platform.Domain.Shared/Sozsoft.Platform.Domain.Shared.csproj index 8eb4efe..216a91e 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/Sozsoft.Platform.Domain.Shared.csproj +++ b/api/src/Sozsoft.Platform.Domain.Shared/Sozsoft.Platform.Domain.Shared.csproj @@ -3,19 +3,19 @@ - net9.0 + net10.0 Sozsoft.Platform true - - - - - - - + + + + + + + @@ -24,7 +24,7 @@ - + diff --git a/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 7351ed8..7755915 100644 --- a/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -226,7 +226,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep if (!redirectUri.IsNullOrWhiteSpace() || !postLogoutRedirectUri.IsNullOrWhiteSpace()) { - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Logout); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.EndSession); } var buildInGrantTypes = new[] { @@ -283,7 +283,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep if (grantType == OpenIddictConstants.GrantTypes.DeviceCode) { application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.DeviceCode); - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Device); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.DeviceAuthorization); } if (grantType == OpenIddictConstants.GrantTypes.Implicit) diff --git a/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs b/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs index 2ed7cb8..3e2da96 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs @@ -56,7 +56,7 @@ public class ChartValueAxis : ValueObject public int MaxAutoBreakCount { get; private set; } = 2; [JsonConstructor] - protected ChartValueAxis() { } + public ChartValueAxis() { } protected override IEnumerable GetAtomicValues() { diff --git a/api/src/Sozsoft.Platform.Domain/Sozsoft.Platform.Domain.csproj b/api/src/Sozsoft.Platform.Domain/Sozsoft.Platform.Domain.csproj index 52b6396..93bffa6 100644 --- a/api/src/Sozsoft.Platform.Domain/Sozsoft.Platform.Domain.csproj +++ b/api/src/Sozsoft.Platform.Domain/Sozsoft.Platform.Domain.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 Sozsoft.Platform @@ -25,18 +25,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260523160811_Initial.Designer.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260524210111_Initial.Designer.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260523160811_Initial.Designer.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260524210111_Initial.Designer.cs index 7a1e36b..1f3f448 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260523160811_Initial.Designer.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260524210111_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Sozsoft.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20260523160811_Initial")] + [Migration("20260524210111_Initial")] partial class Initial { /// @@ -22,7 +22,7 @@ namespace Sozsoft.Platform.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "9.0.2") + .HasAnnotation("ProductVersion", "10.0.4") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -6255,6 +6255,34 @@ namespace Sozsoft.Platform.Migrations b.ToTable("AbpAuditLogActions", (string)null); }); + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogExcelFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("FileName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("FileName"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.ToTable("AbpAuditLogExcelFiles", (string)null); + }); + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") @@ -6352,6 +6380,10 @@ namespace Sozsoft.Platform.Migrations .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); + b.Property("ApplicationName") + .HasMaxLength(96) + .HasColumnType("nvarchar(96)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() @@ -6540,6 +6572,10 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + b.Property("Description") .HasMaxLength(256) .HasColumnType("nvarchar(256)"); @@ -6614,6 +6650,10 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + b.Property("EntityVersion") .HasColumnType("int"); @@ -6774,8 +6814,8 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(64)"); b.Property("DeviceInfo") - .HasMaxLength(64) - .HasColumnType("nvarchar(64)"); + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") @@ -7412,6 +7452,9 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); + b.Property("FrontChannelLogoutUri") + .HasColumnType("nvarchar(max)"); + b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("bit") @@ -7635,8 +7678,8 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(400)"); b.Property("Type") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); b.HasKey("Id"); diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260523160811_Initial.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260524210111_Initial.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260523160811_Initial.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260524210111_Initial.cs index 7751740..05349ad 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260523160811_Initial.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260524210111_Initial.cs @@ -11,6 +11,21 @@ namespace Sozsoft.Platform.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { + migrationBuilder.CreateTable( + name: "AbpAuditLogExcelFiles", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), + FileName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), + CreationTime = table.Column(type: "datetime2", nullable: false), + CreatorId = table.Column(type: "uniqueidentifier", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AbpAuditLogExcelFiles", x => x.Id); + }); + migrationBuilder.CreateTable( name: "AbpAuditLogs", columns: table => new @@ -50,6 +65,7 @@ namespace Sozsoft.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + ApplicationName = table.Column(type: "nvarchar(96)", maxLength: 96, nullable: true), JobName = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), JobArgs = table.Column(type: "nvarchar(max)", maxLength: 1048576, nullable: false), TryCount = table.Column(type: "smallint", nullable: false, defaultValue: (short)0), @@ -78,6 +94,7 @@ namespace Sozsoft.Platform.Migrations RegexDescription = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Description = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), ValueType = table.Column(type: "int", nullable: false), + CreationTime = table.Column(type: "datetime2", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false) }, @@ -244,6 +261,7 @@ namespace Sozsoft.Platform.Migrations IsStatic = table.Column(type: "bit", nullable: false), IsPublic = table.Column(type: "bit", nullable: false), EntityVersion = table.Column(type: "int", nullable: false), + CreationTime = table.Column(type: "datetime2", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false) }, @@ -284,7 +302,7 @@ namespace Sozsoft.Platform.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), SessionId = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), Device = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), - DeviceInfo = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + DeviceInfo = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), TenantId = table.Column(type: "uniqueidentifier", nullable: true), UserId = table.Column(type: "uniqueidentifier", nullable: false), ClientId = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), @@ -802,6 +820,7 @@ namespace Sozsoft.Platform.Migrations RedirectUris = table.Column(type: "nvarchar(max)", nullable: true), Requirements = table.Column(type: "nvarchar(max)", nullable: true), Settings = table.Column(type: "nvarchar(max)", nullable: true), + FrontChannelLogoutUri = table.Column(type: "nvarchar(max)", nullable: true), ClientUri = table.Column(type: "nvarchar(max)", nullable: true), LogoUri = table.Column(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false), @@ -3051,7 +3070,7 @@ namespace Sozsoft.Platform.Migrations ReferenceId = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true), Status = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), Subject = table.Column(type: "nvarchar(400)", maxLength: 400, nullable: true), - Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + Type = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false) }, @@ -4045,6 +4064,9 @@ namespace Sozsoft.Platform.Migrations migrationBuilder.DropTable( name: "AbpAuditLogActions"); + migrationBuilder.DropTable( + name: "AbpAuditLogExcelFiles"); + migrationBuilder.DropTable( name: "AbpBackgroundJobs"); diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 646dab4..990af2d 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace Sozsoft.Platform.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "9.0.2") + .HasAnnotation("ProductVersion", "10.0.4") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -6252,6 +6252,34 @@ namespace Sozsoft.Platform.Migrations b.ToTable("AbpAuditLogActions", (string)null); }); + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogExcelFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("FileName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("FileName"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.ToTable("AbpAuditLogExcelFiles", (string)null); + }); + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") @@ -6349,6 +6377,10 @@ namespace Sozsoft.Platform.Migrations .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); + b.Property("ApplicationName") + .HasMaxLength(96) + .HasColumnType("nvarchar(96)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() @@ -6537,6 +6569,10 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + b.Property("Description") .HasMaxLength(256) .HasColumnType("nvarchar(256)"); @@ -6611,6 +6647,10 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(40)") .HasColumnName("ConcurrencyStamp"); + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + b.Property("EntityVersion") .HasColumnType("int"); @@ -6771,8 +6811,8 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(64)"); b.Property("DeviceInfo") - .HasMaxLength(64) - .HasColumnType("nvarchar(64)"); + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); b.Property("ExtraProperties") .HasColumnType("nvarchar(max)") @@ -7409,6 +7449,9 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); + b.Property("FrontChannelLogoutUri") + .HasColumnType("nvarchar(max)"); + b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("bit") @@ -7632,8 +7675,8 @@ namespace Sozsoft.Platform.Migrations .HasColumnType("nvarchar(400)"); b.Property("Type") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); b.HasKey("Id"); diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Sozsoft.Platform.EntityFrameworkCore.csproj b/api/src/Sozsoft.Platform.EntityFrameworkCore/Sozsoft.Platform.EntityFrameworkCore.csproj index 6ad3fdf..8fae118 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Sozsoft.Platform.EntityFrameworkCore.csproj +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Sozsoft.Platform.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 Sozsoft.Platform @@ -24,26 +24,29 @@ - + - - - - - - - - - - + + + + + + + + + + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/api/src/Sozsoft.Platform.HttpApi.Client/Sozsoft.Platform.HttpApi.Client.csproj b/api/src/Sozsoft.Platform.HttpApi.Client/Sozsoft.Platform.HttpApi.Client.csproj index 77f33a1..1293a13 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Client/Sozsoft.Platform.HttpApi.Client.csproj +++ b/api/src/Sozsoft.Platform.HttpApi.Client/Sozsoft.Platform.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 Sozsoft.Platform @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs index 719040c..210c32d 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs @@ -40,11 +40,11 @@ public class PlatformSessionRevocationHandler : // Hata durumunda (geçersiz token, yetkisiz istek vb.) temizlik yapma. if (context.IsRejected) return; - var userId = context.Principal?.GetClaim(OpenIddictConstants.Claims.Subject); + var userId = context.GenericTokenPrincipal?.GetClaim(OpenIddictConstants.Claims.Subject); if (string.IsNullOrEmpty(userId) || !Guid.TryParse(userId, out var userGuid)) return; // Token'dan tenant ID'yi al. - var tenantId = ParseTenantId(context.Principal?.Claims.FirstOrDefault(c => c.Type == AbpClaimTypes.TenantId)?.Value); + var tenantId = ParseTenantId(context.GenericTokenPrincipal?.Claims.FirstOrDefault(c => c.Type == AbpClaimTypes.TenantId)?.Value); try { diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Sozsoft.Platform.HttpApi.Host.csproj b/api/src/Sozsoft.Platform.HttpApi.Host/Sozsoft.Platform.HttpApi.Host.csproj index 0347f17..dd5e7ad 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Sozsoft.Platform.HttpApi.Host.csproj +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Sozsoft.Platform.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 Sozsoft.Platform true $(NoWarn);CS8632 @@ -12,20 +12,20 @@ - - - - - - + + + + + + - - + + - + diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/package-lock.json b/api/src/Sozsoft.Platform.HttpApi.Host/package-lock.json index 39ca227..1cce811 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/package-lock.json +++ b/api/src/Sozsoft.Platform.HttpApi.Host/package-lock.json @@ -8,250 +8,239 @@ "name": "my-app", "version": "1.0.0", "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~9.0.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0" } }, "node_modules/@abp/aspnetcore.mvc.ui": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-9.0.8.tgz", - "integrity": "sha512-wqdmGuA9rZS/c+8FEA1j2LYQWWf5kdOrsAo+XcApsX6MzLJ02xoeEjuHbunVVjM0mJrMJJKb/NgAMcwxJCdnEQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.3.tgz", + "integrity": "sha512-wPXoe6cDh2/uKAaXETizOKXrlOoQXrJ8xjIX7Vjaybw3tBPSJBGCtyFIUd8Z8OpoeV52B6MpDQszSADZFGsDFQ==", "license": "LGPL-3.0", "dependencies": { "ansi-colors": "^4.1.3" } }, "node_modules/@abp/aspnetcore.mvc.ui.theme.basic": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-9.0.8.tgz", - "integrity": "sha512-TmUk7lHo2/Wit+nFaFlyGUfp8QihAFLk7bVxw6EBJAMJbqA+SUhdFhIu6gxwzk1urCF3nyxgsq1ZczwFZf8vdA==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.3.tgz", + "integrity": "sha512-Z4b6A2yekSdFKM29pWpc252Wz/uofSKTlSzoO1mImLWnm4LH6YeQwK5eEx9LSYtHq0Y0R5i+yVhqYed98hWong==", "license": "LGPL-3.0", "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~9.0.8" + "@abp/aspnetcore.mvc.ui.theme.shared": "~10.0.3" } }, "node_modules/@abp/aspnetcore.mvc.ui.theme.shared": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-9.0.8.tgz", - "integrity": "sha512-/wL9YhPq6nvU7Y4vMiTmBCBFWLyAh0ptfiGJtAN5ERA7Uxf7B3P9kRIl+KapeWbse2T+Hmc49txk79lNWRELDQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.3.tgz", + "integrity": "sha512-1E76v8n6q9kRywB5WExffNivgOKRnMdjLpAiCLLEQ1tGKJKdjsQ2AwC/PvXxhaFQ4TkwNEt3uGhU/jkBC7O/Cg==", "license": "LGPL-3.0", "dependencies": { - "@abp/aspnetcore.mvc.ui": "~9.0.8", - "@abp/bootstrap": "~9.0.8", - "@abp/bootstrap-datepicker": "~9.0.8", - "@abp/bootstrap-daterangepicker": "~9.0.8", - "@abp/datatables.net-bs5": "~9.0.8", - "@abp/font-awesome": "~9.0.8", - "@abp/jquery-form": "~9.0.8", - "@abp/jquery-validation-unobtrusive": "~9.0.8", - "@abp/lodash": "~9.0.8", - "@abp/luxon": "~9.0.8", - "@abp/malihu-custom-scrollbar-plugin": "~9.0.8", - "@abp/moment": "~9.0.8", - "@abp/select2": "~9.0.8", - "@abp/sweetalert2": "~9.0.8", - "@abp/timeago": "~9.0.8", - "@abp/toastr": "~9.0.8" + "@abp/aspnetcore.mvc.ui": "~10.0.3", + "@abp/bootstrap": "~10.0.3", + "@abp/bootstrap-datepicker": "~10.0.3", + "@abp/bootstrap-daterangepicker": "~10.0.3", + "@abp/datatables.net-bs5": "~10.0.3", + "@abp/font-awesome": "~10.0.3", + "@abp/jquery-form": "~10.0.3", + "@abp/jquery-validation-unobtrusive": "~10.0.3", + "@abp/lodash": "~10.0.3", + "@abp/luxon": "~10.0.3", + "@abp/malihu-custom-scrollbar-plugin": "~10.0.3", + "@abp/moment": "~10.0.3", + "@abp/select2": "~10.0.3", + "@abp/sweetalert2": "~10.0.3", + "@abp/timeago": "~10.0.3" } }, "node_modules/@abp/bootstrap": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/bootstrap/-/bootstrap-9.0.8.tgz", - "integrity": "sha512-IZC3VKsHEDksx21pHI6ROcbLeJ+2wX03N8i4DGTl0KRQxEX9y6xqiZikJB3d4WUEsZ4s56IKH1SWeNt57iY2nA==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/bootstrap/-/bootstrap-10.0.3.tgz", + "integrity": "sha512-HKQp72Lim5FJyOAPVNApGA5yrD78TCJ5elPWkRH+/9IlEg+8gadw2R3aDULe16N8n+pAJ6Oi94r9DTT9nOBEVQ==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", - "bootstrap": "^5.3.3" + "@abp/core": "~10.0.3", + "bootstrap": "^5.3.8" } }, "node_modules/@abp/bootstrap-datepicker": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/bootstrap-datepicker/-/bootstrap-datepicker-9.0.8.tgz", - "integrity": "sha512-fns7Sn6WvITENhpDT51HYqvtoLl2XpkXBGfAOAFpbTsjiT5DQm7OTdYHNqHDVT2dhD0nRqi9jtJMY3YS0FTMzA==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.3.tgz", + "integrity": "sha512-vgp0hgSYcZLZ4cg0WuFSaU+WfMgfFneh1R/qbVRVUFhnQWsf4l8+y6tFFT9fKS55dRgl2/Jhz+Y2pHeyMmC6bQ==", "license": "LGPL-3.0", "dependencies": { - "bootstrap-datepicker": "^1.10.0" + "bootstrap-datepicker": "^1.10.1" } }, "node_modules/@abp/bootstrap-daterangepicker": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-9.0.8.tgz", - "integrity": "sha512-fJz6/tlGnpTyz0g/RVlR4Xf8Tk5Xdwagq2yqCzCDlX1nZySSsDYY0Qrqr/rlRqUJjlkNLfhAQ4J7h6aP7R8Smg==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.3.tgz", + "integrity": "sha512-nMHZ8xY8AJ6UBlms6Ub9MQE0EaoNUceMBUUzJ6IGV/KCKSmVM8LwGXaz1FHG0MV35xN8hrgIwxpOB4GIbBqc/A==", "license": "LGPL-3.0", "dependencies": { "bootstrap-daterangepicker": "^3.1.0" } }, "node_modules/@abp/core": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/core/-/core-9.0.8.tgz", - "integrity": "sha512-aogk6fNLAK4Lqc4K+QHdZuEA9HXuUx4RaSx4OJ1d1Zpt8ujxDQjpV+EKcgddXyp0NAS9qpuT5k39B7jRto3zWg==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/core/-/core-10.0.3.tgz", + "integrity": "sha512-eCD3Yvw215bkF3hUgfVCxBw9OHwvfofBnzrQ4PVMKnnqgFkKj521JxYH5JwfX3fD4vW/RcgnWgxJ/IKHVONxiw==", "license": "LGPL-3.0", "dependencies": { - "@abp/utils": "~9.0.8" + "@abp/utils": "~10.0.3" } }, "node_modules/@abp/datatables.net": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/datatables.net/-/datatables.net-9.0.8.tgz", - "integrity": "sha512-L8JGYqJ+hxEdptQtwlpybAIkGxPikSXSYJa3KyqJizAkR42JB990EMyCrLoZtE6chfUHVq0B3VgZe4MZfNnIbw==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/datatables.net/-/datatables.net-10.0.3.tgz", + "integrity": "sha512-1swTVGIFdNyuwlsw+o8ierTGaDHgYpFFZUwdw/467+6wlE+j+UG5WpzxiiIQrTrrvKA/IAXfNg4cZc/QRXffBg==", "license": "LGPL-3.0", "dependencies": { - "@abp/jquery": "~9.0.8", - "datatables.net": "^2.1.8" + "@abp/jquery": "~10.0.3", + "datatables.net": "^2.3.4" } }, "node_modules/@abp/datatables.net-bs5": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/datatables.net-bs5/-/datatables.net-bs5-9.0.8.tgz", - "integrity": "sha512-+RIsBV0pVn+bpnun1n2RXvC7Ns73CDR5rhY0TVFcsPt83fX7zXEyGVnyurn11g87xt+f//ZwbAqkhMUjYvSCGg==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.3.tgz", + "integrity": "sha512-8/eI9c2t1kUZtqW6BYv/uQwCzhifWFuU1bS5I0Kp12aSJproTALEJoBJQoP8/r4Jm5pDxuAycbyOjZtBalwe6A==", "license": "LGPL-3.0", "dependencies": { - "@abp/datatables.net": "~9.0.8", - "datatables.net-bs5": "^2.1.8" + "@abp/datatables.net": "~10.0.3", + "datatables.net-bs5": "^2.3.4" } }, "node_modules/@abp/font-awesome": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/font-awesome/-/font-awesome-9.0.8.tgz", - "integrity": "sha512-+dcQSRjWx6k7qmTmRqlQv6MC7vjfivJtLUXictFkgQ18rRiYJzFlESQ9L5dnkcI3I2Xyr/54raD8Q4xZ4D9Rwg==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/font-awesome/-/font-awesome-10.0.3.tgz", + "integrity": "sha512-i20+cAiy8YwX1H5PBVg9a5/6DPJhFDXF7q3RtF8xoLvJ8v+/t7h1IBHERyRelhw5gC085KRt3j5jwPuUguaeag==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", - "@fortawesome/fontawesome-free": "^6.6.0" + "@abp/core": "~10.0.3", + "@fortawesome/fontawesome-free": "^7.0.1" } }, "node_modules/@abp/jquery": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/jquery/-/jquery-9.0.8.tgz", - "integrity": "sha512-lQWR59JCnP0+y5yPUAgx3Dg7v6mFjGSaQabThwk4m5Ixokz/EQXPDqIPq/M+LDqfbLTofeFNjK100H7hJkn8PQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/jquery/-/jquery-10.0.3.tgz", + "integrity": "sha512-kY3pv5dqUNuNtFT+EeC7In9uyIciWsKKXS5fUccjiQFLuDRZskr7Dhr9Yx1fJrxBRfeJTs3ZBoBFpejtOlAsaQ==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", + "@abp/core": "~10.0.3", "jquery": "~3.7.1" } }, "node_modules/@abp/jquery-form": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/jquery-form/-/jquery-form-9.0.8.tgz", - "integrity": "sha512-jzpi2hQJyRdXP+e+/A3QbLyhPiHKwRKuwNvj/+6Bmvb++WO5Gf0WHROFRW0295uPIqw88OFPqWjBhYf25B7nug==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/jquery-form/-/jquery-form-10.0.3.tgz", + "integrity": "sha512-0L+Myo3Q+nGBxQmbFf+uhTrvEb4RjKyo31UzXMRU+X+5CjjccJ7YvHejIu5JcZoIQp1BTC3rrz+CQW8Ujn6Cyg==", "license": "LGPL-3.0", "dependencies": { - "@abp/jquery": "~9.0.8", + "@abp/jquery": "~10.0.3", "jquery-form": "^4.3.0" } }, "node_modules/@abp/jquery-validation": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/jquery-validation/-/jquery-validation-9.0.8.tgz", - "integrity": "sha512-Ha4Zxsm2JjwclUHT3xCmhkBA1qn6D7GTBbgVN+WqkyvafPLamyeaf1oIOYjhl7Gbovq58HgIw8DLhIYl5IAxKA==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/jquery-validation/-/jquery-validation-10.0.3.tgz", + "integrity": "sha512-ox16GO4LDrQk++Ao0TdC+AYGwrcMrr0AbzGfzvzmtPDwL/HdQm9tBL8mGEaNNO7n9YM/YBEnBVOSLrYswtcc/g==", "license": "LGPL-3.0", "dependencies": { - "@abp/jquery": "~9.0.8", + "@abp/jquery": "~10.0.3", "jquery-validation": "^1.21.0" } }, "node_modules/@abp/jquery-validation-unobtrusive": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-9.0.8.tgz", - "integrity": "sha512-nVeZx5Xgvg45XQZyREQMZxmBPTVmZY6c9U+1upOUaG9Fn3U9CMNPzXqnwy+spuneNUPTCH6tPT2S60HFNVH9zw==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.3.tgz", + "integrity": "sha512-AS/HUSsJ3SdcIsKQMD28o1k9dtNes6JND5rALrN4uS8kJvSkA6wI+jaYKIixQYcL9pH2ilfLEpcGCn7ByZzinQ==", "license": "LGPL-3.0", "dependencies": { - "@abp/jquery-validation": "~9.0.8", + "@abp/jquery-validation": "~10.0.3", "jquery-validation-unobtrusive": "^4.0.0" } }, "node_modules/@abp/lodash": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/lodash/-/lodash-9.0.8.tgz", - "integrity": "sha512-wHZcPwTqndZlPDWWNTN50DzwORv3rptBGOFAbixOXCw7Xt5PiBcpT3NdDcm5kUeuA/GQbtcsjsDFpTTBQEfxHw==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/lodash/-/lodash-10.0.3.tgz", + "integrity": "sha512-x6RW4tCEbebZ6OtxMGMs7TGtnR/oXtWP5kL8pe27EBYOWLoX4U+GUmA6ikdGifbFeEpuRaiUDGdNaTfXGcQjug==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", + "@abp/core": "~10.0.3", "lodash": "^4.17.21" } }, "node_modules/@abp/luxon": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/luxon/-/luxon-9.0.8.tgz", - "integrity": "sha512-gsUGMX9vDIPA8UgU6UKrHNaROCYDEpt0wZ2bpK6mSNqvSFgGX+0TUZmH+S+ABTiktzOp9e7B0j+AQFtATdBIyQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/luxon/-/luxon-10.0.3.tgz", + "integrity": "sha512-KwYTm+tCIFFlGbt8uZo6cvXoIB8DeAw4yKUdY2M8cMMdfENkOvlXNxghvYNrc+KbBxgbUmj3akWUc22iuxmCwg==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", - "luxon": "^3.5.0" + "@abp/core": "~10.0.3", + "luxon": "^3.7.2" } }, "node_modules/@abp/malihu-custom-scrollbar-plugin": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-9.0.8.tgz", - "integrity": "sha512-oWNg9+i6gNMqGMhX55bGTI099EhgZm+VqgAiEKcF41MaIVpt7Qva9GHHwL3Vp6NKfVSo8foPMYJzH2L8pbdpVQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.3.tgz", + "integrity": "sha512-5ESuTYt3nncVBG0pX92wsiKmhYgItsQn8JHVhyhcFXn9LhKOx/condZSBUZnPkkCsGMe5aSibYYDGiQFkYEghg==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", + "@abp/core": "~10.0.3", "malihu-custom-scrollbar-plugin": "^3.1.5" } }, "node_modules/@abp/moment": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/moment/-/moment-9.0.8.tgz", - "integrity": "sha512-8vuJKNG4xu8U8kOh9NkMd/l429qp5mXNSPchjPm1e399TAbVtFaeY7jUuTKd/5fUt3KE/xQ8MR6asph31oSdtA==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/moment/-/moment-10.0.3.tgz", + "integrity": "sha512-/axyeNFgFulipqAt+iGFqLSzHRG/MfFfEXJppPm7aKQm88ACRPSSJyjhqKpnaup7GW8V34u+08d7VhRthA6E5A==", "license": "LGPL-3.0", "dependencies": { "moment": "^2.30.1" } }, "node_modules/@abp/select2": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/select2/-/select2-9.0.8.tgz", - "integrity": "sha512-v3jVRgi9FWS4vxAXRKe+Dyk8H5pDDlvBMuxW5Yde61Xa0UENyWmZkeRKwmHsmmOyeypgLiZzy8/nN86HqNt0ng==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/select2/-/select2-10.0.3.tgz", + "integrity": "sha512-obUAgHbkYxILw0+ZR+TQgmlWlSHcr+dLLTkv2aT/9JxqRwepSiYbh5G9BTXFe94RnZvJeD0lWCj224AK0qLVGg==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", + "@abp/core": "~10.0.3", "select2": "^4.0.13" } }, "node_modules/@abp/sweetalert2": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/sweetalert2/-/sweetalert2-9.0.8.tgz", - "integrity": "sha512-VI2hmQAge8QX+OmDn2Ng8N4wWcwXMm1vf/gXNE1aV+SzFcLcDA2QOh/noLXEW1bjVy4Foa1QFf+nCXnjOilcCQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/sweetalert2/-/sweetalert2-10.0.3.tgz", + "integrity": "sha512-xblJJIKFoEE1Lj3K0dcyR6j9Iqhhp+Ttx5/luxlbFEJdTvugldf4gGKRoYKnn7uVg19qdZcuGK4dnAUgvn9A4A==", "license": "LGPL-3.0", "dependencies": { - "@abp/core": "~9.0.8", - "sweetalert2": "^11.14.1" + "@abp/core": "~10.0.3", + "sweetalert2": "^11.23.0" } }, "node_modules/@abp/timeago": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/timeago/-/timeago-9.0.8.tgz", - "integrity": "sha512-/LcDeX2pnI7J18+HrxqIpQz2cu9FCkrMu7vdnHJstlW3EO163Jq8YEpj9l7yHOuqT6c3FMN7QkXThewxoSWjpQ==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/timeago/-/timeago-10.0.3.tgz", + "integrity": "sha512-1refeaiUhyopr0M1Yr8SiAKNSDv9RpdTiq7QeAiB5cJIhHE7rPQcav42hNQzydJW9WJrJR3q5pe8ChFMQKjmXA==", "license": "LGPL-3.0", "dependencies": { - "@abp/jquery": "~9.0.8", + "@abp/jquery": "~10.0.3", "timeago": "^1.6.7" } }, - "node_modules/@abp/toastr": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/toastr/-/toastr-9.0.8.tgz", - "integrity": "sha512-tOwSjUOMKBlEpRzSQtCFu57i9y3/jRKe2/bYgGQlWiBy4CX/O68R8Sk0/xBjpl1wOrjEBNrHuQmvWWlqkSwNgg==", - "license": "LGPL-3.0", - "dependencies": { - "@abp/jquery": "~9.0.8", - "toastr": "^2.1.4" - } - }, "node_modules/@abp/utils": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@abp/utils/-/utils-9.0.8.tgz", - "integrity": "sha512-Rat+9cnnoIzhSs/ES9JP/Su+6VWotse5B3wcwRPbiQxCMYUNXQYHq5hTSyHhL2nHG2ox6BVur2jCIzNxXvqsBw==", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@abp/utils/-/utils-10.0.3.tgz", + "integrity": "sha512-EFX/LWtfG7lCd5OspHpxctzL+VjIg0tVguS03twdEYOsc5+n866T4qGf9sfPk9ryIFtVfNxKUHbOF73J/h/xbA==", "license": "LGPL-3.0", "dependencies": { "just-compare": "^2.3.0" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz", - "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.2.0.tgz", + "integrity": "sha512-3DguDv/oUE+7vjMeTSOjCSG+KeawgVQOHrKRnvUuqYh1mfArrh7s+s8hXW3e4RerBA1+Wh+hBqf8sJNpqNrBWg==", "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", "engines": { "node": ">=6" @@ -316,21 +305,21 @@ } }, "node_modules/datatables.net": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.4.tgz", - "integrity": "sha512-fKuRlrBIdpAl2uIFgl9enKecHB41QmFd/2nN9LBbOvItV/JalAxLcyqdZXex7wX4ZXjnJQEnv6xeS9veOpKzSw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.8.tgz", + "integrity": "sha512-uhViowhlDlheAuo5a8TrkQqADsjrtGeOyvrigvr4t0+K3MyAWqClORXWAYIcN9VLX6iIX0C8O9gwJNd01hITRg==", "license": "MIT", "dependencies": { "jquery": ">=1.7" } }, "node_modules/datatables.net-bs5": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.4.tgz", - "integrity": "sha512-OSoPWhNfiU71VjNP604uTmFRxiX32U7SCW0KRZ2X6z3ZYbIwjjoWcMEjjPWOH3uOqaI0OTDBgOgOs5G28VaJog==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.8.tgz", + "integrity": "sha512-TbFH99QSWm93Kn3teHLFKeyOqYbaiddlHvRFdXUwAvh/fjTMhACWmHG+I43ss8d23OEFHV0WIbN4lpPusZm5zw==", "license": "MIT", "dependencies": { - "datatables.net": "2.3.4", + "datatables.net": "2.3.8", "jquery": ">=1.7" } }, @@ -359,12 +348,12 @@ } }, "node_modules/jquery-validation": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.21.0.tgz", - "integrity": "sha512-xNot0rlUIgu7duMcQ5qb6MGkGL/Z1PQaRJQoZAURW9+a/2PGOUxY36o/WyNeP2T9R6jvWB8Z9lUVvvQWI/Zs5w==", + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.22.1.tgz", + "integrity": "sha512-ePLXLWK7Rh5eR652YsuIu7YPeGlCXrsJUteVw5iZopiU17yaMd3FaDggs6yyNMl56p8TYVeDRmKGK3fPZrMeQw==", "license": "MIT", "peerDependencies": { - "jquery": "^1.7 || ^2.0 || ^3.1" + "jquery": "^1.7 || ^2.0 || ^3.1 || ^4.0" } }, "node_modules/jquery-validation-unobtrusive": { @@ -384,9 +373,9 @@ "license": "MIT" }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, "node_modules/luxon": { @@ -423,9 +412,9 @@ "license": "MIT" }, "node_modules/sweetalert2": { - "version": "11.26.3", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.26.3.tgz", - "integrity": "sha512-VU0hGw/WfI9h7Mh+SCsDlWgtxDwWZ6ccqS7QcO8zEeWnwplN1GptcLstq76OluUBSLUza6ldvKd3558OhjpJ9A==", + "version": "11.26.25", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.26.25.tgz", + "integrity": "sha512-+hunCOJdJ6FLj04T9YSLvvZXRjsvIkTeTKP2e4VF8CaBias961BTnWiSFAy7F/CM5eq3QK2Rraoc5Gzftslvkg==", "license": "MIT", "funding": { "type": "individual", @@ -439,14 +428,6 @@ "dependencies": { "jquery": ">=1.5.0 <4.0" } - }, - "node_modules/toastr": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz", - "integrity": "sha512-LIy77F5n+sz4tefMmFOntcJ6HL0Fv3k1TDnNmFZ0bU/GcvIIfy6eG2v7zQmMiYgaalAiUv75ttFrPn5s0gyqlA==", - "dependencies": { - "jquery": ">=1.12.0" - } } } } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/package.json b/api/src/Sozsoft.Platform.HttpApi.Host/package.json index d95dbe6..8d219b4 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/package.json +++ b/api/src/Sozsoft.Platform.HttpApi.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~9.0.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~10.0.0" } } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/yarn.lock b/api/src/Sozsoft.Platform.HttpApi.Host/yarn.lock index 846ae0b..62570ee 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/yarn.lock +++ b/api/src/Sozsoft.Platform.HttpApi.Host/yarn.lock @@ -1,425 +1,311 @@ -# This file is generated by running "yarn install" inside your project. -# Manual changes might be lost - proceed with caution! +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 -__metadata: - version: 8 - cacheKey: 10c0 -"@abp/aspnetcore.mvc.ui.theme.basic@npm:~9.0.2": - version: 9.0.8 - resolution: "@abp/aspnetcore.mvc.ui.theme.basic@npm:9.0.8" +"@abp/aspnetcore.mvc.ui.theme.basic@~10.0.0": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-10.0.3.tgz" + integrity sha512-Z4b6A2yekSdFKM29pWpc252Wz/uofSKTlSzoO1mImLWnm4LH6YeQwK5eEx9LSYtHq0Y0R5i+yVhqYed98hWong== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared": "npm:~9.0.8" - checksum: 10c0/0ba699627be691b15533b3c290c55989c3991613eb560b50a14a33ea85c354f21338809b6ff306ce53038c9ec198c6e80075df2bdb692e08ff62b997279e84d1 - languageName: node - linkType: hard + "@abp/aspnetcore.mvc.ui.theme.shared" "~10.0.3" -"@abp/aspnetcore.mvc.ui.theme.shared@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/aspnetcore.mvc.ui.theme.shared@npm:9.0.8" +"@abp/aspnetcore.mvc.ui.theme.shared@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-10.0.3.tgz" + integrity sha512-1E76v8n6q9kRywB5WExffNivgOKRnMdjLpAiCLLEQ1tGKJKdjsQ2AwC/PvXxhaFQ4TkwNEt3uGhU/jkBC7O/Cg== dependencies: - "@abp/aspnetcore.mvc.ui": "npm:~9.0.8" - "@abp/bootstrap": "npm:~9.0.8" - "@abp/bootstrap-datepicker": "npm:~9.0.8" - "@abp/bootstrap-daterangepicker": "npm:~9.0.8" - "@abp/datatables.net-bs5": "npm:~9.0.8" - "@abp/font-awesome": "npm:~9.0.8" - "@abp/jquery-form": "npm:~9.0.8" - "@abp/jquery-validation-unobtrusive": "npm:~9.0.8" - "@abp/lodash": "npm:~9.0.8" - "@abp/luxon": "npm:~9.0.8" - "@abp/malihu-custom-scrollbar-plugin": "npm:~9.0.8" - "@abp/moment": "npm:~9.0.8" - "@abp/select2": "npm:~9.0.8" - "@abp/sweetalert2": "npm:~9.0.8" - "@abp/timeago": "npm:~9.0.8" - "@abp/toastr": "npm:~9.0.8" - checksum: 10c0/2aac9fc3a0ee9686249bdc6ec673747fe7989f4fd92b9d9c17238667fbb97df06534aec44e647b47ed00948415bb2c831abb801154dfefc5b63665c48a36dc4e - languageName: node - linkType: hard + "@abp/aspnetcore.mvc.ui" "~10.0.3" + "@abp/bootstrap" "~10.0.3" + "@abp/bootstrap-datepicker" "~10.0.3" + "@abp/bootstrap-daterangepicker" "~10.0.3" + "@abp/datatables.net-bs5" "~10.0.3" + "@abp/font-awesome" "~10.0.3" + "@abp/jquery-form" "~10.0.3" + "@abp/jquery-validation-unobtrusive" "~10.0.3" + "@abp/lodash" "~10.0.3" + "@abp/luxon" "~10.0.3" + "@abp/malihu-custom-scrollbar-plugin" "~10.0.3" + "@abp/moment" "~10.0.3" + "@abp/select2" "~10.0.3" + "@abp/sweetalert2" "~10.0.3" + "@abp/timeago" "~10.0.3" -"@abp/aspnetcore.mvc.ui@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/aspnetcore.mvc.ui@npm:9.0.8" +"@abp/aspnetcore.mvc.ui@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-10.0.3.tgz" + integrity sha512-wPXoe6cDh2/uKAaXETizOKXrlOoQXrJ8xjIX7Vjaybw3tBPSJBGCtyFIUd8Z8OpoeV52B6MpDQszSADZFGsDFQ== dependencies: - ansi-colors: "npm:^4.1.3" - checksum: 10c0/e55ef7e5e60d880d745b296e009885476fae6aec9f5ac87632abd848098cc6eacbd731510109990cad86a104d64eb80fcf9add5d4d83bbd41ed9cf0bccea21ea - languageName: node - linkType: hard + ansi-colors "^4.1.3" -"@abp/bootstrap-datepicker@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/bootstrap-datepicker@npm:9.0.8" +"@abp/bootstrap-datepicker@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/bootstrap-datepicker/-/bootstrap-datepicker-10.0.3.tgz" + integrity sha512-vgp0hgSYcZLZ4cg0WuFSaU+WfMgfFneh1R/qbVRVUFhnQWsf4l8+y6tFFT9fKS55dRgl2/Jhz+Y2pHeyMmC6bQ== dependencies: - bootstrap-datepicker: "npm:^1.10.0" - checksum: 10c0/32eed7f488a72bb888fb0194ed885a6c65a495d36a607a28f6baccc7ea1defe399abed985ab706c0514f7e56b666e969033de2373a37ea42d56848558fb7fbb1 - languageName: node - linkType: hard + bootstrap-datepicker "^1.10.1" -"@abp/bootstrap-daterangepicker@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/bootstrap-daterangepicker@npm:9.0.8" +"@abp/bootstrap-daterangepicker@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-10.0.3.tgz" + integrity sha512-nMHZ8xY8AJ6UBlms6Ub9MQE0EaoNUceMBUUzJ6IGV/KCKSmVM8LwGXaz1FHG0MV35xN8hrgIwxpOB4GIbBqc/A== dependencies: - bootstrap-daterangepicker: "npm:^3.1.0" - checksum: 10c0/de0ee267ddaafb7fc3dc0615cc07e09481690a22e1762b1513f8379762470d28f2a6637181ca4d4c6115015cd4ef22738e01cdf662c8d7a7575d7f51fd0a2ce0 - languageName: node - linkType: hard + bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/bootstrap@npm:9.0.8" +"@abp/bootstrap@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/bootstrap/-/bootstrap-10.0.3.tgz" + integrity sha512-HKQp72Lim5FJyOAPVNApGA5yrD78TCJ5elPWkRH+/9IlEg+8gadw2R3aDULe16N8n+pAJ6Oi94r9DTT9nOBEVQ== dependencies: - "@abp/core": "npm:~9.0.8" - bootstrap: "npm:^5.3.3" - checksum: 10c0/28c6abb629e103c679edccc1272a99745c9418233044bb309dd9212d4881f70e16b1be4179935f0a9dea5f349d841ae28999e8bfdfb0b7adb38a103c3217e859 - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + bootstrap "^5.3.8" -"@abp/core@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/core@npm:9.0.8" +"@abp/core@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/core/-/core-10.0.3.tgz" + integrity sha512-eCD3Yvw215bkF3hUgfVCxBw9OHwvfofBnzrQ4PVMKnnqgFkKj521JxYH5JwfX3fD4vW/RcgnWgxJ/IKHVONxiw== dependencies: - "@abp/utils": "npm:~9.0.8" - checksum: 10c0/5f4e32cb1624241d5bce4efbae09aa897c526e849d80ba8bb6970a17de204601a3deec3fb8558b66d88ec83ec366075bc2153cf53eabdfca5adb70214b867345 - languageName: node - linkType: hard + "@abp/utils" "~10.0.3" -"@abp/datatables.net-bs5@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/datatables.net-bs5@npm:9.0.8" +"@abp/datatables.net-bs5@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/datatables.net-bs5/-/datatables.net-bs5-10.0.3.tgz" + integrity sha512-8/eI9c2t1kUZtqW6BYv/uQwCzhifWFuU1bS5I0Kp12aSJproTALEJoBJQoP8/r4Jm5pDxuAycbyOjZtBalwe6A== dependencies: - "@abp/datatables.net": "npm:~9.0.8" - datatables.net-bs5: "npm:^2.1.8" - checksum: 10c0/ca01f64eae0e3ce013a9b1e66f400c2bcc81eb28d2f4b6994afe3d18d9437384201b14f58304b1b19c62763ab6afc8551d239cabe6c7fe6727d6d736a6b7e813 - languageName: node - linkType: hard + "@abp/datatables.net" "~10.0.3" + datatables.net-bs5 "^2.3.4" -"@abp/datatables.net@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/datatables.net@npm:9.0.8" +"@abp/datatables.net@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/datatables.net/-/datatables.net-10.0.3.tgz" + integrity sha512-1swTVGIFdNyuwlsw+o8ierTGaDHgYpFFZUwdw/467+6wlE+j+UG5WpzxiiIQrTrrvKA/IAXfNg4cZc/QRXffBg== dependencies: - "@abp/jquery": "npm:~9.0.8" - datatables.net: "npm:^2.1.8" - checksum: 10c0/aed189b311c20f263b9922eccbaafa53cd4ed6c39ee546673f96ad71c05ef5d9f09d26662ee768603dba853dbef7ec633d458c84dcfbac47366aa583def480b2 - languageName: node - linkType: hard + "@abp/jquery" "~10.0.3" + datatables.net "^2.3.4" -"@abp/font-awesome@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/font-awesome@npm:9.0.8" +"@abp/font-awesome@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/font-awesome/-/font-awesome-10.0.3.tgz" + integrity sha512-i20+cAiy8YwX1H5PBVg9a5/6DPJhFDXF7q3RtF8xoLvJ8v+/t7h1IBHERyRelhw5gC085KRt3j5jwPuUguaeag== dependencies: - "@abp/core": "npm:~9.0.8" - "@fortawesome/fontawesome-free": "npm:^6.6.0" - checksum: 10c0/ede4fedc2b8585091934c044d42547028f51b0b55d278fd9bfaa09a6071651620fbfcecf910c06341aac1b6668e24ccc092f44636e2dfdba93e1a57aaca9468d - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + "@fortawesome/fontawesome-free" "^7.0.1" -"@abp/jquery-form@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/jquery-form@npm:9.0.8" +"@abp/jquery-form@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/jquery-form/-/jquery-form-10.0.3.tgz" + integrity sha512-0L+Myo3Q+nGBxQmbFf+uhTrvEb4RjKyo31UzXMRU+X+5CjjccJ7YvHejIu5JcZoIQp1BTC3rrz+CQW8Ujn6Cyg== dependencies: - "@abp/jquery": "npm:~9.0.8" - jquery-form: "npm:^4.3.0" - checksum: 10c0/baf72c2d6d4f7d5b4b1cf8f54b701d9b233b14a8fcb20f01351503483c268bbf47215896db9092ae96410474a9bee6a1908940121be2a93a2ccd4e8d0268de76 - languageName: node - linkType: hard + "@abp/jquery" "~10.0.3" + jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/jquery-validation-unobtrusive@npm:9.0.8" +"@abp/jquery-validation-unobtrusive@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-10.0.3.tgz" + integrity sha512-AS/HUSsJ3SdcIsKQMD28o1k9dtNes6JND5rALrN4uS8kJvSkA6wI+jaYKIixQYcL9pH2ilfLEpcGCn7ByZzinQ== dependencies: - "@abp/jquery-validation": "npm:~9.0.8" - jquery-validation-unobtrusive: "npm:^4.0.0" - checksum: 10c0/d34bb4b35d86c786b2650cf5860416178c5c7f45cfb6489db848b28909fef1ba1a19f1b9243f34663c209f7746cfb748eae5f7eaa1fd20ef021fdf43d6068bc1 - languageName: node - linkType: hard + "@abp/jquery-validation" "~10.0.3" + jquery-validation-unobtrusive "^4.0.0" -"@abp/jquery-validation@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/jquery-validation@npm:9.0.8" +"@abp/jquery-validation@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/jquery-validation/-/jquery-validation-10.0.3.tgz" + integrity sha512-ox16GO4LDrQk++Ao0TdC+AYGwrcMrr0AbzGfzvzmtPDwL/HdQm9tBL8mGEaNNO7n9YM/YBEnBVOSLrYswtcc/g== dependencies: - "@abp/jquery": "npm:~9.0.8" - jquery-validation: "npm:^1.21.0" - checksum: 10c0/abe922666d3ad8e771f0c45f1013db402a3eb796c1cad9089a0b20bfb88a01024d4ffc7b13d6c7e533db1e9c2018e220063d7db92bb2009ecd0d661f52703dc3 - languageName: node - linkType: hard + "@abp/jquery" "~10.0.3" + jquery-validation "^1.21.0" -"@abp/jquery@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/jquery@npm:9.0.8" +"@abp/jquery@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/jquery/-/jquery-10.0.3.tgz" + integrity sha512-kY3pv5dqUNuNtFT+EeC7In9uyIciWsKKXS5fUccjiQFLuDRZskr7Dhr9Yx1fJrxBRfeJTs3ZBoBFpejtOlAsaQ== dependencies: - "@abp/core": "npm:~9.0.8" - jquery: "npm:~3.7.1" - checksum: 10c0/c83c407389a556fb8cf25135f980b6e26b0f16dcf0a0d76a720a5c50da41a6ed38a5bbb6527a7b042f651f78487c552d273ddd7c56307b3e5f999b00fb3829df - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + jquery "~3.7.1" -"@abp/lodash@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/lodash@npm:9.0.8" +"@abp/lodash@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/lodash/-/lodash-10.0.3.tgz" + integrity sha512-x6RW4tCEbebZ6OtxMGMs7TGtnR/oXtWP5kL8pe27EBYOWLoX4U+GUmA6ikdGifbFeEpuRaiUDGdNaTfXGcQjug== dependencies: - "@abp/core": "npm:~9.0.8" - lodash: "npm:^4.17.21" - checksum: 10c0/1b87327f58aa3ae59610c3ec03d32b5a843eb5fa6c88c6ef94a24b2d2572ac5af087289d0bd327dcc9aa004f6687211533925b9652262e6eef39d9824bf9867e - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + lodash "^4.17.21" -"@abp/luxon@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/luxon@npm:9.0.8" +"@abp/luxon@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/luxon/-/luxon-10.0.3.tgz" + integrity sha512-KwYTm+tCIFFlGbt8uZo6cvXoIB8DeAw4yKUdY2M8cMMdfENkOvlXNxghvYNrc+KbBxgbUmj3akWUc22iuxmCwg== dependencies: - "@abp/core": "npm:~9.0.8" - luxon: "npm:^3.5.0" - checksum: 10c0/ec715e63eb6b2e8d2229cead3b83b92ecb5b37a24259a757e394d8816bdf5b4484ae6332ae7e56716f3ecba360c233852ddbcac1aefde0bf2ce14fd83e8a340b - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + luxon "^3.7.2" -"@abp/malihu-custom-scrollbar-plugin@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/malihu-custom-scrollbar-plugin@npm:9.0.8" +"@abp/malihu-custom-scrollbar-plugin@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-10.0.3.tgz" + integrity sha512-5ESuTYt3nncVBG0pX92wsiKmhYgItsQn8JHVhyhcFXn9LhKOx/condZSBUZnPkkCsGMe5aSibYYDGiQFkYEghg== dependencies: - "@abp/core": "npm:~9.0.8" - malihu-custom-scrollbar-plugin: "npm:^3.1.5" - checksum: 10c0/bee8abfc432b71b0c4940c2a2d24f1eca0db8d23994748c7ba2dfe8f7438f1a197e8d38cbbd3c6ce64d14e196b1e8663084ff0b746e36e3753f1fe7a23104cb3 - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/moment@npm:9.0.8" +"@abp/moment@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/moment/-/moment-10.0.3.tgz" + integrity sha512-/axyeNFgFulipqAt+iGFqLSzHRG/MfFfEXJppPm7aKQm88ACRPSSJyjhqKpnaup7GW8V34u+08d7VhRthA6E5A== dependencies: - moment: "npm:^2.30.1" - checksum: 10c0/31cbc9a5e005982fec092d294b1d109f87f63e941055eff38fc3932dd11e50ccd55a035bb5e34bf0ca2fa6f79df7d60bad3e88837cbc19a282c494210f01fd8f - languageName: node - linkType: hard + moment "^2.30.1" -"@abp/select2@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/select2@npm:9.0.8" +"@abp/select2@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/select2/-/select2-10.0.3.tgz" + integrity sha512-obUAgHbkYxILw0+ZR+TQgmlWlSHcr+dLLTkv2aT/9JxqRwepSiYbh5G9BTXFe94RnZvJeD0lWCj224AK0qLVGg== dependencies: - "@abp/core": "npm:~9.0.8" - select2: "npm:^4.0.13" - checksum: 10c0/226224d6741e6660e9bda6937b7304feca88d5fdd2cd56e03ef0f781342e0806047fa0ba68a5df7e74226000dfcb27a2c4e359c9d8f02792b35bdad36f706de2 - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + select2 "^4.0.13" -"@abp/sweetalert2@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/sweetalert2@npm:9.0.8" +"@abp/sweetalert2@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/sweetalert2/-/sweetalert2-10.0.3.tgz" + integrity sha512-xblJJIKFoEE1Lj3K0dcyR6j9Iqhhp+Ttx5/luxlbFEJdTvugldf4gGKRoYKnn7uVg19qdZcuGK4dnAUgvn9A4A== dependencies: - "@abp/core": "npm:~9.0.8" - sweetalert2: "npm:^11.14.1" - checksum: 10c0/aabee4858acb09599918547a0cae172be3d9c7fb8c6e7371f57a3d3003fb19018170cbf4cb60c1cbd596cd35bad5191c35d2df88ad15f3a4f01855b9d72843db - languageName: node - linkType: hard + "@abp/core" "~10.0.3" + sweetalert2 "^11.23.0" -"@abp/timeago@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/timeago@npm:9.0.8" +"@abp/timeago@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/timeago/-/timeago-10.0.3.tgz" + integrity sha512-1refeaiUhyopr0M1Yr8SiAKNSDv9RpdTiq7QeAiB5cJIhHE7rPQcav42hNQzydJW9WJrJR3q5pe8ChFMQKjmXA== dependencies: - "@abp/jquery": "npm:~9.0.8" - timeago: "npm:^1.6.7" - checksum: 10c0/33019bf60b8430e2e6fdd1b5a33e1ced9a9da458205dc64015d907dae9b64571cc61505f412268d7ebeb9695dee10c6657c048e9f0b6991a070c923e3f648cc7 - languageName: node - linkType: hard + "@abp/jquery" "~10.0.3" + timeago "^1.6.7" -"@abp/toastr@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/toastr@npm:9.0.8" +"@abp/utils@~10.0.3": + version "10.0.3" + resolved "https://registry.npmjs.org/@abp/utils/-/utils-10.0.3.tgz" + integrity sha512-EFX/LWtfG7lCd5OspHpxctzL+VjIg0tVguS03twdEYOsc5+n866T4qGf9sfPk9ryIFtVfNxKUHbOF73J/h/xbA== dependencies: - "@abp/jquery": "npm:~9.0.8" - toastr: "npm:^2.1.4" - checksum: 10c0/2c89d54d454efd33170c6fd1398c393ad3e36b078ad54b038cefca1b334b3330cb7279a90611ba2a032cef7255f1734288fdeb430a51c34470d4d88dc5f1dc9e - languageName: node - linkType: hard + just-compare "^2.3.0" -"@abp/utils@npm:~9.0.8": - version: 9.0.8 - resolution: "@abp/utils@npm:9.0.8" +"@fortawesome/fontawesome-free@^7.0.1": + version "7.2.0" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.2.0.tgz" + integrity sha512-3DguDv/oUE+7vjMeTSOjCSG+KeawgVQOHrKRnvUuqYh1mfArrh7s+s8hXW3e4RerBA1+Wh+hBqf8sJNpqNrBWg== + +"@popperjs/core@^2.11.8": + version "2.11.8" + resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + +ansi-colors@^4.1.3: + version "4.1.3" + resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== + +bootstrap-datepicker@^1.10.1: + version "1.10.1" + resolved "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.10.1.tgz" + integrity sha512-GIe+fsLp9Hi30oW7L2v2Q9/a4+aojrIA2p4ZagtLuKw2lpfQgjJjM0L6vl/lYQydGXWUbpoKbEC/O5tzWIkEKQ== dependencies: - just-compare: "npm:^2.3.0" - checksum: 10c0/2b73f5fa4e37df1d7d21dcdf3450aaeb58a7a0032e1480c39c0bd35c0af7d7b86040ff9b18a29e4fa957428a22b81d2929a14820671c132d57caa1e7f9b91529 - languageName: node - linkType: hard + jquery ">=3.4.0 <4.0.0" -"@fortawesome/fontawesome-free@npm:^6.6.0": - version: 6.7.2 - resolution: "@fortawesome/fontawesome-free@npm:6.7.2" - checksum: 10c0/e27fb8b846f0bcf40c904acc210829a640329fc7b7ec4e42a7c43cb53739ed6052d78df90810f555a5c80bc608fee5a5174db3fa6da617f582d6210009a19278 - languageName: node - linkType: hard - -"ansi-colors@npm:^4.1.3": - version: 4.1.3 - resolution: "ansi-colors@npm:4.1.3" - checksum: 10c0/ec87a2f59902f74e61eada7f6e6fe20094a628dab765cfdbd03c3477599368768cffccdb5d3bb19a1b6c99126783a143b1fee31aab729b31ffe5836c7e5e28b9 - languageName: node - linkType: hard - -"bootstrap-datepicker@npm:^1.10.0": - version: 1.10.1 - resolution: "bootstrap-datepicker@npm:1.10.1" +bootstrap-daterangepicker@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-3.1.0.tgz" + integrity sha512-oaQZx6ZBDo/dZNyXGVi2rx5GmFXThyQLAxdtIqjtLlYVaQUfQALl5JZMJJZzyDIX7blfy4ppZPAJ10g8Ma4d/g== dependencies: - jquery: "npm:>=3.4.0 <4.0.0" - checksum: 10c0/bad08e373b70040f4a62003b46dde2e5bd4a7b73aeffb1d504c0a1736b6beaccf56b908d565980491c7f4329377af8c4cfb7bff9c38480ea689210c7c308dc7d - languageName: node - linkType: hard + jquery ">=1.10" + moment "^2.9.0" -"bootstrap-daterangepicker@npm:^3.1.0": - version: 3.1.0 - resolution: "bootstrap-daterangepicker@npm:3.1.0" +bootstrap@^5.3.8: + version "5.3.8" + resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz" + integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg== + +datatables.net-bs5@^2.3.4: + version "2.3.8" + resolved "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.8.tgz" + integrity sha512-TbFH99QSWm93Kn3teHLFKeyOqYbaiddlHvRFdXUwAvh/fjTMhACWmHG+I43ss8d23OEFHV0WIbN4lpPusZm5zw== dependencies: - jquery: "npm:>=1.10" - moment: "npm:^2.9.0" - checksum: 10c0/ab54b5247df355d85d478c8a7e0f5cb299d0064a14722d4311d7147bc72a06c4391752f3b49a2ae0c1ff861c563d17a99042cf7b6056a2ad5986f30c8c85623e - languageName: node - linkType: hard + datatables.net "2.3.8" + jquery ">=1.7" -"bootstrap@npm:^5.3.3": - version: 5.3.8 - resolution: "bootstrap@npm:5.3.8" - peerDependencies: - "@popperjs/core": ^2.11.8 - checksum: 10c0/0039a9df2c3e7bfa04f1abca199c299ff3b75869d578c0cb1721c6f1f203c91531788a5631ecbee01513481979314d0e4ba0d90c2011e6ce18fc2e0bc93e18d9 - languageName: node - linkType: hard - -"datatables.net-bs5@npm:^2.1.8": - version: 2.3.4 - resolution: "datatables.net-bs5@npm:2.3.4" +datatables.net@^2.3.4, datatables.net@2.3.8: + version "2.3.8" + resolved "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.8.tgz" + integrity sha512-uhViowhlDlheAuo5a8TrkQqADsjrtGeOyvrigvr4t0+K3MyAWqClORXWAYIcN9VLX6iIX0C8O9gwJNd01hITRg== dependencies: - datatables.net: "npm:2.3.4" - jquery: "npm:>=1.7" - checksum: 10c0/27dab5a78fd98aed45fadd40f2b5da551663a8292cdc90384135dfdf99cb1397758b54b0d1934389fb04768fa00ca66be4cc1aca079c3bb13f6265b3c91716fa - languageName: node - linkType: hard + jquery ">=1.7" -"datatables.net@npm:2.3.4, datatables.net@npm:^2.1.8": - version: 2.3.4 - resolution: "datatables.net@npm:2.3.4" +jquery-form@^4.3.0: + version "4.3.0" + resolved "https://registry.npmjs.org/jquery-form/-/jquery-form-4.3.0.tgz" + integrity sha512-q3uaVCEWdLOYUCI6dpNdwf/7cJFOsUgdpq6r0taxtGQ5NJSkOzofyWm4jpOuJ5YxdmL1FI5QR+q+HB63HHLGnQ== dependencies: - jquery: "npm:>=1.7" - checksum: 10c0/8683653cf1aacb50cc637c799f73bc91e477ccbf49ec99859e991034ba43c8e01b9c5a245fadcb0d10cbba9dca69989a5a36e886212fb4c62d53cd6e38081287 - languageName: node - linkType: hard + jquery ">=1.7.2" -"jquery-form@npm:^4.3.0": - version: 4.3.0 - resolution: "jquery-form@npm:4.3.0" +jquery-mousewheel@>=3.0.6: + version "3.2.2" + resolved "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.2.2.tgz" + integrity sha512-JP71xTAg08ZY3hcs9ZbYUZ5i+dkSsz4yRl/zpWkAmtzc+kMs5EfPkpkINSidiLYMaR0MTo3DfFGF9WIezMsFQQ== dependencies: - jquery: "npm:>=1.7.2" - checksum: 10c0/69bc684a612978a47d83a8f6b54f4a288a90e4142201233d4b15449251c365dd0e2b30fa042c4209097d1d5eb8fd72cb7facf92384f8aa39650fa9eed2d10c28 - languageName: node - linkType: hard + jquery ">=1.2.6" -"jquery-mousewheel@npm:>=3.0.6": - version: 3.2.2 - resolution: "jquery-mousewheel@npm:3.2.2" +jquery-validation-unobtrusive@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.0.0.tgz" + integrity sha512-1ervYFFv6LX/rp7ktuLnMakHNG0piNRDyROI8Ir3hL1vPIwylAehB1AY3BPrYJnzW3WmwWryZq+Bz4sazZK9iQ== dependencies: - jquery: "npm:>=1.2.6" - checksum: 10c0/a8b45ae7759ce14134284cb6a2f2446f16d43325550c2e25653de572ca3e197b471b8322afb11ec114ab3b0f26b7072a7b47de7ed6617e9417328a94eac30740 - languageName: node - linkType: hard + jquery "^3.6.0" + jquery-validation ">=1.19" -"jquery-validation-unobtrusive@npm:^4.0.0": - version: 4.0.0 - resolution: "jquery-validation-unobtrusive@npm:4.0.0" +jquery-validation@^1.21.0, jquery-validation@>=1.19: + version "1.22.1" + resolved "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.22.1.tgz" + integrity sha512-ePLXLWK7Rh5eR652YsuIu7YPeGlCXrsJUteVw5iZopiU17yaMd3FaDggs6yyNMl56p8TYVeDRmKGK3fPZrMeQw== + +"jquery@^1.7 || ^2.0 || ^3.1 || ^4.0", jquery@^3.6.0, jquery@>=1.10, jquery@>=1.2.6, "jquery@>=1.5.0 <4.0", jquery@>=1.7, jquery@>=1.7.2, "jquery@>=3.4.0 <4.0.0", jquery@~3.7.1: + version "3.7.1" + resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz" + integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== + +just-compare@^2.3.0: + version "2.3.0" + resolved "https://registry.npmjs.org/just-compare/-/just-compare-2.3.0.tgz" + integrity sha512-6shoR7HDT+fzfL3gBahx1jZG3hWLrhPAf+l7nCwahDdT9XDtosB9kIF0ZrzUp5QY8dJWfQVr5rnsPqsbvflDzg== + +lodash@^4.17.21: + version "4.18.1" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz" + integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q== + +luxon@^3.7.2: + version "3.7.2" + resolved "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz" + integrity sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew== + +malihu-custom-scrollbar-plugin@^3.1.5: + version "3.1.5" + resolved "https://registry.npmjs.org/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.1.5.tgz" + integrity sha512-lwW3LgI+CNDMPnP4ED2la6oYxWMkCXlnhex+s2wuOLhFDFGnGmQuTQVdRK9bvDLpxs10sGlfErVufJy9ztfgJQ== dependencies: - jquery: "npm:^3.6.0" - jquery-validation: "npm:>=1.19" - checksum: 10c0/17d28abec3759c1b615bfd6aaa87fea8ac2bea5c925fc1cab90da3e9c76d9feb29740877936ef41ed073eecc4f3a1a6b415f29cd00605fa02deb77427395646e - languageName: node - linkType: hard + jquery-mousewheel ">=3.0.6" -"jquery-validation@npm:>=1.19, jquery-validation@npm:^1.21.0": - version: 1.21.0 - resolution: "jquery-validation@npm:1.21.0" - peerDependencies: - jquery: ^1.7 || ^2.0 || ^3.1 - checksum: 10c0/b5e51fc037f79779f38bbc74dab9d1568d9f7821128aff6dcfeb12b39f0dea79f763516dc3e05b45fc9a2e9282037b08eccad0eef29fc3a23a0211454ab0f0e5 - languageName: node - linkType: hard +moment@^2.30.1, moment@^2.9.0: + version "2.30.1" + resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== -"jquery@npm:>=1.10, jquery@npm:>=1.12.0, jquery@npm:>=1.2.6, jquery@npm:>=1.5.0 <4.0, jquery@npm:>=1.7, jquery@npm:>=1.7.2, jquery@npm:>=3.4.0 <4.0.0, jquery@npm:^3.6.0, jquery@npm:~3.7.1": - version: 3.7.1 - resolution: "jquery@npm:3.7.1" - checksum: 10c0/808cfbfb758438560224bf26e17fcd5afc7419170230c810dd11f5c1792e2263e2970cca8d659eb84fcd9acc301edb6d310096e450277d54be4f57071b0c82d9 - languageName: node - linkType: hard +select2@^4.0.13: + version "4.0.13" + resolved "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz" + integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw== -"just-compare@npm:^2.3.0": - version: 2.3.0 - resolution: "just-compare@npm:2.3.0" - checksum: 10c0/f99853b608c06bc36f3727220b159626a16c4ac890216725db83dd06d99d6cd1d5e8c3a2ab02072a39350f44d07745c14918be0db4aff74b744ed787712adeec - languageName: node - linkType: hard +sweetalert2@^11.23.0: + version "11.26.25" + resolved "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.26.25.tgz" + integrity sha512-+hunCOJdJ6FLj04T9YSLvvZXRjsvIkTeTKP2e4VF8CaBias961BTnWiSFAy7F/CM5eq3QK2Rraoc5Gzftslvkg== -"lodash@npm:^4.17.21": - version: 4.17.21 - resolution: "lodash@npm:4.17.21" - checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c - languageName: node - linkType: hard - -"luxon@npm:^3.5.0": - version: 3.7.2 - resolution: "luxon@npm:3.7.2" - checksum: 10c0/ed8f0f637826c08c343a29dd478b00628be93bba6f068417b1d8896b61cb61c6deacbe1df1e057dbd9298334044afa150f9aaabbeb3181418ac8520acfdc2ae2 - languageName: node - linkType: hard - -"malihu-custom-scrollbar-plugin@npm:^3.1.5": - version: 3.1.5 - resolution: "malihu-custom-scrollbar-plugin@npm:3.1.5" +timeago@^1.6.7: + version "1.6.7" + resolved "https://registry.npmjs.org/timeago/-/timeago-1.6.7.tgz" + integrity sha512-FikcjN98+ij0siKH4VO4dZ358PR3oDDq4Vdl1+sN9gWz1/+JXGr3uZbUShYH/hL7bMhcTpPbplJU5Tej4b4jbQ== dependencies: - jquery-mousewheel: "npm:>=3.0.6" - checksum: 10c0/f0eeb2cf7c53dfe3c02c11e9dc7ca0221101050beaca6b779c07bde2381bd599f0084158a2188c91dc8a2dd7eb9450db5af5063dbb31d65a0deefa29a1c9df99 - languageName: node - linkType: hard - -"moment@npm:^2.30.1, moment@npm:^2.9.0": - version: 2.30.1 - resolution: "moment@npm:2.30.1" - checksum: 10c0/865e4279418c6de666fca7786607705fd0189d8a7b7624e2e56be99290ac846f90878a6f602e34b4e0455c549b85385b1baf9966845962b313699e7cb847543a - languageName: node - linkType: hard - -"my-app@workspace:.": - version: 0.0.0-use.local - resolution: "my-app@workspace:." - dependencies: - "@abp/aspnetcore.mvc.ui.theme.basic": "npm:~9.0.2" - languageName: unknown - linkType: soft - -"select2@npm:^4.0.13": - version: 4.0.13 - resolution: "select2@npm:4.0.13" - checksum: 10c0/a393866565a5f878ca21276ed32793595851debb35ff48a8c368640e732619349f547d335b438b45ff5647145eb6c5af868cd5153740de58306a2dca2498550f - languageName: node - linkType: hard - -"sweetalert2@npm:^11.14.1": - version: 11.26.3 - resolution: "sweetalert2@npm:11.26.3" - checksum: 10c0/cd7ab9f8800ffc75ec58fd5a103c57c4a2b1a3ac270631790bdda0610f908f790eac13efd85d7faec019eb99e65992cc893fc23290cd196f6c2f0162debcfe4c - languageName: node - linkType: hard - -"timeago@npm:^1.6.7": - version: 1.6.7 - resolution: "timeago@npm:1.6.7" - dependencies: - jquery: "npm:>=1.5.0 <4.0" - checksum: 10c0/e5337d3d071590d4c75a101d50b2651153f5a25212e4c37476533f8cd4bc014fb335934b4290deef06842bf3df14181e83a81e099038efc535d59d191abac2c6 - languageName: node - linkType: hard - -"toastr@npm:^2.1.4": - version: 2.1.4 - resolution: "toastr@npm:2.1.4" - dependencies: - jquery: "npm:>=1.12.0" - checksum: 10c0/325ef9faa5d67fced64461a3c641002ca24492917c9d8c5c1a782d11f7e3ed5281683e3e00310c756365e3475ef6719e6acd93462228b8ac050eb6feee8ced60 - languageName: node - linkType: hard + jquery ">=1.5.0 <4.0" diff --git a/api/src/Sozsoft.Platform.HttpApi/Sozsoft.Platform.HttpApi.csproj b/api/src/Sozsoft.Platform.HttpApi/Sozsoft.Platform.HttpApi.csproj index 1a0256f..73ac480 100644 --- a/api/src/Sozsoft.Platform.HttpApi/Sozsoft.Platform.HttpApi.csproj +++ b/api/src/Sozsoft.Platform.HttpApi/Sozsoft.Platform.HttpApi.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 Sozsoft.Platform @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/Sozsoft.Platform.EntityFrameworkCore.Tests.csproj b/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/Sozsoft.Platform.EntityFrameworkCore.Tests.csproj index 702ff57..efc9167 100644 --- a/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/Sozsoft.Platform.EntityFrameworkCore.Tests.csproj +++ b/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/Sozsoft.Platform.EntityFrameworkCore.Tests.csproj @@ -3,7 +3,7 @@ - net9.0 + net10.0 enable Sozsoft.Platform @@ -11,11 +11,11 @@ - + - + diff --git a/api/test/Sozsoft.Platform.TestBase/Sozsoft.Platform.TestBase.csproj b/api/test/Sozsoft.Platform.TestBase/Sozsoft.Platform.TestBase.csproj index 3d722ef..6f82766 100644 --- a/api/test/Sozsoft.Platform.TestBase/Sozsoft.Platform.TestBase.csproj +++ b/api/test/Sozsoft.Platform.TestBase/Sozsoft.Platform.TestBase.csproj @@ -3,20 +3,20 @@ - net9.0 + net10.0 enable Sozsoft.Platform - - - - + + + + - + all diff --git a/ui/package.json b/ui/package.json index 4d06b70..a08e988 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "sozsoft-platform-ui", "private": true, - "version": "1.0.4", + "version": "1.0.6", "elstarVersion": "2.1.6", "type": "module", "scripts": { diff --git a/ui/src/views/admin/role-management/RolesPermission.tsx b/ui/src/views/admin/role-management/RolesPermission.tsx index 0730645..420146c 100644 --- a/ui/src/views/admin/role-management/RolesPermission.tsx +++ b/ui/src/views/admin/role-management/RolesPermission.tsx @@ -231,7 +231,6 @@ function RolesPermission({ const tenantGroup = tenant?.menuGroup?.trim() if (!tenantGroup) { - console.warn('Tenant menuGroup boş, tüm izinler gösterilecek') setPermissionList(data) return } diff --git a/ui/src/views/admin/videoroom/Dashboard.tsx b/ui/src/views/admin/videoroom/Dashboard.tsx index 784ec12..8fed910 100644 --- a/ui/src/views/admin/videoroom/Dashboard.tsx +++ b/ui/src/views/admin/videoroom/Dashboard.tsx @@ -30,7 +30,7 @@ const Dashboard: React.FC = () => { title={translate('::' + 'App.Videoroom.Dashboard')} defaultTitle="Erp Platform" > -
+