From ffb65b3369d0dd8143152bf7d3ee6be672c3cc80 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Fri, 9 May 2025 13:48:39 +0530 Subject: [PATCH] Refactor MachineInstances component: enhance rendering logic by adding MachineContentUi and improving structure; create MachineContentUi component for better separation of concerns. --- .../machine/instances/machineInstances.tsx | 29 +++++++++------- .../simulation/ui3d/MachineContentUi.tsx | 34 +++++++++++++++++++ .../simulation/ui3d/RoboticArmContentUi.tsx | 4 +-- 3 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 app/src/modules/simulation/ui3d/MachineContentUi.tsx diff --git a/app/src/modules/simulation/machine/instances/machineInstances.tsx b/app/src/modules/simulation/machine/instances/machineInstances.tsx index 594265d..d56fe44 100644 --- a/app/src/modules/simulation/machine/instances/machineInstances.tsx +++ b/app/src/modules/simulation/machine/instances/machineInstances.tsx @@ -1,17 +1,20 @@ -import React from 'react' -import MachineInstance from './machineInstance/machineInstance' -import { useMachineStore } from '../../../../store/simulation/useMachineStore'; +import React from "react"; +import MachineInstance from "./machineInstance/machineInstance"; +import { useMachineStore } from "../../../../store/simulation/useMachineStore"; +import MachineContentUi from "../../ui3d/MachineContentUi"; function MachineInstances() { - const { machines } = useMachineStore(); - return ( - <> - {machines.map((machine: MachineStatus) => ( - - ))} - - - ) + const { machines } = useMachineStore(); + return ( + <> + {machines.map((machine: MachineStatus) => ( + + + + + ))} + + ); } -export default MachineInstances \ No newline at end of file +export default MachineInstances; diff --git a/app/src/modules/simulation/ui3d/MachineContentUi.tsx b/app/src/modules/simulation/ui3d/MachineContentUi.tsx new file mode 100644 index 0000000..bad89ed --- /dev/null +++ b/app/src/modules/simulation/ui3d/MachineContentUi.tsx @@ -0,0 +1,34 @@ +import { Html } from "@react-three/drei"; +import React from "react"; +import AssetDetailsCard from "../../../components/ui/simulation/AssetDetailsCard"; +import { Vector3 } from "three"; + +type MachineContentUiProps = { + machine: MachineStatus; +}; + +const MachineContentUi: React.FC = ({ machine }) => { + return ( + + + + ); +}; + +export default MachineContentUi; diff --git a/app/src/modules/simulation/ui3d/RoboticArmContentUi.tsx b/app/src/modules/simulation/ui3d/RoboticArmContentUi.tsx index c85e387..dbe32c6 100644 --- a/app/src/modules/simulation/ui3d/RoboticArmContentUi.tsx +++ b/app/src/modules/simulation/ui3d/RoboticArmContentUi.tsx @@ -3,11 +3,11 @@ import React from "react"; import AssetDetailsCard from "../../../components/ui/simulation/AssetDetailsCard"; import { Vector3 } from "three"; -type VehicleContentUiProps = { +type RoboticArmContentUiProps = { roboticArm: ArmBotStatus; }; -const RoboticArmContentUi: React.FC = ({ roboticArm }) => { +const RoboticArmContentUi: React.FC = ({ roboticArm }) => { return (