From b28631285fb5e86939635807ed2b17a72e690d0b Mon Sep 17 00:00:00 2001 From: Alex <77341673+defectiveAi@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:41:09 +0200 Subject: [PATCH 1/5] Show energy supplier for SYO. --- .../dh-request-settlement-report-modal.component.html | 2 +- .../modal/dh-request-settlement-report-modal.component.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html index ee41242973..e271d27eb1 100644 --- a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html +++ b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html @@ -60,7 +60,7 @@ } - @if ((isFas$ | push) && form.controls.energySupplier) { + @if ((showEnergySupplier$ | push) && form.controls.energySupplier) {
(false, { nonNullable: true }), }); - isFas$ = this.permissionService.isFas().pipe( - tap((isFas) => { - if (isFas) { + showEnergySupplier$ = this.permissionService.isFas().pipe( + map(isFas => isFas || this.actorStorage.getSelectedActor().marketRole === EicFunction.SystemOperator), + tap((showEnergySupplier) => { + if (showEnergySupplier) { this.form.addControl( 'energySupplier', new FormControl(null, Validators.required) From 2e5132af64f8caef92119e010999c91c524973a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Sep 2024 08:42:35 +0000 Subject: [PATCH 2/5] style: format --- .../modal/dh-request-settlement-report-modal.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.ts b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.ts index 74fa93c8c0..a5f2df0482 100644 --- a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.ts +++ b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.ts @@ -171,7 +171,10 @@ export class DhRequestSettlementReportModalComponent extends WattTypedModal { }); showEnergySupplier$ = this.permissionService.isFas().pipe( - map(isFas => isFas || this.actorStorage.getSelectedActor().marketRole === EicFunction.SystemOperator), + map( + (isFas) => + isFas || this.actorStorage.getSelectedActor().marketRole === EicFunction.SystemOperator + ), tap((showEnergySupplier) => { if (showEnergySupplier) { this.form.addControl( From ffa47c769c79e59445d1ffd0302adf5d4678e4de Mon Sep 17 00:00:00 2001 From: Alex <77341673+defectiveAi@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:50:52 +0200 Subject: [PATCH 3/5] Poke From cd834208409f0dacd7b6f099e9daf2f0318c9199 Mon Sep 17 00:00:00 2001 From: Alex <77341673+defectiveAi@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:08:16 +0200 Subject: [PATCH 4/5] Change name. --- .../modal/dh-request-settlement-report-modal.component.html | 2 +- .../modal/dh-request-settlement-report-modal.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html index e271d27eb1..1eccafcfc9 100644 --- a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html +++ b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html @@ -60,7 +60,7 @@ }
- @if ((showEnergySupplier$ | push) && form.controls.energySupplier) { + @if ((showEnergySupplierDowndown$ | push) && form.controls.energySupplier) {
(false, { nonNullable: true }), }); - showEnergySupplier$ = this.permissionService.isFas().pipe( + showEnergySupplierDowndown$ = this.permissionService.isFas().pipe( map( (isFas) => isFas || this.actorStorage.getSelectedActor().marketRole === EicFunction.SystemOperator ), - tap((showEnergySupplier) => { - if (showEnergySupplier) { + tap((showEnergySupplierDowndown) => { + if (showEnergySupplierDowndown) { this.form.addControl( 'energySupplier', new FormControl(null, Validators.required) From 7469f5574f53acf5e6232df6a1b72687822dd058 Mon Sep 17 00:00:00 2001 From: Alex <77341673+defectiveAi@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:09:51 +0200 Subject: [PATCH 5/5] Spelling --- .../modal/dh-request-settlement-report-modal.component.html | 2 +- .../modal/dh-request-settlement-report-modal.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html index 1eccafcfc9..2710983517 100644 --- a/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html +++ b/libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.html @@ -60,7 +60,7 @@ }
- @if ((showEnergySupplierDowndown$ | push) && form.controls.energySupplier) { + @if ((showEnergySupplierDropdown$ | push) && form.controls.energySupplier) {
(false, { nonNullable: true }), }); - showEnergySupplierDowndown$ = this.permissionService.isFas().pipe( + showEnergySupplierDropdown$ = this.permissionService.isFas().pipe( map( (isFas) => isFas || this.actorStorage.getSelectedActor().marketRole === EicFunction.SystemOperator ), - tap((showEnergySupplierDowndown) => { - if (showEnergySupplierDowndown) { + tap((showEnergySupplierDropdown) => { + if (showEnergySupplierDropdown) { this.form.addControl( 'energySupplier', new FormControl(null, Validators.required)