From f3b538d6a963a3819943f3d44519908fef3d6b30 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Thu, 30 Mar 2023 12:21:20 +0300 Subject: [PATCH] UI: Fixed navigatePrevState and updated help template --- ui-ngx/src/app/core/api/widget-api.models.ts | 2 +- .../states/default-state-controller.component.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui-ngx/src/app/core/api/widget-api.models.ts b/ui-ngx/src/app/core/api/widget-api.models.ts index c6e00ab882..115bf6e222 100644 --- a/ui-ngx/src/app/core/api/widget-api.models.ts +++ b/ui-ngx/src/app/core/api/widget-api.models.ts @@ -160,7 +160,7 @@ export interface IStateController { openRightLayout(): void; preserveState(): void; cleanupPreservedStates(): void; - navigatePrevState(index: number): void; + navigatePrevState(index: number, params?: StateParams): void; getStateId(): string; getStateIndex(): number; getStateIdAtIndex(index: number): string; diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts index 1abf5b8acd..dcf7c70e00 100644 --- a/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts +++ b/ui-ngx/src/app/modules/home/components/dashboard-page/states/default-state-controller.component.ts @@ -169,14 +169,14 @@ export class DefaultStateControllerComponent extends StateControllerComponent im } public navigatePrevState(index: number, params?: StateParams): void { - let lastIndex: number = this.stateObject.length - 1; - if (index < lastIndex) { - this.stateObject.splice(index + 1, lastIndex - 1); - lastIndex = this.stateObject.length - 1; + const lastStateIndex = this.stateObject.length - 1; + if (index < lastStateIndex) { + this.stateObject.splice(index + 1, lastStateIndex - index); + const selectedStateIndex = this.stateObject.length - 1; if (params) { - this.stateObject[lastIndex].params = params; + this.stateObject[selectedStateIndex].params = params; } - this.gotoState(this.stateObject[lastIndex].id, true); + this.gotoState(this.stateObject[selectedStateIndex].id, true); } }