fix issue with adding new detectors and beamlines

DiamondLightSource · May 22, 2024 · f338614 · f338614
1 parent 8c2670d
commit f338614
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -26,6 +26,7 @@ module.exports = {
     "no-throw-literal": "off",
     "max-len": ["warn", { code: 80 }],
     "@typescript-eslint/no-throw-literal": "error",
+    "@typescript-eslint/no-misused-promises": ["error", { "checksVoidReturn": { "attributes": false } }],
   },
   settings: {
     react: {

diff --git a/src/dialogs/beamlineDialog.tsx b/src/dialogs/beamlineDialog.tsx
@@ -49,7 +49,7 @@ export default function PresetDialog(props: {
       keepMounted
       onClose={props.handleClose}
     >
-      <form onSubmit={() => handleSubmit(onSubmit)}>
+      <form onSubmit={handleSubmit(onSubmit)}>
         <DialogTitle sx={{ display: "flex", alignItems: "center" }}>
           <Typography variant="h5"> Beamlines </Typography>
           <Divider />
@@ -92,23 +92,23 @@ export default function PresetDialog(props: {
                 />
                 <TextField
                   type="number"
-                  label="min camera length"
-                  {...register("beamline.minCameraLength", { required: true })}
+                  label="max wavelength "
                   variant="outlined"
                   size="small"
+                  {...register("beamline.maxWavelength", { required: true })}
                   inputProps={{
                     step: INPUT_PRECISION,
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">m</InputAdornment>
+                      <InputAdornment position="end">nm</InputAdornment>
                     ),
                   }}
                 />
                 <TextField
                   type="number"
-                  label="camera length step"
-                  {...register("beamline.cameraLengthStep", { required: true })}
+                  label="min camera length"
+                  {...register("beamline.minCameraLength", { required: true })}
                   variant="outlined"
                   size="small"
                   inputProps={{
@@ -122,25 +122,25 @@ export default function PresetDialog(props: {
                 />
                 <TextField
                   type="number"
-                  label="max wavelength "
+                  label="max camera length"
                   variant="outlined"
                   size="small"
-                  {...register("beamline.maxWavelength", { required: true })}
+                  {...register("beamline.maxCameraLength", { required: true })}
                   inputProps={{
                     step: INPUT_PRECISION,
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">nm</InputAdornment>
+                      <InputAdornment position="end">m</InputAdornment>
                     ),
                   }}
                 />
                 <TextField
                   type="number"
-                  label="max camera length"
+                  label="camera length step"
+                  {...register("beamline.cameraLengthStep", { required: true })}
                   variant="outlined"
                   size="small"
-                  {...register("beamline.maxCameraLength", { required: true })}
                   inputProps={{
                     step: INPUT_PRECISION,
                   }}

diff --git a/src/dialogs/detectorDialog.tsx b/src/dialogs/detectorDialog.tsx
@@ -47,7 +47,7 @@ export default function DetectorDialog(props: {
       onClose={props.handleClose}
       maxWidth={"xl"}
     >
-      <form onSubmit={() => handleSubmit(onSubmit)}>
+      <form onSubmit={handleSubmit(onSubmit)}>
         <DialogTitle sx={{ display: "flex", alignItems: "center" }}>
           <Typography variant="h5"> Detectors </Typography>
           <IconButton onClick={props.handleClose} sx={{ ml: "auto" }}>