From 67d901ee4b1d76834670222a33f2a2815d791690 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Mon, 14 Dec 2020 09:19:53 +0300 Subject: [PATCH 1/4] fix: resolve session state updating problem resolves #6625 --- .../packages/core/src/lib/services/session-state.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 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 bdc53fa26c..1d1c1e394d 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 @@ -30,7 +30,7 @@ export class SessionStateService { private init() { const session = localStorage.getItem('abpSession'); if (session) { - this.store.patch(JSON.parse(session)); + this.store.set(JSON.parse(session)); } this.store.sliceUpdate(state => state).subscribe(this.updateLocalStorage); @@ -81,7 +81,7 @@ export class SessionStateService { setTenant(tenant: CurrentTenantDto) { if (compare(tenant, this.store.state.tenant)) return; - this.store.patch({ tenant }); + this.store.set({ ...this.store.state, tenant }); } setLanguage(language: string) { From 5ac09075ea4851f670f476dafc4dcd4e1efa3d44 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Mon, 14 Dec 2020 09:21:10 +0300 Subject: [PATCH 2/4] fix: update current tenant informationw if currentTenant is null --- npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts index 4291219db8..d37200c9c8 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts @@ -38,8 +38,6 @@ export function getInitialData(injector: Injector) { tap(() => checkAccessToken(injector)), tap(() => { const currentTenant = configState.getOne('currentTenant') as CurrentTenantDto; - if (!currentTenant?.id) return; - injector.get(SessionStateService).setTenant(currentTenant); }), ) From 82728a823c27977216aff243332c60f199b9ae24 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Mon, 14 Dec 2020 09:35:04 +0300 Subject: [PATCH 3/4] refactor: use set method of internal store in replaceable-components.service --- .../core/src/lib/services/replaceable-components.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts b/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts index df0f9231e9..e929d489f7 100644 --- a/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/replaceable-components.service.ts @@ -39,7 +39,7 @@ export class ReplaceableComponentsService { replaceableComponents.push(replaceableComponent); } - this.store.patch(replaceableComponents); + this.store.set(replaceableComponents); if (reload) reloadRoute(this.router, this.ngZone); } From 020b0dd862af58bb78f7d4c745db2438b49086e9 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Mon, 14 Dec 2020 09:36:07 +0300 Subject: [PATCH 4/4] refactor: use set method instead of the patch in reset method of internal strore --- .../packages/core/src/lib/utils/internal-store-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts index fbf707c284..87bc3f81fd 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/internal-store-utils.ts @@ -36,6 +36,6 @@ export class InternalStore { } reset() { - this.patch(this.initialState); + this.set(this.initialState); } }