From 10126c5051431ce08f209b43ea4904e55da42898 Mon Sep 17 00:00:00 2001 From: sumeyye Date: Thu, 13 Feb 2025 16:03:57 +0300 Subject: [PATCH] fix: filter problems on permission modal --- .../lib/components/permission-management.component.html | 4 +++- .../src/lib/components/permission-management.component.ts | 8 +++++--- 2 files changed, 8 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 7470c3e772..32fe44e488 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 @@ -40,7 +40,9 @@
- {{ 'AbpPermissionManagement::PermissionGroup' | abpLocalization }} + + {{ 'AbpPermissionManagement::PermissionGroup' | abpLocalization }} +
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 a5a912e3eb..2742cedcee 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 @@ -164,6 +164,7 @@ export class PermissionManagementComponent let groups = this.permissionGroupSignal(); if (!search) { + this.setSelectedGroup(groups[0]); return groups; } @@ -176,9 +177,7 @@ export class PermissionManagementComponent if (groups.length) { this.setSelectedGroup(groups[0]); - this.disabledSelectAllInAllTabs = false; } else { - this.disabledSelectAllInAllTabs = true; this.selectedGroupPermissions = []; } @@ -323,6 +322,9 @@ export class PermissionManagementComponent ); const selectedPermissions = selectablePermissions.filter(per => per.isGranted); const element = document.querySelector('#select-all-in-this-tabs') as any; + if (!element) { + return; + } if (selectedPermissions.length === selectablePermissions.length) { element.indeterminate = false; @@ -373,7 +375,7 @@ export class PermissionManagementComponent onClickSelectAll() { if (this.filter()) { this.filter.set(''); - } + } this.permissions = this.permissions.map(permission => ({ ...permission,