[SI-2948] - hide EditCondensation if condensation grid failure exists AND they are completed; correct test 2
Signed-off-by: dtheinert <dietmar.theinert@pta.de>
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts
index 2270df1..57d70e9 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts
@@ -277,10 +277,9 @@
break;
case this._eventTypeEnum.InitialLoad:
this._changeMode();
- const condensedGridFailure = this.sandbox.overviewGridFailureList.find(gridFailure => gridFailure.id === this.sandbox.condenseId);
this.showEditCondensationBtn = !(
- !!condensedGridFailure &&
- (condensedGridFailure.statusIntern === StateEnum.COMPLETED || condensedGridFailure.statusIntern === StateEnum.CANCELED)
+ !!this.sandbox.condenseStatusIntern &&
+ (this.sandbox.condenseStatusIntern === StateEnum.COMPLETED || this.sandbox.condenseStatusIntern === StateEnum.CANCELED)
);
break;
default:
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts
index 7082a69..c420991 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts
@@ -46,6 +46,7 @@
public condensationList: GridFailure[] = new Array();
public condenseId: string = null;
public condenseBranch: string = null;
+ public condenseStatusIntern: string = null;
public StateEnum = StateEnum;
public RolesEnum = RolesEnum;
public isReminderActive$: Observable<boolean> = this.appState$.select(store.getGridFailureReminderData);
@@ -126,6 +127,10 @@
).subscribe(([stations, condensedGridFailures]) => {
if (condensedGridFailures && condensedGridFailures.length) {
this.condensationList = this._getGridFailureWithReadableStationInformation(condensedGridFailures, stations);
+ const condensedGridFailureFromOverview = this.overviewGridFailureList.find(gridFailure => gridFailure.id === this.condenseId);
+ if (!!condensedGridFailureFromOverview) {
+ this.condenseStatusIntern = condensedGridFailureFromOverview.statusIntern;
+ }
this.condenseBranch = condensedGridFailures[0].branch;
}
});
