From: Jérôme Benoit Date: Wed, 15 Apr 2026 23:54:33 +0000 (+0200) Subject: fix(common): include Date in JsonPrimitive, restore Date fields X-Git-Tag: v4.5~75 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=758cbfa38651951565a0c152a0e9b8f82a2239d2;p=e-mobility-charging-stations-simulator.git fix(common): include Date in JsonPrimitive, restore Date fields --- diff --git a/ui/common/src/types/JsonType.ts b/ui/common/src/types/JsonType.ts index ace385f0..c70ea84f 100644 --- a/ui/common/src/types/JsonType.ts +++ b/ui/common/src/types/JsonType.ts @@ -2,6 +2,6 @@ export type JsonObject = { [K in string]?: (JsonObject | JsonPrimitive)[] | JsonObject | JsonPrimitive } -export type JsonPrimitive = boolean | null | number | string +export type JsonPrimitive = boolean | Date | null | number | string export type JsonType = (JsonObject | JsonPrimitive)[] | JsonObject | JsonPrimitive diff --git a/ui/web/src/types/ChargingStationType.ts b/ui/web/src/types/ChargingStationType.ts index 1a98ce19..bfce74dd 100644 --- a/ui/web/src/types/ChargingStationType.ts +++ b/ui/web/src/types/ChargingStationType.ts @@ -323,7 +323,7 @@ export const IncomingRequestCommand = { export type IncomingRequestCommand = OCPP16IncomingRequestCommand export interface OCPP16BootNotificationResponse extends JsonObject { - currentTime: string + currentTime: Date interval: number status: OCPP16RegistrationStatus } @@ -351,17 +351,17 @@ export interface Status extends JsonObject { acceptedStartTransactionRequests?: number acceptedStopTransactionRequests?: number authorizeRequests?: number - lastRunDate?: string + lastRunDate?: Date rejectedAuthorizeRequests?: number rejectedStartTransactionRequests?: number rejectedStopTransactionRequests?: number skippedConsecutiveTransactions?: number skippedTransactions?: number start?: boolean - startDate?: string + startDate?: Date startTransactionRequests?: number - stopDate?: string - stoppedDate?: string + stopDate?: Date + stoppedDate?: Date stopTransactionRequests?: number } diff --git a/ui/web/tests/unit/constants.ts b/ui/web/tests/unit/constants.ts index 3b326f03..ea1dd5b9 100644 --- a/ui/web/tests/unit/constants.ts +++ b/ui/web/tests/unit/constants.ts @@ -38,7 +38,7 @@ export function createChargingStationData ( ): ChargingStationData { return { bootNotificationResponse: { - currentTime: '2024-01-01T00:00:00.000Z', + currentTime: new Date('2024-01-01T00:00:00Z'), interval: 60, status: OCPP16RegistrationStatus.ACCEPTED, },