From 54bfc5bf60869a7f27352afdd861c85a3c8fac19 Mon Sep 17 00:00:00 2001 From: Wroud Date: Sun, 1 Nov 2020 16:31:19 +0300 Subject: [PATCH] fix(core-administration): CB-449 detecting outside navigation for sub route --- .../src/AdministrationItem/IAdministrationItem.ts | 4 ++-- .../src/AdministrationScreen/AdministrationScreenService.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts b/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts index fd1901e43c..91837ee9b5 100644 --- a/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts +++ b/webapp/packages/core-administration/src/AdministrationItem/IAdministrationItem.ts @@ -39,7 +39,7 @@ export type AdministrationItemSubContentProps = AdministrationItemContentProps & }; export type AdministrationItemSubContentComponent = React.FunctionComponent; -export type AdministrationItemEvent = (configurationWizard: boolean, administration: boolean) => Promise | void; +export type AdministrationItemEvent = (configurationWizard: boolean, outside: boolean) => Promise | void; export type AdministrationItemCanActivateEvent = ( configurationWizard: boolean, administration: boolean @@ -47,7 +47,7 @@ export type AdministrationItemCanActivateEvent = ( export type AdministrationItemSubEvent = ( param: string | null, configurationWizard: boolean, - administration: boolean + outside: boolean ) => Promise | void; export type AdministrationItemSubCanActivateEvent = ( param: string | null, diff --git a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts index 1148d892aa..bae9cd74ee 100644 --- a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts +++ b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts @@ -169,7 +169,7 @@ export class AdministrationScreenService { await this.administrationItemService.deActivate( screen, this.isConfigurationMode, - screen.item !== toScreen?.item + screen.sub !== toScreen?.sub ); }