tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Always use GetCancellationToken

pull/12054/head
liangshiwei 4 years ago
parent
5a8b468397
commit
c9f348db49
16 changed files with 246 additions and 247 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogFeatureRepository.cs
  2. 8
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs
  3. 13
      modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs
  4. 8
      modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreTagRepository.cs
  5. 17
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogFeatureRepository.cs
  6. 18
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs
  7. 2
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs
  8. 12
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoTagRepository.cs
  9. 12
      modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
  10. 10
      modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
  11. 8
      modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs
  12. 20
      modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
  13. 11
      modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs
  14. 2
      modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs
  15. 2
      modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs
  16. 343
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock

7
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogFeatureRepository.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
@ -9,9 +10,9 @@ namespace Volo.CmsKit.Blogs;
public interface IBlogFeatureRepository : IBasicRepository<BlogFeature, Guid> public interface IBlogFeatureRepository : IBasicRepository<BlogFeature, Guid>
{ {
Task<List<BlogFeature>> GetListAsync(Guid blogId); Task<List<BlogFeature>> GetListAsync(Guid blogId, CancellationToken cancellationToken = default);
Task<List<BlogFeature>> GetListAsync(Guid blogId, List<string> featureNames); Task<List<BlogFeature>> GetListAsync(Guid blogId, List<string> featureNames, CancellationToken cancellationToken = default);
Task<BlogFeature> FindAsync(Guid blogId, string featureName); Task<BlogFeature> FindAsync(Guid blogId, string featureName, CancellationToken cancellationToken = default);
} }

8
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs
View File

@ -24,9 +24,13 @@ public interface ITagRepository : IBasicRepository<Tag, Guid>
[NotNull] string name, [NotNull] string name,
CancellationToken cancellationToken = default); CancellationToken cancellationToken = default);
Task<List<Tag>> GetListAsync(string filter); Task<List<Tag>> GetListAsync(
string filter,
CancellationToken cancellationToken = default);
Task<int> GetCountAsync(string filter); Task<int> GetCountAsync(
string filter,
CancellationToken cancellationToken = default);
Task<List<Tag>> GetAllRelatedTagsAsync( Task<List<Tag>> GetAllRelatedTagsAsync(
[NotNull] string entityType, [NotNull] string entityType,

13
modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs
View File

@ -2,6 +2,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
@ -15,22 +16,22 @@ public class EfCoreBlogFeatureRepository : EfCoreRepository<CmsKitDbContext, Blo
{ {
} }
public Task<BlogFeature> FindAsync(Guid blogId, string featureName) public Task<BlogFeature> FindAsync(Guid blogId, string featureName, CancellationToken cancellationToken = default)
{ {
return base.FindAsync(x => x.BlogId == blogId && x.FeatureName == featureName); return base.FindAsync(x => x.BlogId == blogId && x.FeatureName == featureName, cancellationToken: cancellationToken);
} }
public async Task<List<BlogFeature>> GetListAsync(Guid blogId) public async Task<List<BlogFeature>> GetListAsync(Guid blogId, CancellationToken cancellationToken = default)
{ {
return await (await GetQueryableAsync()) return await (await GetQueryableAsync())
.Where(x => x.BlogId == blogId) .Where(x => x.BlogId == blogId)
.ToListAsync(); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<List<BlogFeature>> GetListAsync(Guid blogId, List<string> featureNames) public async Task<List<BlogFeature>> GetListAsync(Guid blogId, List<string> featureNames, CancellationToken cancellationToken = default)
{ {
return await (await GetQueryableAsync()) return await (await GetQueryableAsync())
.Where(x => x.BlogId == blogId && featureNames.Contains(x.FeatureName)) .Where(x => x.BlogId == blogId && featureNames.Contains(x.FeatureName))
.ToListAsync(); .ToListAsync(GetCancellationToken(cancellationToken));
} }
} }

8
modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreTagRepository.cs
View File

@ -80,14 +80,14 @@ public class EfCoreTagRepository : EfCoreRepository<ICmsKitDbContext, Tag, Guid>
return await query.ToListAsync(cancellationToken: GetCancellationToken(cancellationToken)); return await query.ToListAsync(cancellationToken: GetCancellationToken(cancellationToken));
} }
public async Task<List<Tag>> GetListAsync(string filter) public async Task<List<Tag>> GetListAsync(string filter, CancellationToken cancellationToken = default)
{ {
return await (await GetQueryableByFilterAsync(filter)).ToListAsync(); return await (await GetQueryableByFilterAsync(filter)).ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<int> GetCountAsync(string filter) public async Task<int> GetCountAsync(string filter, CancellationToken cancellationToken = default)
{ {
return await (await GetQueryableByFilterAsync(filter)).CountAsync(); return await (await GetQueryableByFilterAsync(filter)).CountAsync(GetCancellationToken(cancellationToken));
} }
private async Task<IQueryable<Tag>> GetQueryableByFilterAsync(string filter) private async Task<IQueryable<Tag>> GetQueryableByFilterAsync(string filter)

17
modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogFeatureRepository.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using MongoDB.Driver.Linq; using MongoDB.Driver.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories.MongoDB; using Volo.Abp.Domain.Repositories.MongoDB;
using Volo.Abp.MongoDB; using Volo.Abp.MongoDB;
@ -17,22 +18,22 @@ public class MongoBlogFeatureRepository : MongoDbRepository<ICmsKitMongoDbContex
{ {
} }
public Task<BlogFeature> FindAsync(Guid blogId, string featureName) public Task<BlogFeature> FindAsync(Guid blogId, string featureName, CancellationToken cancellationToken = default)
{ {
return base.FindAsync(x => x.BlogId == blogId && x.FeatureName == featureName); return base.FindAsync(x => x.BlogId == blogId && x.FeatureName == featureName, cancellationToken: cancellationToken);
} }
public virtual async Task<List<BlogFeature>> GetListAsync(Guid blogId) public virtual async Task<List<BlogFeature>> GetListAsync(Guid blogId, CancellationToken cancellationToken = default)
{ {
return await (await GetMongoQueryableAsync()) return await (await GetMongoQueryableAsync(cancellationToken))
.Where(x => x.BlogId == blogId) .Where(x => x.BlogId == blogId)
.ToListAsync(); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<List<BlogFeature>> GetListAsync(Guid blogId, List<string> featureNames) public virtual async Task<List<BlogFeature>> GetListAsync(Guid blogId, List<string> featureNames, CancellationToken cancellationToken = default)
{ {
return await (await GetMongoQueryableAsync()) return await (await GetMongoQueryableAsync(cancellationToken))
.Where(x => x.BlogId == blogId && featureNames.Contains(x.FeatureName)) .Where(x => x.BlogId == blogId && featureNames.Contains(x.FeatureName))
.ToListAsync(); .ToListAsync(GetCancellationToken(cancellationToken));
} }
} }

18
modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs
View File

@ -44,12 +44,12 @@ public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, B
Guid? blogId = null, Guid? blogId = null,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var token = GetCancellationToken(cancellationToken); cancellationToken = GetCancellationToken(cancellationToken);
return await (await GetMongoQueryableAsync(token)) return await (await GetMongoQueryableAsync(cancellationToken))
.WhereIf<BlogPost, IMongoQueryable<BlogPost>>(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter)) .WhereIf<BlogPost, IMongoQueryable<BlogPost>>(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter))
.WhereIf<BlogPost, IMongoQueryable<BlogPost>>(blogId.HasValue, x => x.BlogId == blogId) .WhereIf<BlogPost, IMongoQueryable<BlogPost>>(blogId.HasValue, x => x.BlogId == blogId)
.CountAsync(GetCancellationToken(cancellationToken)); .CountAsync(cancellationToken);
} }
public virtual async Task<List<BlogPost>> GetListAsync( public virtual async Task<List<BlogPost>> GetListAsync(
@ -60,8 +60,8 @@ public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, B
string sorting = null, string sorting = null,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var token = GetCancellationToken(cancellationToken); cancellationToken = GetCancellationToken(cancellationToken);
var dbContext = await GetDbContextAsync(token); var dbContext = await GetDbContextAsync(cancellationToken);
var blogPostQueryable = await GetQueryableAsync(); var blogPostQueryable = await GetQueryableAsync();
var usersQueryable = dbContext.Collection<CmsUser>().AsQueryable(); var usersQueryable = dbContext.Collection<CmsUser>().AsQueryable();
@ -81,7 +81,7 @@ public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, B
.Skip(skipCount) .Skip(skipCount)
.Take(maxResultCount); .Take(maxResultCount);
var combinedResult = await AsyncExecuter.ToListAsync(combinedQueryable, GetCancellationToken(cancellationToken)); var combinedResult = await AsyncExecuter.ToListAsync(combinedQueryable, cancellationToken);
return combinedResult.Select(s => return combinedResult.Select(s =>
{ {
@ -95,8 +95,8 @@ public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, B
{ {
Check.NotNullOrEmpty(slug, nameof(slug)); Check.NotNullOrEmpty(slug, nameof(slug));
var token = GetCancellationToken(cancellationToken); cancellationToken = GetCancellationToken(cancellationToken);
var queryable = await GetMongoQueryableAsync(token); var queryable = await GetMongoQueryableAsync(cancellationToken);
return await queryable.AnyAsync(x => x.BlogId == blogId && x.Slug.ToLower() == slug, token); return await queryable.AnyAsync(x => x.BlogId == blogId && x.Slug.ToLower() == slug, cancellationToken);
} }
} }

2
modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs
View File

@ -66,7 +66,7 @@ public class MongoBlogRepository : MongoDbRepository<ICmsKitMongoDbContext, Blog
protected virtual async Task<IQueryable<Blog>> GetListQueryAsync(string filter = null, CancellationToken cancellationToken = default) protected virtual async Task<IQueryable<Blog>> GetListQueryAsync(string filter = null, CancellationToken cancellationToken = default)
{ {
return (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken))) return (await GetMongoQueryableAsync(cancellationToken))
.WhereIf(!filter.IsNullOrWhiteSpace(), b => b.Name.Contains(filter)); .WhereIf(!filter.IsNullOrWhiteSpace(), b => b.Name.Contains(filter));
} }
} }

