Merge branch '13-event-casting-fix' into 'master'

[#13] - fix TripLocationHistory and OperationList not casting correctly when...

Closes #13

See merge request research-development/hydra/software/sdk/evam-sdk!15

Author: Kain Bryan-Jones

src/api/EvamApi.ts

@@ -7,7 +7,8 @@ import {
     Battery,
     DeviceRole,
     DisplayMode,
-    EvamEvent, GRPC,
+    EvamEvent,
+    GRPC,
     InternetState,
     Location,
     Notification,
@@ -143,6 +144,7 @@ export class EvamApi {
     private static newOrUpdatedInternetStateCallbacks: CallbackFunctionArray = [];
     private static newOrUpdatedVehicleStateCallbacks: CallbackFunctionArray = [];
     private static newOrUpdatedTripLocationHistoryCallbacks: CallbackFunctionArray = [];
+    private static newOrUpdatedOperationListCallbacks: CallbackFunctionArray = [];
     private static newOrUpdatedBatteryCallbacks: CallbackFunctionArray = [];
     private static newOrUpdatedDisplayModeCallbacks: CallbackFunctionArray = [];
 
@@ -550,7 +552,7 @@ export class EvamApi {
     onNewOrUpdatedActiveOperation(callback: CallbackFunction<Operation | undefined>) {
         if (callback) {
             const c = (e: Event) => {
-                callback((e as CustomEvent).detail as Operation);
+                callback(Operation.fromJSON((e as CustomEvent).detail));
             };
             EvamApi.newOrUpdatedOperationCallbacks.push(c);
             subscribe(EvamEvent.NewOrUpdatedOperation, c);
@@ -594,7 +596,7 @@ export class EvamApi {
     onNewOrUpdatedLocation(callback: CallbackFunction<Location | undefined>) {
         if (callback) {
             const c = (e: Event) => {
-                callback((e as CustomEvent).detail as Location);
+                callback(Location.fromJSON((e as CustomEvent).detail));
             };
             EvamApi.newOrUpdatedLocationCallbacks.push(c);
             subscribe(EvamEvent.NewOrUpdatedLocation, c);
@@ -624,7 +626,7 @@ export class EvamApi {
     onNewOrUpdatedVehicleState(callback: CallbackFunction<VehicleState | undefined>) {
         if (callback) {
             const c = (e: Event) => {
-                callback((e as CustomEvent).detail as VehicleState);
+                callback(VehicleState.fromJSON((e as CustomEvent).detail));
             };
             EvamApi.newOrUpdatedVehicleStateCallbacks.push(c);
             subscribe(EvamEvent.NewOrUpdatedVehicleState, c);
@@ -640,7 +642,8 @@ export class EvamApi {
     onNewOrUpdatedTripLocationHistory(callback: CallbackFunction<TripLocationHistory | undefined>) {
         if (callback) {
             const c = (e: Event) => {
-                callback((e as CustomEvent).detail as TripLocationHistory);
+                const {detail} = (e as CustomEvent);
+                callback(TripLocationHistory.fromJSON(detail));
             };
             EvamApi.newOrUpdatedTripLocationHistoryCallbacks.push(c);
             subscribe(EvamEvent.NewOrUpdatedTripLocationHistory, c);
@@ -656,9 +659,12 @@ export class EvamApi {
     onNewOrUpdatedOperationList(callback: CallbackFunction<Operation[] | undefined>) {
         if (callback) {
             const c = (e: Event) => {
-                callback((e as CustomEvent).detail as Operation[]);
+                const detail = (e as CustomEvent).detail;
+                if (Array.isArray(detail)) {
+                    callback(detail.map<Operation>(Operation.fromJSON));
+                }
             };
-            EvamApi.newOrUpdatedTripLocationHistoryCallbacks.push(c);
+            EvamApi.newOrUpdatedOperationListCallbacks.push(c);
             subscribe(EvamEvent.NewOrUpdatedOperationList, c);
         }
     }

src/component/appbar/EvamAppBarLayout.tsx

@@ -1,8 +1,8 @@
-import * as React from 'react';
-import {Button, Grid} from "@mui/material";
-import Box from '@mui/material/Box';
+import * as React from "react";
 import {Fragment, ReactNode, useRef} from "react";
-import {EvamTabContext, EvamAppBarContextModel} from "./EvamTabContext";
+import {Button, Grid} from "@mui/material";
+import Box from "@mui/material/Box";
+import {EvamAppBarContextModel, EvamTabContext} from "./EvamTabContext";
 import {Route, Routes, useNavigate} from "react-router-dom";
 import {EvamAppBarHeaderTabs} from "./header/EvamAppBarHeaderTabs";
 import {EvamAppBarHeaderMenu} from "./header/EvamAppBarHeaderMenu";

src/component/appbar/EvamHamburgerMenu.tsx

@@ -1,10 +1,9 @@
 import React, {ReactNode, useState} from "react";
 import {Button, Grid, SxProps} from "@mui/material";
 import MenuIcon from "@mui/icons-material/Menu";
-import {alpha, styled} from '@mui/material/styles';
-import Menu, {MenuProps} from '@mui/material/Menu';
+import {alpha, styled} from "@mui/material/styles";
+import Menu, {MenuProps} from "@mui/material/Menu";
 import {EvamTabContext} from "./EvamTabContext";
-import {EvamApi} from "../../api/EvamApi";
 
 interface EvamHamburgerMenuProps {
     children: ReactNode;

src/component/appbar/EvamTab.tsx

@@ -1,4 +1,4 @@
-import Tab from '@mui/material/Tab';
+import Tab from "@mui/material/Tab";
 import * as React from "react";
 
 /**

src/component/appbar/EvamTabPanel.tsx

@@ -1,7 +1,7 @@
-import * as React from 'react';
+import * as React from "react";
 import {EvamTabContext} from "./EvamTabContext";
-import Typography from '@mui/material/Typography';
-import Box from '@mui/material/Box';
+import Typography from "@mui/material/Typography";
+import Box from "@mui/material/Box";
 import {Slide} from "@mui/material";
 
 export interface TabPanelProps {

src/component/appbar/header/EvamSearchInput.tsx

@@ -1,7 +1,7 @@
 import {Input} from "@mui/material";
 import * as React from "react";
-import {useNavigate, useSearchParams} from "react-router-dom";
 import {Fragment, useRef} from "react";
+import {useNavigate, useSearchParams} from "react-router-dom";
 
 interface EvamSearchInputProps {
     searchTextHint: string

src/dev-test-environment/components/NotificationComponent/NotificationComponent.tsx

@@ -1,5 +1,5 @@
 import React, {useRef, useState} from "react";
-import {Button, Card, Icon, CardBody, CardFooter, CardHeader, Heading, HStack, Text} from "@chakra-ui/react";
+import {Button, Card, CardBody, CardFooter, CardHeader, Heading, HStack, Icon, Text} from "@chakra-ui/react";
 import {VehicleServicesNoRender} from "../util";
 import {_InternalVehicleServicesNotification} from "../../../domain/_InternalVehicleServicesNotification";
 import {motion} from "framer-motion";

src/dev-test-environment/components/index.ts

@@ -1,4 +1,4 @@
 import {NotificationComponent} from "./NotificationComponent";
-import {VehicleServicesNoRender} from "./util"
+import {VehicleServicesNoRender} from "./util";
 
 export {NotificationComponent, VehicleServicesNoRender}

src/dev-test-environment/components/util/index.ts

@@ -1,3 +1,3 @@
-import {VehicleServicesNoRender} from './VehicleServicesNoRender'
+import {VehicleServicesNoRender} from "./VehicleServicesNoRender";
 
 export {VehicleServicesNoRender}

src/dev-test-environment/util/EventHelpers/index.ts

@@ -1,3 +1,3 @@
-import {subscribe, publish, unsubscribe} from "./EventHelpers";
+import {publish, subscribe, unsubscribe} from "./EventHelpers";
 
 export {subscribe, publish, unsubscribe};