From 598c886d552bbefae7d2c539da6f104c243e3c7f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Fri, 3 Feb 2023 00:53:18 +0100
Subject: [PATCH] fix(simulator): fix default version bump scale at firmware
 upgrade simulation
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/charging-station/ChargingStation.ts | 6 +++++-
 src/utils/Configuration.ts              | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 79cf45b8..54b3afab 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -36,6 +36,7 @@ import type { ChargingStationOcppConfiguration } from '../types/ChargingStationO
 import {
   type ChargingStationTemplate,
   CurrentType,
+  type FirmwareUpgrade,
   PowerUnits,
   type WsOptions,
 } from '../types/ChargingStationTemplate';
@@ -890,8 +891,11 @@ export default class ChargingStation {
         } does not match firmware version pattern '${stationInfo.firmwareVersionPattern}'`
       );
     }
-    stationInfo.firmwareUpgrade = merge(
+    stationInfo.firmwareUpgrade = merge<FirmwareUpgrade>(
       {
+        versionUpgrade: {
+          step: 1,
+        },
         reset: true,
       },
       stationTemplate?.firmwareUpgrade ?? {}
diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts
index 209ce774..2cba674d 100644
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -69,7 +69,10 @@ export default class Configuration {
       },
     };
     if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'uiServer')) {
-      uiServerConfiguration = merge(uiServerConfiguration, Configuration.getConfig()?.uiServer);
+      uiServerConfiguration = merge<UIServerConfiguration>(
+        uiServerConfiguration,
+        Configuration.getConfig()?.uiServer
+      );
     }
     if (Configuration.isCFEnvironment() === true) {
       delete uiServerConfiguration.options?.host;
-- 
2.34.1