From 5e2a0de6c3f4dffd3fe740f91396629b6b4931af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Can=20Y=C4=B1lmaz?=
 <30300440+bariscanyilmaz@users.noreply.github.com>
Date: Wed, 15 Feb 2023 11:09:39 +0300
Subject: [PATCH 1/2] make selected group permissions as array

---
 .../permission-management.component.ts        | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 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 44cc372f32..de285fd147 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
@@ -81,7 +81,7 @@ export class PermissionManagementComponent
           });
       });
     } else {
-      this.selectedGroup = null;
+      this.setSelectedGroup(null);
       this._visible = false;
       this.visibleChange.emit(false);
     }
@@ -112,8 +112,20 @@ export class PermissionManagementComponent
 
   trackByFn: TrackByFunction<PermissionGroupDto> = (_, item) => item.name;
 
-  get selectedGroupPermissions(): PermissionWithStyle[] {
-    if (!this.selectedGroup) return [];
+  selectedGroupPermissions: PermissionWithStyle[] = [];
+
+  constructor(protected service: PermissionsService, protected configState: ConfigStateService) {}
+
+  getChecked(name: string) {
+    return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted;
+  }
+
+  setSelectedGroup(group: PermissionGroupDto) {
+    this.selectedGroup = group;
+    if (!this.selectedGroup) {
+      this.selectedGroupPermissions = [];
+      return;
+    }
 
     const margin = `margin-${
       (document.body.dir as LocaleDirection) === 'rtl' ? 'right' : 'left'
@@ -123,7 +135,7 @@ export class PermissionManagementComponent
       group => group.name === this.selectedGroup.name,
     ).permissions;
 
-    return permissions.map(
+    this.selectedGroupPermissions = permissions.map(
       permission =>
         ({
           ...permission,
@@ -133,12 +145,6 @@ export class PermissionManagementComponent
     );
   }
 
-  constructor(protected service: PermissionsService, protected configState: ConfigStateService) {}
-
-  getChecked(name: string) {
-    return (this.permissions.find(per => per.name === name) || { isGranted: false }).isGranted;
-  }
-
   setDisabled(permissions: PermissionGrantInfoDto[]) {
     if (permissions.length) {
       this.disableSelectAllTab = permissions.every(
@@ -248,7 +254,7 @@ export class PermissionManagementComponent
 
   onChangeGroup(group: PermissionGroupDto) {
     this.setDisabled(group.permissions);
-    this.selectedGroup = group;
+    this.setSelectedGroup(group);
     this.setTabCheckboxState();
   }
 
@@ -291,8 +297,8 @@ export class PermissionManagementComponent
     return this.service.get(this.providerName, this.providerKey).pipe(
       tap((permissionRes: GetPermissionListResultDto) => {
         this.data = permissionRes;
-        this.selectedGroup = permissionRes.groups[0];
         this.permissions = getPermissions(permissionRes.groups);
+        this.setSelectedGroup(permissionRes.groups[0]);
         this.disabledSelectAllInAllTabs = this.permissions.every(
           per =>
             per.isGranted &&

From 95cab6cbed0e00ffafc90dc892297d989a36022e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Can=20Y=C4=B1lmaz?=
 <30300440+bariscanyilmaz@users.noreply.github.com>
Date: Wed, 15 Feb 2023 13:09:19 +0300
Subject: [PATCH 2/2] fix lint

---
 .../src/lib/components/permission-management.component.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 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 de285fd147..3d52624990 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
@@ -110,10 +110,10 @@ export class PermissionManagementComponent
 
   modalBusy = false;
 
-  trackByFn: TrackByFunction<PermissionGroupDto> = (_, item) => item.name;
-
   selectedGroupPermissions: PermissionWithStyle[] = [];
 
+  trackByFn: TrackByFunction<PermissionGroupDto> = (_, item) => item.name;
+
   constructor(protected service: PermissionsService, protected configState: ConfigStateService) {}
 
   getChecked(name: string) {