From aa3f752d4251010b2352008db3ba0f17ed542aab Mon Sep 17 00:00:00 2001
From: Olivier Zalmanski <88216225+OlivierZal@users.noreply.github.com>
Date: Sun, 8 Dec 2024 10:39:48 +0100
Subject: [PATCH] improve

---
 drivers/base-device.mts         | 22 +++++++++++-----------
 drivers/melcloud_atw/device.mts |  2 +-
 drivers/melcloud_erv/device.mts |  4 ++--
 widgets/charts/public/index.mts |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/base-device.mts b/drivers/base-device.mts
index 3a29a7cb..21aa3e09 100644
--- a/drivers/base-device.mts
+++ b/drivers/base-device.mts
@@ -100,24 +100,24 @@ export abstract class BaseMELCloudDevice<
 
   #device?: IDeviceFacade<T>
 
+  protected abstract readonly EnergyReportRegular:
+    | (new (device: BaseMELCloudDevice<T>) => EnergyReportRegular<T>)
+    | null
+
+  protected abstract readonly EnergyReportTotal:
+    | (new (device: BaseMELCloudDevice<T>) => EnergyReportTotal<T>)
+    | null
+
   protected abstract readonly fromDevice: Partial<
     Record<keyof OpCapabilities<T>, ConvertFromDevice<T>>
   >
 
+  protected abstract readonly thermostatMode: object | null
+
   protected abstract toDevice: Partial<
     Record<keyof SetCapabilities<T>, ConvertToDevice<T>>
   >
 
-  protected abstract readonly EnergyReportRegular?: new (
-    device: BaseMELCloudDevice<T>,
-  ) => EnergyReportRegular<T>
-
-  protected abstract readonly EnergyReportTotal?: new (
-    device: BaseMELCloudDevice<T>,
-  ) => EnergyReportTotal<T>
-
-  protected abstract readonly thermostatMode?: object
-
   public get id(): number {
     return this.getData().id
   }
@@ -337,7 +337,7 @@ export abstract class BaseMELCloudDevice<
   }
 
   #isThermostatModeSupportingOff(): boolean {
-    return this.thermostatMode !== undefined && 'off' in this.thermostatMode
+    return this.thermostatMode !== null && 'off' in this.thermostatMode
   }
 
   #registerCapabilityListeners(): void {
diff --git a/drivers/melcloud_atw/device.mts b/drivers/melcloud_atw/device.mts
index c6d76684..a1a3d78d 100644
--- a/drivers/melcloud_atw/device.mts
+++ b/drivers/melcloud_atw/device.mts
@@ -116,7 +116,7 @@ export default class MELCloudDeviceAtw extends BaseMELCloudDevice<DeviceType.Atw
     'thermostat_mode.zone2': convertFromDeviceOperationZone,
   } as const
 
-  protected readonly thermostatMode = undefined
+  protected readonly thermostatMode = null
 
   protected readonly toDevice: Partial<
     Record<
diff --git a/drivers/melcloud_erv/device.mts b/drivers/melcloud_erv/device.mts
index 1b78611d..7a5d8436 100644
--- a/drivers/melcloud_erv/device.mts
+++ b/drivers/melcloud_erv/device.mts
@@ -15,9 +15,9 @@ import type {
 } from '../../types/common.mts'
 
 export default class MELCloudDeviceErv extends BaseMELCloudDevice<DeviceType.Erv> {
-  protected readonly EnergyReportRegular = undefined
+  protected readonly EnergyReportRegular = null
 
-  protected readonly EnergyReportTotal = undefined
+  protected readonly EnergyReportTotal = null
 
   protected readonly fromDevice: Partial<
     Record<
diff --git a/widgets/charts/public/index.mts b/widgets/charts/public/index.mts
index 0946911f..f2d08950 100644
--- a/widgets/charts/public/index.mts
+++ b/widgets/charts/public/index.mts
@@ -217,7 +217,7 @@ const handleChartAndOptions = async (
   }: { chart: HomeySettings['chart']; height: number; days?: number },
 ): Promise<ApexCharts.ApexOptions> => {
   const hiddenSeries = (options.series ?? []).map((serie) =>
-    typeof serie === 'number' || serie.hidden !== true ? undefined : serie.name,
+    typeof serie === 'number' || serie.hidden !== true ? null : serie.name,
   )
   const newOptions = getChartOptions(
     await getChartFunction(homey, chart)(days),
@@ -226,9 +226,9 @@ const handleChartAndOptions = async (
   if (
     hiddenSeries.some(
       (name) =>
-        name !== undefined &&
+        name !== null &&
         !(newOptions.series ?? [])
-          .map((serie) => (typeof serie === 'number' ? undefined : serie.name))
+          .map((serie) => (typeof serie === 'number' ? null : serie.name))
           .includes(name),
     )
   ) {