From ae215f76f6b01699223dff2c933661e196613142 Mon Sep 17 00:00:00 2001 From: Mahmut Gundogdu Date: Mon, 5 Dec 2022 17:07:58 +0300 Subject: [PATCH 1/2] Fix permission modal parent-child relations --- .../permission-management.component.ts | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 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 e503396540..1ca5163ccd 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,25 +164,16 @@ export class PermissionManagementComponent return; setTimeout(() => { - this.permissions = this.permissions - .map(per => { - if (clickedPermission.name === per.name) { - return { ...per, isGranted: !per.isGranted }; - } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) { - return { ...per, isGranted: false }; - } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) { - return { ...per, isGranted: true }; - } - - return per; - }) - .map((per, index, permissions) => { - const childrens = permissions.filter(p => p.parentName === per.name); - if (childrens.length > 0 && childrens.every(x => !x.isGranted)) { - return { ...per, isGranted: false }; - } - return per; - }); + this.permissions = this.permissions.map(per => { + if (clickedPermission.name === per.name) { + return { ...per, isGranted: !per.isGranted }; + } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) { + return { ...per, isGranted: false }; + } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) { + return { ...per, isGranted: true }; + } + return per; + }); this.setTabCheckboxState(); this.setGrantCheckboxState(); }, 0); From 71d330bf0da8bffdd7ddf25728631d9676a38edd Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 6 Dec 2022 14:43:20 +0300 Subject: [PATCH 2/2] fix initial language conflict --- .../core/src/lib/services/session-state.service.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts index be521f33c1..d0902f40e3 100644 --- a/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts @@ -31,7 +31,7 @@ export class SessionStateService { } private setInitialLanguage() { - if (this.getLanguage()) return; + const appLanguage = this.getLanguage(); this.configState .getDeep$('localization.currentCulture.cultureName') @@ -43,8 +43,9 @@ export class SessionStateService { if (lang.includes(';')) { lang = lang.split(';')[0]; } - - this.setLanguage(lang); + if (appLanguage !== lang) { + this.setLanguage(lang); + } }); }