From 057579a8ecc4e1b0aaeba5b2f5a9891259de2f39 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Mon, 21 Aug 2023 13:38:59 +0300
Subject: [PATCH 1/2] add scrollable option to abp-modal on Permission
 Component

---
 .../lib/components/permission-management.component.html  | 9 +++++----
 .../lib/components/permission-management.component.ts    | 4 ++++
 2 files changed, 9 insertions(+), 4 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 2d95ede2d7..c486ad23b0 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" [busy]="modalBusy" [options]="{ size: 'lg' }">
+<abp-modal [(visible)]="visible" [busy]="modalBusy" [options]="{ size: 'lg' ,scrollable:false }">
   <ng-container *ngIf="data.entityDisplayName || entityDisplayName">
     <ng-template #abpHeader>
       <h4>
@@ -8,7 +8,7 @@
     </ng-template>
     <ng-template #abpBody>
       <div class="row">
-        <div class="col-md-4">
+        <div class="col-md-4 permission-scrollbar">
           <div class="form-check mb-2">
             <input
               #selectAllInAllTabsRef
@@ -44,8 +44,9 @@
               </li>
             </ul>
           </div>
-        </div>
-        <div class="col-md-8 overflow-auto">
+         </div>
+
+        <div class="col-md-8 permission-scrollbar">
           <div class="ps-1">
             <div class="form-check mb-2">
               <input
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 5a3373121c..077835072c 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
@@ -40,6 +40,10 @@ type PermissionWithGroupName = PermissionGrantInfoDto & {
         max-height: 70vh;
         overflow-y: scroll;
       }
+      .permission-scrollbar {
+        overflow:auto;
+        max-height: calc(100vh - 15rem)
+      }
     `,
   ],
 })

From 6bac218d1da8fc87f2993b20ee447206583fe3cc Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Mon, 21 Aug 2023 14:12:36 +0300
Subject: [PATCH 2/2] change css selector name

---
 .../src/lib/components/permission-management.component.html   | 4 ++--
 .../src/lib/components/permission-management.component.ts     | 2 +-
 2 files changed, 3 insertions(+), 3 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 c486ad23b0..581a5bd002 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
@@ -8,7 +8,7 @@
     </ng-template>
     <ng-template #abpBody>
       <div class="row">
-        <div class="col-md-4 permission-scrollbar">
+        <div class="col-md-4 scroll-in-modal">
           <div class="form-check mb-2">
             <input
               #selectAllInAllTabsRef
@@ -46,7 +46,7 @@
           </div>
          </div>
 
-        <div class="col-md-8 permission-scrollbar">
+        <div class="col-md-8 scroll-in-modal">
           <div class="ps-1">
             <div class="form-check mb-2">
               <input
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 077835072c..2609d92198 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
@@ -40,7 +40,7 @@ type PermissionWithGroupName = PermissionGrantInfoDto & {
         max-height: 70vh;
         overflow-y: scroll;
       }
-      .permission-scrollbar {
+      .scroll-in-modal {
         overflow:auto;
         max-height: calc(100vh - 15rem)
       }