From 52d4505410f2bde7c999ffa38f3df2c1482df199 Mon Sep 17 00:00:00 2001
From: Proddy <paul@derbyshire.nl>
Date: Mon, 5 Jun 2023 18:09:02 +0200
Subject: [PATCH] updates #3

---
 interface/package.json                     |  2 +-
 interface/src/api/endpoints.ts             |  2 +-
 interface/src/project/DashboardDevices.tsx |  8 ++------
 interface/src/project/api.ts               |  5 +++--
 interface/src/project/types.ts             |  1 +
 interface/yarn.lock                        | 10 +++++-----
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/interface/package.json b/interface/package.json
index ab3303400..76b8c0c09 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -30,7 +30,7 @@
     "@types/react": "^18.2.8",
     "@types/react-dom": "^18.2.4",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.5.4",
+    "alova": "^2.5.5",
     "async-validator": "^4.2.5",
     "axios": "^1.4.0",
     "history": "^5.3.0",
diff --git a/interface/src/api/endpoints.ts b/interface/src/api/endpoints.ts
index 19ce5b290..3c8d5e480 100644
--- a/interface/src/api/endpoints.ts
+++ b/interface/src/api/endpoints.ts
@@ -1,5 +1,5 @@
 import { xhrRequestAdapter } from '@alova/adapter-xhr';
-import { createAlova, useRequest } from 'alova';
+import { createAlova } from 'alova';
 import GlobalFetch from 'alova/GlobalFetch';
 import ReactHook from 'alova/react';
 import axios from 'axios';
diff --git a/interface/src/project/DashboardDevices.tsx b/interface/src/project/DashboardDevices.tsx
index 1b7dd2013..4e12f06a5 100644
--- a/interface/src/project/DashboardDevices.tsx
+++ b/interface/src/project/DashboardDevices.tsx
@@ -43,7 +43,7 @@ import { formatValue } from './deviceValue';
 
 import { DeviceValueUOM_s, DeviceEntityMask, DeviceType } from './types';
 import { deviceValueItemValidation } from './validators';
-import type { Device, CoreData, DeviceData, DeviceValue } from './types';
+import type { Device, DeviceValue } from './types';
 import type { FC } from 'react';
 import { ButtonRow, SectionContent, MessageBox } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
@@ -74,10 +74,9 @@ const DashboardDevices: FC = () => {
       devices: []
     },
     force: true,
-    immediate: false
+    immediate: true
   });
 
-  // TODO prevent firing when page is loaded
   const { data: deviceData, send: readDeviceData } = useRequest((id) => EMSESP.readDeviceData(id), {
     initialData: {
       data: []
@@ -86,7 +85,6 @@ const DashboardDevices: FC = () => {
     immediate: false
   });
 
-  // TODO prevent firing when page is loaded
   const { loading: submitting, send: writeDeviceValue } = useRequest(
     (id: number, deviceValue: DeviceValue) => EMSESP.writeDeviceValue(id, deviceValue),
     {
@@ -251,8 +249,6 @@ const DashboardDevices: FC = () => {
   // };
 
   async function onSelectChange(action: any, state: any) {
-    // TODO check if still needed
-    // setDeviceData({ data: [] });
     setSelectedDevice(state.id);
     if (action.type === 'ADD_BY_ID_EXCLUSIVELY') {
       await readDeviceData(state.id);
diff --git a/interface/src/project/api.ts b/interface/src/project/api.ts
index 65b995a91..5d9c39be4 100644
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -11,7 +11,6 @@ import type {
   DeviceEntity,
   UniqueID,
   CustomEntities,
-  WriteDeviceValue,
   WriteTemperatureSensor,
   WriteAnalogSensor,
   SensorData,
@@ -37,7 +36,9 @@ export const readDeviceData = (id: number) =>
 export const writeDeviceValue = (id: number, devicevalue: DeviceValue) =>
   alovaInstance.Post('/writeDeviceValue', { id, devicevalue });
 
-// TODO to change to alova
+//
+// TODO change below to use alova
+//
 
 export function restart(): AxiosPromise<void> {
   return AXIOS.post('/restart');
diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
index 76220929f..dbdcebcd5 100644
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -132,6 +132,7 @@ export interface DeviceValue {
   x?: number; // max, optional
 }
 
+// TODO can be refacvtored to DeviceValue[]?
 export interface DeviceData {
   data: DeviceValue[];
 }
diff --git a/interface/yarn.lock b/interface/yarn.lock
index 1ef1a1249..faf39b8ed 100644
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1543,7 +1543,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^5.59.8
     "@typescript-eslint/parser": ^5.59.8
     "@vitejs/plugin-react-swc": ^3.3.2
-    alova: ^2.5.4
+    alova: ^2.5.5
     async-validator: ^4.2.5
     axios: ^1.4.0
     eslint: ^8.42.0
@@ -1647,10 +1647,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alova@npm:^2.5.4":
-  version: 2.5.4
-  resolution: "alova@npm:2.5.4"
-  checksum: f58698009419025a50653a9c64a0d497e3cd64448877bfa64f9907878a09eb9f965609fc5950c93b85e37c67099445c28e39ee677d98e6ec665eab5f66a359cd
+"alova@npm:^2.5.5":
+  version: 2.5.5
+  resolution: "alova@npm:2.5.5"
+  checksum: 028c24678fd91a5e2350b6c9c930475dd650fb766efad4d3dd8cd15d1ca85b2424e0857ba41d8f6eb2ad60999424269d8488b4aec66a4f74c98efd3378f21427
   languageName: node
   linkType: hard