From 67e81cbcab4025a335385f3a319c314a1158ece2 Mon Sep 17 00:00:00 2001
From: muhammedaltug <muhammetaltug@gmail.com>
Date: Wed, 1 Dec 2021 17:04:21 +0300
Subject: [PATCH 1/2] fix permission click fix permission group count

---
 .../permission-management.component.html          |  6 ++----
 .../components/permission-management.component.ts | 15 +++++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
index 5e37a7ba97..a28607bb59 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
@@ -73,11 +73,9 @@
                 [attr.id]="permission.name"
                 class="form-check-input"
                 [disabled]="isGrantedByOtherProviderName(permission.grantedProviders)"
-              />
-              <label
-                class="form-check-label"
-                [attr.for]="permission.name"
                 (click)="onClickCheckbox(permission, permissionCheckbox.value)"
+              />
+              <label class="form-check-label" [attr.for]="permission.name"
                 >{{ permission.displayName }}
                 <ng-container *ngIf="!hideBadges">
                   <span
diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
index 20aeef530c..e43acdd605 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts
@@ -26,6 +26,10 @@ type PermissionWithStyle = PermissionGrantInfoDto & {
   style: string;
 };
 
+type PermissionWithGroupName = PermissionGrantInfoDto & {
+  groupName: string;
+};
+
 @Component({
   selector: 'abp-permission-management',
   templateUrl: './permission-management.component.html',
@@ -91,7 +95,7 @@ export class PermissionManagementComponent
 
   selectedGroup: PermissionGroupDto;
 
-  permissions: PermissionGrantInfoDto[] = [];
+  permissions: PermissionWithGroupName[] = [];
 
   selectThisTab = false;
 
@@ -277,7 +281,7 @@ export class PermissionManagementComponent
 
   getAssignedCount(groupName: string) {
     return this.permissions.reduce(
-      (acc, val) => (val.name.split('.')[0] === groupName && val.isGranted ? acc + 1 : acc),
+      (acc, val) => (val.groupName === groupName && val.isGranted ? acc + 1 : acc),
       0,
     );
   }
@@ -304,6 +308,9 @@ function findMargin(permissions: PermissionGrantInfoDto[], permission: Permissio
   return parentPermission ? 20 : 0;
 }
 
-function getPermissions(groups: PermissionGroupDto[]): PermissionGrantInfoDto[] {
-  return groups.reduce((acc, val) => [...acc, ...val.permissions], []);
+function getPermissions(groups: PermissionGroupDto[]): PermissionWithGroupName[] {
+  return groups.reduce(
+    (acc, val) => [...acc, ...val.permissions.map(p => ({ ...p, groupName: val.name }))],
+    [],
+  );
 }

From 248b787235c2e0a423dbaea550be5d02dedd8a69 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 2 Dec 2021 15:22:30 +0800
Subject: [PATCH 2/2] Remove `MyProjectName.HttpApi` from
 `Blazor.Server.Tiered`

---
 .../MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj      | 1 -
 .../MyProjectNameBlazorModule.cs                                 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
index 0c5b6a40b5..46ebc4d4e2 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
@@ -21,7 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs
index 46c9506e00..1ddd376409 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs
@@ -52,7 +52,6 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered
 {
     [DependsOn(
         typeof(MyProjectNameHttpApiClientModule),
-        typeof(MyProjectNameHttpApiModule),
         typeof(AbpCachingStackExchangeRedisModule),
         typeof(AbpAspNetCoreMvcClientModule),
         typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),