Merging dev into main #49

Merged
8464960 merged 260 commits from dev into main 2026-01-28 10:48:52 +00:00
Showing only changes of commit fa046e6b2a - Show all commits

View File

@@ -1,4 +1,5 @@
import { useEffect } from 'react' import { useEffect } from 'react'
import Logging from '../Logging/Logging';
// Define the robot type // Define the robot type
type Robot = { type Robot = {
@@ -27,7 +28,8 @@ export default function ConnectedRobots({
// Safeguard id in request. // Safeguard id in request.
if (data.id === null || data.id === undefined) { if (data.id === null || data.id === undefined) {
console.log("Missing robot id in connection request.") console.log(`Missing robot id in connection request.
Use format: 'data: {event = 'robot_connected', id = <id>, (optional) name = <name>, (optional) port = <port>}'.`)
return () => eventSource.close(); return () => eventSource.close();
} }
@@ -46,13 +48,23 @@ export default function ConnectedRobots({
if (data.event === "robot_disconnected") { if (data.event === "robot_disconnected") {
// Safeguard id in request. // Safeguard id in request.
if (data.id === null || data.id === undefined) { if (data.id === null || data.id === undefined) {
console.log("Missing robot id in connection request.") console.log("Missing robot id in connection request. Use format: 'data: {event = 'robot_disconnected', id = <id>}'.");
return () => eventSource.close(); return () => eventSource.close();
} }
// Filter out same ids (should only be one) // Filter out same ids (should only be one)
setConnectedRobots(robots => robots.filter(robot => robot.id !== data.id)); setConnectedRobots(robots => robots.filter(robot => robot.id !== data.id));
} }
if (data.event === "robot_list") {
if (data.list === null || data.list === undefined) {
console.log("Missing list in robot_list request. Use format: 'data: {event = 'robot_list', list = <list>}'.");
return () => eventSource.close();
}
// Set the robot list to the one found in CB
setConnectedRobots(data.list);
}
} catch { } catch {
console.log("Unparsable SSE message:", event.data); console.log("Unparsable SSE message:", event.data);
} }
@@ -77,8 +89,52 @@ export default function ConnectedRobots({
<div className={"flex-col gap-lg"}> <div className={"flex-col gap-lg"}>
<div className={"flex-row gap-md justify-center"}> <div className={"flex-row gap-md justify-center"}>
<button onClick={() => { <button onClick={() => {
// Reload from CB database (other ticket) // Let's test the reload function.
}}>Reload from CB</button> const example_list = [{ id: "pepper_robot1", name: "Pepper1", port: 1234 },
{ id: "pepper_robot2", name: "Pepper2", port: 1235 },
{ id: "pepper_robot3", name: "Pepper3", port: 1236 },
{ id: "pepper_robot4", name: "Pepper4", port: 1237 }]
const example_event = `{
"event": "robot_list", "list":
[{ "id": "pepper_robot1",
"name": "Pepper1",
"port": 1234 },{
"id": "pepper_robot2",
"name": "Pepper2",
"port": 1235 },{
"id": "pepper_robot3",
"name": "Pepper3",
"port": 1236 }, {
"id": "pepper_robot4",
"name": "Pepper4",
"port": 1237 }]}`
// Now let's put it through the same steps as the event would do. :)
try {
const data = JSON.parse(example_event);
if (data.event === "robot_list") {
if (data.list === null || data.list === undefined) {
console.log("Missing list in robot_list request. Use format: 'data: {event = 'robot_list', list = <list>}'.");
return;
}
// Check if it is as expected.
if (JSON.stringify(data.list) !== JSON.stringify(example_list)) {
console.log("Dummy reload failed: list don't match.")
}
else {
console.log("Dummy reload succes!!")
}
} else {
console.log("Dummy reload failed, didn't parse to 'data.event === 'robot_list'.'")
}
} catch {
console.log("Dummy reload failed: didnt parse correctly.")
}
}}>Dummy Reload from CB</button>
<button onClick={() => { <button onClick={() => {
// Example dummy robots // Example dummy robots
const connection_dummies: Robot[] = [ const connection_dummies: Robot[] = [