12
modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoTagRepository.cs
View File

@ -82,19 +82,19 @@ public class MongoTagRepository : MongoDbRepository<ICmsKitMongoDbContext, Volo.
} }
public async Task<List<Tag>> GetListAsync(string filter) public async Task<List<Tag>> GetListAsync(string filter, CancellationToken cancellationToken = default)
{ {
return await (await GetQueryableByFilterAsync(filter)).ToListAsync(); return await (await GetQueryableByFilterAsync(filter, cancellationToken)).ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<int> GetCountAsync(string filter) public async Task<int> GetCountAsync(string filter, CancellationToken cancellationToken = default)
{ {
return await (await GetQueryableByFilterAsync(filter)).CountAsync(); return await (await GetQueryableByFilterAsync(filter, cancellationToken)).CountAsync(GetCancellationToken(cancellationToken));
} }
private async Task<IMongoQueryable<Tag>> GetQueryableByFilterAsync(string filter) private async Task<IMongoQueryable<Tag>> GetQueryableByFilterAsync(string filter, CancellationToken cancellationToken = default)
{ {
var mongoQueryable = await GetMongoQueryableAsync(); var mongoQueryable = await GetMongoQueryableAsync(cancellationToken: cancellationToken);
if (!filter.IsNullOrWhiteSpace()) if (!filter.IsNullOrWhiteSpace())
{ {

12
modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/Documents/EFCoreDocumentRepository.cs
View File

@ -29,13 +29,13 @@ namespace Volo.Docs.Documents
LanguageCode = x.LanguageCode, LanguageCode = x.LanguageCode,
Format = x.Format, Format = x.Format,
}) })
.ToListAsync(cancellationToken: cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<List<Document>> GetListByProjectId(Guid projectId, public async Task<List<Document>> GetListByProjectId(Guid projectId,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
return await (await GetDbSetAsync()).Where(d => d.ProjectId == projectId).ToListAsync(cancellationToken: cancellationToken); return await (await GetDbSetAsync()).Where(d => d.ProjectId == projectId).ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<List<Document>> GetListAsync(Guid? projectId, string version, string name, CancellationToken cancellationToken = default) public async Task<List<Document>> GetListAsync(Guid? projectId, string version, string name, CancellationToken cancellationToken = default)
@ -44,7 +44,7 @@ namespace Volo.Docs.Documents
.WhereIf(version != null, x => x.Version == version) .WhereIf(version != null, x => x.Version == version)
.WhereIf(name != null, x => x.Name == name) .WhereIf(name != null, x => x.Name == name)
.WhereIf(projectId.HasValue, x => x.ProjectId == projectId) .WhereIf(projectId.HasValue, x => x.ProjectId == projectId)
.ToListAsync(cancellationToken: cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<List<DocumentWithoutContent>> GetAllAsync( public async Task<List<DocumentWithoutContent>> GetAllAsync(
@ -86,7 +86,7 @@ namespace Volo.Docs.Documents
); );
query = query.OrderBy(string.IsNullOrWhiteSpace(sorting) ? nameof(Document.Name) : sorting); query = query.OrderBy(string.IsNullOrWhiteSpace(sorting) ? nameof(Document.Name) : sorting);
return await query.PageBy(skipCount, maxResultCount).ToListAsync(cancellationToken); return await query.PageBy(skipCount, maxResultCount).ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<long> GetAllCountAsync( public async Task<long> GetAllCountAsync(
@ -138,7 +138,7 @@ namespace Volo.Docs.Documents
.FirstOrDefaultAsync(x => .FirstOrDefaultAsync(x =>
x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode && x.ProjectId == projectId && x.Name == name && x.LanguageCode == languageCode &&
x.Version == version, x.Version == version,
cancellationToken); GetCancellationToken(cancellationToken));
} }
public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, CancellationToken cancellationToken = default) public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, CancellationToken cancellationToken = default)
@ -150,7 +150,7 @@ namespace Volo.Docs.Documents
public async Task<Document> GetAsync(Guid id, CancellationToken cancellationToken = default) public async Task<Document> GetAsync(Guid id, CancellationToken cancellationToken = default)
{ {
return await (await GetDbSetAsync()).Where(x => x.Id == id).SingleAsync(cancellationToken: cancellationToken); return await (await GetDbSetAsync()).Where(x => x.Id == id).SingleAsync(cancellationToken: GetCancellationToken(cancellationToken));
} }
protected virtual IQueryable<DocumentWithoutContent> ApplyFilterForGetAll( protected virtual IQueryable<DocumentWithoutContent> ApplyFilterForGetAll(

10
modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/Documents/MongoDocumentRepository.cs
View File

@ -31,12 +31,12 @@ namespace Volo.Docs.Documents
LanguageCode = x.LanguageCode, LanguageCode = x.LanguageCode,
Format = x.Format Format = x.Format
}) })
.ToListAsync(cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<List<Document>> GetListByProjectId(Guid projectId, CancellationToken cancellationToken = default) public async Task<List<Document>> GetListByProjectId(Guid projectId, CancellationToken cancellationToken = default)
{ {
return await (await GetMongoQueryableAsync(cancellationToken)).Where(d => d.ProjectId == projectId).ToListAsync(cancellationToken); return await (await GetMongoQueryableAsync(cancellationToken)).Where(d => d.ProjectId == projectId).ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<Document> FindAsync(Guid projectId, string name, string languageCode, string version, public async Task<Document> FindAsync(Guid projectId, string name, string languageCode, string version,
@ -46,7 +46,7 @@ namespace Volo.Docs.Documents
return await (await GetMongoQueryableAsync(cancellationToken)).FirstOrDefaultAsync(x => x.ProjectId == projectId && return await (await GetMongoQueryableAsync(cancellationToken)).FirstOrDefaultAsync(x => x.ProjectId == projectId &&
x.Name == name && x.Name == name &&
x.LanguageCode == languageCode && x.LanguageCode == languageCode &&
x.Version == version, cancellationToken); x.Version == version, GetCancellationToken(cancellationToken));
} }
public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version, public async Task DeleteAsync(Guid projectId, string name, string languageCode, string version,
@ -64,7 +64,7 @@ namespace Volo.Docs.Documents
.WhereIf(name != null, x => x.Name == name) .WhereIf(name != null, x => x.Name == name)
.WhereIf(projectId.HasValue, x => x.ProjectId == projectId) .WhereIf(projectId.HasValue, x => x.ProjectId == projectId)
.As<IMongoQueryable<Document>>() .As<IMongoQueryable<Document>>()
.ToListAsync(cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public async Task<List<DocumentWithoutContent>> GetAllAsync( public async Task<List<DocumentWithoutContent>> GetAllAsync(
@ -156,7 +156,7 @@ namespace Volo.Docs.Documents
public async Task<Document> GetAsync(Guid id, CancellationToken cancellationToken = default) public async Task<Document> GetAsync(Guid id, CancellationToken cancellationToken = default)
{ {
return await (await GetMongoQueryableAsync(cancellationToken)).Where(x => x.Id == id).SingleAsync(cancellationToken); return await (await GetMongoQueryableAsync(cancellationToken)).Where(x => x.Id == id).SingleAsync(GetCancellationToken(cancellationToken));
} }
protected virtual IMongoQueryable<DocumentWithoutContent> ApplyFilterForGetAll( protected virtual IMongoQueryable<DocumentWithoutContent> ApplyFilterForGetAll(

8
modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs
View File

@ -137,7 +137,7 @@ public class EfCoreOrganizationUnitRepository
.WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter)) .WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter))
.OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting)
.PageBy(skipCount, maxResultCount) .PageBy(skipCount, maxResultCount)
.ToListAsync(cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<int> GetUnaddedRolesCountAsync( public virtual async Task<int> GetUnaddedRolesCountAsync(
@ -151,7 +151,7 @@ public class EfCoreOrganizationUnitRepository
return await dbContext.Roles return await dbContext.Roles
.Where(r => !roleIds.Contains(r.Id)) .Where(r => !roleIds.Contains(r.Id))
.WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter)) .WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter))
.CountAsync(cancellationToken); .CountAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<List<IdentityUser>> GetMembersAsync( public virtual async Task<List<IdentityUser>> GetMembersAsync(
@ -211,7 +211,7 @@ public class EfCoreOrganizationUnitRepository
.IncludeDetails(includeDetails) .IncludeDetails(includeDetails)
.OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityUser.Name) : sorting) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityUser.Name) : sorting)
.PageBy(skipCount, maxResultCount) .PageBy(skipCount, maxResultCount)
.ToListAsync(cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<int> GetUnaddedUsersCountAsync( public virtual async Task<int> GetUnaddedUsersCountAsync(
@ -231,7 +231,7 @@ public class EfCoreOrganizationUnitRepository
u.UserName.Contains(filter) || u.UserName.Contains(filter) ||
u.Email.Contains(filter) || u.Email.Contains(filter) ||
(u.PhoneNumber != null && u.PhoneNumber.Contains(filter))) (u.PhoneNumber != null && u.PhoneNumber.Contains(filter)))
.CountAsync(cancellationToken); .CountAsync(GetCancellationToken(cancellationToken));
} }
[Obsolete("Use WithDetailsAsync method.")] [Obsolete("Use WithDetailsAsync method.")]

20
modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
View File

@ -36,7 +36,8 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
Guid id, Guid id,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var user = await GetAsync(id, cancellationToken: GetCancellationToken(cancellationToken)); cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var organizationUnitIds = user.OrganizationUnits var organizationUnitIds = user.OrganizationUnits
.Select(r => r.OrganizationUnitId) .Select(r => r.OrganizationUnitId)
.ToArray(); .ToArray();
@ -47,14 +48,15 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
var orgUnitRoleIds = organizationUnits.SelectMany(x => x.Roles.Select(r => r.RoleId)).ToArray(); var orgUnitRoleIds = organizationUnits.SelectMany(x => x.Roles.Select(r => r.RoleId)).ToArray();
var roleIds = user.Roles.Select(r => r.RoleId).ToArray(); var roleIds = user.Roles.Select(r => r.RoleId).ToArray();
var allRoleIds = orgUnitRoleIds.Union(roleIds); var allRoleIds = orgUnitRoleIds.Union(roleIds);
return await (await GetMongoQueryableAsync<IdentityRole>(cancellationToken)).Where(r => allRoleIds.Contains(r.Id)).Select(r => r.Name).ToListAsync(GetCancellationToken(cancellationToken)); return await (await GetMongoQueryableAsync<IdentityRole>(cancellationToken)).Where(r => allRoleIds.Contains(r.Id)).Select(r => r.Name).ToListAsync(cancellationToken);
} }
public virtual async Task<List<string>> GetRoleNamesInOrganizationUnitAsync( public virtual async Task<List<string>> GetRoleNamesInOrganizationUnitAsync(
Guid id, Guid id,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var user = await GetAsync(id, cancellationToken: GetCancellationToken(cancellationToken)); cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var organizationUnitIds = user.OrganizationUnits var organizationUnitIds = user.OrganizationUnits
.Select(r => r.OrganizationUnitId) .Select(r => r.OrganizationUnitId)
@ -71,7 +73,7 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
return await queryable return await queryable
.Where(r => roleIds.Contains(r.Id)) .Where(r => roleIds.Contains(r.Id))
.Select(r => r.Name) .Select(r => r.Name)
.ToListAsync(GetCancellationToken(cancellationToken)); .ToListAsync(cancellationToken);
} }
public virtual async Task<IdentityUser> FindByLoginAsync( public virtual async Task<IdentityUser> FindByLoginAsync(
@ -172,7 +174,8 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
bool includeDetails = false, bool includeDetails = false,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var user = await GetAsync(id, cancellationToken: GetCancellationToken(cancellationToken)); cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var organizationUnitIds = user.OrganizationUnits var organizationUnitIds = user.OrganizationUnits
.Select(r => r.OrganizationUnitId) .Select(r => r.OrganizationUnitId)
.ToArray(); .ToArray();
@ -183,7 +186,7 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
var orgUnitRoleIds = organizationUnits.SelectMany(x => x.Roles.Select(r => r.RoleId)).ToArray(); var orgUnitRoleIds = organizationUnits.SelectMany(x => x.Roles.Select(r => r.RoleId)).ToArray();
var roleIds = user.Roles.Select(r => r.RoleId).ToArray(); var roleIds = user.Roles.Select(r => r.RoleId).ToArray();
var allRoleIds = orgUnitRoleIds.Union(roleIds); var allRoleIds = orgUnitRoleIds.Union(roleIds);
return await (await GetMongoQueryableAsync<IdentityRole>(cancellationToken)).Where(r => allRoleIds.Contains(r.Id)).ToListAsync(GetCancellationToken(cancellationToken)); return await (await GetMongoQueryableAsync<IdentityRole>(cancellationToken)).Where(r => allRoleIds.Contains(r.Id)).ToListAsync(cancellationToken);
} }
public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync( public virtual async Task<List<OrganizationUnit>> GetOrganizationUnitsAsync(
@ -191,12 +194,13 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
bool includeDetails = false, bool includeDetails = false,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
var user = await GetAsync(id, cancellationToken: GetCancellationToken(cancellationToken)); cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var organizationUnitIds = user.OrganizationUnits.Select(r => r.OrganizationUnitId); var organizationUnitIds = user.OrganizationUnits.Select(r => r.OrganizationUnitId);
return await (await GetMongoQueryableAsync<OrganizationUnit>(cancellationToken)) return await (await GetMongoQueryableAsync<OrganizationUnit>(cancellationToken))
.Where(ou => organizationUnitIds.Contains(ou.Id)) .Where(ou => organizationUnitIds.Contains(ou.Id))
.ToListAsync(GetCancellationToken(cancellationToken)); .ToListAsync(cancellationToken);
} }
public virtual async Task<long> GetCountAsync( public virtual async Task<long> GetCountAsync(

11
modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs
View File

@ -95,7 +95,7 @@ public class MongoOrganizationUnitRepository
.OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting)
.As<IMongoQueryable<IdentityRole>>() .As<IMongoQueryable<IdentityRole>>()
.PageBy<IdentityRole, IMongoQueryable<IdentityRole>>(skipCount, maxResultCount) .PageBy<IdentityRole, IMongoQueryable<IdentityRole>>(skipCount, maxResultCount)
.ToListAsync(cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<int> GetRolesCountAsync( public virtual async Task<int> GetRolesCountAsync(
@ -104,7 +104,7 @@ public class MongoOrganizationUnitRepository
{ {
var roleIds = organizationUnit.Roles.Select(r => r.RoleId).ToArray(); var roleIds = organizationUnit.Roles.Select(r => r.RoleId).ToArray();
return await (await GetMongoQueryableAsync<IdentityRole>(cancellationToken)).Where(r => roleIds.Contains(r.Id)).CountAsync(cancellationToken); return await (await GetMongoQueryableAsync<IdentityRole>(cancellationToken)).Where(r => roleIds.Contains(r.Id)).CountAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<List<IdentityRole>> GetUnaddedRolesAsync( public virtual async Task<List<IdentityRole>> GetUnaddedRolesAsync(
@ -124,7 +124,7 @@ public class MongoOrganizationUnitRepository
.OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting) .OrderBy(sorting.IsNullOrEmpty() ? nameof(IdentityRole.Name) : sorting)
.As<IMongoQueryable<IdentityRole>>() .As<IMongoQueryable<IdentityRole>>()
.PageBy<IdentityRole, IMongoQueryable<IdentityRole>>(skipCount, maxResultCount) .PageBy<IdentityRole, IMongoQueryable<IdentityRole>>(skipCount, maxResultCount)
.ToListAsync(cancellationToken); .ToListAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<int> GetUnaddedRolesCountAsync( public virtual async Task<int> GetUnaddedRolesCountAsync(
@ -138,7 +138,7 @@ public class MongoOrganizationUnitRepository
.Where(r => !roleIds.Contains(r.Id)) .Where(r => !roleIds.Contains(r.Id))
.WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter)) .WhereIf(!filter.IsNullOrWhiteSpace(), r => r.Name.Contains(filter))
.As<IMongoQueryable<IdentityRole>>() .As<IMongoQueryable<IdentityRole>>()
.CountAsync(cancellationToken); .CountAsync(GetCancellationToken(cancellationToken));
} }
public virtual async Task<List<IdentityUser>> GetMembersAsync( public virtual async Task<List<IdentityUser>> GetMembersAsync(
@ -218,12 +218,13 @@ public class MongoOrganizationUnitRepository
public virtual async Task RemoveAllMembersAsync(OrganizationUnit organizationUnit, CancellationToken cancellationToken = default) public virtual async Task RemoveAllMembersAsync(OrganizationUnit organizationUnit, CancellationToken cancellationToken = default)
{ {
cancellationToken = GetCancellationToken(cancellationToken);
var userQueryable = await GetMongoQueryableAsync<IdentityUser>(cancellationToken); var userQueryable = await GetMongoQueryableAsync<IdentityUser>(cancellationToken);
var dbContext = await GetDbContextAsync(cancellationToken); var dbContext = await GetDbContextAsync(cancellationToken);
var users = await userQueryable var users = await userQueryable
.Where(u => u.OrganizationUnits.Any(uou => uou.OrganizationUnitId == organizationUnit.Id)) .Where(u => u.OrganizationUnits.Any(uou => uou.OrganizationUnitId == organizationUnit.Id))
.As<IMongoQueryable<IdentityUser>>() .As<IMongoQueryable<IdentityUser>>()
.ToListAsync(GetCancellationToken(cancellationToken)); .ToListAsync(cancellationToken);
foreach (var user in users) foreach (var user in users)
{ {

2
modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs
View File

@ -74,7 +74,7 @@ public class EfCoreTenantRepository : EfCoreRepository<ITenantManagementDbContex
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.Name.Contains(filter) u.Name.Contains(filter)
).CountAsync(cancellationToken: cancellationToken); ).CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
} }
[Obsolete("Use WithDetailsAsync method.")] [Obsolete("Use WithDetailsAsync method.")]

2
modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs
View File

@ -69,6 +69,6 @@ public class MongoTenantRepository : MongoDbRepository<ITenantManagementMongoDbC
!filter.IsNullOrWhiteSpace(), !filter.IsNullOrWhiteSpace(),
u => u =>
u.Name.Contains(filter) u.Name.Contains(filter)
).CountAsync(cancellationToken: cancellationToken); ).CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
} }
} }

343
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock
View File

@ -2,37 +2,37 @@
# yarn lockfile v1 # yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@^5.0.1": "@abp/aspnetcore.mvc.ui.theme.basic@^5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.1.tgz#884a4bc9ea043654891be56cd7e7c7bbf9bbad8c" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.2.0-rc.2.tgz#d2cf4a0f2b8a93f1fe53a0bc6c66d9c3233b620a"
integrity sha512-JGTQyg3Zyfda84yg/Geq6rGuBN2SX4gIOaFL2h8BX9bA8CVuBC+zcwfO1bBsP89xfTyPvdSAGBvSfhCjPwsukQ== integrity sha512-aQk3RSl31UT4gEqiHT3oV06BZ/k6q1DVKBwVOj+YQEIb8ojptJtbGv+aUhHEql5I7zwiWe4EWf2rM2Ve0JQa6Q==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.1" "@abp/aspnetcore.mvc.ui.theme.shared" "~5.2.0-rc.2"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.1": "@abp/aspnetcore.mvc.ui.theme.shared@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.1.tgz#77a4900424603e0be048f3507aa852701f3139a2" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.2.0-rc.2.tgz#9ff2eb2a1b5f438d8f848659400100e20f74fc77"
integrity sha512-mn9HEOHBkmBr7d/VUt0bfg9K58IyRDb7j3ZiDoHo263WLXJkf0+C7MEbv/zxfDHW4NeztsNCd3ugA7PdTxPzmA== integrity sha512-m06zMEt0C9P3f7+Qg7SjvP+k4wHPqvAOzsd5jDNN0JekeWH4gIMsqgDAoRB2SA72HUUpMbGe8Utune7EgE/T1Q==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.1" "@abp/aspnetcore.mvc.ui" "~5.2.0-rc.2"
"@abp/bootstrap" "~5.0.1" "@abp/bootstrap" "~5.2.0-rc.2"
"@abp/bootstrap-datepicker" "~5.0.1" "@abp/bootstrap-datepicker" "~5.2.0-rc.2"
"@abp/datatables.net-bs5" "~5.0.1" "@abp/datatables.net-bs5" "~5.2.0-rc.2"
"@abp/font-awesome" "~5.0.1" "@abp/font-awesome" "~5.2.0-rc.2"
"@abp/jquery-form" "~5.0.1" "@abp/jquery-form" "~5.2.0-rc.2"
"@abp/jquery-validation-unobtrusive" "~5.0.1" "@abp/jquery-validation-unobtrusive" "~5.2.0-rc.2"
"@abp/lodash" "~5.0.1" "@abp/lodash" "~5.2.0-rc.2"
"@abp/luxon" "~5.0.1" "@abp/luxon" "~5.2.0-rc.2"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.1" "@abp/malihu-custom-scrollbar-plugin" "~5.2.0-rc.2"
"@abp/select2" "~5.0.1" "@abp/select2" "~5.2.0-rc.2"
"@abp/sweetalert2" "~5.0.1" "@abp/sweetalert2" "~5.2.0-rc.2"
"@abp/timeago" "~5.0.1" "@abp/timeago" "~5.2.0-rc.2"
"@abp/toastr" "~5.0.1" "@abp/toastr" "~5.2.0-rc.2"
"@abp/aspnetcore.mvc.ui@~5.0.1": "@abp/aspnetcore.mvc.ui@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.1.tgz#f5aa4e0dcc10878f590e30836887f3f9861e91e3" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.2.0-rc.2.tgz#427811f66eb738dbb89434e926b36a2309fe43b2"
integrity sha512-bN15UcNhTqeo0RXlIYws7Jd8ZfSBsVM6Y5wiAqbq1Q3Lvs1uLmryhZpn6sHmKw2Z3Lnhec7VjnZN0FwNpzEqUw== integrity sha512-+ss9MctYTF9Ewn7VEsMqszEoiX51G070kN2bIepgyXnYetrQRFsTgQGa4yi1bAqyAF9rZ1j0hSB0eM2clFyJMg==
dependencies: dependencies:
ansi-colors "^4.1.1" ansi-colors "^4.1.1"
extend-object "^1.0.0" extend-object "^1.0.0"
@ -41,152 +41,151 @@
merge-stream "^2.0.0" merge-stream "^2.0.0"
micromatch "^4.0.2" micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~5.0.1": "@abp/bootstrap-datepicker@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.1.tgz#52116a154e343d84c87257ad1ef10b54012f4c33" resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.2.0-rc.2.tgz#bfb648e7b8e5d2a9806301417c7864abb4cc26e2"
integrity sha512-ZJWaZKzGzshBAfyBqaUScfWqeBVfWGbZIwIplF8VKtDGcyI8R54bqDsydhS88CCnolRz4+tfq3QY6yAXrUEKAw== integrity sha512-wKR+5g/xx7zqFGFaOZVO9XySlrOmOFH/ZidDpq9QYjE+OoHSlS8X5DUnkbXj2MbQy4etZuvz9ILcmnBPonrQ7g==
dependencies: dependencies:
bootstrap-datepicker "^1.9.0" bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~5.0.1": "@abp/bootstrap@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.1.tgz#d542a8fd7151e22eda1643e313a67f9892c50533" resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.2.0-rc.2.tgz#0375b38317c5d1f5f6cb7d46a0ee6bf9b85a6f4f"
integrity sha512-wyVAp6a4OIwlqK7AZozs7wpsBZgzG55EKeChBBfUXloJPuirQHxccFNE41aAYWfKur+wj25WD5NBnzFuKyNYiQ== integrity sha512-hsgxY8WNRonQZP3cmMKvBNHnyCSBfbBB4savLW5r7CxysjnRt6MDyhmmj7XVwVTC1siBviUcWClOHCJisaNRSw==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
bootstrap "^5.1.0" bootstrap "^5.1.3"
bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~5.0.1": "@abp/core@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.1.tgz#904fa2c22bcbf42deb56abf772c3a53362807a2f" resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.2.0-rc.2.tgz#f0c3dd7f0b12e8e13a702a3b0a53aa4525da673e"
integrity sha512-QzX35Oa+Vncu2OP1tXvGjAVFznmD1tZRn4tlDQgn36B2MU06UEO0JSx7JVedPvhzQZceUe5+WWMfuYNM2xeBTw== integrity sha512-zotgZOXmkh+aD0KExBr4QytQfDDHxrG15e2HFzYKywhd0mpnwAVdR2Z2Ye01C360wJ2opv0mtgaSuEZniXNO3Q==
dependencies: dependencies:
"@abp/utils" "~5.0.1" "@abp/utils" "~5.2.0-rc.2"
"@abp/datatables.net-bs5@~5.0.1": "@abp/datatables.net-bs5@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.0.1.tgz#b8afa2255e374c86c50e57bd57c2b36a86d6a890" resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.2.0-rc.2.tgz#df5cbe004ba3a2330cc667b3724440c4881cc6b2"
integrity sha512-1fuCk+K4xW3XnDFo2+kPXHMoOTol4HLRcWVRELjoBQ5YbTxEPsbrhfNUeUsECDAmkxoqY7G3MEdtIVwmy5NPpg== integrity sha512-Q2Sy6MMWM3EuELHeHxKkDflPTX09ictonjB5vn/Cau2PHuOkWTnL0Ystl91a1DetQIa1ejJL/YB+Pz1TUVoUNA==
dependencies: dependencies:
"@abp/datatables.net" "~5.0.1" "@abp/datatables.net" "~5.2.0-rc.2"
datatables.net-bs5 "^1.10.25" datatables.net-bs5 "^1.11.4"
"@abp/datatables.net@~5.0.1": "@abp/datatables.net@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.1.tgz#0ce5bdf7aa5bf224b93a22758a016c50562d6569" resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.2.0-rc.2.tgz#bfdc01302d19eab0d73eff908238bf88c5806e74"
integrity sha512-x9D2YNtnOJRrKXi2Pwrqzz9sIOrn3o6x2c8ZxjyC54vh+SLQtLycAzQw7OyaZGdbFkudlJiCuME/FiuZvht8Og== integrity sha512-TG1b8moW4RqCyNtzQKB7RnCmDt1cDEy/5WD++Maz2x4/yvu1uBBa6qLR7Mn6UNgoC51Y/op+LzaabkwXUSJl4w==
dependencies: dependencies:
"@abp/jquery" "~5.0.1" "@abp/jquery" "~5.2.0-rc.2"
datatables.net "^1.10.21" datatables.net "^1.11.4"
"@abp/font-awesome@~5.0.1": "@abp/font-awesome@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.1.tgz#661753403499925661f880c53214841dd34f5210" resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.2.0-rc.2.tgz#0292cb22c0280dccfe148ad3d46947ede26f8b14"
integrity sha512-C+alReNvHZzST55ITBTyFqhdTehPo5ondzfqc9QlyB3Kwk1DIq0CaLqfS2xU5glYGDSqKi7xfkyQnJdwu2hKRA== integrity sha512-FzjH/lnAglswqU7/YAXZP0H/ocGBrDkegMiQ7OjzZVcgGPS9BnqRPbiHDz7mjBHaQHzBtTCcZrXnU0l3GXCdbw==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
"@fortawesome/fontawesome-free" "^5.13.0" "@fortawesome/fontawesome-free" "^5.15.4"
"@abp/jquery-form@~5.0.1": "@abp/jquery-form@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.1.tgz#20fa51946f68a7acd6ef3dd3d8d1349307f681b4" resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.2.0-rc.2.tgz#797e3b72a91435d74f19ddaa9b2e6e04fcfed616"
integrity sha512-Q7GG0+XFXs7pDoa4p3r7vm8+sUh5ohwovedPNVghtX8Rm2I1sfVfJKamPr24PCAyJcFVntU1WCt/CngneES3pw== integrity sha512-cVbReCeM5q7nqeQDjSIH7VmuMwX8lE36D9sariUw8xSUn5GJlnrGYNV4kE7G9JLIlIRanIlS3SPuA3RFA2z9ZA==
dependencies: dependencies:
"@abp/jquery" "~5.0.1" "@abp/jquery" "~5.2.0-rc.2"
jquery-form "^4.3.0" jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~5.0.1": "@abp/jquery-validation-unobtrusive@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.1.tgz#50798d3c087d0b103944b3a9e7c39a1f51db9fdc" resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.2.0-rc.2.tgz#ec0c22cecef3016c1da0b8dca4374a263915a835"
integrity sha512-w5SAYB0EZRbOhIFcCUXWvoGB/dWj3zyQOarbvzJ9LelgrXvvoissaaSSqq6BySjr1UigIWBCVuruAQssizmXBQ== integrity sha512-b+ttLlnRPgDB7V2tnYp8+1Q3niM4ZmiU/ZaQB4z6gSMk/2tPAIhOOwAQt7DYRWSMUsgGFI0NvsgEBM9aLTikFA==
dependencies: dependencies:
"@abp/jquery-validation" "~5.0.1" "@abp/jquery-validation" "~5.2.0-rc.2"
jquery-validation-unobtrusive "^3.2.11" jquery-validation-unobtrusive "^3.2.12"
"@abp/jquery-validation@~5.0.1": "@abp/jquery-validation@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.1.tgz#5932060d1fdf04a81e998caac959188aefdf1669" resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.2.0-rc.2.tgz#a98383e6c7fb21b74ecde937c25d7fa46810a333"
integrity sha512-T5p0U2cWh6Jov55AiUxJYRw92L6ubFXfqL0EkaePV5AnoetVXheluhq9gQAKnwVAqtc/3Rxkr/lO047catUkjw== integrity sha512-6lVxJyMfL0kHmv8tpxLhVfK0Rf+qjLMPkm1qHd0pSwvH+GM0QMN39s9TaexCvH3QO70BlEnwXJ2PWVY9OQY5uw==
dependencies: dependencies:
"@abp/jquery" "~5.0.1" "@abp/jquery" "~5.2.0-rc.2"
jquery-validation "^1.19.2" jquery-validation "^1.19.3"
"@abp/jquery@~5.0.1": "@abp/jquery@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.1.tgz#1522ba1e0c488bffdc30a230ab35e225ae32d028" resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.2.0-rc.2.tgz#3235b92834cbca4d3e22fb0b19122aa2a24b8262"
integrity sha512-AacK4cy/RpzBfRYf7Jjn+TmVm72TW0jEjRoQ3TOXmlOrunRph05mQm72Ux2o8+Z1lOwxJKRz5gKSbRTfa6Tgpw== integrity sha512-u7xpQcaMpzlXq018qBdzwWmPx+65QHPq5VhI7aAvZAUlQrvQjiiCeG25egxOeCL0aROcCjsAlnTItT1U/q9loQ==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
jquery "~3.6.0" jquery "~3.6.0"
"@abp/lodash@~5.0.1": "@abp/lodash@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.1.tgz#ad22895772ce65e52941dddb84d0a7d26c521d59" resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.2.0-rc.2.tgz#e55f11279d4f374785a56ec68ed99cdf2495a9aa"
integrity sha512-r1QqZCXfDd0YQnE4MkcY291H5jWFdZtGeYmwjIkn7aeOZ0PP9qsDPkWTwPwbpfmnz4DhmIdO5a1rveWz/J5ZwQ== integrity sha512-BR6d1NbTcuk772RK8VdeHBokbqZ1OHUgRKdPG3MXlDGKZmUS4/ijFdRiIvo7Rd0WFqgk2QdbHw3lfKQ/CGqyhw==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
lodash "^4.17.15" lodash "^4.17.21"
"@abp/luxon@~5.0.1": "@abp/luxon@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.1.tgz#7930e30db60e63b486a51030c60e09b54bcb3867" resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.2.0-rc.2.tgz#0d263482b9a73269164a8a58562ce8bd69b57f36"
integrity sha512-cXbnyAI9Gn2bZBQuCN46UFOkzb+djA3LMgpeMlTTv0aA87PrjzT60EPQ4a9FLovESqNnblaQ9Je43QwoGH8kZA== integrity sha512-KIhpvl9kf43Bc/E/u6bmb1lp0asf81NoUoERQTRz7JqmH1XYJvJCqGHxommvItcu7zNjCLL6FK/JtO0v7DUiEw==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
luxon "^1.24.1" luxon "^2.3.0"
"@abp/malihu-custom-scrollbar-plugin@~5.0.1": "@abp/malihu-custom-scrollbar-plugin@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.1.tgz#268ec30eef8ba72a0c8cb997e55d48a1508b2719" resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.2.0-rc.2.tgz#5136c0d59d5d385350f560c6d8a3d10f6393dea7"
integrity sha512-mqF6OizoWp6kg5pztNfF78+mbfyX3JAXDfv+ZUCvjtAqllIzyOUIqRSXULDkAcDeCC1+PluRsd+uSltIppC5hA== integrity sha512-7Q8yZbU9YRA5/Y+rRLLiPD724rjfrVBuCpfp1+b99LyeFTFTSD2oNG3r/I6FC7tE5HLaFscJLJyOca4GPS1mww==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
malihu-custom-scrollbar-plugin "^3.1.5" malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~5.0.1": "@abp/select2@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.1.tgz#644c46c7c942a6b9d36bc76c7132f32ad577933b" resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.2.0-rc.2.tgz#2eef30442957ac02133357604a1256e995a9ebe7"
integrity sha512-FHVqEebQS3XiYn5TMEhGaQJOAYnPqxivKpeOB0F0F2bEDGqt3OXh05KcQBOm+sDSScq3c7T7HLr9mMzlYtyHXw== integrity sha512-1cFOavpWP6zRfrpXi0zozFkL6W0tEEBkWj7AiHU3AGctAQEZ0qWGKSTIExqnEsDb3LsjAKMdBycGdkLFbK97Og==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
select2 "^4.0.13" select2 "^4.0.13"
"@abp/sweetalert2@~5.0.1": "@abp/sweetalert2@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.1.tgz#acf2acfc04619c7907237238bfaeb63f2d75fb22" resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.2.0-rc.2.tgz#15b6718b1378e8bd7e0ea019b965e7b51f0cb1ea"
integrity sha512-CPqXIaHK7Ff6i8gNhxoZ9r3te9LIEiDCUpdHNtgRVMCaLbywfkiLyirlfRIB6lxRWSw8BZ+M/azdp5uzidW8Vw== integrity sha512-1ROKcfpu0Xyk7ebUFMNBhFgENcHCMj48+1Lj/OxdJH3U7KhyF5WEs54uYgn8EvY2wTCgOkHCnqeK9bRCp5M9+g==
dependencies: dependencies:
"@abp/core" "~5.0.1" "@abp/core" "~5.2.0-rc.2"
sweetalert2 "^11.0.18" sweetalert2 "^11.3.6"
"@abp/timeago@~5.0.1": "@abp/timeago@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.1.tgz#09ca6302304de09baa5ac8c72b950515ab0d0451" resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.2.0-rc.2.tgz#e6ad0cb584515b95e47258976d726fd996b7f47d"
integrity sha512-6onXho8R6eiWfncONZFBn18OwgQPKIaRM73rVevpRGJTf2pylcHtCp4uHGsoqgCc+TQU7FyoKTTkg4lfvCQa0A== integrity sha512-D9Y7xfpP6neURDkP/WMrFh25G++0SUiGIDaCIElgymhNdVp2gm9pC633ShetMOFrPCSuOUvlzC2p4YkUdq0Lnw==
dependencies: dependencies:
"@abp/jquery" "~5.0.1" "@abp/jquery" "~5.2.0-rc.2"
timeago "^1.6.7" timeago "^1.6.7"
"@abp/toastr@~5.0.1": "@abp/toastr@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.1.tgz#a3959df1de0c4640fabf508da9ccd3ed37ae2b03" resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.2.0-rc.2.tgz#b5f013f1f00dab648da2fe1cf4ece6691e6eafc7"
integrity sha512-ndL1uj2ce4PbGDzxh+QCIWYu+GAmW1Xwma4aJcq5zKo+xhlLJJnTe6QFGKr7wSsTVZMB7z1Pp2olvXH6an82+g== integrity sha512-FSkva7zP3kJFSh6SlmvrgjPFJscJbmrgCilxGxPGVxlg5p9LNORgkotNk2yKsGHX0F0rnKJ4kHepTq7g+oGMdw==
dependencies: dependencies:
"@abp/jquery" "~5.0.1" "@abp/jquery" "~5.2.0-rc.2"
toastr "^2.1.4" toastr "^2.1.4"
"@abp/utils@~5.0.1": "@abp/utils@~5.2.0-rc.2":
version "5.0.1" version "5.2.0-rc.2"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.1.tgz#57934383004a21172bf7e08130813c08946894fb" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.2.0-rc.2.tgz#1280059ff3e948ae0827eaf06d916e5a90f8907b"
integrity sha512-WLCWe7iJ8krxsz8Z7E+8GDaGZuG/6PZDdqPcMIh95opi0kvcLxb+mjPXXpiXdtFzW7O09a+NaNOxorsEFxjoKw== integrity sha512-/mo4dSXPkhCEbqyKunuURcF1cEzuJqRTPOGpjSrjDwOgymVSWp/AqqjJPBXuc4qrMfB4q9y+Iod5nslXp2cXeA==
dependencies: dependencies:
just-compare "^1.3.0" just-compare "^1.3.0"
"@fortawesome/fontawesome-free@^5.13.0": "@fortawesome/fontawesome-free@^5.15.4":
version "5.13.1" version "5.15.4"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz#c53b4066edae16cd1fd669f687baf031b45fb9d6" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
integrity sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw== integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
abbrev@1: abbrev@1:
version "1.1.1" version "1.1.1"
@ -391,12 +390,7 @@ bootstrap-datepicker@^1.9.0:
dependencies: dependencies:
jquery ">=1.7.1 <4.0.0" jquery ">=1.7.1 <4.0.0"
bootstrap-v4-rtl@4.6.0-1: bootstrap@^5.1.3:
version "4.6.0-1"
resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.6.0-1.tgz#8fc502e800308fb725151128dd288df1c027cd8e"
integrity sha512-ChcbO5JeEQx6/Yz40YZLq3A4RIWcCmCCiRpweF5wg32/Q8CfWrwDNpcDTJ2SU+aSAewUJoCSzf/tRxhAgnZuog==
bootstrap@^5.1.0:
version "5.1.3" version "5.1.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
@ -603,25 +597,18 @@ d@1:
dependencies: dependencies:
es5-ext "^0.10.9" es5-ext "^0.10.9"
datatables.net-bs5@^1.10.25: datatables.net-bs5@^1.11.4:
version "1.11.3" version "1.11.5"
resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-1.11.3.tgz#939d0e66fbf518718a519534a88fc88cd29405b0" resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-1.11.5.tgz#593608d54aeb7f91bcbd80bde304155ba3795663"
integrity sha512-u0tosKUR1XNpXzxOOt2NInnNYayt7GQoG+OM1xPRhdkZ7ZBD4oNF8S0aKve8yvSUq/ZwTMh4WJeh80GdmrJAdQ== integrity sha512-1zyh972GtuK1uAb9h8nP3jJ7f/3UgCDq69LAaZS2bVd4mEHECJ6vrZLacxrkOHOs/q/H3v5sEMeZ46vXz8ox4w==
dependencies: dependencies:
datatables.net ">=1.10.25" datatables.net ">=1.11.3"
jquery ">=1.7" jquery ">=1.7"
datatables.net@>=1.10.25: datatables.net@>=1.11.3, datatables.net@^1.11.4:
version "1.11.3" version "1.11.5"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.11.3.tgz#80e691036efcd62467558ee64c07dd566cb761b4" resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.11.5.tgz#858a69953a01e1d5b18786769802117b04b8e3c9"
integrity sha512-VMj5qEaTebpNurySkM6jy6sGpl+s6onPK8xJhYr296R/vUBnz1+id16NVqNf9z5aR076OGcpGHCuiTuy4E05oQ== integrity sha512-nlFst2xfwSWaQgaOg5sXVG3cxYC0tH8E8d65289w9ROgF2TmLULOOpcdMpyxxUim/qEwVSEem42RjkTWEpr3eA==
dependencies:
jquery ">=1.7"
datatables.net@^1.10.21:
version "1.10.21"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.21.tgz#f1d35c8e5c3eb7f5caef39e80cd5b836a8c77103"
integrity sha512-/bSZtxmf3GTpYcvEmwZ8q26I1yhSx8qklR2B+s1K8+/51UW/zc2zTYwJMqr/Z+iCYixAc00ildj4g2x0Qamolw==
dependencies: dependencies:
jquery ">=1.7" jquery ">=1.7"
@ -1375,12 +1362,12 @@ jquery-mousewheel@>=3.0.6:
version "3.1.13" version "3.1.13"
resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5" resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5"
jquery-validation-unobtrusive@^3.2.11: jquery-validation-unobtrusive@^3.2.12:
version "3.2.11" version "3.2.12"
resolved "https://registry.yarnpkg.com/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.2.11.tgz#175ee46380385a0e33ed320f255fad321f68f9f5" resolved "https://registry.yarnpkg.com/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.2.12.tgz#1d52841f653e516525c251e494b042e664dad8af"
integrity sha512-3FQPllaWdD+Aq55zJLGSW39+eXPDz1HhwAvrSwYi8zHQ8DVcu5IJ1HVeTiCl0BnCnrIBvfFU3zEB/DrGdcoRIQ== integrity sha512-kPixGhVcuat7vZXngGFfSIksy4VlzZcHyRgnBIZdsfVneCU+D5sITC8T8dD/9c9K/Q+qkMlgp7ufJHz93nKSuQ==
dependencies: dependencies:
jquery ">=1.8" jquery "^3.5.1"
jquery-validation ">=1.16" jquery-validation ">=1.16"
jquery-validation@>=1.16: jquery-validation@>=1.16:
@ -1389,12 +1376,12 @@ jquery-validation@>=1.16:
dependencies: dependencies:
jquery "^1.7 || ^2.0 || ^3.1" jquery "^1.7 || ^2.0 || ^3.1"
jquery-validation@^1.19.2: jquery-validation@^1.19.3:
version "1.19.2" version "1.19.3"
resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.2.tgz#c602831b0d8c5881400af424e872757ce241eff9" resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.3.tgz#50b350eba8b02bcfd119ba15f199487b7eb64086"
integrity sha512-yHaAqOGaAB7+p2u5lpzhhQVt3CBMUw3fHcuCJ7nXmXz0LWLHPN7yOhwnocp5nrn2SmnXR1jpV+whx2j1kLz1tQ== integrity sha512-iXxCS5W7STthSTMFX/NDZfWHBLbJ1behVK3eAgHXAV8/0vRa9M4tiqHvJMr39VGWHMGdlkhrtrkBuaL2UlE8yw==
jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.7.2, jquery@>=1.8, "jquery@^1.7 || ^2.0 || ^3.1": jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.7.2, "jquery@^1.7 || ^2.0 || ^3.1":
version "3.3.1" version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
@ -1403,7 +1390,7 @@ jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.7.2, jquery@>=1.8, "jquery@^1.7 || ^2.
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
jquery@~3.6.0: jquery@^3.5.1, jquery@~3.6.0:
version "3.6.0" version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
@ -1497,15 +1484,15 @@ load-json-file@^1.0.0:
pinkie-promise "^2.0.0" pinkie-promise "^2.0.0"
strip-bom "^2.0.0" strip-bom "^2.0.0"
lodash@^4.17.15: lodash@^4.17.21:
version "4.17.15" version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
luxon@^1.24.1: luxon@^2.3.0:
version "1.24.1" version "2.3.1"
resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.24.1.tgz#a8383266131ed4eaed4b5f430f96f3695403a52a" resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.3.1.tgz#f276b1b53fd9a740a60e666a541a7f6dbed4155a"
integrity sha512-CgnIMKAWT0ghcuWFfCWBnWGOddM0zu6c4wZAWmD0NN7MZTnro0+833DF6tJep+xlxRPg4KtsYEHYLfTMBQKwYg== integrity sha512-I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA==
make-iterator@^1.0.0: make-iterator@^1.0.0:
version "1.0.1" version "1.0.1"
@ -2356,10 +2343,10 @@ sver-compat@^1.5.0:
es6-iterator "^2.0.1" es6-iterator "^2.0.1"
es6-symbol "^3.1.1" es6-symbol "^3.1.1"
sweetalert2@^11.0.18: sweetalert2@^11.3.6:
version "11.3.3" version "11.4.6"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.3.3.tgz#92ca0408380de8f29180788ce7ed5d5faf799cea" resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.4.6.tgz#c17ae901150c8a89ea85b93cefe5c4791f32e68a"
integrity sha512-10Keqbmjng/+XpkpSOQ6dttpztl7XNohjnpC6bX6XFgm0WpRXM81YE0wmonGYOP6uyzd76vpfnZS04PdVvO31Q== integrity sha512-7UDJV8etrJQ6vJGh88k7D63qBKtwEl8JV7zIxmO2Frp8ZGQDgQQC6f9ivqiVwLRxoEyfxsn/v3T6Zykk7/vlEg==
tar@^4: tar@^4:
version "4.4.10" version "4.4.10"

Write Preview
Loading…
Cancel
Save