From c2fbd7e2a4070d6a2417c913cf4501a1cb18716c Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Mon, 18 Apr 2022 19:24:18 +0300
Subject: [PATCH 1/5] Add proper title to Abp-permission-manager.component
 #9581

---
 .../identity/src/lib/components/roles/roles.component.html    | 1 +
 .../identity/src/lib/components/users/users.component.html    | 1 +
 .../identity/src/lib/components/users/users.component.ts      | 4 +++-
 .../identity/src/lib/defaults/default-users-entity-actions.ts | 2 +-
 .../src/lib/components/permission-management.component.html   | 4 ++--
 .../src/lib/components/permission-management.component.ts     | 3 +++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
index 09dcdb1be3..20d5509d15 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
@@ -55,6 +55,7 @@
     };
     let init = initTemplate
   "
+  [title]="providerKey"
   (abpInit)="init(abpPermissionManagement)"
 >
 </abp-permission-management>
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index 6f42485364..a481b9d697 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -95,6 +95,7 @@
     };
     let init = initTemplate
   "
+  [title]="userName"
   (abpInit)="init(abpPermissionManagement)"
 >
 </abp-permission-management>
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 6f458a781b..1c9f6f0f17 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -64,6 +64,7 @@ export class UsersComponent implements OnInit {
   onVisiblePermissionChange = event => {
     this.visiblePermissions = event;
   };
+  userName: string;
 
   get roleGroups(): FormGroup[] {
     return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || [];
@@ -176,8 +177,9 @@ export class UsersComponent implements OnInit {
     this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res));
   }
 
-  openPermissionsModal(providerKey: string) {
+  openPermissionsModal(providerKey: string, userName:string) {
     this.providerKey = providerKey;
+    this.userName = userName;
     setTimeout(() => {
       this.visiblePermissions = true;
     }, 0);
diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts
index 13f058dd37..0bd21c571b 100644
--- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts
+++ b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts
@@ -15,7 +15,7 @@ export const DEFAULT_USERS_ENTITY_ACTIONS = EntityAction.createMany<IdentityUser
     text: 'AbpIdentity::Permissions',
     action: data => {
       const component = data.getInjected(UsersComponent);
-      component.openPermissionsModal(data.record.id);
+      component.openPermissionsModal(data.record.id, data.record.userName);
     },
     permission: 'AbpIdentity.Users.ManagePermissions',
   },
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 a28607bb59..d2d14035ca 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
@@ -2,8 +2,8 @@
   <ng-container *ngIf="data.entityDisplayName">
     <ng-template #abpHeader>
       <h4>
-        {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} -
-        {{ data.entityDisplayName }}
+        {{ 'AbpPermissionManagement::Permissions' | abpLocalization }}
+        <ng-template [ngIf]="title"> - </ng-template> {{ title }}
       </h4>
     </ng-template>
     <ng-template #abpBody>
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 e43acdd605..bc07bb6583 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
@@ -64,6 +64,9 @@ export class PermissionManagementComponent
     return this._visible;
   }
 
+  @Input()
+  title = '';
+
   set visible(value: boolean) {
     if (value === this._visible) return;
 

From 8744d1953bca2eb0ab9ae2b673e5d63f77a95547 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 20 Apr 2022 16:39:21 +0300
Subject: [PATCH 2/5] Change permisson title input name to entityDisplayName

---
 .../identity/src/lib/components/roles/roles.component.html  | 1 -
 .../identity/src/lib/components/users/users.component.html  | 2 +-
 .../identity/src/lib/components/users/users.component.ts    | 6 +++---
 .../src/lib/components/permission-management.component.html | 6 +++---
 .../src/lib/components/permission-management.component.ts   | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
index 20d5509d15..09dcdb1be3 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
@@ -55,7 +55,6 @@
     };
     let init = initTemplate
   "
-  [title]="providerKey"
   (abpInit)="init(abpPermissionManagement)"
 >
 </abp-permission-management>
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index a481b9d697..7873adf6ea 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -95,7 +95,7 @@
     };
     let init = initTemplate
   "
