diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs
index 32e09b3339..b0da7f9db0 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.Cli.Commands.Services
case DatabaseManagementSystem.MySQL:
return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;";
case DatabaseManagementSystem.PostgreSQL:
- return "User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=MyProjectName;Pooling=true;Min Pool Size=0;Max Pool Size=100;Connection Lifetime=0;";
+ return "Host=localhost;Port=5432;Database=MyProjectName;User ID=root;Password=myPassword;Pooling=true;MinimumPoolSize=0;MaximumPoolSize=100;Connection Lifetime=0;";
//case DatabaseManagementSystem.Oracle:
case DatabaseManagementSystem.OracleDevart:
return "Data Source=MyProjectName;Integrated Security=yes;";
diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs
index 3bda51bd2e..f1136c4ea2 100644
--- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs
+++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs
@@ -20,8 +20,10 @@ namespace Volo.Abp.Domain.Repositories
{
///
/// Get a single entity by the given .
- /// It returns null if no entity with the given .
+ ///
+ /// It returns null if there is no entity with the given .
/// It throws if there are multiple entities with the given .
+ ///
///
/// A condition to find the entity
/// Set true to include all children of this entity
@@ -34,8 +36,10 @@ namespace Volo.Abp.Domain.Repositories
///
/// Get a single entity by the given .
+ ///
/// It throws if there is no entity with the given .
/// It throws if there are multiple entities with the given .
+ ///
///
/// A condition to filter entities
/// Set true to include all children of this entity
@@ -47,10 +51,11 @@ namespace Volo.Abp.Domain.Repositories
);
///
- /// Deletes many entities by function.
- /// Notice that: All entities fits to given predicate are retrieved and deleted.
- /// This may cause major performance problems if there are too many entities with
- /// given predicate.
+ /// Deletes many entities by the given .
+ ///
+ /// Please note: This may cause major performance problems if there are too many entities returned for a
+ /// given predicate and the database provider doesn't have a way to efficiently delete many entities.
+ ///
///
/// A condition to filter entities
///
@@ -69,4 +74,4 @@ namespace Volo.Abp.Domain.Repositories
where TEntity : class, IEntity
{
}
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
index 055c9c2de9..d673ff2c28 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@@ -289,10 +289,7 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
.Where(predicate)
.ToListAsync(GetCancellationToken(cancellationToken));
- foreach (var entity in entities)
- {
- dbSet.Remove(entity);
- }
+ await DeleteManyAsync(entities, autoSave, cancellationToken);
if (autoSave)
{
diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
index 8ab6753de3..fd8c5afd16 100644
--- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
+++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs
@@ -191,10 +191,7 @@ namespace Volo.Abp.Domain.Repositories.MemoryDb
{
var entities = (await GetQueryableAsync()).Where(predicate).ToList();
- foreach (var entity in entities)
- {
- await DeleteAsync(entity, autoSave, cancellationToken);
- }
+ await DeleteManyAsync(entities, autoSave, cancellationToken);
}
public override async Task InsertAsync(
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
index fc520bce81..e6030246aa 100644
--- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
+++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs
@@ -71,16 +71,18 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
protected Task GetDbContextAsync(CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
// Multi-tenancy unaware entities should always use the host connection string
if (!EntityHelper.IsMultiTenant())
{
using (CurrentTenant.Change(null))
{
- return DbContextProvider.GetDbContextAsync(GetCancellationToken(cancellationToken));
+ return DbContextProvider.GetDbContextAsync(cancellationToken);
}
}
- return DbContextProvider.GetDbContextAsync(GetCancellationToken(cancellationToken));
+ return DbContextProvider.GetDbContextAsync(cancellationToken);
}
protected IMongoDbContextProvider DbContextProvider { get; }
@@ -107,9 +109,11 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
bool autoSave = false,
CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
await ApplyAbpConceptsForAddedEntityAsync(entity);
- var dbContext = await GetDbContextAsync(GetCancellationToken(cancellationToken));
+ var dbContext = await GetDbContextAsync(cancellationToken);
var collection = dbContext.Collection();
if (dbContext.SessionHandle != null)
@@ -117,14 +121,14 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
await collection.InsertOneAsync(
dbContext.SessionHandle,
entity,
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
else
{
await collection.InsertOneAsync(
entity,
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
@@ -133,6 +137,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
public override async Task InsertManyAsync(IEnumerable entities, bool autoSave = false, CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
var entityArray = entities.ToArray();
foreach (var entity in entityArray)
@@ -140,7 +146,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
await ApplyAbpConceptsForAddedEntityAsync(entity);
}
- var dbContext = await GetDbContextAsync(GetCancellationToken(cancellationToken));
+ var dbContext = await GetDbContextAsync(cancellationToken);
var collection = dbContext.Collection();
if (BulkOperationProvider != null)
@@ -169,6 +175,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
bool autoSave = false,
CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
SetModificationAuditProperties(entity);
if (entity is ISoftDelete softDeleteEntity && softDeleteEntity.IsDeleted)
@@ -186,7 +194,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
var oldConcurrencyStamp = SetNewConcurrencyStamp(entity);
ReplaceOneResult result;
- var dbContext = await GetDbContextAsync(GetCancellationToken(cancellationToken));
+ var dbContext = await GetDbContextAsync(cancellationToken);
var collection = dbContext.Collection();
if (dbContext.SessionHandle != null)
@@ -195,7 +203,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
dbContext.SessionHandle,
CreateEntityFilter(entity, true, oldConcurrencyStamp),
entity,
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
else
@@ -203,7 +211,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
result = await collection.ReplaceOneAsync(
CreateEntityFilter(entity, true, oldConcurrencyStamp),
entity,
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
@@ -277,15 +285,18 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
bool autoSave = false,
CancellationToken cancellationToken = default)
{
- await ApplyAbpConceptsForDeletedEntityAsync(entity);
- var oldConcurrencyStamp = SetNewConcurrencyStamp(entity);
+ cancellationToken = GetCancellationToken(cancellationToken);
- var dbContext = await GetDbContextAsync(GetCancellationToken(cancellationToken));
+ var dbContext = await GetDbContextAsync(cancellationToken);
var collection = dbContext.Collection();
- if (entity is ISoftDelete softDeleteEntity && !IsHardDeleted(entity))
+ var oldConcurrencyStamp = SetNewConcurrencyStamp(entity);
+
+ if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity))
{
- softDeleteEntity.IsDeleted = true;
+ ((ISoftDelete)entity).IsDeleted = true;
+ await ApplyAbpConceptsForDeletedEntityAsync(entity);
+
ReplaceOneResult result;
if (dbContext.SessionHandle != null)
@@ -294,7 +305,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
dbContext.SessionHandle,
CreateEntityFilter(entity, true, oldConcurrencyStamp),
entity,
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
else
@@ -302,7 +313,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
result = await collection.ReplaceOneAsync(
CreateEntityFilter(entity, true, oldConcurrencyStamp),
entity,
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
@@ -313,6 +324,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
}
else
{
+ await ApplyAbpConceptsForDeletedEntityAsync(entity);
+
DeleteResult result;
if (dbContext.SessionHandle != null)
@@ -320,14 +333,14 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
result = await collection.DeleteOneAsync(
dbContext.SessionHandle,
CreateEntityFilter(entity, true, oldConcurrencyStamp),
- cancellationToken: GetCancellationToken(cancellationToken)
+ cancellationToken: cancellationToken
);
}
else
{
result = await collection.DeleteOneAsync(
CreateEntityFilter(entity, true, oldConcurrencyStamp),
- GetCancellationToken(cancellationToken)
+ cancellationToken
);
}
@@ -343,55 +356,55 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
bool autoSave = false,
CancellationToken cancellationToken = default)
{
- var softDeletedEntities = new List();
+ cancellationToken = GetCancellationToken(cancellationToken);
+
+ var softDeletedEntities = new Dictionary();
var hardDeletedEntities = new List();
foreach (var entity in entities)
{
- await ApplyAbpConceptsForDeletedEntityAsync(entity);
- SetNewConcurrencyStamp(entity);
-
if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity))
{
- softDeletedEntities.Add(entity);
+ ((ISoftDelete)entity).IsDeleted = true;
+
+ softDeletedEntities.Add(entity, SetNewConcurrencyStamp(entity));
}
else
{
hardDeletedEntities.Add(entity);
}
+
+ await ApplyAbpConceptsForDeletedEntityAsync(entity);
}
- var dbContext = await GetDbContextAsync(GetCancellationToken(cancellationToken));
+ var dbContext = await GetDbContextAsync(cancellationToken);
var collection = dbContext.Collection();
if (BulkOperationProvider != null)
{
- await BulkOperationProvider.DeleteManyAsync(this, entities.ToArray(), dbContext.SessionHandle, autoSave, cancellationToken);
+ await BulkOperationProvider.DeleteManyAsync(this, entities, dbContext.SessionHandle, autoSave, cancellationToken);
return;
}
if (softDeletedEntities.Count > 0)
{
- UpdateResult updateResult;
- var softDeleteEntitiesCount = softDeletedEntities.Count;
+ BulkWriteResult updateResult;
+
+ var replaceRequests = new List>(
+ softDeletedEntities.Select(entity => new ReplaceOneModel(
+ CreateEntityFilter(entity.Key, true, entity.Value), entity.Key))
+ );
if (dbContext.SessionHandle != null)
{
- updateResult = await collection.UpdateManyAsync(
- dbContext.SessionHandle,
- CreateEntitiesFilter(softDeletedEntities),
- Builders.Update.Set(x => ((ISoftDelete)x).IsDeleted, true)
- );
+ updateResult = await collection.BulkWriteAsync(dbContext.SessionHandle, replaceRequests, cancellationToken: cancellationToken);
}
else
{
- updateResult = await collection.UpdateManyAsync(
- CreateEntitiesFilter(softDeletedEntities),
- Builders.Update.Set(x => ((ISoftDelete)x).IsDeleted, true)
- );
+ updateResult = await collection.BulkWriteAsync(replaceRequests, cancellationToken: cancellationToken);
}
- if (updateResult.MatchedCount < softDeleteEntitiesCount)
+ if (updateResult.MatchedCount < softDeletedEntities.Count)
{
ThrowOptimisticConcurrencyException();
}
@@ -406,14 +419,14 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
{
deleteResult = await collection.DeleteManyAsync(
dbContext.SessionHandle,
- CreateEntitiesFilter(hardDeletedEntities)
- );
+ CreateEntitiesFilter(hardDeletedEntities),
+ cancellationToken: cancellationToken);
}
else
{
deleteResult = await collection.DeleteManyAsync(
- CreateEntitiesFilter(hardDeletedEntities)
- );
+ CreateEntitiesFilter(hardDeletedEntities),
+ cancellationToken: cancellationToken);
}
if (deleteResult.DeletedCount < hardDeletedEntitiesCount)
@@ -462,10 +475,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
.Where(predicate)
.ToListAsync(cancellationToken);
- foreach (var entity in entities)
- {
- await DeleteAsync(entity, autoSave, cancellationToken);
- }
+ await DeleteManyAsync(entities, autoSave, cancellationToken);
}
[Obsolete("Use GetQueryableAsync method.")]
@@ -484,9 +494,11 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
bool includeDetails = true,
CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
return await (await GetMongoQueryableAsync(cancellationToken))
.Where(predicate)
- .SingleOrDefaultAsync(GetCancellationToken(cancellationToken));
+ .SingleOrDefaultAsync(cancellationToken);
}
[Obsolete("Use GetMongoQueryableAsync method.")]
@@ -501,6 +513,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
public async Task> GetMongoQueryableAsync(CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
var dbContext = await GetDbContextAsync(cancellationToken);
var collection = dbContext.Collection();
@@ -513,6 +527,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
public async Task> GetAggregateAsync(CancellationToken cancellationToken = default)
{
+ cancellationToken = GetCancellationToken(cancellationToken);
+
var dbContext = await GetDbContextAsync(cancellationToken);
var collection = await GetCollectionAsync(cancellationToken);
@@ -695,13 +711,13 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
[Obsolete("This method will be removed in future versions.")]
public IAsyncCursor ToCursor(CancellationToken cancellationToken = new CancellationToken())
{
- return GetMongoQueryable().ToCursor(cancellationToken);
+ return GetMongoQueryable().ToCursor(GetCancellationToken(cancellationToken));
}
[Obsolete("This method will be removed in future versions.")]
public Task> ToCursorAsync(CancellationToken cancellationToken = new CancellationToken())
{
- return GetMongoQueryable().ToCursorAsync(cancellationToken);
+ return GetMongoQueryable().ToCursorAsync(GetCancellationToken(cancellationToken));
}
}
@@ -724,7 +740,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
bool includeDetails = true,
CancellationToken cancellationToken = default)
{
- var entity = await FindAsync(id, includeDetails, cancellationToken);
+ var entity = await FindAsync(id, includeDetails, GetCancellationToken(cancellationToken));
if (entity == null)
{
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs
index b8618fd6a3..4b313d2127 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs
@@ -56,6 +56,23 @@ namespace Volo.Abp.TestApp.Testing
douglas.DeletionTime.ShouldNotBeNull();
}
}
+
+ [Fact]
+ public async Task Should_Cancel_Deletion_For_Soft_Delete_Many_Entities_ById()
+ {
+ await PersonRepository.DeleteManyAsync(new []{ TestDataBuilder.UserDouglasId });
+
+ var douglas = await PersonRepository.FindAsync(TestDataBuilder.UserDouglasId);
+ douglas.ShouldBeNull();
+
+ using (DataFilter.Disable())
+ {
+ douglas = await PersonRepository.FindAsync(TestDataBuilder.UserDouglasId);
+ douglas.ShouldNotBeNull();
+ douglas.IsDeleted.ShouldBeTrue();
+ douglas.DeletionTime.ShouldNotBeNull();
+ }
+ }
[Fact]
public async Task Should_Handle_Deletion_On_Update_For_Soft_Delete_Entities()
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagAdminController.cs
index afc9a83fc8..4655c60bd6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagAdminController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagAdminController.cs
@@ -62,6 +62,8 @@ namespace Volo.CmsKit.Admin.Tags
return TagAdminAppService.UpdateAsync(id, input);
}
+ [HttpGet]
+ [Route("tag-definitions")]
public Task> GetTagDefinitionsAsync()
{
return TagAdminAppService.GetTagDefinitionsAsync();
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
index 0142adeb25..c5829c8e79 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
@@ -154,6 +154,7 @@ export class ModalComponent implements OnDestroy {
}
ngOnDestroy(): void {
+ this.toggle(false);
this.destroy$.next();
}
diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock
index c87d4f36e2..bae49929de 100644
--- a/npm/ng-packs/yarn.lock
+++ b/npm/ng-packs/yarn.lock
@@ -2,12 +2,12 @@
# yarn lockfile v1
-"@abp/ng.core@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-4.2.0-rc.2.tgz#d5ae888cd6beba0ab7cc92a9759e8f3b4095f5dc"
- integrity sha512-uPsxulybSdGyBpR08d9XR3i/YdG/ILvo1Gzyz2wTOG/gay12hh/p83S50kWeBuPkh8uOiT3ezO9BY/GPVrRI+Q==
+"@abp/ng.core@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-4.2.0.tgz#cd6848291699b9bc60303c58162074d80a0c4428"
+ integrity sha512-HhTpOeK5RdzlfK5zy5t7v68DDqNqAB75if6E4Lt2CwgY8pQUuY0EIzD0+AXhkC5+bjyULNHV2/HW3q/Fm75TVg==
dependencies:
- "@abp/utils" "^4.2.0-rc.1"
+ "@abp/utils" "^4.2.0-rc.2"
"@angular/localize" "~10.0.10"
"@ngxs/store" "^3.7.0"
angular-oauth2-oidc "^10.0.0"
@@ -17,35 +17,35 @@
ts-toolbelt "6.15.4"
tslib "^2.0.0"
-"@abp/ng.feature-management@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-4.2.0-rc.2.tgz#c0273a07f73d95e7133ec90c1facd5de51121430"
- integrity sha512-sGQfh0plQGtm3qCGYs1qmCtWt2EOwVgRyUcNd2ipzorH55S5/dX7or9dYKZofPz7GF55FohbfpxBqnKnBo0WOQ==
+"@abp/ng.feature-management@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-4.2.0.tgz#2c89d64845533c23560325f806289c131457ced9"
+ integrity sha512-IftgAecb2bygNQhMCvQ6m6BxTq7eAvKE36jBZ1s72S658PtO9xx1LIjCql/QNKyu8YpI88Uc5OXZM8mJOVsYuw==
dependencies:
- "@abp/ng.theme.shared" "~4.2.0-rc.2"
+ "@abp/ng.theme.shared" "~4.2.0"
tslib "^2.0.0"
-"@abp/ng.identity@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-4.2.0-rc.2.tgz#fe20f05b60980561218f8357df55c00d85af8eb2"
- integrity sha512-zrY5oPhDq8lPcvDvxYM/hS5CtRj71Zlu04Slz4f+ljlStWHBOBZx1VVBl4OQvbDGxDGC04Pf2Sj3PtppEU28gw==
+"@abp/ng.identity@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-4.2.0.tgz#e6e321545a612b37f7f1ff8d0df43086319e77fa"
+ integrity sha512-yNSxscWa9Po9H+7b7m94oAzMNLe360yJq9s/yw2EhEnkUTJ5bBbbrnSKK35NNRhziYp9V5CwYsW7uhjxQ3NGqQ==
dependencies:
- "@abp/ng.permission-management" "~4.2.0-rc.2"
- "@abp/ng.theme.shared" "~4.2.0-rc.2"
+ "@abp/ng.permission-management" "~4.2.0"
+ "@abp/ng.theme.shared" "~4.2.0"
tslib "^2.0.0"
-"@abp/ng.permission-management@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-4.2.0-rc.2.tgz#771285283bf3c82dcdd6a07ef444ada73b918d4a"
- integrity sha512-FSMSiXGhalTMZIJzQCS6fYRdFH2eVmk73aPeFn1NnMxNdhzCXfbsHpX/lVes+UMw7CddEEgriv0GQYi8dYMnDw==
+"@abp/ng.permission-management@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-4.2.0.tgz#ad2970796b8b1aecfcd5b0a0136c508a0e18e9d4"
+ integrity sha512-wG26+7clnqll7d2+Uypd4xleA2DjpSkkctMOGai7EDaHqgVFDjfX3lZHtz/u7Xt9y9wHltGhqONjh/FuRkrgBA==
dependencies:
- "@abp/ng.theme.shared" "~4.2.0-rc.2"
+ "@abp/ng.theme.shared" "~4.2.0"
tslib "^2.0.0"
-"@abp/ng.schematics@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.2.0-rc.2.tgz#93774148f57964c72498fa060c04eb99f6c3987d"
- integrity sha512-Ul/+nPTnGpNhi0NMfeYY9fDnsTVzVxP4iSIdqXevPxugeY6pqCefC84i0XHdkVsxIi1UR7VP84tqE9SCv7KnCw==
+"@abp/ng.schematics@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.2.0.tgz#db1a8ae787cf028452774a51cb62e784a1670e25"
+ integrity sha512-44bDoLRqDzcJ/X75KH1O0AoQev7zKh0IkAe4N7KQNgjgRiIuWe3h/SQPfqTSlZNT2ZYo/SZMZyX5Nv8OSKXydg==
dependencies:
"@angular-devkit/core" "~11.0.2"
"@angular-devkit/schematics" "~11.0.2"
@@ -53,37 +53,37 @@
jsonc-parser "^2.3.0"
typescript "~3.9.2"
-"@abp/ng.setting-management@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-4.2.0-rc.2.tgz#a7c5bb30e881f8efe702fcc8f3b95bf442b0289a"
- integrity sha512-5sOk19EzFBIIdeTAx6EEmgh2pYOj5oRXq6uuAOmGVzZiX7arFoyqvTR4OAypIBQdMlZ0Iv4EApvJLD6/1IIrqw==
+"@abp/ng.setting-management@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-4.2.0.tgz#4a4b685ee74ac5030b7e9e73ee67110219df9065"
+ integrity sha512-Ldl+I2jWgMuQdMOnnOBIfk0OoTao5QN9zzQwCGMPgu7dOGjD8IT9h9CpkG4ROKw9YAT1R+P8QlQ6502jQWOMYQ==
dependencies:
- "@abp/ng.theme.shared" "~4.2.0-rc.2"
+ "@abp/ng.theme.shared" "~4.2.0"
tslib "^2.0.0"
-"@abp/ng.tenant-management@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-4.2.0-rc.2.tgz#dc5c019f16ac679589dbeac85317628ec6682096"
- integrity sha512-O2Lb0Fe+L11yC69DAcgX4hY6KwI9ojaDnPTFxGtvvTjaUVKnxxchQrJwP0ITsudZe5cWKbF7cME3b3uH4jorBA==
+"@abp/ng.tenant-management@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-4.2.0.tgz#e42aa4b81036c653abcc0144b74c287587a4ec9f"
+ integrity sha512-EWfwKAH4wjA37xigikXzI+jTNGopV3WEP/ezQj1KO7pbW1peiTXwIPHN7GDc8MJ6f2olZki7kXypzmgJn9A6KQ==
dependencies:
- "@abp/ng.feature-management" "~4.2.0-rc.2"
- "@abp/ng.theme.shared" "~4.2.0-rc.2"
+ "@abp/ng.feature-management" "~4.2.0"
+ "@abp/ng.theme.shared" "~4.2.0"
tslib "^2.0.0"
-"@abp/ng.theme.basic@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-4.2.0-rc.2.tgz#83c6ae4d0d95fc0271386a02c2f22531325c3b26"
- integrity sha512-VGEDWIIRnmHPrhcjIhhBcqILI8NUsuVIX7K5XfJUuf3WmEzH9Ru9Yyi81AYZNuBNXNAjyjRH/nIxwljnHxO8bA==
+"@abp/ng.theme.basic@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-4.2.0.tgz#bc239a9c014cca926c80196eb751a40ceeb7446c"
+ integrity sha512-xTy/AjuPujVNVb/cUenwRiKAS/BoYRR2Hh+AMksfgndIPMUEXYtJ8eSG+XOAtu0+QE/QI5RYk7FzcbfxDBeuvQ==
dependencies:
- "@abp/ng.theme.shared" "~4.2.0-rc.2"
+ "@abp/ng.theme.shared" "~4.2.0"
tslib "^2.0.0"
-"@abp/ng.theme.shared@~4.2.0-rc.2":
- version "4.2.0-rc.2"
- resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.2.0-rc.2.tgz#935ca3aa32d8ced85d277139ce790f3cc3faa184"
- integrity sha512-UjYPd6KL3bO9PN9XEmBlKQSc0C3EJsLHhifoV+rgtqAHvortOygSHHknOthRA4PN+cg2/PiuWA5gpvMHP1K7Ow==
+"@abp/ng.theme.shared@~4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.2.0.tgz#4b7925c61224d4d1b182c50e11ef915b50b78dda"
+ integrity sha512-LfatA+lk/Wn6MOAZlHlJIiTH5uxqRWBl4QyWXhFrXhYYpJG4je06Y9KA3h+BP4dIQIe06gwAVYpE7D/ur3CbEQ==
dependencies:
- "@abp/ng.core" "~4.2.0-rc.2"
+ "@abp/ng.core" "~4.2.0"
"@fortawesome/fontawesome-free" "^5.14.0"
"@ng-bootstrap/ng-bootstrap" "^7.0.0"
"@ngx-validate/core" "^0.0.13"
@@ -92,10 +92,10 @@
chart.js "^2.9.3"
tslib "^2.0.0"
-"@abp/utils@^4.2.0-rc.1":
- version "4.2.0-rc.1"
- resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0-rc.1.tgz#397615ec208150f46ae626b67ea71053750f612f"
- integrity sha512-MkXq5pKf/ZzJJT9oHYgBlUOL5wTx03qdxJeD82nxwJx6w5JFdshBWKj5iJixE1aM5HnzwSGn7bxFqe5QOKST+Q==
+"@abp/utils@^4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.0.tgz#073330e3e3f6ee61892f50260e48dbe1b05df35e"
+ integrity sha512-75qR3SdiAa75wqleAx9sUMXLj4m9duuBo5+2sVv7Y29GcEyKUPvm8B1s6tksvSGA0e3vnFTHeVEc10eD1xKHSQ==
dependencies:
just-compare "^1.3.0"