From 1a5273e4d821334cedc22ae981fadb4cf166c21a Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 20 Dec 2019 16:17:59 +0300 Subject: [PATCH 1/5] chore: update labeler action --- .github/labeler.yml | 3 +++ .github/workflows/labeler.yml | 21 ++++++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 738b727317..2dded9549b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,4 +1,7 @@ ui-angular: + - npm/ng-packs/* - npm/ng-packs/**/* + - templates/app/angular/* - templates/app/angular/**/* + - templates/module/angular/* - templates/module/angular/**/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index e70e966d4a..2796d177d1 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,17 +1,12 @@ -name: "Pull Request Labeler" +name: Pull request labeler on: - pull_request: - paths: - - npm/ng-packs/**/* - - templates/app/angular/**/* - - templates/module/angular/**/* - branches: - - master - - dev + schedule: + - cron: '0 */1 * * *' jobs: labeler: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - - uses: actions/labeler@v2 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" + - uses: paulfantom/periodic-labeler@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ github.repository }} From 894adc4ccb410930b43a0796f7858e2a0fd78e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 20 Dec 2019 16:54:28 +0300 Subject: [PATCH 2/5] Convert FirstOrDefault to First (temporary) --- .../EfCorePermissionGrantRepository.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs index 413a960c7c..101ebc235e 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs @@ -16,14 +16,14 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore } - public async Task FindAsync(string name, string providerName, string providerKey) + public Task FindAsync(string name, string providerName, string providerKey) { - return await DbSet - .FirstOrDefaultAsync(s => + return Task.FromResult(DbSet + .FirstOrDefault(s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey - ); + )); } public async Task> GetListAsync(string providerName, string providerKey) From 16c2df3358717bf00bcf68eba3742026f6703abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 20 Dec 2019 18:26:19 +0300 Subject: [PATCH 3/5] Revert "Convert FirstOrDefault to First (temporary)" This reverts commit 894adc4ccb410930b43a0796f7858e2a0fd78e65. --- .../EfCorePermissionGrantRepository.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs index 101ebc235e..413a960c7c 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs @@ -16,14 +16,14 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore } - public Task FindAsync(string name, string providerName, string providerKey) + public async Task FindAsync(string name, string providerName, string providerKey) { - return Task.FromResult(DbSet - .FirstOrDefault(s => + return await DbSet + .FirstOrDefaultAsync(s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey - )); + ); } public async Task> GetListAsync(string providerName, string providerKey) From 652ea9d1b50e079ddf681a0531660bf1c2ffd899 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Sat, 21 Dec 2019 00:52:54 +0300 Subject: [PATCH 4/5] Update labeler.yml --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 2796d177d1..a5cb109c96 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,7 +1,7 @@ name: Pull request labeler on: schedule: - - cron: '0 */1 * * *' + - cron: '0 0 1 1 *' jobs: labeler: runs-on: ubuntu-latest From 7967b24284241a1b00169f80d39a4bd5d58dc0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 22 Dec 2019 13:25:53 +0300 Subject: [PATCH 5/5] Remove unnecessary GetCountAsync methods. --- .../Volo/Abp/Identity/IIdentityRoleRepository.cs | 4 ---- .../Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs | 6 ------ 2 files changed, 10 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs index d27de75865..6ce3ce3c0c 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs @@ -21,9 +21,5 @@ namespace Volo.Abp.Identity bool includeDetails = false, CancellationToken cancellationToken = default ); - - Task GetCountAsync( - CancellationToken cancellationToken = default - ); } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs index 81c6106b7d..50c1403a03 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs @@ -43,11 +43,5 @@ namespace Volo.Abp.Identity.MongoDB .PageBy>(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } - - public async Task GetCountAsync(CancellationToken cancellationToken = default) - { - return await GetMongoQueryable() - .LongCountAsync(GetCancellationToken(cancellationToken)); - } } } \ No newline at end of file