Merge branch 'dev' of https://github.com/abpframework/abp into dev

modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs

@@ -11,7 +11,7 @@ namespace Volo.Abp.BackgroundJobs.DemoApp
 {
     [DependsOn(
         typeof(DemoAppSharedModule),
-        typeof(BackgroundJobsEntityFrameworkCoreModule),
+        typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
         typeof(AbpAutofacModule),
         typeof(AbpEntityFrameworkCoreSqlServerModule)
         )]

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/BackgroundJobsDomainSharedModule.cs → modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainSharedModule.cs

@@ -2,7 +2,7 @@
 
 namespace Volo.Abp.BackgroundJobs
 {
-    public class BackgroundJobsDomainSharedModule : AbpModule
+    public class AbpBackgroundJobsDomainSharedModule : AbpModule
     {
         
     }

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDomainModule.cs → modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainModule.cs

@@ -5,15 +5,15 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BackgroundJobs
 {
     [DependsOn(
-        typeof(BackgroundJobsDomainSharedModule),
+        typeof(AbpBackgroundJobsDomainSharedModule),
         typeof(AbpBackgroundJobsModule),
         typeof(AbpAutoMapperModule)
         )]
-    public class BackgroundJobsDomainModule : AbpModule //TODO: Rename to AbpBackgroundJobsDomainModule
+    public class AbpBackgroundJobsDomainModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<BackgroundJobsDomainModule>();
+            context.Services.AddAutoMapperObjectMapper<AbpBackgroundJobsDomainModule>();
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<BackgroundJobsDomainAutoMapperProfile>(validate: true);

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs

@@ -10,11 +10,11 @@ namespace Volo.Abp.BackgroundJobs
     {
         protected IBackgroundJobRepository BackgroundJobRepository { get; }
 
-        protected IObjectMapper<BackgroundJobsDomainModule> ObjectMapper { get; }
+        protected IObjectMapper<AbpBackgroundJobsDomainModule> ObjectMapper { get; }
 
         public BackgroundJobStore(
             IBackgroundJobRepository backgroundJobRepository,
-            IObjectMapper<BackgroundJobsDomainModule> objectMapper)
+            IObjectMapper<AbpBackgroundJobsDomainModule> objectMapper)
         {
             ObjectMapper = objectMapper;
             BackgroundJobRepository = backgroundJobRepository;

modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreModule.cs → modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreModule.cs

@@ -5,10 +5,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpEntityFrameworkCoreModule)
     )]
-    public class BackgroundJobsEntityFrameworkCoreModule : AbpModule
+    public class AbpBackgroundJobsEntityFrameworkCoreModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbModule.cs → modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbModule.cs

@@ -5,10 +5,10 @@ using Volo.Abp.MongoDB;
 namespace Volo.Abp.BackgroundJobs.MongoDB
 {
     [DependsOn(
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpMongoDbModule)
         )]
-    public class BackgroundJobsMongoDbModule : AbpModule
+    public class AbpBackgroundJobsMongoDbModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestModule.cs → modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainTestModule.cs

@@ -4,9 +4,9 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BackgroundJobs
 {
     [DependsOn(
-        typeof(BackgroundJobsEntityFrameworkCoreTestModule)
+        typeof(AbpBackgroundJobsEntityFrameworkCoreTestModule)
         )]
-    public class BackgroundJobsDomainTestModule : AbpModule
+    public class AbpBackgroundJobsDomainTestModule : AbpModule
     {
         
     }

modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestBase.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.BackgroundJobs
 {
-    public abstract class BackgroundJobsDomainTestBase : BackgroundJobsTestBase<BackgroundJobsDomainTestModule>
+    public abstract class BackgroundJobsDomainTestBase : BackgroundJobsTestBase<AbpBackgroundJobsDomainTestModule>
     {
 
     }

modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreTestModule.cs → modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreTestModule.cs

@@ -9,10 +9,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(BackgroundJobsTestBaseModule),
-        typeof(BackgroundJobsEntityFrameworkCoreModule)
+        typeof(AbpBackgroundJobsTestBaseModule),
+        typeof(AbpBackgroundJobsEntityFrameworkCoreModule)
         )]
-    public class BackgroundJobsEntityFrameworkCoreTestModule : AbpModule
+    public class AbpBackgroundJobsEntityFrameworkCoreTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobRepositoryTests.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore
 {
-    public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests<BackgroundJobsEntityFrameworkCoreTestModule>
+    public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests<AbpBackgroundJobsEntityFrameworkCoreTestModule>
     {
 
     }

modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs → modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs

@@ -7,10 +7,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BackgroundJobs.MongoDB
 {
     [DependsOn(
-        typeof(BackgroundJobsTestBaseModule),
-        typeof(BackgroundJobsMongoDbModule)
+        typeof(AbpBackgroundJobsTestBaseModule),
+        typeof(AbpBackgroundJobsMongoDbModule)
         )]
-    public class BackgroundJobsMongoDbTestModule : AbpModule
+    public class AbpBackgroundJobsMongoDbTestModule : AbpModule
     {
         private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
 

modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs

@@ -1,6 +1,6 @@
 namespace Volo.Abp.BackgroundJobs.MongoDB
 {
-    public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests<BackgroundJobsMongoDbTestModule>
+    public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests<AbpBackgroundJobsMongoDbTestModule>
     {
 
     }

modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs → modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/AbpBackgroundJobsTestBaseModule.cs

@@ -7,9 +7,9 @@ namespace Volo.Abp.BackgroundJobs
     [DependsOn(
         typeof(AbpAutofacModule),
         typeof(AbpTestBaseModule),
-        typeof(BackgroundJobsDomainModule)
+        typeof(AbpBackgroundJobsDomainModule)
         )]
-    public class BackgroundJobsTestBaseModule : AbpModule
+    public class AbpBackgroundJobsTestBaseModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

npm/ng-packs/angular.json

@@ -435,9 +435,14 @@
               "apps/dev-app/src/styles.scss",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
               {
-                "input": "node_modules/font-awesome/css/font-awesome.min.css",
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
                 "lazy": true,
-                "bundleName": "font-awesome.min"
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "lazy": true,
+                "bundleName": "fontawesome-v4-shims.min"
               },
               {
                 "input": "node_modules/primeng/resources/themes/nova-light/theme.css",

npm/ng-packs/apps/dev-app/src/app/app.component.ts

@@ -14,7 +14,13 @@ export class AppComponent implements OnInit {
   ngOnInit() {
     this.lazyLoadService
       .load(
-        ['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'],
+        [
+          'primeng.min.css',
+          'primeicons.css',
+          'primeng-nova-light-theme.css',
+          'fontawesome-all.min.css',
+          'fontawesome-v4-shims.min.css',
+        ],
         'style',
         null,
         'head',

npm/ng-packs/apps/dev-app/src/app/home/home.component.html

@@ -6,7 +6,7 @@
     </p>
     <p *ngIf="!hasLoggedIn">
       <a routerLink="/account/login" [state]="{ redirectUrl: '/' }" class="btn btn-primary" role="button"
-        ><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
+        ><i class="fa fa-sign-in mr-1"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
       >
     </p>
     <hr />

npm/ng-packs/package.json

@@ -7,13 +7,17 @@
     "abpng": "abpng",
     "commit": "git-cz && node scripts/push.js",
     "lint": "ng lint --fix",
-    "build:scripts": "cd scripts && npm install && npm run build"
+    "scripts:build": "cd scripts && npm install && npm run build"
   },
   "devDependencies": {
-    "@abp/ng.core": "^0.9.0",
-    "@abp/ng.feature-management": "^0.9.0",
-    "@abp/ng.permission-management": "^0.9.0",
-    "@abp/ng.theme.shared": "^0.9.0",
+    "@abp/ng.account.config": "0.9.2",
+    "@abp/ng.core": "0.9.2",
+    "@abp/ng.feature-management": "0.9.2",
+    "@abp/ng.identity.config": "0.9.2",
+    "@abp/ng.permission-management": "0.9.2",
+    "@abp/ng.setting-management.config": "0.9.2",
+    "@abp/ng.tenant-management.config": "0.9.2",
+    "@abp/ng.theme.shared": "0.9.2",
     "@angular-builders/jest": "^8.2.0",
     "@angular-devkit/build-angular": "~0.803.6",
     "@angular-devkit/build-ng-packagr": "~0.803.6",
@@ -29,6 +33,7 @@
     "@angular/platform-browser": "~8.2.8",
     "@angular/platform-browser-dynamic": "~8.2.8",
     "@angular/router": "~8.1.2",
+    "@fortawesome/fontawesome-free": "^5.11.2",
     "@ng-bootstrap/ng-bootstrap": "^5.1.0",
     "@ngneat/spectator": "^4.4.0",
     "@ngx-validate/core": "^0.0.7",
@@ -64,11 +69,7 @@
     "tsickle": "^0.37.0",
     "tslint": "~5.20.0",
     "typescript": "~3.5.3",
-    "zone.js": "~0.9.1",
-    "@abp/ng.account.config": "^0.9.0",
-    "@abp/ng.identity.config": "0.9.0",
-    "@abp/ng.tenant-management.config": "^0.9.0",
-    "@abp/ng.setting-management.config": "^0.9.0"
+    "zone.js": "~0.9.1"
   },
   "dependencies": {
     "tslib": "^1.10.0"

npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html

@@ -45,7 +45,7 @@
         <tr
           abp-table-empty-message
           [attr.colspan]="columnWidths.length"
-          localizationResource="AbpIdentityServer"
+          localizationResource="AbpIdentity"
           localizationProp="NoDataAvailableInDatatable"
         ></tr>
       </ng-template>
@@ -130,5 +130,5 @@
   </ng-template>
 </abp-modal>
 
-<abp-permission-management [(visible)]="visiblePermissions" providerName="Role" [providerKey]="providerKey">
+<abp-permission-management [(visible)]="visiblePermissions" providerName="R" [providerKey]="providerKey">
 </abp-permission-management>

npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@@ -51,7 +51,7 @@
         <tr
           abp-table-empty-message
           [attr.colspan]="columnWidths.length"
-          localizationResource="AbpIdentityServer"
+          localizationResource="AbpIdentity"
           localizationProp="NoDataAvailableInDatatable"
         ></tr>
       </ng-template>
@@ -220,5 +220,5 @@
   </ng-template>
 </abp-modal>
 
-<abp-permission-management [(visible)]="visiblePermissions" providerName="User" [providerKey]="providerKey">
+<abp-permission-management [(visible)]="visiblePermissions" providerName="U" [providerKey]="providerKey">
 </abp-permission-management>

npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html

@@ -177,5 +177,5 @@
   </form>
 </ng-template>
 
-<abp-feature-management [(visible)]="visibleFeatures" providerName="Tenant" [providerKey]="providerKey">
+<abp-feature-management [(visible)]="visibleFeatures" providerName="T" [providerKey]="providerKey">
 </abp-feature-management>

npm/ng-packs/packages/theme-shared/ng-package.json

@@ -7,6 +7,7 @@
   "whitelistedNonPeerDependencies": [
     "@abp/ng.core",
     "@angular/cdk",
+    "@fortawesome/fontawesome-free",
     "@ng-bootstrap/ng-bootstrap",
     "@ngx-validate/core",
     "bootstrap",

npm/ng-packs/packages/theme-shared/package.json

@@ -4,6 +4,7 @@
   "dependencies": {
     "@abp/ng.core": "^0.9.2",
     "@angular/cdk": "^8.0.1",
+    "@fortawesome/fontawesome-free": "5.10.1",
     "@ng-bootstrap/ng-bootstrap": "^5.1.0",
     "@ngx-validate/core": "^0.0.7",
     "bootstrap": "^4.3.1",
@@ -11,7 +12,7 @@
     "font-awesome": "^4.7.0",
     "ngx-perfect-scrollbar": "^8.0.0",
     "primeicons": "^2.0.0",
-    "primeng": "^8.0.3"
+    "primeng": "^8.0.4"
   },
   "publishConfig": {
     "access": "public"

npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts

@@ -55,7 +55,7 @@ export class ButtonComponent implements OnInit {
   @Input() type = 'button';
 
   get icon(): string {
-    return `${this.loading ? 'fa fa-pulse fa-spinner' : this.iconClass || 'd-none'}`;
+    return `${this.loading ? 'fa fa-spinner fa-spin' : this.iconClass || 'd-none'}`;
   }
 
   constructor(private renderer: Renderer2) {}

templates/app/angular/angular.json

@@ -29,9 +29,14 @@
               "src/styles.scss",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
               {
-                "input": "node_modules/font-awesome/css/font-awesome.min.css",
+                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
                 "lazy": true,
-                "bundleName": "font-awesome.min"
+                "bundleName": "fontawesome-all.min"
+              },
+              {
+                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+                "lazy": true,
+                "bundleName": "fontawesome-v4-shims.min"
               },
               {
                 "input": "node_modules/primeng/resources/themes/nova-light/theme.css",

templates/app/angular/src/app/app.component.ts

@@ -14,7 +14,13 @@ export class AppComponent implements OnInit {
   ngOnInit() {
     this.lazyLoadService
       .load(
-        ['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'],
+        [
+          'primeng.min.css',
+          'primeicons.css',
+          'primeng-nova-light-theme.css',
+          'fontawesome-all.min.css',
+          'fontawesome-v4-shims.min.css',
+        ],
         'style',
         null,
         'head',

templates/app/angular/src/app/home/home.component.html

@@ -6,7 +6,7 @@
     </p>
     <p *ngIf="!hasLoggedIn">
       <a routerLink="/account/login" [state]="{ redirectUrl: '/' }" class="btn btn-primary" role="button"
-        ><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
+        ><i class="fa fa-sign-in mr-1"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
       >
     </p>
     <hr />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs

@@ -16,7 +16,7 @@ namespace MyCompanyName.MyProjectName
 {
     [DependsOn(
         typeof(AbpAuditLoggingDomainSharedModule),
-        typeof(BackgroundJobsDomainSharedModule),
+        typeof(AbpBackgroundJobsDomainSharedModule),
         typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpIdentityDomainSharedModule),
         typeof(AbpIdentityServerDomainSharedModule),

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs

@@ -16,7 +16,7 @@ namespace MyCompanyName.MyProjectName
     [DependsOn(
         typeof(MyProjectNameDomainSharedModule),
         typeof(AbpAuditLoggingDomainModule),
-        typeof(BackgroundJobsDomainModule),
+        typeof(AbpBackgroundJobsDomainModule),
         typeof(AbpFeatureManagementDomainModule),
         typeof(AbpIdentityDomainModule),
         typeof(AbpPermissionManagementDomainIdentityModule),

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs

@@ -20,7 +20,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
         typeof(AbpPermissionManagementEntityFrameworkCoreModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
         typeof(AbpEntityFrameworkCoreSqlServerModule),
-        typeof(BackgroundJobsEntityFrameworkCoreModule),
+        typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
         typeof(AbpTenantManagementEntityFrameworkCoreModule),
         typeof(AbpFeatureManagementEntityFrameworkCoreModule)

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbModule.cs

@@ -17,7 +17,7 @@ namespace MyCompanyName.MyProjectName.MongoDB
         typeof(AbpSettingManagementMongoDbModule),
         typeof(AbpIdentityMongoDbModule),
         typeof(AbpIdentityServerMongoDbModule),
-        typeof(BackgroundJobsMongoDbModule),
+        typeof(AbpBackgroundJobsMongoDbModule),
         typeof(AbpAuditLoggingMongoDbModule),
         typeof(AbpTenantManagementMongoDbModule),
         typeof(AbpFeatureManagementMongoDbModule)