Merge pull request #22 from juherr/feature/ocpp-configuration

Feature: implements missing action from Core profile
shiv3 · Nov 29, 2024 · d68c4f1 · d68c4f1
2 parents d7735e5 + acf1dba
commit d68c4f1
Show file tree

Hide file tree

Showing 7 changed files with 670 additions and 54 deletions.
diff --git a/src/components/Connector.tsx b/src/components/Connector.tsx
@@ -1,6 +1,7 @@
 import React, {useState, useEffect} from "react";
 import {ChargePoint} from "../cp/ChargePoint.ts";
 import * as ocpp from "../cp/OcppTypes";
+import { OCPPAvailability } from "../cp/OcppTypes";
 
 interface ConnectorProps {
   id: number;
@@ -13,8 +14,8 @@ const Connector: React.FC<ConnectorProps> = ({id: connector_id, cp,idTag}) => {
   const [connectorStatus, setConnectorStatus] = useState<ocpp.OCPPStatus>(
     ocpp.OCPPStatus.Unavailable
   );
-  const [availability, setAvailability] = useState<string>(
-    ocpp.OCPPAvailability.Operative
+  const [availability, setAvailability] = useState<OCPPAvailability>(
+    "Operative"
   );
   const [meterValue, setMeterValue] = useState<number>(0);
   const [tagId, setIdTag] = useState<string>(idTag);
@@ -223,12 +224,12 @@ const ConnectorStatus: React.FC<{ status: string }> = ({status}) => {
   return <span className={statusColor(status)}>{status}</span>;
 };
 
-const ConnectorAvailability: React.FC<{ availability: string }> = ({availability,}) => {
-  const availabilityColor = (a: string) => {
+const ConnectorAvailability: React.FC<{ availability: OCPPAvailability }> = ({availability,}) => {
+  const availabilityColor = (a: OCPPAvailability) => {
     switch (a) {
-      case ocpp.OCPPAvailability.Operative:
+      case "Operative":
         return "text-green-500";
-      case ocpp.OCPPAvailability.Inoperative:
+      case "Inoperative":
         return "text-red-500";
       default:
         return "text-black";

diff --git a/src/cp/ChargePoint.ts b/src/cp/ChargePoint.ts
@@ -28,7 +28,7 @@ export class ChargePoint {
     | null = null;
   private _availabilityChangeCallbacks: Map<
     number,
-    (availability: string) => void
+    (availability: OCPPAvailability) => void
   > = new Map();
 
   constructor(id: string,
@@ -121,7 +121,7 @@ export class ChargePoint {
 
   setAvailabilityChangeCallback(
     connectorId: number,
-    callback: (availability: string) => void
+    callback: (availability: OCPPAvailability) => void
   ): void {
     this._availabilityChangeCallbacks.set(connectorId, callback);
   }
@@ -320,23 +320,24 @@ export class ChargePoint {
 
   public updateConnectorAvailability(
     connectorId: number,
-    newAvailability: string
-  ): void {
+    newAvailability: OCPPAvailability
+  ): boolean {
     const connector = this.getConnector(connectorId);
-    if (connector) {
-      connector.availability! = newAvailability;
-      if (newAvailability === OCPPAvailability.Inoperative) {
-        this.updateConnectorStatus(connectorId, OCPPStatus.Unavailable);
-      } else if (newAvailability === OCPPAvailability.Operative) {
-        this.updateConnectorStatus(connectorId, OCPPStatus.Available);
-      }
-      const callback = this._availabilityChangeCallbacks.get(connectorId);
-      if (callback) {
-        callback(newAvailability);
-      }
-    } else {
+    if (!connector) {
       this._logger.error(`Connector ${connectorId} not found`);
+      return false;
+    }
+    connector.availability = newAvailability;
+    if (newAvailability === "Inoperative") {
+      this.updateConnectorStatus(connectorId, OCPPStatus.Unavailable);
+    } else if (newAvailability === "Operative") {
+      this.updateConnectorStatus(connectorId, OCPPStatus.Available);
+    }
+    const callback = this._availabilityChangeCallbacks.get(connectorId);
+    if (callback) {
+      callback(newAvailability);
     }
+    return true;
   }
 
   public setTransactionID(connectorId: number, transactionId: number): void {