diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000000..738b727317 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,4 @@ +ui-angular: + - npm/ng-packs/**/* + - templates/app/angular/**/* + - templates/module/angular/**/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 0000000000..e70e966d4a --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,17 @@ +name: "Pull Request Labeler" +on: + pull_request: + paths: + - npm/ng-packs/**/* + - templates/app/angular/**/* + - templates/module/angular/**/* + branches: + - master + - dev +jobs: + labeler: + runs-on: ubuntu-18.04 + steps: + - uses: actions/labeler@v2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.gitignore b/.gitignore index 4eabbccebd..73d74ec7c6 100644 --- a/.gitignore +++ b/.gitignore @@ -289,4 +289,5 @@ samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Logs/logs.txt samples/MicroserviceDemo/applications/PublicWebSite.Host/Logs/logs.txt samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Logs/logs.txt samples/MicroserviceDemo/microservices/BloggingService.Host/Logs/logs.txt +samples/MicroserviceDemo/applications/ConsoleClientDemo/Logs/logs.txt modules/docs/app/Volo.DocsTestApp/Logs/logs.txt diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json index a01d460e01..c34a08f7ed 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json @@ -18,10 +18,10 @@ "AbpShortDescription": "ABP é uma arquitetura completa e uma forte infraestrutura para criar aplicativos da web modernos! Segue as melhores práticas e convenções para fornecer uma sólida experiência de desenvolvimento.", "SourceCodeUpper": "CÓDIGO FONTE", "LatestReleaseLogs": "Últimos registros de lançamento", - "Infrastructure": "Infra-estrutura", + "Infrastructure": "Infraestrutura", "Architecture": "Arquitetura", "Modular": "Modular", - "DontRepeatYourself": "Não se repita", + "DontRepeatYourself": "Não repita a si mesmo", "DeveloperFocused": "Desenvolvedor focado", "FullStackApplicationInfrastructure": "Infraestrutura de aplicativos full stack.", "DomainDrivenDesign": "Design Orientado a Domínio", @@ -30,7 +30,7 @@ "AuthorizationExplanation": "Autorização avançada com usuário, função e sistema de permissão refinado. Criada na biblioteca Microsoft Identity.", "MultiTenancy": "Múltiplos inquilinos", "MultiTenancyExplanation": "Aplicativos SaaS facilitados! Multilocação integrada do banco de dados à interface do usuário.", - "CrossCuttingConcerns": "Preocupações transversais", + "CrossCuttingConcerns": "Características transversais", "CrossCuttingConcernsExplanation": "Infraestrutura completa para autorização, validação, tratamento de exceções, armazenamento em cache, log de auditoria, gerenciamento de transações e assim por diante.", "BuiltInBundlingMinification": "Pacote & Minificação Integrados", "BuiltInBundlingMinificationExplanation": "Pare de usar ferramentas externas para empacotamento e minificação. O ABP oferece uma maneira mais simples, dinâmica, poderosa, modular e integrada!", diff --git a/docs/en/AspNetCore/Bundling-Minification.md b/docs/en/AspNetCore/Bundling-Minification.md index 220562935d..8868d441e1 100644 --- a/docs/en/AspNetCore/Bundling-Minification.md +++ b/docs/en/AspNetCore/Bundling-Minification.md @@ -114,7 +114,7 @@ public class MyWebModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options .ScriptBundles @@ -151,7 +151,7 @@ public class MyWebExtensionModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options .ScriptBundles @@ -189,7 +189,7 @@ public class MyExtensionGlobalStyleContributor : BundleContributor Then you can use this contributor as like below: ````C# -services.Configure(options => +services.Configure(options => { options .ScriptBundles @@ -317,7 +317,7 @@ In some specific cases, it may be needed to create a **new** bundle **inherited* Example: ````c# -services.Configure(options => +services.Configure(options => { options .StyleBundles diff --git a/docs/en/Best-Practices/Module-Architecture.md b/docs/en/Best-Practices/Module-Architecture.md index f37d60d68b..d9f833726f 100644 --- a/docs/en/Best-Practices/Module-Architecture.md +++ b/docs/en/Best-Practices/Module-Architecture.md @@ -57,7 +57,7 @@ Next section describes the packages in more details. * **Do** divide the domain layer into two projects: * **Domain.Shared** package, named as *CompanyName.ModuleName.Domain.Shared*, that contains constants, enums and other types those can be safely shared with the all layers of the module. This package can also be shared to 3rd-party clients. It can not contain entities, repositories, domain services or any other business objects. * **Domain** package, named as *CompanyName.ModuleName.Domain*, that contains entities, repository interfaces, domain service interfaces and their implementations and other domain objects. - * Domain package depends on the **Domain.Share** package. + * Domain package depends on the **Domain.Shared** package. #### Application Layer @@ -85,5 +85,5 @@ Next section describes the packages in more details. #### Web Layer -* Do create a **Web** package, named as *CompanyName.ModuleName.Web*, that contains pages, views, scripts, styles, images and other UI components. +* **Do** create a **Web** package, named as *CompanyName.ModuleName.Web*, that contains pages, views, scripts, styles, images and other UI components. * Web package only depends on the **HttpApi** package. \ No newline at end of file diff --git a/docs/en/Multi-Tenancy.md b/docs/en/Multi-Tenancy.md index c69e2cb299..00f51d430d 100644 --- a/docs/en/Multi-Tenancy.md +++ b/docs/en/Multi-Tenancy.md @@ -312,10 +312,10 @@ http://nginx.org/en/docs/http/ngx_http_core_module.html#ignore_invalid_headers http://nginx.org/en/docs/http/ngx_http_core_module.html#underscores_in_headers -"__tenant" parameter name can be changed using AspNetCoreMultiTenancyOptions. Example: +"__tenant" parameter name can be changed using AbpAspNetCoreMultiTenancyOptions. Example: ````C# -services.Configure(options => +services.Configure(options => { options.TenantKey = "MyTenantKey"; }); diff --git a/docs/en/Tutorials/Angular/Part-II.md b/docs/en/Tutorials/Angular/Part-II.md index 41414c917c..1dbfe9b5cd 100644 --- a/docs/en/Tutorials/Angular/Part-II.md +++ b/docs/en/Tutorials/Angular/Part-II.md @@ -218,26 +218,6 @@ Open `book-list.component.html` and add the form in the body template of the mod > We've used [NgBootstrap datepicker](https://ng-bootstrap.github.io/#/components/datepicker/overview) in this component. -Open the `book-list.component.ts` and then create an array, named `bookTypeArr`: - -```js -//... -booksType = Books.BookType; - -bookTypeArr = Object.keys(Books.BookType).filter( - bookType => typeof this.booksType[bookType] === 'number' -); -``` -> It use the `booksType` field,please put the `bookTypeArr` defined below that line - -The `bookTypeArr` contains the fields of the `BookType` enum. Resulting array is shown below: - -```js -['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...] -``` - -This array was used in the previous form template (in the `ngFor` loop). - #### Datepicker Requirements You need to import `NgbDatepickerModule` to the `books.module.ts`: @@ -269,6 +249,28 @@ export class BookListComponent implements OnInit { > The `NgbDateAdapter` converts Datepicker value to `Date` type. See the [datepicker adapters](https://ng-bootstrap.github.io/#/components/datepicker/overview) for more details. +#### Create the Book Type Array + +Open the `book-list.component.ts` and then create an array, named `bookTypeArr`: + +```js +//... +booksType = Books.BookType; + +bookTypeArr = Object.keys(Books.BookType).filter( + bookType => typeof this.booksType[bookType] === 'number' +); +``` + +The `bookTypeArr` contains the fields of the `BookType` enum. Resulting array is shown below: + +```js +['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...] +``` + +This array was used in the previous form template (in the `ngFor` loop). + + ![new-book-form](images/bookstore-new-book-form.png) #### Saving the Book diff --git a/docs/zh-Hans/Best-Practices/Module-Architecture.md b/docs/zh-Hans/Best-Practices/Module-Architecture.md index ad38509ef8..648bf660b1 100644 --- a/docs/zh-Hans/Best-Practices/Module-Architecture.md +++ b/docs/zh-Hans/Best-Practices/Module-Architecture.md @@ -57,33 +57,33 @@ * **推荐** 将领域层划分为两个项目: * **Domain.Shared** 包(项目) 命名为*CompanyName.ModuleName.Domain.Shared*,包含常量,枚举和其他类型, 它不能包含实体,存储库,域服务或任何其他业务对象. 可以安全地与模块中的所有层使用. 此包也可以与第三方客户端使用. * **Domain** 包(项目) 命名为*CompanyName.ModuleName.Domain*, 包含实体, 仓储接口,领域服务接口及其实现和其他领域对象. - * Domain package 依赖于 **Domain.Share** package. + * Domain 包依赖于 **Domain.Shared** 包. #### 应用服务层 * **推荐** 将应用服务层划分为两个项目: * **Application.Contracts** 包(项目) 命名为*CompanyName.ModuleName.Application.Contracts,包含应用服务接口和相关的数据传输对象(DTO). - * Application contract package 依赖于 **Domain.Shared** package. + * Application contract 包依赖于 **Domain.Shared** 包. * **Application** 包(项目)命名为*CompanyName.ModuleName.Application*,包含应用服务实现. - * Application package 依赖于 **Domain** 和 **Application.Contracts** packages. + * Application 包依赖于 **Domain** 包和 **Application.Contracts** 包. #### 基础设施层 * **推荐** 为每个orm/数据库集成创建一个独立的集成包, 比如Entity Framework Core 和 MongoDB. - * **推荐** 例如, 创建一个抽象Entity Framework Core集成的*CompanyName.ModuleName.EntityFrameworkCore* package. ORM 集成 package 依赖于 **Domain** package. + * **推荐** 例如, 创建一个抽象Entity Framework Core集成的*CompanyName.ModuleName.EntityFrameworkCore* 包. ORM 集成包依赖于 **Domain** 包. * **不推荐** 依赖于orm/数据库集成包中的其他层. * **推荐** 为每个主要的库创建一个独立的集成包, 在不影响其他包的情况下可以被另一个库替换. #### HTTP 层 * **推荐** 创建命名为*CompanyName.ModuleName.HttpApi*的**HTTP API**包, 为模块开发REST风格的HTTP API. - * HTTP API package 只依赖于 **Application.Contracts** package. 不要依赖 Application package. + * HTTP API 包只依赖于 **Application.Contracts** 包. 不要依赖 Application 包. * **推荐** 为每个应用服务创建一个Controller (通常通过实现其接口). 这些控制器使用应用服务接口来委托操作. 它根据需要配置路由, HTTP方法和其他与Web相关的东西. -* **推荐** 创建一个为HTTP API包提供客户端服务的**HTTP API Client**包, 它的命名为*companyname.modulename.httpapi*. 这些客户端服务将应用服务接口实现远程端点的客户端. - * HTTP API Client package 仅依赖于 **Application.Contracts** package. +* **推荐** 创建一个为HTTP API包提供客户端服务的**HTTP API Client**包, 它的命名为*Companyname.ModuleName.HttpApi.Client*. 这些客户端服务将应用服务接口实现远程端点的客户端. + * HTTP API Client 包仅依赖于 **Application.Contracts** 包. * **推荐** 使用ABP框架提供的动态代理HTTP C＃客户端的功能. #### Web 层 * **推荐** 创建命名为*CompanyName.ModuleName.Web*的 **Web**包. 包含页面,视图,脚本,样式,图像和其他UI组件. - * Web package 仅依赖于 **HttpApi** package. \ No newline at end of file + * Web 包仅依赖于 **HttpApi** 包. \ No newline at end of file diff --git a/docs/zh-Hans/Index.md b/docs/zh-Hans/Index.md index fbe003b8e7..d946d8f0bb 100644 --- a/docs/zh-Hans/Index.md +++ b/docs/zh-Hans/Index.md @@ -6,12 +6,6 @@ ABP是一个**开源应用程序框架**,专注于基于ASP.NET Core的Web应用 浏览左侧导航菜单以深入了解文档. -## 项目状态 - -ABP是开源[ASP.NET Boilerplate](https://aspnetboilerplate.com/)框架的**下一代框架**, 它目前处于早期预览阶段,尚未准备好在生产中使用. 文档仍在进行中,远未完成. - -对于短期和生产级应用程序, 建议使用[ASP.NET Boilerplate](https://aspnetboilerplate.com/)框架,该框架具有丰富的功能集,成熟,积极维护和最新. - ## 入门 使用ABP开发新项目的最简单方法是使用启动模板: diff --git a/docs/zh-Hans/Multi-Tenancy.md b/docs/zh-Hans/Multi-Tenancy.md index f42fd73454..5f00c2c12c 100644 --- a/docs/zh-Hans/Multi-Tenancy.md +++ b/docs/zh-Hans/Multi-Tenancy.md @@ -312,10 +312,10 @@ Volo.Abp.AspNetCore.MultiTenancy 添加了下面这些租户解析器,从当前W http://nginx.org/en/docs/http/ngx_http_core_module.html#ignore_invalid_headers http://nginx.org/en/docs/http/ngx_http_core_module.html#underscores_in_headers -可以使用AspNetCoreMultiTenancyOptions修改默认的参数名"__tenant".例如: +可以使用AbpAspNetCoreMultiTenancyOptions修改默认的参数名"__tenant".例如: ````C# -services.Configure(options => +services.Configure(options => { options.TenantKey = "MyTenantKey"; }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml index fe6e8c36fd..ae3255abbf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml @@ -1,14 +1,18 @@ -@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.LanguageSwitch +@using System.Linq +@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.LanguageSwitch @model LanguageSwitchViewComponentModel -
- +@if (Model.OtherLanguages.Any()) +{ +
+ -
- @foreach (var language in Model.OtherLanguages) - { - @language.DisplayName - } -
-
\ No newline at end of file +
+ @foreach (var language in Model.OtherLanguages) + { + @language.DisplayName + } +
+
+} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml index 548977ffe1..d1738165d3 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml @@ -9,7 +9,14 @@ @model ApplicationMenu
@if (Model.Items.Any()) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index 7b43c6d969..13d438441d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -53,11 +53,14 @@
+ @if (MultiTenancyOptions.Value.IsEnabled && + (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true)) + {
- @MultiTenancyStringLocalizer["Tenant"]
+ @MultiTenancyStringLocalizer["Tenant"]
@if (CurrentTenant.Id == null) { @@ -72,15 +75,12 @@
- @if (MultiTenancyOptions.Value.IsEnabled && - (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true)) - { - @MultiTenancyStringLocalizer["Switch"] - } + @MultiTenancyStringLocalizer["Switch"]
-
+
+ } @(await Component.InvokeAsync()) @RenderBody() diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs index 59c7de8840..a633edb37e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpMvcOptionsExtensions.cs @@ -4,6 +4,7 @@ using Volo.Abp.AspNetCore.Mvc.Auditing; using Volo.Abp.AspNetCore.Mvc.Conventions; using Volo.Abp.AspNetCore.Mvc.ExceptionHandling; using Volo.Abp.AspNetCore.Mvc.Features; +using Volo.Abp.AspNetCore.Mvc.ModelBinding; using Volo.Abp.AspNetCore.Mvc.Uow; using Volo.Abp.AspNetCore.Mvc.Validation; @@ -35,7 +36,7 @@ namespace Volo.Abp.AspNetCore.Mvc private static void AddModelBinders(MvcOptions options) { - //options.ModelBinderProviders.Add(new AbpDateTimeModelBinderProvider()); + options.ModelBinderProviders.Insert(0, new AbpDateTimeModelBinderProvider()); } private static void AddMetadataProviders(MvcOptions options, IServiceCollection services) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs new file mode 100644 index 0000000000..1916b9aa16 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinder.cs @@ -0,0 +1,49 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Volo.Abp.Timing; + +namespace Volo.Abp.AspNetCore.Mvc.ModelBinding +{ + public class AbpDateTimeModelBinder : IModelBinder + { + private readonly Type _type; + private readonly SimpleTypeModelBinder _simpleTypeModelBinder; + private readonly IClock _clock; + + public AbpDateTimeModelBinder(ModelBinderProviderContext context) + { + _type = context.Metadata.ModelType; + _clock = context.Services.GetRequiredService(); + _simpleTypeModelBinder = new SimpleTypeModelBinder(context.Metadata.ModelType, + context.Services.GetRequiredService()); + } + + public async Task BindModelAsync(ModelBindingContext bindingContext) + { + await _simpleTypeModelBinder.BindModelAsync(bindingContext); + + if (!bindingContext.Result.IsModelSet) + { + return; + } + + if (_type == typeof(DateTime)) + { + var dateTime = (DateTime) bindingContext.Result.Model; + bindingContext.Result = ModelBindingResult.Success(_clock.Normalize(dateTime)); + } + else + { + var dateTime = (DateTime?) bindingContext.Result.Model; + if (dateTime != null) + { + bindingContext.Result = ModelBindingResult.Success(_clock.Normalize(dateTime.Value)); + } + } + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs new file mode 100644 index 0000000000..fd55e2b61a --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs @@ -0,0 +1,47 @@ +using System; +using System.Linq; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; +using Volo.Abp.Timing; + +namespace Volo.Abp.AspNetCore.Mvc.ModelBinding +{ + public class AbpDateTimeModelBinderProvider : IModelBinderProvider + { + public IModelBinder GetBinder(ModelBinderProviderContext context) + { + if (context.Metadata.ModelType != typeof(DateTime) && + context.Metadata.ModelType != typeof(DateTime?)) + { + return null; + } + + if (context.Metadata.ContainerType == null) + { + if (context.Metadata is DefaultModelMetadata defaultModelMetadata && + defaultModelMetadata.Attributes.Attributes.All(x => x.GetType() != typeof(DisableDateTimeNormalizationAttribute))) + { + return new AbpDateTimeModelBinder(context); + } + } + else + { + var dateNormalizationDisabledForClass = + context.Metadata.ContainerType.IsDefined(typeof(DisableDateTimeNormalizationAttribute), true); + + var dateNormalizationDisabledForProperty = context.Metadata.ContainerType + .GetProperty(context.Metadata.PropertyName) + ?.IsDefined(typeof(DisableDateTimeNormalizationAttribute), true); + + if (!dateNormalizationDisabledForClass && + dateNormalizationDisabledForProperty != null && + !dateNormalizationDisabledForProperty.Value) + { + return new AbpDateTimeModelBinder(context); + } + } + + return null; + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 0f31af2eb0..a1775bb987 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -44,31 +44,37 @@ namespace Volo.Abp.Cli.Commands var updateNpm = commandLineArgs.Options.ContainsKey(Options.Packages.Npm); var updateNuget = commandLineArgs.Options.ContainsKey(Options.Packages.NuGet); + var directory = commandLineArgs.Options.GetOrNull(Options.SolutionPath.Short, Options.SolutionPath.Long); + if (directory == null) + { + directory = Directory.GetCurrentDirectory(); + } + var both = (updateNuget && updateNpm) || (!updateNuget && !updateNpm); if (updateNuget || both) { - await UpdateNugetPackages(commandLineArgs); + await UpdateNugetPackages(commandLineArgs, directory); } if (updateNpm || both) { - UpdateNpmPackages(); + UpdateNpmPackages(directory); } } - private void UpdateNpmPackages() + private void UpdateNpmPackages(string directory) { - _npmPackagesUpdater.Update(Directory.GetCurrentDirectory()); + _npmPackagesUpdater.Update(directory); } - private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs) + private async Task UpdateNugetPackages(CommandLineArgs commandLineArgs, string directory) { var includePreviews = commandLineArgs.Options.GetOrNull(Options.IncludePreviews.Short, Options.IncludePreviews.Long) != null; - var solution = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.sln").FirstOrDefault(); + var solution = Directory.GetFiles(directory, "*.sln").FirstOrDefault(); if (solution != null) { @@ -131,6 +137,12 @@ namespace Volo.Abp.Cli.Commands public static class Options { + public static class SolutionPath + { + public const string Short = "sp"; + public const string Long = "solution-path"; + } + public static class IncludePreviews { public const string Short = "p"; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs index ad808e6026..a0096ef9ac 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs @@ -9,9 +9,9 @@ namespace Volo.Abp.DependencyInjection { public Type[] ServiceTypes { get; } - public bool? IncludeDefaults { get; set; } + public bool IncludeDefaults { get; set; } - public bool? IncludeSelf { get; set; } + public bool IncludeSelf { get; set; } public ExposeServicesAttribute(params Type[] serviceTypes) { @@ -22,19 +22,19 @@ namespace Volo.Abp.DependencyInjection { var serviceList = ServiceTypes.ToList(); - if (IncludeDefaults == true) + if (IncludeDefaults) { foreach (var type in GetDefaultServices(targetType)) { serviceList.AddIfNotContains(type); } - if (IncludeSelf != false) + if (IncludeSelf) { serviceList.AddIfNotContains(targetType); } } - else if (IncludeSelf == true) + else if (IncludeSelf) { serviceList.AddIfNotContains(targetType); } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs index f7324014d4..cb0d727795 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposedServiceExplorer.cs @@ -10,7 +10,8 @@ namespace Volo.Abp.DependencyInjection private static readonly ExposeServicesAttribute DefaultExposeServicesAttribute = new ExposeServicesAttribute { - IncludeDefaults = true + IncludeDefaults = true, + IncludeSelf = true }; public static List GetExposedServices(Type type) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index 0d45d719fd..18758d98e3 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -18,10 +18,12 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities.Events; using Volo.Abp.EntityFrameworkCore.EntityHistory; +using Volo.Abp.EntityFrameworkCore.ValueConverters; using Volo.Abp.Guids; using Volo.Abp.MultiTenancy; using Volo.Abp.Reflection; using Volo.Abp.Threading; +using Volo.Abp.Timing; namespace Volo.Abp.EntityFrameworkCore { @@ -48,6 +50,8 @@ namespace Volo.Abp.EntityFrameworkCore public IAuditingManager AuditingManager { get; set; } + public IClock Clock { get; set; } + public ILogger> Logger { get; set; } private static readonly MethodInfo ConfigureBasePropertiesMethodInfo @@ -57,6 +61,13 @@ namespace Volo.Abp.EntityFrameworkCore BindingFlags.Instance | BindingFlags.NonPublic ); + private static readonly MethodInfo ConfigureValueConverterMethodInfo + = typeof(AbpDbContext) + .GetMethod( + nameof(ConfigureValueConverter), + BindingFlags.Instance | BindingFlags.NonPublic + ); + protected AbpDbContext(DbContextOptions options) : base(options) { @@ -75,6 +86,10 @@ namespace Volo.Abp.EntityFrameworkCore ConfigureBasePropertiesMethodInfo .MakeGenericMethod(entityType.ClrType) .Invoke(this, new object[] { modelBuilder, entityType }); + + ConfigureValueConverterMethodInfo + .MakeGenericMethod(entityType.ClrType) + .Invoke(this, new object[] { modelBuilder, entityType }); } } @@ -332,6 +347,11 @@ namespace Volo.Abp.EntityFrameworkCore protected virtual void ConfigureBaseProperties(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) where TEntity : class { + if (mutableEntityType.IsOwned()) + { + return; + } + ConfigureConcurrencyStampProperty(modelBuilder, mutableEntityType); ConfigureExtraProperties(modelBuilder, mutableEntityType); ConfigureAuditProperties(modelBuilder, mutableEntityType); @@ -488,6 +508,39 @@ namespace Volo.Abp.EntityFrameworkCore } } + protected virtual void ConfigureValueConverter(ModelBuilder modelBuilder, IMutableEntityType mutableEntityType) + where TEntity : class + { + if (mutableEntityType.BaseType == null && + !typeof(TEntity).IsDefined(typeof(DisableDateTimeNormalizationAttribute), true) && + !typeof(TEntity).IsDefined(typeof(OwnedAttribute), true) && + !mutableEntityType.IsOwned()) + { + if (Clock == null || !Clock.SupportsMultipleTimezone) + { + return; + } + + var dateTimeValueConverter = new AbpDateTimeValueConverter(Clock); + + var dateTimePropertyInfos = typeof(TEntity).GetProperties() + .Where(property => + (property.PropertyType == typeof(DateTime) || + property.PropertyType == typeof(DateTime?)) && + property.CanWrite && + !property.IsDefined(typeof(DisableDateTimeNormalizationAttribute), true) + ).ToList(); + + dateTimePropertyInfos.ForEach(property => + { + modelBuilder + .Entity() + .Property(property.Name) + .HasConversion(dateTimeValueConverter); + }); + } + } + protected virtual bool ShouldFilterEntity(IMutableEntityType entityType) where TEntity : class { if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity))) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs new file mode 100644 index 0000000000..e3562c4134 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs @@ -0,0 +1,17 @@ +using System; +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Volo.Abp.Timing; + +namespace Volo.Abp.EntityFrameworkCore.ValueConverters +{ + public class AbpDateTimeValueConverter : ValueConverter + { + public AbpDateTimeValueConverter(IClock clock, [CanBeNull] ConverterMappingHints mappingHints = null) + : base( + x => x.HasValue ? clock.Normalize(x.Value) : x, + x => x.HasValue ? clock.Normalize(x.Value) : x, mappingHints) + { + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj index 118e60d31c..d96ab22fbe 100644 --- a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj +++ b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj @@ -14,7 +14,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs new file mode 100644 index 0000000000..2c5a69e7e7 --- /dev/null +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController.cs @@ -0,0 +1,61 @@ +using System; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Timing; + +namespace Volo.Abp.AspNetCore.Mvc.ModelBinding +{ + [Route("api/model-Binding-test")] + public class ModelBindingController : AbpController + { + [HttpGet("DateTimeKind")] + public string DateTimeKind(DateTime input) + { + return input.Kind.ToString().ToLower(); + } + + [HttpGet("NullableDateTimeKind")] + public string NullableDateTimeKind(DateTime? input) + { + return input.Value.Kind.ToString().ToLower(); + } + + [HttpGet("DisableDateTimeNormalizationDateTimeKind")] + public string DisableDateTimeNormalizationDateTimeKind([DisableDateTimeNormalization]DateTime input) + { + return input.Kind.ToString().ToLower(); + } + + [HttpGet("DisableDateTimeNormalizationNullableDateTimeKind")] + public string DisableDateTimeNormalizationNullableDateTimeKind([DisableDateTimeNormalization]DateTime? input) + { + return input.Value.Kind.ToString().ToLower(); + } + + [HttpGet("ComplexTypeDateTimeKind")] + public string ComplexTypeDateTimeKind(GetDateTimeKindModel input) + { + return input.Time1.Kind.ToString().ToLower() + "_" + + input.Time2.Kind.ToString().ToLower() + "_" + + input.Time3.Value.Kind.ToString().ToLower() + "_" + + input.InnerModel.Time4.Kind.ToString().ToLower(); + } + } + + public class GetDateTimeKindModel + { + [DisableDateTimeNormalization] + public DateTime Time1 { get; set; } + + public DateTime Time2 { get; set; } + + public DateTime? Time3 { get; set; } + + public GetDateTimeKindInnerModel InnerModel { get; set; } + + [DisableDateTimeNormalization] + public class GetDateTimeKindInnerModel + { + public DateTime Time4 { get; set; } + } + } +} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs new file mode 100644 index 0000000000..632a02194f --- /dev/null +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs @@ -0,0 +1,100 @@ +using System; +using System.Net; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Shouldly; +using Volo.Abp.Timing; +using Xunit; + +namespace Volo.Abp.AspNetCore.Mvc.ModelBinding +{ + public abstract class ModelBindingController_Tests : AspNetCoreMvcTestBase + { + protected DateTimeKind DateTimeKind { get; set; } + + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) + { + services.Configure(x => x.Kind = DateTimeKind); + } + + [Fact] + public async Task DateTimeKind_Test() + { + var response = await Client.GetAsync("/api/model-Binding-test/DateTimeKind?input=2010-01-01T00:00:00Z"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + var resultAsString = await response.Content.ReadAsStringAsync(); + resultAsString.ShouldBe(DateTimeKind.ToString().ToLower()); + } + + [Fact] + public async Task NullableDateTimeKind_Test() + { + var response = + await Client.GetAsync("/api/model-Binding-test/NullableDateTimeKind?input=2010-01-01T00:00:00Z"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + var resultAsString = await response.Content.ReadAsStringAsync(); + resultAsString.ShouldBe(DateTimeKind.ToString().ToLower()); + } + + [Fact] + public async Task DisableDateTimeNormalizationDateTimeKind_Test() + { + var response = + await Client.GetAsync( + "/api/model-Binding-test/DisableDateTimeNormalizationDateTimeKind?input=2010-01-01T00:00:00Z"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + var resultAsString = await response.Content.ReadAsStringAsync(); + //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local. + resultAsString.ShouldBe(DateTimeKind.Local.ToString().ToLower()); + } + + [Fact] + public async Task DisableDateTimeNormalizationNullableDateTimeKind_Test() + { + var response = + await Client.GetAsync( + "/api/model-Binding-test/DisableDateTimeNormalizationNullableDateTimeKind?input=2010-01-01T00:00:00Z"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + var resultAsString = await response.Content.ReadAsStringAsync(); + //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local. + resultAsString.ShouldBe(DateTimeKind.Local.ToString().ToLower()); + } + + [Fact] + public async Task ComplexTypeDateTimeKind_Test() + { + var response = await Client.GetAsync("/api/model-Binding-test/ComplexTypeDateTimeKind?" + + "Time1=2010-01-01T00:00:00Z&" + + "Time2=2010-01-01T00:00:00Z&" + + "Time3=2010-01-01T00:00:00Z&" + + "InnerModel.Time4=2010-01-01T00:00:00Z"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + var resultAsString = await response.Content.ReadAsStringAsync(); + //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local. + resultAsString.ShouldBe( + $"local_{DateTimeKind.ToString().ToLower()}_{DateTimeKind.ToString().ToLower()}_local"); + } + } + + public class ModelBindingController_Utc_Tests : ModelBindingController_Tests + { + public ModelBindingController_Utc_Tests() + { + DateTimeKind = DateTimeKind.Utc; + } + } + + public class ModelBindingController_Local_Tests : ModelBindingController_Tests + { + public ModelBindingController_Local_Tests() + { + DateTimeKind = DateTimeKind.Local; + } + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs index b1b92ab5b2..71522d0216 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Data.Sqlite; +using System; +using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; @@ -10,6 +11,7 @@ using Volo.Abp.Modularity; using Volo.Abp.TestApp; using Volo.Abp.TestApp.Domain; using Volo.Abp.TestApp.EntityFrameworkCore; +using Volo.Abp.Timing; namespace Volo.Abp.EntityFrameworkCore { @@ -41,6 +43,8 @@ namespace Volo.Abp.EntityFrameworkCore abpDbContextConfigurationContext.DbContextOptions.UseSqlite(sqliteConnection); }); }); + + Configure(options => options.Kind = DateTimeKind.Utc); } public override void OnPreApplicationInitialization(ApplicationInitializationContext context) @@ -56,6 +60,9 @@ namespace Volo.Abp.EntityFrameworkCore using (var context = new TestMigrationsDbContext(new DbContextOptionsBuilder().UseSqlite(connection).Options)) { context.GetService().CreateTables(); + context.Database.ExecuteSqlRaw( + @"CREATE VIEW View_PersonView AS + SELECT Name, CreationTime, Birthday, LastActive FROM People"); } return connection; diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs index 0f9def32f0..da66392a18 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs @@ -25,12 +25,23 @@ namespace Volo.Abp.EntityFrameworkCore protected override void OnModelCreating(ModelBuilder modelBuilder) { + modelBuilder.Owned(); + base.OnModelCreating(modelBuilder); modelBuilder.Entity(b => { b.HasKey(p => new { p.PersonId, p.Number }); }); + + modelBuilder.Entity(b => + { + b.OwnsMany(c => c.Districts, d => + { + d.WithOwner().HasForeignKey(x => x.CityId); + d.HasKey(x => new { x.CityId, x.Name }); + }); + }); } } } diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs new file mode 100644 index 0000000000..c2793b3b67 --- /dev/null +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter_Tests.cs @@ -0,0 +1,9 @@ +using Volo.Abp.TestApp.Testing; + +namespace Volo.Abp.EntityFrameworkCore.ValueConverters +{ + public class AbpDateTimeValueConverter_Tests : AbpDateTimeValueConverter_Tests + { + + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs new file mode 100644 index 0000000000..ab8c1920a7 --- /dev/null +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/PersonRepository.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.TestApp.Domain; + +namespace Volo.Abp.TestApp.EntityFrameworkCore +{ + public class PersonRepository : EfCoreRepository, IPersonRepository + { + public PersonRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + + public async Task GetViewAsync(string name) + { + return await DbContext.PersonView.Where(x => x.Name == name).FirstOrDefaultAsync(); + } + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs index bfcecdeb65..289364411d 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs @@ -11,6 +11,8 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore public DbSet Cities { get; set; } + public DbSet PersonView { get; set; } + public DbSet DummyEntities { get; set; } public DbSet EntityWithIntPks { get; set; } @@ -23,12 +25,30 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore protected override void OnModelCreating(ModelBuilder modelBuilder) { + modelBuilder.Owned(); + base.OnModelCreating(modelBuilder); modelBuilder.Entity(b => { b.HasKey(p => new {p.PersonId, p.Number}); }); + + modelBuilder + .Entity(p => + { + p.HasNoKey(); + p.ToView("View_PersonView"); + }); + + modelBuilder.Entity(b => + { + b.OwnsMany(c => c.Districts, d => + { + d.WithOwner().HasForeignKey(x => x.CityId); + d.HasKey(x => new {x.CityId, x.Name}); + }); + }); } } } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs index 76361463d7..cc5a194088 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/City.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using Volo.Abp.Domain.Entities; namespace Volo.Abp.TestApp.Domain @@ -7,6 +9,8 @@ namespace Volo.Abp.TestApp.Domain { public string Name { get; set; } + public ICollection Districts { get; set; } + private City() { @@ -16,6 +20,12 @@ namespace Volo.Abp.TestApp.Domain : base(id) { Name = name; + Districts = new List(); + } + + public int GetPopulation() + { + return Districts.Select(d => d.Population).Sum(); } } } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs new file mode 100644 index 0000000000..13f0f9d5c7 --- /dev/null +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/District.cs @@ -0,0 +1,30 @@ +using System; +using Volo.Abp.Domain.Entities.Auditing; + +namespace Volo.Abp.TestApp.Domain +{ + public class District : CreationAuditedEntity + { + public Guid CityId { get; private set; } + + public string Name { get; private set; } + + public int Population { get; set; } + + private District() + { + + } + + public District(Guid cityId, string name, int population = 0) + { + CityId = cityId; + Name = name; + } + + public override object[] GetKeys() + { + return new Object[] {CityId, Name}; + } + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs new file mode 100644 index 0000000000..9058522346 --- /dev/null +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/IPersonRepository.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Domain.Repositories; + +namespace Volo.Abp.TestApp.Domain +{ + public interface IPersonRepository : IBasicRepository + { + Task GetViewAsync(string name); + } +} diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs index 3bbec118a2..9075740f11 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs @@ -2,6 +2,7 @@ using System; using System.Collections.ObjectModel; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; +using Volo.Abp.Timing; namespace Volo.Abp.TestApp.Domain { @@ -15,6 +16,11 @@ namespace Volo.Abp.TestApp.Domain public virtual int Age { get; set; } + public virtual DateTime? Birthday { get; set; } + + [DisableDateTimeNormalization] + public virtual DateTime? LastActive { get; set; } + public virtual Collection Phones { get; set; } private Person() diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs new file mode 100644 index 0000000000..e77827c263 --- /dev/null +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/PersonView.cs @@ -0,0 +1,17 @@ +using System; +using Volo.Abp.Timing; + +namespace Volo.Abp.TestApp.Domain +{ + public class PersonView + { + public string Name { get; set; } + + public DateTime CreationTime { get; set; } + + public DateTime? Birthday { get; set; } + + [DisableDateTimeNormalization] + public DateTime? LastActive { get; set; } + } +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs index 1f955b3e82..8900d8cfdf 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs @@ -38,10 +38,15 @@ namespace Volo.Abp.TestApp private void AddCities() { + var istanbul = new City(IstanbulCityId, "Istanbul"); + istanbul.Districts.Add(new District(istanbul.Id, "Bakirkoy", 1283999)); + istanbul.Districts.Add(new District(istanbul.Id, "Mecidiyeky", 2222321)); + istanbul.Districts.Add(new District(istanbul.Id, "Uskudar", 726172)); + _cityRepository.Insert(new City(Guid.NewGuid(), "Tokyo")); _cityRepository.Insert(new City(Guid.NewGuid(), "Madrid")); _cityRepository.Insert(new City(LondonCityId, "London") {ExtraProperties = { { "Population", 10_470_000 } } }); - _cityRepository.Insert(new City(IstanbulCityId, "Istanbul")); + _cityRepository.Insert(istanbul); _cityRepository.Insert(new City(Guid.NewGuid(), "Paris")); _cityRepository.Insert(new City(Guid.NewGuid(), "Washington")); _cityRepository.Insert(new City(Guid.NewGuid(), "Sao Paulo")); diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs new file mode 100644 index 0000000000..e36225e53c --- /dev/null +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/AbpDateTimeValueConverter_Tests.cs @@ -0,0 +1,73 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Shouldly; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Modularity; +using Volo.Abp.TestApp.Domain; +using Volo.Abp.Timing; +using Xunit; + +namespace Volo.Abp.TestApp.Testing +{ + public abstract class AbpDateTimeValueConverter_Tests : TestAppTestBase + where TStartupModule : IAbpModule + { + private readonly IPersonRepository _personRepository; + + protected AbpDateTimeValueConverter_Tests() + { + _personRepository = GetRequiredService(); + } + + [Fact] + public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_Test() + { + var personId = Guid.Parse("4125582e-d100-4c27-aa84-e4de85830dca"); + await _personRepository.InsertAsync(new Person(personId, "bob lee", 18) + { + Birthday = DateTime.Parse("2020-01-01 00:00:00"), + LastActive = DateTime.Parse("2020-01-01 00:00:00"), + }, true); + + var person = await _personRepository.GetAsync(personId); + + person.ShouldNotBeNull(); + person.CreationTime.Kind.ShouldBe(DateTimeKind.Utc); + + person.Birthday.ShouldNotBeNull(); + person.Birthday.Value.Kind.ShouldBe(DateTimeKind.Utc); + person.Birthday.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00"); + + //LastActive DisableDateTimeNormalization + person.LastActive.ShouldNotBeNull(); + person.LastActive.Value.Kind.ShouldBe(DateTimeKind.Unspecified); + person.LastActive.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00"); + } + + [Fact] + public async Task DateTime_Kind_Should_Be_Normalized_To_UTC_View_Test() + { + var personName = "bob lee"; + await _personRepository.InsertAsync(new Person(Guid.NewGuid(), personName, 18) + { + Birthday = DateTime.Parse("2020-01-01 00:00:00"), + LastActive = DateTime.Parse("2020-01-01 00:00:00"), + }, true); + + var person = await _personRepository.GetViewAsync(personName); + + person.ShouldNotBeNull(); + person.CreationTime.Kind.ShouldBe(DateTimeKind.Utc); + + person.Birthday.ShouldNotBeNull(); + person.Birthday.Value.Kind.ShouldBe(DateTimeKind.Utc); + person.Birthday.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00"); + + //LastActive DisableDateTimeNormalization + person.LastActive.ShouldNotBeNull(); + person.LastActive.Value.Kind.ShouldBe(DateTimeKind.Unspecified); + person.LastActive.Value.ToString("yyy-MM-dd HH:mm:ss").ShouldBe("2020-01-01 00:00:00"); + } + } +} \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs index b6902e86d8..f1abf44750 100644 --- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs @@ -1,4 +1,4 @@ -using IdentityModel; +using IdentityModel; using IdentityServer4.Events; using IdentityServer4.Models; using IdentityServer4.Services; @@ -12,8 +12,10 @@ using System.Linq; using System.Security.Claims; using System.Security.Principal; using System.Threading.Tasks; +using Volo.Abp.Account.Web.Settings; using Volo.Abp.DependencyInjection; using Volo.Abp.MultiTenancy; +using Volo.Abp.Settings; using Volo.Abp.Uow; namespace Volo.Abp.Account.Web.Pages.Account @@ -40,7 +42,7 @@ namespace Volo.Abp.Account.Web.Pages.Account IdentityServerEvents = identityServerEvents; } - public override async Task OnGetAsync() + public override async Task OnGetAsync() { LoginInput = new LoginInputModel(); @@ -63,7 +65,7 @@ namespace Volo.Abp.Account.Web.Pages.Account { LoginInput.UserNameOrEmailAddress = context.LoginHint; ExternalProviders = new[] { new ExternalProviderModel { AuthenticationScheme = context.IdP } }; - return; + return Page(); } var schemes = await _schemeProvider.GetAllSchemesAsync(); @@ -77,7 +79,7 @@ namespace Volo.Abp.Account.Web.Pages.Account }) .ToList(); - EnableLocalLogin = true; //TODO: We can get default from a setting? + EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin); if (context?.ClientId != null) { var client = await ClientStore.FindEnabledClientByIdAsync(context.ClientId); @@ -96,15 +98,16 @@ namespace Volo.Abp.Account.Web.Pages.Account if (IsExternalLoginOnly) { - //return await ExternalLogin(vm.ExternalLoginScheme, returnUrl); - throw new NotImplementedException(); + return await base.OnPostExternalLogin(providers.First().AuthenticationScheme); } + + return Page(); } [UnitOfWork] //TODO: Will be removed when we implement action filter public override async Task OnPostAsync(string action) { - EnableLocalLogin = true; //TODO: We can get default from a setting? + EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin); if (action == "Cancel") { diff --git a/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs b/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs index 1f1b43b853..eb7d1cbc84 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LogoutController.cs @@ -17,10 +17,15 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers } //todo@alper: this method can be moved to AccountController like "account/logout" - public async Task Index() + public async Task Index(string returnUrl = null) { await _signInManager.SignOutAsync(); + if (returnUrl != null) + { + return LocalRedirect(returnUrl); + } + return RedirectToPage("/Account/Login"); } } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs index cc82de414f..e7e625416a 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs @@ -10,8 +10,10 @@ using System.Diagnostics; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; +using Volo.Abp.Account.Web.Settings; using Volo.Abp.Identity; using Volo.Abp.Security.Claims; +using Volo.Abp.Settings; using Volo.Abp.Uow; using Volo.Abp.Validation; using IdentityUser = Volo.Abp.Identity.IdentityUser; @@ -56,7 +58,7 @@ namespace Volo.Abp.Account.Web.Pages.Account _accountOptions = accountOptions.Value; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { LoginInput = new LoginInputModel(); @@ -71,8 +73,8 @@ namespace Volo.Abp.Account.Web.Pages.Account }) .ToList(); - EnableLocalLogin = true; //TODO: We can get default from a setting? - + EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin); + ExternalProviders = providers.ToArray(); if (IsExternalLoginOnly) @@ -80,12 +82,14 @@ namespace Volo.Abp.Account.Web.Pages.Account //return await ExternalLogin(vm.ExternalLoginScheme, returnUrl); throw new NotImplementedException(); } + + return Page(); } [UnitOfWork] //TODO: Will be removed when we implement action filter public virtual async Task OnPostAsync(string action) { - EnableLocalLogin = true; //TODO: We can get default from a setting? + EnableLocalLogin = await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin); ValidateModel(); diff --git a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs index 8d3ccba7c9..be16fa7045 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs @@ -9,6 +9,10 @@ namespace Volo.Abp.Account.Web.Settings context.Add( new SettingDefinition(AccountSettingNames.IsSelfRegistrationEnabled, "true") ); + + context.Add( + new SettingDefinition(AccountSettingNames.EnableLocalLogin, "true") + ); } } } \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs index 3122dbdc6a..a167be0ce8 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingNames.cs @@ -3,5 +3,7 @@ public class AccountSettingNames { public const string IsSelfRegistrationEnabled = "Abp.Account.IsSelfRegistrationEnabled"; + + public const string EnableLocalLogin = "Abp.Account.EnableLocalLogin"; } } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs index 23632efce0..aca1535c3c 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs @@ -34,7 +34,7 @@ namespace Volo.Abp.Identity public virtual string Name { get; set; } /// - /// Gets or sets the Surame for the user. + /// Gets or sets the Surname for the user. /// public virtual string Surname { get; set; } diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json new file mode 100644 index 0000000000..9340b7999f --- /dev/null +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Localization/Resources/tr.json @@ -0,0 +1,8 @@ +{ + "culture": "tr", + "texts": { + "Volo.IdentityServer:DuplicateIdentityResourceName": "Identity Resource adı zaten mevcut: {Name}", + "Volo.IdentityServer:DuplicateApiResourceName": "Api Resource adı zaten mevcut: {Name}", + "Volo.IdentityServer:DuplicateClientId": "ClientId already zaten mevcut: {ClientId}" + } +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js index 4583cd616a..3ae75e6ad6 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js @@ -17,6 +17,9 @@ var _dataTable = _$wrapper.find('table').DataTable(abp.libs.datatables.normalizeConfiguration({ order: [[1, "asc"]], + processing: true, + paging: true, + serverSide: true, ajax: abp.libs.datatables.createAjax(_tenantAppService.getList), columnDefs: [ { diff --git a/npm/ng-packs/.prettierrc b/npm/ng-packs/.prettierrc index b5b5724081..5e2863a11f 100644 --- a/npm/ng-packs/.prettierrc +++ b/npm/ng-packs/.prettierrc @@ -1,6 +1,5 @@ { - "printWidth": 120, + "printWidth": 100, "singleQuote": true, "trailingComma": "all" } - diff --git a/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts b/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts index e01287e1cb..fad7ae5fc7 100644 --- a/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts @@ -1,4 +1,4 @@ -import { ConfigState, GetAppConfiguration, ABP } from '@abp/ng.core'; +import { ConfigState, GetAppConfiguration, ABP, SessionState } from '@abp/ng.core'; import { ToasterService } from '@abp/ng.theme.shared'; import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -11,6 +11,7 @@ import snq from 'snq'; import { RegisterRequest } from '../../models'; import { AccountService } from '../../services/account.service'; import { PasswordRules, validatePassword } from '@ngx-validate/core'; +import { HttpHeaders } from '@angular/common/http'; const { maxLength, minLength, required, email } = Validators; @Component({ @@ -29,7 +30,9 @@ export class RegisterComponent implements OnInit { private store: Store, private toasterService: ToasterService, ) { - this.oauthService.configure(this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig); + this.oauthService.configure( + this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig, + ); this.oauthService.loadDiscoveryDocument(); } @@ -62,7 +65,10 @@ export class RegisterComponent implements OnInit { this.form = this.fb.group({ username: ['', [required, maxLength(255)]], - password: ['', [required, validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(32)]], + password: [ + '', + [required, validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(32)], + ], email: ['', [required, email]], }); } @@ -79,10 +85,22 @@ export class RegisterComponent implements OnInit { appName: 'Angular', } as RegisterRequest; + const tenant = this.store.selectSnapshot(SessionState.getTenant); + this.accountService .register(newUser) .pipe( - switchMap(() => from(this.oauthService.fetchTokenUsingPasswordFlow(newUser.userName, newUser.password))), + switchMap(() => + from( + this.oauthService.fetchTokenUsingPasswordFlow( + newUser.userName, + newUser.password, + new HttpHeaders({ + ...(tenant && tenant.id && { __tenant: tenant.id }), + }), + ), + ), + ), switchMap(() => this.store.dispatch(new GetAppConfiguration())), tap(() => this.store.dispatch(new Navigate(['/']))), take(1), diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts index 67350b88ce..b3c687672d 100644 --- a/npm/ng-packs/packages/core/src/lib/core.module.ts +++ b/npm/ng-packs/packages/core/src/lib/core.module.ts @@ -28,6 +28,7 @@ import { ConfigState } from './states/config.state'; import { ProfileState } from './states/profile.state'; import { SessionState } from './states/session.state'; import { getInitialData, localeInitializer } from './utils/initial-utils'; +import './utils/date-extensions'; @NgModule({ imports: [ diff --git a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts index 68a5ae6f75..870e4ec144 100644 --- a/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts +++ b/npm/ng-packs/packages/core/src/lib/directives/permission.directive.ts @@ -1,31 +1,68 @@ -import { Directive, ElementRef, Input, OnDestroy, OnInit, Optional, Renderer2 } from '@angular/core'; +import { + Directive, + ElementRef, + Input, + OnDestroy, + OnInit, + Renderer2, + ViewContainerRef, + TemplateRef, + Optional, + SimpleChanges, + OnChanges, +} from '@angular/core'; import { Store } from '@ngxs/store'; import { ConfigState } from '../states'; import { takeUntilDestroy } from '../utils'; +import { Subscription } from 'rxjs'; @Directive({ selector: '[abpPermission]', }) -export class PermissionDirective implements OnInit, OnDestroy { +export class PermissionDirective implements OnInit, OnDestroy, OnChanges { @Input('abpPermission') condition: string; - constructor(@Optional() private elRef: ElementRef, private renderer: Renderer2, private store: Store) {} + subscription: Subscription; + + constructor( + private elRef: ElementRef, + private renderer: Renderer2, + private store: Store, + @Optional() private templateRef: TemplateRef, + private vcRef: ViewContainerRef, + ) {} + + private check() { + if (this.subscription) { + this.subscription.unsubscribe(); + } + + this.subscription = this.store + .select(ConfigState.getGrantedPolicy(this.condition)) + .pipe(takeUntilDestroy(this)) + .subscribe(isGranted => { + if (this.templateRef && isGranted) { + this.vcRef.clear(); + this.vcRef.createEmbeddedView(this.templateRef); + } else if (this.templateRef && !isGranted) { + this.vcRef.clear(); + } else if (!isGranted && !this.templateRef) { + this.renderer.removeChild((this.elRef.nativeElement as HTMLElement).parentElement, this.elRef.nativeElement); + } + }); + } ngOnInit() { - if (this.condition) { - this.store - .select(ConfigState.getGrantedPolicy(this.condition)) - .pipe(takeUntilDestroy(this)) - .subscribe(isGranted => { - if (!isGranted) { - this.renderer.removeChild( - (this.elRef.nativeElement as HTMLElement).parentElement, - this.elRef.nativeElement, - ); - } - }); + if (this.templateRef && !this.condition) { + this.vcRef.createEmbeddedView(this.templateRef); } } ngOnDestroy(): void {} + + ngOnChanges({ condition }: SimpleChanges) { + if ((condition || { currentValue: null }).currentValue) { + this.check(); + } + } } diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts index ca69eb127d..e23eeb40c2 100644 --- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts +++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts @@ -1,10 +1,11 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, CanActivate } from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router'; import { Store } from '@ngxs/store'; import { Observable } from 'rxjs'; -import { ConfigState } from '../states'; import { tap } from 'rxjs/operators'; +import snq from 'snq'; import { RestOccurError } from '../actions'; +import { ConfigState } from '../states'; @Injectable({ providedIn: 'root', @@ -12,8 +13,14 @@ import { RestOccurError } from '../actions'; export class PermissionGuard implements CanActivate { constructor(private store: Store) {} - canActivate({ data }: ActivatedRouteSnapshot): Observable { - const resource = data.requiredPolicy as string; + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + let resource = snq(() => route.data.routes.requiredPolicy) || snq(() => route.data.requiredPolicy as string); + if (!resource) { + resource = snq( + () => route.routeConfig.children.find(child => state.url.indexOf(child.path) > -1).data.requiredPolicy, + ); + } + return this.store.select(ConfigState.getGrantedPolicy(resource)).pipe( tap(access => { if (!access) { diff --git a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts index ea23da1efc..4d634f33c7 100644 --- a/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts +++ b/npm/ng-packs/packages/core/src/lib/pipes/sort.pipe.ts @@ -5,7 +5,11 @@ export type SortOrder = 'asc' | 'desc'; name: 'abpSort', }) export class SortPipe implements PipeTransform { - transform(value: any[], sortOrder: SortOrder | string = 'asc', sortKey?: string): any { + transform( + value: any[], + sortOrder: SortOrder | string = 'asc', + sortKey?: string, + ): any { sortOrder = sortOrder && (sortOrder.toLowerCase() as any); if (!value || (sortOrder !== 'asc' && sortOrder !== 'desc')) return value; @@ -17,7 +21,9 @@ export class SortPipe implements PipeTransform { numberArray = value.filter(item => typeof item === 'number').sort(); stringArray = value.filter(item => typeof item === 'string').sort(); } else { - numberArray = value.filter(item => typeof item[sortKey] === 'number').sort((a, b) => a[sortKey] - b[sortKey]); + numberArray = value + .filter(item => typeof item[sortKey] === 'number') + .sort((a, b) => a[sortKey] - b[sortKey]); stringArray = value .filter(item => typeof item[sortKey] === 'string') .sort((a, b) => { @@ -26,7 +32,15 @@ export class SortPipe implements PipeTransform { else return 0; }); } - const sorted = numberArray.concat(stringArray); + const sorted = [ + ...numberArray, + ...stringArray, + ...value.filter( + item => + typeof (sortKey ? item[sortKey] : item) !== 'number' && + typeof (sortKey ? item[sortKey] : item) !== 'string', + ), + ]; return sortOrder === 'asc' ? sorted : sorted.reverse(); } } diff --git a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts index 4057a4a29a..0ad32ba010 100644 --- a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts @@ -23,17 +23,31 @@ export class RestService { config = config || ({} as Rest.Config); const { observe = Rest.Observe.Body, skipHandleError } = config; const url = (api || this.store.selectSnapshot(ConfigState.getApiUrl())) + request.url; - const { method, ...options } = request; + const { method, params, ...options } = request; - return this.http.request(method, url, { observe, ...options } as any).pipe( - observe === Rest.Observe.Body ? take(1) : tap(), - catchError(err => { - if (skipHandleError) { - return throwError(err); - } + return this.http + .request(method, url, { + observe, + ...(params && { + params: Object.keys(params).reduce( + (acc, key) => ({ + ...acc, + ...(typeof params[key] !== 'undefined' && params[key] !== '' && { [key]: params[key] }), + }), + {}, + ), + }), + ...options, + } as any) + .pipe( + observe === Rest.Observe.Body ? take(1) : tap(), + catchError(err => { + if (skipHandleError) { + return throwError(err); + } - return this.handleError(err); - }), - ); + return this.handleError(err); + }), + ); } } diff --git a/npm/ng-packs/packages/core/src/lib/states/config.state.ts b/npm/ng-packs/packages/core/src/lib/states/config.state.ts index 381dc3e0f6..d984a8d9b3 100644 --- a/npm/ng-packs/packages/core/src/lib/states/config.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/config.state.ts @@ -1,8 +1,18 @@ -import { Action, createSelector, Selector, State, StateContext, Store } from '@ngxs/store'; +import { + Action, + createSelector, + Selector, + State, + StateContext, + Store, +} from '@ngxs/store'; import { of } from 'rxjs'; import { switchMap, tap } from 'rxjs/operators'; import snq from 'snq'; -import { GetAppConfiguration, PatchRouteByName } from '../actions/config.actions'; +import { + GetAppConfiguration, + PatchRouteByName, +} from '../actions/config.actions'; import { SetLanguage } from '../actions/session.actions'; import { ABP } from '../models/common'; import { Config } from '../models/config'; @@ -26,12 +36,9 @@ export class ConfigState { } static getOne(key: string) { - const selector = createSelector( - [ConfigState], - (state: Config.State) => { - return state[key]; - }, - ); + const selector = createSelector([ConfigState], (state: Config.State) => { + return state[key]; + }); return selector; } @@ -45,36 +52,32 @@ export class ConfigState { throw new Error('The argument must be a dot string or an string array.'); } - const selector = createSelector( - [ConfigState], - (state: Config.State) => { - return (keys as string[]).reduce((acc, val) => { - if (acc) { - return acc[val]; - } - - return undefined; - }, state); - }, - ); + const selector = createSelector([ConfigState], (state: Config.State) => { + return (keys as string[]).reduce((acc, val) => { + if (acc) { + return acc[val]; + } + + return undefined; + }, state); + }); return selector; } - static getRoute(path?: string, name?: string) { - const selector = createSelector( - [ConfigState], - (state: Config.State) => { - const { flattedRoutes } = state; - return (flattedRoutes as ABP.FullRoute[]).find(route => { - if (path && route.path === path) { - return route; - } else if (name && route.name === name) { - return route; - } - }); - }, - ); + static getRoute(path?: string, name?: string, url?: string) { + const selector = createSelector([ConfigState], (state: Config.State) => { + const { flattedRoutes } = state; + return (flattedRoutes as ABP.FullRoute[]).find(route => { + if (path && route.path === path) { + return route; + } else if (name && route.name === name) { + return route; + } else if (url && route.url === url) { + return route; + } + }); + }); return selector; } @@ -91,30 +94,33 @@ export class ConfigState { } static getSetting(key: string) { - const selector = createSelector( - [ConfigState], - (state: Config.State) => { - return snq(() => state.setting.values[key]); - }, - ); + const selector = createSelector([ConfigState], (state: Config.State) => { + return snq(() => state.setting.values[key]); + }); return selector; } static getSettings(keyword?: string) { - const selector = createSelector( - [ConfigState], - (state: Config.State) => { - if (keyword) { - const keys = snq(() => Object.keys(state.setting.values).filter(key => key.indexOf(keyword) > -1), []); - - if (keys.length) { - return keys.reduce((acc, key) => ({ ...acc, [key]: state.setting.values[key] }), {}); - } + const selector = createSelector([ConfigState], (state: Config.State) => { + if (keyword) { + const keys = snq( + () => + Object.keys(state.setting.values).filter( + key => key.indexOf(keyword) > -1, + ), + [], + ); + + if (keys.length) { + return keys.reduce( + (acc, key) => ({ ...acc, [key]: state.setting.values[key] }), + {}, + ); } + } - return snq(() => state.setting.values, {}); - }, - ); + return snq(() => state.setting.values, {}); + }); return selector; } @@ -123,14 +129,36 @@ export class ConfigState { [ConfigState], (state: Config.State): boolean => { if (!key) return true; - return snq(() => state.auth.grantedPolicies[key], false); + const getPolicy = k => snq(() => state.auth.grantedPolicies[k], false); + + const orRegexp = /\|\|/g; + const andRegexp = /&&/g; + + if (orRegexp.test(key)) { + const keys = key.split('||').filter(k => !!k); + + if (keys.length !== 2) return false; + + return getPolicy(keys[0].trim()) || getPolicy(keys[1].trim()); + } else if (andRegexp.test(key)) { + const keys = key.split('&&').filter(k => !!k); + + if (keys.length !== 2) return false; + + return getPolicy(keys[0].trim()) && getPolicy(keys[1].trim()); + } + + return getPolicy(key); }, ); return selector; } - static getLocalization(key: string | Config.LocalizationWithDefault, ...interpolateParams: string[]) { + static getLocalization( + key: string | Config.LocalizationWithDefault, + ...interpolateParams: string[] + ) { let defaultValue: string; if (typeof key !== 'string') { @@ -141,52 +169,52 @@ export class ConfigState { if (!key) key = ''; const keys = key.split('::') as string[]; - const selector = createSelector( - [ConfigState], - (state: Config.State) => { - if (!state.localization) return defaultValue || key; - - const { defaultResourceName } = state.environment.localization; - if (keys[0] === '') { - if (!defaultResourceName) { - throw new Error( - `Please check your environment. May you forget set defaultResourceName? + const selector = createSelector([ConfigState], (state: Config.State) => { + if (!state.localization) return defaultValue || key; + + const { defaultResourceName } = state.environment.localization; + if (keys[0] === '') { + if (!defaultResourceName) { + throw new Error( + `Please check your environment. May you forget set defaultResourceName? Here is the example: { production: false, localization: { defaultResourceName: 'MyProjectName' } }`, - ); - } - - keys[0] = snq(() => defaultResourceName); + ); } - let localization = (keys as any).reduce((acc, val) => { - if (acc) { - return acc[val]; - } - - return undefined; - }, state.localization.values); + keys[0] = snq(() => defaultResourceName); + } - interpolateParams = interpolateParams.filter(params => params != null); - if (localization && interpolateParams && interpolateParams.length) { - interpolateParams.forEach(param => { - localization = localization.replace(/[\'\"]?\{[\d]+\}[\'\"]?/, param); - }); + let localization = (keys as any).reduce((acc, val) => { + if (acc) { + return acc[val]; } - if (typeof localization !== 'string') localization = ''; - return localization || defaultValue || key; - }, - ); + return undefined; + }, state.localization.values); + + interpolateParams = interpolateParams.filter(params => params != null); + if (localization && interpolateParams && interpolateParams.length) { + interpolateParams.forEach(param => { + localization = localization.replace(/[\'\"]?\{[\d]+\}[\'\"]?/, param); + }); + } + + if (typeof localization !== 'string') localization = ''; + return localization || defaultValue || key; + }); return selector; } - constructor(private appConfigurationService: ApplicationConfigurationService, private store: Store) {} + constructor( + private appConfigurationService: ApplicationConfigurationService, + private store: Store, + ) {} @Action(GetAppConfiguration) addData({ patchState, dispatch }: StateContext) { @@ -197,19 +225,25 @@ export class ConfigState { }), ), switchMap(configuration => { - let defaultLang: string = configuration.setting.values['Abp.Localization.DefaultLanguage']; + let defaultLang: string = + configuration.setting.values['Abp.Localization.DefaultLanguage']; if (defaultLang.includes(';')) { defaultLang = defaultLang.split(';')[0]; } - return this.store.selectSnapshot(SessionState.getLanguage) ? of(null) : dispatch(new SetLanguage(defaultLang)); + return this.store.selectSnapshot(SessionState.getLanguage) + ? of(null) + : dispatch(new SetLanguage(defaultLang)); }), ); } @Action(PatchRouteByName) - patchRoute({ patchState, getState }: StateContext, { name, newValue }: PatchRouteByName) { + patchRoute( + { patchState, getState }: StateContext, + { name, newValue }: PatchRouteByName, + ) { let routes: ABP.FullRoute[] = getState().routes; const index = routes.findIndex(route => route.name === name); @@ -230,7 +264,9 @@ function patchRouteDeep( ): ABP.FullRoute[] { routes = routes.map(route => { if (route.name === name) { - newValue.url = `${parentUrl}/${(!newValue.path && newValue.path === '' ? route.path : newValue.path) || ''}`; + newValue.url = `${parentUrl}/${(!newValue.path && newValue.path === '' + ? route.path + : newValue.path) || ''}`; if (newValue.children && newValue.children.length) { newValue.children = newValue.children.map(child => ({ @@ -241,7 +277,12 @@ function patchRouteDeep( return { ...route, ...newValue }; } else if (route.children && route.children.length) { - route.children = patchRouteDeep(route.children, name, newValue, (parentUrl || '/') + route.path); + route.children = patchRouteDeep( + route.children, + name, + newValue, + (parentUrl || '/') + route.path, + ); } return route; diff --git a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts index a7bae167b1..1fd2e45b35 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts @@ -1,8 +1,15 @@ -import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spectator/jest'; +import { + createServiceFactory, + SpectatorService, + SpyObject, +} from '@ngneat/spectator/jest'; import { Store } from '@ngxs/store'; import { ReplaySubject, timer, Subject, of } from 'rxjs'; import { Config } from '../models/config'; -import { ApplicationConfigurationService, ConfigStateService } from '../services'; +import { + ApplicationConfigurationService, + ConfigStateService, +} from '../services'; import { ConfigState } from '../states'; import { SetLanguage, PatchRouteByName } from '../actions'; @@ -91,6 +98,7 @@ export const CONFIG_STATE_DATA = { }, grantedPolicies: { 'Abp.Identity': false, + 'Abp.Account': true, }, }, setting: { @@ -126,7 +134,10 @@ describe('ConfigState', () => { store = spectator.get(Store); service = spectator.service; appConfigService = spectator.get(ApplicationConfigurationService); - state = new ConfigState(spectator.get(ApplicationConfigurationService), store); + state = new ConfigState( + spectator.get(ApplicationConfigurationService), + store, + ); }); describe('#getAll', () => { @@ -137,24 +148,34 @@ describe('ConfigState', () => { describe('#getApplicationInfo', () => { it('should return application property', () => { - expect(ConfigState.getApplicationInfo(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.application); + expect(ConfigState.getApplicationInfo(CONFIG_STATE_DATA)).toEqual( + CONFIG_STATE_DATA.environment.application, + ); }); }); describe('#getOne', () => { it('should return one property', () => { - expect(ConfigState.getOne('environment')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment); + expect(ConfigState.getOne('environment')(CONFIG_STATE_DATA)).toEqual( + CONFIG_STATE_DATA.environment, + ); }); }); describe('#getDeep', () => { it('should return deeper', () => { - expect(ConfigState.getDeep('environment.localization.defaultResourceName')(CONFIG_STATE_DATA)).toEqual( - CONFIG_STATE_DATA.environment.localization.defaultResourceName, - ); - expect(ConfigState.getDeep(['environment', 'localization', 'defaultResourceName'])(CONFIG_STATE_DATA)).toEqual( - CONFIG_STATE_DATA.environment.localization.defaultResourceName, - ); + expect( + ConfigState.getDeep('environment.localization.defaultResourceName')( + CONFIG_STATE_DATA, + ), + ).toEqual(CONFIG_STATE_DATA.environment.localization.defaultResourceName); + expect( + ConfigState.getDeep([ + 'environment', + 'localization', + 'defaultResourceName', + ])(CONFIG_STATE_DATA), + ).toEqual(CONFIG_STATE_DATA.environment.localization.defaultResourceName); expect(ConfigState.getDeep('test')(null)).toBeFalsy(); }); @@ -162,21 +183,33 @@ describe('ConfigState', () => { describe('#getRoute', () => { it('should return route', () => { - expect(ConfigState.getRoute(null, '::Menu:Home')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.flattedRoutes[0]); - expect(ConfigState.getRoute('identity')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.flattedRoutes[1]); + expect( + ConfigState.getRoute(null, '::Menu:Home')(CONFIG_STATE_DATA), + ).toEqual(CONFIG_STATE_DATA.flattedRoutes[0]); + expect(ConfigState.getRoute('identity')(CONFIG_STATE_DATA)).toEqual( + CONFIG_STATE_DATA.flattedRoutes[1], + ); }); }); describe('#getApiUrl', () => { it('should return api url', () => { - expect(ConfigState.getApiUrl('other')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.apis.other.url); - expect(ConfigState.getApiUrl()(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.environment.apis.default.url); + expect(ConfigState.getApiUrl('other')(CONFIG_STATE_DATA)).toEqual( + CONFIG_STATE_DATA.environment.apis.other.url, + ); + expect(ConfigState.getApiUrl()(CONFIG_STATE_DATA)).toEqual( + CONFIG_STATE_DATA.environment.apis.default.url, + ); }); }); describe('#getSetting', () => { it('should return a setting', () => { - expect(ConfigState.getSetting('Abp.Localization.DefaultLanguage')(CONFIG_STATE_DATA)).toEqual( + expect( + ConfigState.getSetting('Abp.Localization.DefaultLanguage')( + CONFIG_STATE_DATA, + ), + ).toEqual( CONFIG_STATE_DATA.setting.values['Abp.Localization.DefaultLanguage'], ); }); @@ -184,41 +217,82 @@ describe('ConfigState', () => { describe('#getSettings', () => { it('should return settings', () => { - expect(ConfigState.getSettings('Localization')(CONFIG_STATE_DATA)).toEqual({ + expect( + ConfigState.getSettings('Localization')(CONFIG_STATE_DATA), + ).toEqual({ 'Abp.Localization.DefaultLanguage': 'en', }); - expect(ConfigState.getSettings('AllSettings')(CONFIG_STATE_DATA)).toEqual(CONFIG_STATE_DATA.setting.values); + expect(ConfigState.getSettings('AllSettings')(CONFIG_STATE_DATA)).toEqual( + CONFIG_STATE_DATA.setting.values, + ); }); }); describe('#getGrantedPolicy', () => { it('should return a granted policy', () => { - expect(ConfigState.getGrantedPolicy('Abp.Identity')(CONFIG_STATE_DATA)).toBe(false); + expect( + ConfigState.getGrantedPolicy('Abp.Identity')(CONFIG_STATE_DATA), + ).toBe(false); + expect( + ConfigState.getGrantedPolicy('Abp.Identity || Abp.Account')( + CONFIG_STATE_DATA, + ), + ).toBe(true); + expect( + ConfigState.getGrantedPolicy('Abp.Account && Abp.Identity')( + CONFIG_STATE_DATA, + ), + ).toBe(false); + expect( + ConfigState.getGrantedPolicy('Abp.Account &&')(CONFIG_STATE_DATA), + ).toBe(false); + expect( + ConfigState.getGrantedPolicy('|| Abp.Account')(CONFIG_STATE_DATA), + ).toBe(false); expect(ConfigState.getGrantedPolicy('')(CONFIG_STATE_DATA)).toBe(true); }); }); describe('#getLocalization', () => { it('should return a localization', () => { - expect(ConfigState.getLocalization('AbpIdentity::Identity')(CONFIG_STATE_DATA)).toBe('identity'); - - expect(ConfigState.getLocalization('AbpIdentity::NoIdentity')(CONFIG_STATE_DATA)).toBe('AbpIdentity::NoIdentity'); - - expect(ConfigState.getLocalization({ key: '', defaultValue: 'default' })(CONFIG_STATE_DATA)).toBe('default'); - - expect(ConfigState.getLocalization("::'{0}' and '{1}' do not match.", 'first', 'second')(CONFIG_STATE_DATA)).toBe( - 'first and second do not match.', - ); + expect( + ConfigState.getLocalization('AbpIdentity::Identity')(CONFIG_STATE_DATA), + ).toBe('identity'); + + expect( + ConfigState.getLocalization('AbpIdentity::NoIdentity')( + CONFIG_STATE_DATA, + ), + ).toBe('AbpIdentity::NoIdentity'); + + expect( + ConfigState.getLocalization({ key: '', defaultValue: 'default' })( + CONFIG_STATE_DATA, + ), + ).toBe('default'); + + expect( + ConfigState.getLocalization( + "::'{0}' and '{1}' do not match.", + 'first', + 'second', + )(CONFIG_STATE_DATA), + ).toBe('first and second do not match.'); try { ConfigState.getLocalization('::Test')({ ...CONFIG_STATE_DATA, - environment: { ...CONFIG_STATE_DATA.environment, localization: {} as any }, + environment: { + ...CONFIG_STATE_DATA.environment, + localization: {} as any, + }, }); expect(false).toBeTruthy(); // fail } catch (error) { - expect((error as Error).message).toContain('Please check your environment'); + expect((error as Error).message).toContain( + 'Please check your environment', + ); } }); }); @@ -273,7 +347,9 @@ describe('ConfigState', () => { name: 'Home', path: 'home', url: '/home', - children: [{ path: 'dashboard', name: 'Dashboard', url: '/home/dashboard' }], + children: [ + { path: 'dashboard', name: 'Dashboard', url: '/home/dashboard' }, + ], }); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts index c1d324620d..6d9dd3964f 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/permission.directive.spec.ts @@ -43,4 +43,43 @@ describe('PermissionDirective', () => { expect(spy.mock.calls).toHaveLength(0); }); }); + + describe('structural', () => { + beforeEach(() => { + spectator = createDirective( + '
Testing Permission Directive
', + { hostProps: { condition: '' } }, + ); + directive = spectator.directive; + }); + + it('should be created', () => { + expect(directive).toBeTruthy(); + }); + + it('should remove the element from DOM', () => { + expect(spectator.query('#test-element')).toBeTruthy(); + expect(spectator.directive.subscription).toBeUndefined(); + spectator.setHostInput({ condition: 'test' }); + expect(spectator.directive.subscription).toBeTruthy(); + grantedPolicy$.next(true); + expect(spectator.query('#test-element')).toBeTruthy(); + grantedPolicy$.next(false); + expect(spectator.query('#test-element')).toBeFalsy(); + grantedPolicy$.next(true); + grantedPolicy$.next(true); + expect(spectator.queryAll('#test-element')).toHaveLength(1); + }); + + describe('#subscription', () => { + it('should call the unsubscribe', () => { + const spy = jest.fn(() => {}); + spectator.setHostInput({ condition: 'test' }); + spectator.directive.subscription.unsubscribe = spy; + spectator.setHostInput({ condition: 'test2' }); + + expect(spy).toHaveBeenCalled(); + }); + }); + }); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts index b358005837..a995a4c822 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/permission.guard.spec.ts @@ -23,7 +23,7 @@ describe('PermissionGuard', () => { it('should return true when the grantedPolicy is true', done => { store.select.andReturn(of(true)); const spy = jest.spyOn(store, 'dispatch'); - guard.canActivate({ data: { requiredPolicy: '' } } as any).subscribe(res => { + guard.canActivate({ data: { requiredPolicy: 'test' } } as any, null).subscribe(res => { expect(res).toBe(true); expect(spy.mock.calls).toHaveLength(0); done(); @@ -33,11 +33,25 @@ describe('PermissionGuard', () => { it('should return false and dispatch RestOccurError when the grantedPolicy is false', done => { store.select.andReturn(of(false)); const spy = jest.spyOn(store, 'dispatch'); - guard.canActivate({ data: { requiredPolicy: '' } } as any).subscribe(res => { + guard.canActivate({ data: { requiredPolicy: 'test' } } as any, null).subscribe(res => { expect(res).toBe(false); expect(spy.mock.calls[0][0] instanceof RestOccurError).toBeTruthy(); expect((spy.mock.calls[0][0] as RestOccurError).payload).toEqual({ status: 403 }); done(); }); }); + + it('should find the requiredPolicy from child route', done => { + store.select.andReturn(of(false)); + const spy = jest.spyOn(store, 'select'); + guard + .canActivate( + { data: {}, routeConfig: { children: [{ path: 'test', data: { requiredPolicy: 'TestPolicy' } }] } } as any, + { url: 'test' } as any, + ) + .subscribe(() => { + expect(spy.mock.calls[0][0]({ auth: { grantedPolicies: { TestPolicy: true } } })).toBe(true); + done(); + }); + }); }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts index 8428515118..b69d139091 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/sort.pipe.spec.ts @@ -17,10 +17,28 @@ describe('SortPipe', () => { }); test('should sort object array in given order with given key', () => { - const array = [{ key: 5 }, { key: 'b' }, { key: 1 }, { key: 'a' }]; + const array = [ + { key: 5 }, + { key: 'b' }, + { key: 1 }, + { key: 'a' }, + { key: null }, + ]; - expect(pipe.transform(array, 'asc', 'key')).toEqual([{ key: 1 }, { key: 5 }, { key: 'a' }, { key: 'b' }]); - expect(pipe.transform(array, 'desc', 'key')).toEqual([{ key: 'b' }, { key: 'a' }, { key: 5 }, { key: 1 }]); + expect(pipe.transform(array, 'asc', 'key')).toEqual([ + { key: 1 }, + { key: 5 }, + { key: 'a' }, + { key: 'b' }, + { key: null }, + ]); + expect(pipe.transform(array, 'desc', 'key')).toEqual([ + { key: null }, + { key: 'b' }, + { key: 'a' }, + { key: 5 }, + { key: 1 }, + ]); }); test('should require an array as value', () => { diff --git a/npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts b/npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts new file mode 100644 index 0000000000..3522b000c8 --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/utils/date-extensions.ts @@ -0,0 +1,13 @@ +export {}; + +declare global { + interface Date { + toLocalISOString(): string; + } +} + +Date.prototype.toLocalISOString = function(this: Date): string { + const timezoneOffset = this.getTimezoneOffset(); + + return new Date(this.getTime() - timezoneOffset * 60000).toISOString(); +}; diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index fa0ee93d1a..59fa3f4199 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -6,7 +6,7 @@
-
-
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.scss similarity index 87% rename from npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.scss rename to npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.scss index a98b5a3ca6..b9f7690a5b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.scss +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.scss @@ -1,7 +1,6 @@ .error { position: fixed; top: 0; - background-color: #fff; width: 100vw; height: 100vh; z-index: 999999; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts similarity index 79% rename from npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts rename to npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts index 70ddce726e..a102672ad6 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/http-error-wrapper/http-error-wrapper.component.ts @@ -1,25 +1,27 @@ import { Config, takeUntilDestroy } from '@abp/ng.core'; import { AfterViewInit, + ApplicationRef, Component, ComponentFactoryResolver, ElementRef, EmbeddedViewRef, + Injector, OnDestroy, + OnInit, Type, ViewChild, - ApplicationRef, - Injector, } from '@angular/core'; import { fromEvent, Subject } from 'rxjs'; import { debounceTime, filter } from 'rxjs/operators'; +import snq from 'snq'; @Component({ - selector: 'abp-error', - templateUrl: './error.component.html', - styleUrls: ['error.component.scss'], + selector: 'abp-http-error-wrapper', + templateUrl: './http-error-wrapper.component.html', + styleUrls: ['http-error-wrapper.component.scss'], }) -export class ErrorComponent implements AfterViewInit, OnDestroy { +export class HttpErrorWrapperComponent implements AfterViewInit, OnDestroy, OnInit { appRef: ApplicationRef; cfRes: ComponentFactoryResolver; @@ -38,6 +40,8 @@ export class ErrorComponent implements AfterViewInit, OnDestroy { hideCloseIcon = false; + backgroundColor: string; + @ViewChild('container', { static: false }) containerRef: ElementRef; @@ -45,6 +49,11 @@ export class ErrorComponent implements AfterViewInit, OnDestroy { return this.status ? `[${this.status}]` : ''; } + ngOnInit() { + this.backgroundColor = + snq(() => window.getComputedStyle(document.body).getPropertyValue('background-color')) || '#fff'; + } + ngAfterViewInit() { if (this.customComponent) { const customComponentRef = this.cfRes.resolveComponentFactory(this.customComponent).create(this.injector); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html index 9b712d7199..c3168bad92 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.html @@ -1,30 +1,34 @@ - -