Merge branch 'master' into dev

docs/en/API/Application-Configuration.md

@@ -2,12 +2,12 @@
 
 ABP Framework provides a pre-built and standard endpoint that contains some useful information about the application/service. Here, the list of some fundamental information at this endpoint:
 
-* [Localization](Localization.md) values, supported and the current language of the application.
-* Available and granted [policies](Authorization.md) (permissions) for the current user.
-* [Setting](Settings.md) values for the current user.
-* Info about the [current user](CurrentUser.md) (like id and user name).
-* Info about the current [tenant](Multi-Tenancy.md) (like id and name).
-* [Time zone](Timing.md) information for the current user and the [clock](Timing.md) type of the application.
+* [Localization](../Localization.md) values, supported and the current language of the application.
+* Available and granted [policies](../Authorization.md) (permissions) for the current user.
+* [Setting](../Settings.md) values for the current user.
+* Info about the [current user](../CurrentUser.md) (like id and user name).
+* Info about the current [tenant](../Multi-Tenancy.md) (like id and name).
+* [Time zone](../Timing.md) information for the current user and the [clock](Timing.md) type of the application.
 
 ## HTTP API
 

docs/en/Authorization.md

@@ -284,8 +284,6 @@ You may need to check a policy/permission on the client side. For ASP.NET Core M
 abp.auth.isGranted('MyPermissionName');
 ```
 
-See [abp.auth](UI/AspNetCore/JavaScript-API/Index.md) API documentation for details.
-
 ## Permission Management
 
 Permission management is normally done by an admin user using the permission management modal:

docs/en/Background-Workers-Quartz.md

@@ -1,6 +1,6 @@
 # Quartz Background Worker Manager
 
-[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Worker.md). ABP simply integrates quartz.
+[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Workers.md). ABP simply integrates quartz.
 
 ## Installation
 

docs/en/Best-Practices/Application-Services.md

@@ -206,7 +206,7 @@ This method votes a question and returns the current score of the question.
 
 #### Extra Properties
 
-* **Do** use either `MapExtraPropertiesTo` extension method ([see](Object-Extensions.md)) or configure the object mapper (`MapExtraProperties`) to allow application developers to be able to extend the objects and services.
+* **Do** use either `MapExtraPropertiesTo` extension method ([see](../Object-Extensions.md)) or configure the object mapper (`MapExtraProperties`) to allow application developers to be able to extend the objects and services.
 
 #### Manipulating / Deleting Entities
 

docs/en/Blob-Storing-Database.md

@@ -27,7 +27,7 @@ This command adds all the NuGet packages to corresponding layers of your solutio
 
 Here, all the NuGet packages defined by this provider;
 
-* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Domain.Shared)
+* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain.Shared)
 * [Volo.Abp.BlobStoring.Database.Domain](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain)
 * [Volo.Abp.BlobStoring.Database.EntityFrameworkCore](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.EntityFrameworkCore)
 * [Volo.Abp.BlobStoring.Database.MongoDB](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.MongoDB)

docs/en/Entity-Framework-Core-Migrations.md

@@ -2,7 +2,7 @@
 
 This document begins by **introducing the default structure** provided by [the application startup template](Startup-Templates/Application.md) and **discusses various scenarios** you may want to implement for your own application.
 
-> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Index.md).
+> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Part-1.md).
 
 ### Source Code
 

docs/en/Modules/Docs.md

@@ -613,7 +613,7 @@ Configure<DocsElasticSearchOptions>(options =>
 The `Index` is automatically created after the application starts if the `Index` does not exist.
 
 `DefaultElasticClientProvider` is responsible for creating `IElasticClient`. By default, it reads Elastic Search's `Url` from `IConfiguration`.
-If your `IElasticClient` needs additional configuration, please use override `IElasticClientProvider` service and replace it in the [dependency injection](Dependency-Injection.md) system.
+If your `IElasticClient` needs additional configuration, please use override `IElasticClientProvider` service and replace it in the [dependency injection](../Dependency-Injection.md) system.
 
 ```
 {

docs/en/Startup-Templates/Module.md

@@ -56,7 +56,7 @@ An `IssueType` enum and an `IssueConsts` class (which may have some constant fie
 
 ### .Domain Project
 
-This is the domain layer of the solution. It mainly contains [entities, aggregate roots](../Entities.md), [domain services](../Domain-Services.md), [value types](../Value-Types.md), [repository interfaces](../Repositories.md) and other domain objects.
+This is the domain layer of the solution. It mainly contains [entities, aggregate roots](../Entities.md), [domain services](../Domain-Services.md), value types, [repository interfaces](../Repositories.md) and other domain objects.
 
 An `Issue` entity, an `IssueManager` domain service and an `IIssueRepository` interface are good candidates for this project.
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmApplicationType.cs

@@ -5,6 +5,7 @@ namespace Volo.Abp.Cli.ProjectModification
     [Flags]
     public enum NpmApplicationType
     {
-        Mvc = 1
+        Mvc = 1,
+        Angular = 2
     }
-}
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -39,7 +39,7 @@ namespace Volo.Abp.Cli.ProjectModification
             EfCoreMigrationAdder efCoreMigrationAdder,
             DerivedClassFinder derivedClassFinder,
             ProjectNpmPackageAdder projectNpmPackageAdder,
-            NpmGlobalPackagesChecker npmGlobalPackagesChecker, 
+            NpmGlobalPackagesChecker npmGlobalPackagesChecker,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
             SourceCodeDownloadService sourceCodeDownloadService,
             SolutionFileModifier solutionFileModifier,
@@ -159,7 +159,7 @@ namespace Volo.Abp.Cli.ProjectModification
             {
                 Directory.Delete(demoFolder, true);
             }
-            
+
             var hostFolder = Path.Combine(targetModuleFolder, "host");
             if (Directory.Exists(hostFolder))
             {
@@ -186,7 +186,9 @@ namespace Volo.Abp.Cli.ProjectModification
                 await ProjectNugetPackageAdder.AddAsync(targetProjectFile, nugetPackage);
             }
 
-            if (!module.NpmPackages.IsNullOrEmpty())
+            var mvcNpmPackages = module.NpmPackages?.Where(p => p.ApplicationType.HasFlag(NpmApplicationType.Mvc)).ToList();
+
+            if (!mvcNpmPackages.IsNullOrEmpty())
             {
                 var targetProjects = ProjectFinder.FindNpmTargetProjectFile(projectFiles);
                 if (targetProjects.Any())
@@ -195,8 +197,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
                     foreach (var targetProject in targetProjects)
                     {
-                        foreach (var npmPackage in module.NpmPackages.Where(p =>
-                            p.ApplicationType.HasFlag(NpmApplicationType.Mvc)))
+                        foreach (var npmPackage in mvcNpmPackages)
                         {
                             await ProjectNpmPackageAdder.AddAsync(Path.GetDirectoryName(targetProject), npmPackage);
                         }
@@ -222,7 +223,7 @@ namespace Volo.Abp.Cli.ProjectModification
             }
 
             var dbMigrationsProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrations.csproj"));
-            
+
             if (dbMigrationsProject == null)
             {
                 Logger.LogDebug("Solution doesn't have a \".DbMigrations\" project.");
@@ -241,7 +242,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
             if (addedNewBuilder && !skipDbMigrations)
             {
-                EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject); 
+                EfCoreMigrationAdder.AddMigration(dbMigrationsProject, module.Name, startupProject);
             }
         }
 
@@ -274,4 +275,4 @@ namespace Volo.Abp.Cli.ProjectModification
                 .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".HttpApi.Host"));
         }
     }
-}
+}