From 0004677796022b0c3b0a2c621aebf56ce0e5280f Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 2 Aug 2019 17:42:08 +0300
Subject: [PATCH] fix(user, permission): bug fix

---
 .../src/lib/components/users/users.component.html     |  4 ++--
 .../components/permission-management.component.html   | 11 +++++++----
 .../lib/components/permission-management.component.ts | 10 +++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

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 44edb889e6..436e5c3dd0 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
@@ -83,7 +83,7 @@
   </ng-template>
 
   <ng-template #abpBody>
-    <perfect-scrollbar class="ps-show-always" style="max-height: 65vh;">
+    <perfect-scrollbar class="ps-show-always" style="max-height: 70vh;">
       <form [formGroup]="form">
         <ngb-tabset>
           <ngb-tab [title]="'AbpIdentity::UserInformations' | abpLocalization">
@@ -92,7 +92,7 @@
                 <div class="form-group">
                   <label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
                   ><span> * </span>
-                  <input type="text" id="user-name" class="form-control" formControlName="userName" autofocus/>
+                  <input type="text" id="user-name" class="form-control" formControlName="userName" autofocus />
                 </div>
 
                 <div class="form-group">
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 d91bac10c1..22488241f3 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,4 +1,4 @@
-<abp-modal [(visible)]="visible">
+<abp-modal [(visible)]="visible" (init)="initModal()">
   <ng-container *ngIf="{ entityName: entityName$ | async } as data">
     <ng-template #abpHeader>
       <h4>{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - {{ data.entityName }}</h4>
@@ -24,9 +24,12 @@
           <ul class="nav nav-pills flex-column">
             <perfect-scrollbar class="ps-show-always" style="max-height: 70vh;">
               <li *ngFor="let group of groups$ | async; trackBy: trackByFn" class="nav-item">
-                <a class="nav-link" [class.active]="selectedGroup.name === group.name" (click)="onChangeGroup(group)">{{
-                  group?.displayName
-                }}</a>
+                <a
+                  class="nav-link pointer"
+                  [class.active]="selectedGroup.name === group.name"
+                  (click)="onChangeGroup(group)"
+                  >{{ group?.displayName }}</a
+                >
               </li>
             </perfect-scrollbar>
           </ul>
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 7a004003eb..ed2139ecb7 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
@@ -216,14 +216,14 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
         this.permissions = getPermissions(permissionRes.groups);
 
         this.visible = true;
-
-        setTimeout(() => {
-          this.setTabCheckboxState();
-          this.setGrantCheckboxState();
-        }, 0);
       });
   }
 
+  initModal() {
+    this.setTabCheckboxState();
+    this.setGrantCheckboxState();
+  }
+
   ngOnChanges({ visible }: SimpleChanges): void {
     if (!visible) return;