Merge branch 'main' of github.com:DiamondLightSource/mx-daq-ui into organise_oavmover

Author: Tamoor Shahid

src/blueapi/visit.ts

@@ -1,5 +1,5 @@
-import { RawValue } from "../pv/types";
-import { forceString, ReadPvRawValue } from "../pv/util";
+import { RawValue } from "pv/types";
+import { forceString, ReadPvRawValue } from "pv/util";
 
 /**
  * Read the full visit path from the visit PV set by the beamline staff.

src/components/Extruder/CollectionSetupEx.tsx

@@ -1,12 +1,12 @@
 import { Box, Grid2, Stack } from "@mui/material";
 import React from "react";
-import { ParameterInput } from "../ParameterInputs";
 import {
   LaserCheckButtons,
   PumpProbeSelection,
   PumpProbeSetup,
 } from "./PumpProbeSelection";
-import { AbortButton, RunPlanButton } from "../../blueapi/BlueapiComponents";
+import { ParameterInput } from "components/ParameterInputs";
+import { AbortButton, RunPlanButton } from "blueapi/BlueapiComponents";
 
 /**Main collection input window for the extruderpanel. */
 export function CollectionSetupEx() {

src/components/Extruder/PumpProbeSelection.tsx

@@ -5,9 +5,9 @@ import {
   Select,
   Tooltip,
 } from "@mui/material";
-import { ParameterInput } from "../ParameterInputs";
+import { RunPlanButton } from "blueapi/BlueapiComponents";
+import { ParameterInput } from "components/ParameterInputs";
 import React from "react";
-import { RunPlanButton } from "../../blueapi/BlueapiComponents";
 
 export function PumpProbeSelection({
   pumpProbe,

src/components/FixedTarget/CollectionSetupFt.tsx

@@ -11,9 +11,9 @@ import {
 import React from "react";
 import { PumpProbeOptions } from "./PumpProbeComponents";
 import { MapView } from "./FixedTargetMapComponents";
-import { chipTypes, MapTypes, pumpProbeMode } from "../params";
-import { AbortButton, RunPlanButton } from "../../blueapi/BlueapiComponents";
-import { ParameterInput } from "../ParameterInputs";
+import { RunPlanButton, AbortButton } from "blueapi/BlueapiComponents";
+import { ParameterInput } from "components/ParameterInputs";
+import { pumpProbeMode, chipTypes, MapTypes } from "components/params";
 
 type ParametersProps = {
   subDir: string;

src/components/FixedTarget/FixedTargetMapComponents.tsx

@@ -13,8 +13,8 @@ import {
   ToggleButtonGroup,
   Tooltip,
 } from "@mui/material";
+import { MapTypes } from "components/params";
 import React from "react";
-import { MapTypes } from "../params";
 
 /**
  * Create list of numbered ToggleButtons to add to a ToggleButtonGroup

src/components/FixedTarget/PumpProbeComponents.tsx

@@ -11,8 +11,8 @@ import {
   TextField,
   Tooltip,
 } from "@mui/material";
+import { EavaRequest, calculateEAVA } from "components/params";
 import React from "react";
-import { calculateEAVA, EavaRequest } from "../params";
 
 /**
  * Opens a dilog showing the calculated laser delay to set for each EAVA setting, given the laser

src/components/OavVideoStream.tsx

@@ -1,36 +1,13 @@
 import { Box } from "@mui/material";
-import { PvComponent } from "../pv/PvComponent";
-import { PvItem, PvDescription } from "../pv/types";
+import React from "react";
+import { useContainerDimensions } from "./OavVideoStreamHelper";
+import { PvComponent } from "pv/PvComponent";
+import { PvDescription, PvItem } from "pv/types";
 import {
+  useParsedPvConnection,
   parseNumericPv,
   pvIntArrayToString,
-  useParsedPvConnection,
-} from "../pv/util";
-import React from "react";
-
-export const useContainerDimensions = (
-  ref: React.MutableRefObject<HTMLHeadingElement | null>,
-) => {
-  const [dimensions, setDimensions] = React.useState({ width: 0, height: 0 });
-  React.useEffect(() => {
-    const getDimensions = () => ({
-      width: ref.current?.offsetWidth || 0,
-      height: ref.current?.offsetWidth || 0,
-    });
-    const handleResize = () => {
-      setDimensions(getDimensions());
-    };
-    if (ref.current) {
-      setDimensions(getDimensions());
-    }
-    window.addEventListener("resize", handleResize);
-    return () => {
-      window.removeEventListener("resize", handleResize);
-    };
-  }, [ref]);
-
-  return dimensions;
-};
+} from "pv/util";
 
 /*
  * A viewer which allows overlaying a crosshair (takes numbers which could be the values from a react useState hook)

src/components/OavVideoStreamHelper.ts

@@ -0,0 +1,25 @@
+import { useState, useEffect } from "react";
+
+export const useContainerDimensions = (
+  ref: React.MutableRefObject<HTMLHeadingElement | null>,
+) => {
+  const [dimensions, setDimensions] = useState({ width: 0, height: 0 });
+  useEffect(() => {
+    const getDimensions = () => ({
+      width: ref.current?.offsetWidth || 0,
+      height: ref.current?.offsetWidth || 0,
+    });
+    const handleResize = () => {
+      setDimensions(getDimensions());
+    };
+    if (ref.current) {
+      setDimensions(getDimensions());
+    }
+    window.addEventListener("resize", handleResize);
+    return () => {
+      window.removeEventListener("resize", handleResize);
+    };
+  }, [ref]);
+
+  return dimensions;
+};

src/components/ReadOnlyInputs.tsx

@@ -1,5 +1,5 @@
 import { Grid2 } from "@mui/material";
-import { RoPvBox } from "../pv/PvComponent";
+import { RoPvBox } from "pv/PvComponent";
 
 type RoPvAddress = {
   visit: string;

src/components/SelectionControl.tsx

@@ -1,8 +1,8 @@
 import React from "react";
-import { PvDescription } from "../pv/types";
-import { submitAndRunPlanImmediately } from "../blueapi/blueapi";
+import { PvDescription } from "pv/types";
+import { submitAndRunPlanImmediately } from "blueapi/blueapi";
 import { FormControl, InputLabel, MenuItem, Select } from "@mui/material";
-import { forceString, useParsedPvConnection } from "../pv/util";
+import { forceString, useParsedPvConnection } from "pv/util";
 
 type SelectionProps = PvDescription & {
   id: string;