-  [title]="userName"
+  [entityDisplayName]="entityDisplayName"
   (abpInit)="init(abpPermissionManagement)"
 >
 </abp-permission-management>
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 1c9f6f0f17..90a453e5c9 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -64,7 +64,7 @@ export class UsersComponent implements OnInit {
   onVisiblePermissionChange = event => {
     this.visiblePermissions = event;
   };
-  userName: string;
+  entityDisplayName: string;
 
   get roleGroups(): FormGroup[] {
     return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || [];
@@ -177,9 +177,9 @@ export class UsersComponent implements OnInit {
     this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res));
   }
 
-  openPermissionsModal(providerKey: string, userName:string) {
+  openPermissionsModal(providerKey: string, entityDisplayName?: string) {
     this.providerKey = providerKey;
-    this.userName = userName;
+    this.entityDisplayName = entityDisplayName;
     setTimeout(() => {
       this.visiblePermissions = true;
     }, 0);
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 d2d14035ca..34396b97b4 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
@@ -1,9 +1,9 @@
 <abp-modal [(visible)]="visible" [busy]="modalBusy" [options]="{ size: 'lg' }">
-  <ng-container *ngIf="data.entityDisplayName">
+  <ng-container *ngIf="data.entityDisplayName || entityDisplayName">
     <ng-template #abpHeader>
       <h4>
-        {{ 'AbpPermissionManagement::Permissions' | abpLocalization }}
-        <ng-template [ngIf]="title"> - </ng-template> {{ title }}
+        {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} -
+        {{ entityDisplayName || data.data.entityDisplayName }}
       </h4>
     </ng-template>
     <ng-template #abpBody>
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 bc07bb6583..4b53350208 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
@@ -65,7 +65,7 @@ export class PermissionManagementComponent
   }
 
   @Input()
-  title = '';
+  entityDisplayName: string | undefined;
 
   set visible(value: boolean) {
     if (value === this._visible) return;

From 909b62566c8c91a9aaf2c3d467165d02a5c44602 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 20 Apr 2022 16:40:29 +0300
Subject: [PATCH 3/5] Update permission-management.component.html

---
 .../src/lib/components/permission-management.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 34396b97b4..5a9fa0dd5a 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
@@ -3,7 +3,7 @@
     <ng-template #abpHeader>
       <h4>
         {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} -
-        {{ entityDisplayName || data.data.entityDisplayName }}
+        {{ entityDisplayName || data.entityDisplayName }}
       </h4>
     </ng-template>
     <ng-template #abpBody>

From 0f0f4e0d504cfb349e008c88ac22a768e6232a33 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 20 Apr 2022 16:59:36 +0300
Subject: [PATCH 4/5] Fix lint error on PermissonManagement

---
 .../src/lib/components/permission-management.component.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 4b53350208..496b3bb989 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
@@ -59,14 +59,14 @@ export class PermissionManagementComponent
 
   protected _visible = false;
 
+  @Input()
+  entityDisplayName: string | undefined;
+
   @Input()
   get visible(): boolean {
     return this._visible;
   }
 
-  @Input()
-  entityDisplayName: string | undefined;
-
   set visible(value: boolean) {
     if (value === this._visible) return;
 

From 44ad5168a204b3e965fbf71b5662effb35443ff6 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 20 Apr 2022 17:07:42 +0300
Subject: [PATCH 5/5] fix lint error on user component

---
 .../identity/src/lib/components/users/users.component.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 90a453e5c9..b8fadc81a1 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -59,12 +59,13 @@ export class UsersComponent implements OnInit {
 
   permissionManagementKey = ePermissionManagementComponents.PermissionManagement;
 
+  entityDisplayName: string;
+
   trackByFn: TrackByFunction<AbstractControl> = (index, item) => Object.keys(item)[0] || index;
 
   onVisiblePermissionChange = event => {
     this.visiblePermissions = event;
   };
-  entityDisplayName: string;
 
   get roleGroups(): FormGroup[] {
     return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || [];