diff --git a/Emrald-UI/src/components/drag-and-drop/DraggableItem.tsx b/Emrald-UI/src/components/drag-and-drop/DraggableItem.tsx index bd0205a4..33c6a17a 100644 --- a/Emrald-UI/src/components/drag-and-drop/DraggableItem.tsx +++ b/Emrald-UI/src/components/drag-and-drop/DraggableItem.tsx @@ -35,7 +35,7 @@ const DraggableItem: React.FC> = ({ }); return ( - + {children} ); diff --git a/Emrald-UI/src/components/forms/ActionForm/FormFieldsByType/ExtSimulation.tsx b/Emrald-UI/src/components/forms/ActionForm/FormFieldsByType/ExtSimulation.tsx index 883e2033..b03be5aa 100644 --- a/Emrald-UI/src/components/forms/ActionForm/FormFieldsByType/ExtSimulation.tsx +++ b/Emrald-UI/src/components/forms/ActionForm/FormFieldsByType/ExtSimulation.tsx @@ -1,8 +1,11 @@ import { Box, Checkbox, + FormControl, FormControlLabel, + FormLabel, MenuItem, + TextField, } from '@mui/material'; import React, { useEffect, useState } from 'react'; import { useActionFormContext } from '../ActionFormContext'; @@ -35,7 +38,7 @@ const ExtSimulation: React.FC = () => { const { extSimList } = useExtSimContext(); const { variableList } = useVariableContext(); const extSimVariables = variableList.value.filter( - (variable) => variable.varScope === 'gt3DSim', + (variable) => variable.varScope === 'gt3DSim' && variable.type === 'string', ); // const simEndTimeDuration = dayjs.duration(simEndTime); const [milliseconds, setMilliseconds] = useState(0); @@ -59,11 +62,7 @@ const ExtSimulation: React.FC = () => { return ( - + {simTypeOptions.map((item, index) => ( {item.label} @@ -96,29 +95,56 @@ const ExtSimulation: React.FC = () => { label="Use variable for items below" /> - - {extSimVariables.map((item, index) => ( - - {item.name} - - ))} - - - - {extSimVariables.map((item, index) => ( - - {item.name} - - ))} - + {openSimVarParams ? ( +
+ + {extSimVariables.map((item, index) => ( + + {item.name} + + ))} + + + {extSimVariables.map((item, index) => ( + + {item.name} + + ))} + +
+ ) : ( +
+ + Model Reference (Optional) + setSim3DModelRef(e.target.value)} + > + +
+ + Config Data (Optional) + setSim3DConfigData(e.target.value)} + > + +
+ )}
) : ( <>