diff --git a/.gitignore b/.gitignore index f0be55a5..8fa0aec3 100755 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /styleguideServer/node_modules /ReactApp/node_modules /ReactApp/storybook-static +/ReactApp/dist /node_modules /.pnp .pnp.js diff --git a/ReactApp/src/components/AlarmHandler/EnableDialog.jsx b/ReactApp/src/components/AlarmHandler/EnableDialog.jsx index e3dc4f84..215a8aa4 100644 --- a/ReactApp/src/components/AlarmHandler/EnableDialog.jsx +++ b/ReactApp/src/components/AlarmHandler/EnableDialog.jsx @@ -11,13 +11,11 @@ import FormControlLabel from "@mui/material/FormControlLabel"; import Divider from "@mui/material/Divider"; import Typography from "@mui/material/Typography"; -import DateFnsUtils from "@date-io/date-fns"; import { formatISO, parseISO, setSeconds, addHours } from "date-fns"; import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns"; import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider"; import { MobileDateTimePicker } from "@mui/x-date-pickers/MobileDateTimePicker"; -import { TextField } from "@mui/material"; // Styles const useStyles = makeStyles((theme) => ({ boldText: { diff --git a/ReactApp/src/components/AlarmHandler/ScheduleDialog.jsx b/ReactApp/src/components/AlarmHandler/ScheduleDialog.jsx index 9bd83579..6322024e 100644 --- a/ReactApp/src/components/AlarmHandler/ScheduleDialog.jsx +++ b/ReactApp/src/components/AlarmHandler/ScheduleDialog.jsx @@ -21,7 +21,6 @@ import SmsOutlinedIcon from "@mui/icons-material/SmsOutlined"; import WhatsAppIcon from "@mui/icons-material/WhatsApp"; import SignalIcon from "./SignalIcon"; -import DateFnsUtils from "@date-io/date-fns"; import { formatISO, isSameDay, diff --git a/ReactApp/src/components/ArchiverDataViewer/ArchiverDataViewer.jsx b/ReactApp/src/components/ArchiverDataViewer/ArchiverDataViewer.jsx index f661505a..fbc9c129 100644 --- a/ReactApp/src/components/ArchiverDataViewer/ArchiverDataViewer.jsx +++ b/ReactApp/src/components/ArchiverDataViewer/ArchiverDataViewer.jsx @@ -4,7 +4,6 @@ import ContextMenu from "../SystemComponents/ContextMenu"; import Accordion from "@mui/material/Accordion"; import AccordionSummary from "@mui/material/AccordionSummary"; import AccordionDetails from "@mui/material/AccordionDetails"; -import DateFnsUtils from "@date-io/date-fns"; import formatISO from "date-fns/formatISO"; import { subHours, diff --git a/ReactApp/src/components/AreaDetector/AreaDetector.jsx b/ReactApp/src/components/AreaDetector/AreaDetector.jsx index 337d8a8d..af659d62 100644 --- a/ReactApp/src/components/AreaDetector/AreaDetector.jsx +++ b/ReactApp/src/components/AreaDetector/AreaDetector.jsx @@ -7,7 +7,6 @@ import Typography from "@mui/material/Typography"; import Grid from "@mui/material/Grid"; import Box from "@mui/material/Box"; import { useTheme } from "@mui/system"; -import GraphHeatmap from "./GraphHeatmap"; import Accordion from "@mui/material/Accordion"; import AccordionSummary from "@mui/material/AccordionSummary"; import AccordionDetails from "@mui/material/AccordionDetails"; @@ -35,7 +34,6 @@ import PluginsMore from "./PluginsMore"; const AreaDetector = (props) => { const [tabVal, setTabVal] = useState(0); const [morePluginsR, setMorePluginsR] = useState(null); - const muiTextFieldProps = { size: "small", variant: "standard" }; const theme = useTheme(); const paperElevation = theme.palette.paperElevation; return ( diff --git a/ReactApp/src/components/AreaDetector/Attributes.jsx b/ReactApp/src/components/AreaDetector/Attributes.jsx index 78c1be23..98d4e31d 100644 --- a/ReactApp/src/components/AreaDetector/Attributes.jsx +++ b/ReactApp/src/components/AreaDetector/Attributes.jsx @@ -6,12 +6,10 @@ import TableBody from "@mui/material/TableBody"; import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import TableCell from "@mui/material/TableCell"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; const Attributes = (props) => { const muiTextFieldProps = { size: "small", variant: "standard" }; - const theme = useTheme(); return ( diff --git a/ReactApp/src/components/AreaDetector/Buffers.jsx b/ReactApp/src/components/AreaDetector/Buffers.jsx index fd0aa34e..87f0914f 100644 --- a/ReactApp/src/components/AreaDetector/Buffers.jsx +++ b/ReactApp/src/components/AreaDetector/Buffers.jsx @@ -8,12 +8,10 @@ import TableRow from "@mui/material/TableRow"; import TableCell from "@mui/material/TableCell"; import SelectionInput from "../BaseComponents/SelectionInput"; import ActionButton from "../BaseComponents/ActionButton"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; const Buffers = (props) => { const muiTextFieldProps = { size: "small", variant: "standard" }; - const theme = useTheme(); return (
diff --git a/ReactApp/src/components/AreaDetector/GraphHeatmap.jsx b/ReactApp/src/components/AreaDetector/GraphHeatmap.jsx index 1e6dc304..22e0d3e5 100644 --- a/ReactApp/src/components/AreaDetector/GraphHeatmap.jsx +++ b/ReactApp/src/components/AreaDetector/GraphHeatmap.jsx @@ -5,7 +5,6 @@ import ContextMenu from "../SystemComponents/ContextMenu"; import PV from "../SystemComponents/PV"; import Plot from "react-plotly.js"; import { isMobileOnly } from "react-device-detect"; -import { replaceMacros } from "../SystemComponents/Utils/macroReplacement"; const PlotData = (props) => { const theme = useTheme(); const updateDataReducer = (pvs, newData) => { diff --git a/ReactApp/src/components/AreaDetector/Plugins.jsx b/ReactApp/src/components/AreaDetector/Plugins.jsx index d076669e..bbdee575 100644 --- a/ReactApp/src/components/AreaDetector/Plugins.jsx +++ b/ReactApp/src/components/AreaDetector/Plugins.jsx @@ -1,11 +1,10 @@ -import React, { useState } from "react"; +import React from "react"; import Table from "@mui/material/Table"; import TableBody from "@mui/material/TableBody"; import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import TableCell from "@mui/material/TableCell"; import TextUpdate from "../BaseComponents/TextUpdate"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; import RadioButton from "../BaseComponents/RadioButton"; import SettingsIcon from "@mui/icons-material/Settings"; diff --git a/ReactApp/src/components/AreaDetector/PluginsMore.jsx b/ReactApp/src/components/AreaDetector/PluginsMore.jsx index ab7dea28..d893f225 100644 --- a/ReactApp/src/components/AreaDetector/PluginsMore.jsx +++ b/ReactApp/src/components/AreaDetector/PluginsMore.jsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React from "react"; import TextOutput from "../BaseComponents/TextOutput"; import TextInput from "../BaseComponents/TextInput"; @@ -12,7 +12,6 @@ import SelectionInput from "../BaseComponents/SelectionInput"; import ActionButton from "../BaseComponents/ActionButton"; import Stack from "@mui/system/Stack"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; import { Typography } from "@mui/material"; import IconButton from "@mui/material/IconButton"; @@ -20,8 +19,6 @@ import CloseIcon from "@mui/icons-material/Close"; const PluginsMore = (props) => { const muiTextFieldProps = { size: "small", variant: "standard" }; - const theme = useTheme(); - const paperElevation = theme.palette.paperElevation; return (
diff --git a/ReactApp/src/components/AreaDetector/ReadOut.jsx b/ReactApp/src/components/AreaDetector/ReadOut.jsx index e5f4b3c3..5c1c4ff0 100644 --- a/ReactApp/src/components/AreaDetector/ReadOut.jsx +++ b/ReactApp/src/components/AreaDetector/ReadOut.jsx @@ -7,7 +7,6 @@ import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import TableCell from "@mui/material/TableCell"; import SelectionInput from "../BaseComponents/SelectionInput"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; const ReadOut = (props) => { diff --git a/ReactApp/src/components/AreaDetector/Setup.jsx b/ReactApp/src/components/AreaDetector/Setup.jsx index 877b0b32..2a92257c 100644 --- a/ReactApp/src/components/AreaDetector/Setup.jsx +++ b/ReactApp/src/components/AreaDetector/Setup.jsx @@ -7,7 +7,6 @@ import TableRow from "@mui/material/TableRow"; import TableCell from "@mui/material/TableCell"; import ActionButton from "../BaseComponents/ActionButton"; import Stack from "@mui/system/Stack"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; import { Typography } from "@mui/material"; diff --git a/ReactApp/src/components/AreaDetector/Shutter.jsx b/ReactApp/src/components/AreaDetector/Shutter.jsx index 7b9744c7..71ab90c7 100644 --- a/ReactApp/src/components/AreaDetector/Shutter.jsx +++ b/ReactApp/src/components/AreaDetector/Shutter.jsx @@ -7,7 +7,6 @@ import TableHead from "@mui/material/TableHead"; import TableRow from "@mui/material/TableRow"; import TableCell from "@mui/material/TableCell"; import SelectionInput from "../BaseComponents/SelectionInput"; -import { useTheme } from "@mui/system"; import { StyledTableCell } from "./TableStyles"; import { Accordion } from "@mui/material"; import { AccordionSummary } from "@mui/material"; diff --git a/ReactApp/src/components/BaseComponents/BitIndicators.jsx b/ReactApp/src/components/BaseComponents/BitIndicators.jsx index d20669b4..82b2090c 100644 --- a/ReactApp/src/components/BaseComponents/BitIndicators.jsx +++ b/ReactApp/src/components/BaseComponents/BitIndicators.jsx @@ -1,5 +1,4 @@ import React from "react"; -import withStyles from "@mui/styles/withStyles"; import { Grid, FormControlLabel, SvgIcon, useTheme } from "@mui/material"; import { Lens } from "@mui/icons-material"; import PropTypes from "prop-types"; diff --git a/ReactApp/src/components/BaseComponents/Gauge.jsx b/ReactApp/src/components/BaseComponents/Gauge.jsx index 85064600..45e4438b 100644 --- a/ReactApp/src/components/BaseComponents/Gauge.jsx +++ b/ReactApp/src/components/BaseComponents/Gauge.jsx @@ -23,7 +23,6 @@ function getTickValues( xOffset, radialTextOffset ) { - const { classes } = props; let ticks = []; let i = 0; for (i = 0; i < numberOfTicks; i++) { @@ -59,7 +58,6 @@ function getTickValues( function GaugeComponent(props) { const theme = useTheme(); const gradientId = uuidv4(); - const { classes } = props; const units = props.units; const value = props.value; const min = props.min; diff --git a/ReactApp/src/components/BaseComponents/ProgressBar.jsx b/ReactApp/src/components/BaseComponents/ProgressBar.jsx index 370b0976..e6fed3ab 100644 --- a/ReactApp/src/components/BaseComponents/ProgressBar.jsx +++ b/ReactApp/src/components/BaseComponents/ProgressBar.jsx @@ -36,7 +36,6 @@ function getTickValues( yOffset, value ) { - const { classes } = props; let ticks = []; let i = 0; if (typeof props.disabled === "undefined") { @@ -290,7 +289,6 @@ const ProgressBarInternalComponent = (props) => { ]); const { initialized } = props; - const { classes } = props; let units; let value; let min; diff --git a/ReactApp/src/components/ControlScreens/Components/EditorSinglePS.jsx b/ReactApp/src/components/ControlScreens/Components/EditorSinglePS.jsx index 14272608..a559565c 100644 --- a/ReactApp/src/components/ControlScreens/Components/EditorSinglePS.jsx +++ b/ReactApp/src/components/ControlScreens/Components/EditorSinglePS.jsx @@ -6,7 +6,6 @@ import TextOutput from '../../BaseComponents/TextOutput'; import Slider from '../../BaseComponents/Slider'; import Grid from '@mui/material/Grid'; import ToggleButton from '../../BaseComponents/ToggleButton'; -import withStyles from '@mui/styles/withStyles'; import Button from '@mui/material/Button'; import { Link } from 'react-router-dom' import ThumbWheel from '../../BaseComponents/ThumbWheel'; diff --git a/ReactApp/src/components/SettingsPages/Probe.jsx b/ReactApp/src/components/SettingsPages/Probe.jsx index e7c556c9..4d6e9f5d 100644 --- a/ReactApp/src/components/SettingsPages/Probe.jsx +++ b/ReactApp/src/components/SettingsPages/Probe.jsx @@ -1,6 +1,5 @@ import React from "react"; -import AutomationStudioContext from "../SystemComponents/AutomationStudioContext"; import TextInput from "../BaseComponents/TextInput"; import TextOutput from "../BaseComponents/TextOutput"; import Slider from "../BaseComponents/Slider"; @@ -8,12 +7,9 @@ import Grid from "@mui/material/Grid"; import GraphY from "../BaseComponents/GraphY"; import TextField from "@mui/material/TextField"; import { useLocation } from "react-router-dom"; -import { useTheme } from "@mui/material/styles"; const Probe = () => { - const context = React.useContext(AutomationStudioContext); const location = useLocation(); - const theme = useTheme(); const probeObject = JSON.parse(decodeURIComponent(location.search.substr(1))); let probetype; @@ -257,19 +253,7 @@ const Probe = () => { disabled margin="none" variant="outlined" - InputLabelProps={{ - classes: { - root: classes.cssLabel, - focused: classes.cssFocused, - }, - }} InputProps={{ - classes: { - root: classes.cssOutlinedInput, - focused: classes.cssFocused, - input: classes.input, - notchedOutline: classes.notchedOutline, - }, readOnly: true, }} /> diff --git a/ReactApp/src/components/SvgBeamlineComponents/BendingMagnet.jsx b/ReactApp/src/components/SvgBeamlineComponents/BendingMagnet.jsx index 785b2df5..b5e04e04 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/BendingMagnet.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/BendingMagnet.jsx @@ -1,7 +1,6 @@ import React from 'react' import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from '@mui/styles/withStyles'; import { v4 as uuidv4 } from 'uuid'; import {svgHeight,svgCenterY,svgWidth,svgCenterX} from "../SystemComponents/svgConstants"; diff --git a/ReactApp/src/components/SvgBeamlineComponents/FC.jsx b/ReactApp/src/components/SvgBeamlineComponents/FC.jsx index b1f302df..24cc1714 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/FC.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/FC.jsx @@ -1,7 +1,6 @@ import React, { useState } from 'react' import Button from '@mui/material/Button'; import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from '@mui/styles/withStyles'; import { svgHeight, svgCenterY, svgWidth, svgCenterX } from "../SystemComponents/svgConstants"; import { v4 as uuidv4 } from 'uuid'; import PropTypes from 'prop-types'; diff --git a/ReactApp/src/components/SvgBeamlineComponents/Harp.jsx b/ReactApp/src/components/SvgBeamlineComponents/Harp.jsx index ed6191b3..1432851f 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/Harp.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/Harp.jsx @@ -1,7 +1,6 @@ import React,{useState} from 'react' import Button from '@mui/material/Button'; import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from '@mui/styles/withStyles'; import { svgHeight, svgCenterY, svgWidth, svgCenterX } from "../SystemComponents/svgConstants"; import { v4 as uuidv4 } from 'uuid'; import PropTypes from 'prop-types'; diff --git a/ReactApp/src/components/SvgBeamlineComponents/QuadrapoleMagnet.jsx b/ReactApp/src/components/SvgBeamlineComponents/QuadrapoleMagnet.jsx index a123cca7..357bd2bf 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/QuadrapoleMagnet.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/QuadrapoleMagnet.jsx @@ -1,7 +1,6 @@ import React from 'react' import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from '@mui/styles/withStyles'; import { v4 as uuidv4 } from 'uuid'; import {svgHeight,svgCenterY,svgWidth,svgCenterX} from "../SystemComponents/svgConstants"; import PropTypes from 'prop-types'; diff --git a/ReactApp/src/components/SvgBeamlineComponents/SlitXY.jsx b/ReactApp/src/components/SvgBeamlineComponents/SlitXY.jsx index 25c01ed0..4c712e8f 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/SlitXY.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/SlitXY.jsx @@ -1,7 +1,6 @@ import React from "react"; import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from "@mui/styles/withStyles"; import { svgHeight, svgCenterY, diff --git a/ReactApp/src/components/SvgBeamlineComponents/SteererXYMagnet.jsx b/ReactApp/src/components/SvgBeamlineComponents/SteererXYMagnet.jsx index 45426f59..07202b4b 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/SteererXYMagnet.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/SteererXYMagnet.jsx @@ -1,7 +1,6 @@ import React from "react"; import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from "@mui/styles/withStyles"; import { svgHeight, svgCenterY, diff --git a/ReactApp/src/components/SvgBeamlineComponents/SteererYMagnet.jsx b/ReactApp/src/components/SvgBeamlineComponents/SteererYMagnet.jsx index 24c3dd8c..1daf859d 100644 --- a/ReactApp/src/components/SvgBeamlineComponents/SteererYMagnet.jsx +++ b/ReactApp/src/components/SvgBeamlineComponents/SteererYMagnet.jsx @@ -1,7 +1,6 @@ import React from 'react' import Widget from "../SystemComponents/Widgets/Widget"; -import withStyles from '@mui/styles/withStyles'; import {svgHeight,svgCenterY,svgWidth,svgCenterX} from "../SystemComponents/svgConstants"; import { v4 as uuidv4 } from 'uuid'; import PropTypes from 'prop-types'; diff --git a/ReactApp/src/components/SystemComponents/ProtectedRoute.jsx b/ReactApp/src/components/SystemComponents/ProtectedRoute.jsx index 6388131f..e0ff2a03 100644 --- a/ReactApp/src/components/SystemComponents/ProtectedRoute.jsx +++ b/ReactApp/src/components/SystemComponents/ProtectedRoute.jsx @@ -6,7 +6,6 @@ import { useLocation, Navigate } from "react-router-dom"; const ProtectedRoute = (props) => { const location = useLocation(); - const Component = props.component; const context = useContext(AutomationStudioContext); const loggingIn = context.userData.loggingIn; const loggedIn = diff --git a/ReactApp/src/components/SystemComponents/Utils/widgetProps.jsx b/ReactApp/src/components/SystemComponents/Utils/widgetProps.jsx index 4c3100c1..7e47eca5 100644 --- a/ReactApp/src/components/SystemComponents/Utils/widgetProps.jsx +++ b/ReactApp/src/components/SystemComponents/Utils/widgetProps.jsx @@ -13,4 +13,4 @@ const nonNegativeInteger = (props, propName, componentName) => { } }; -export default { nonNegativeInteger }; +export default nonNegativeInteger; diff --git a/ReactApp/src/components/UI/Layout/ComposedLayouts/TraditionalLayout.jsx b/ReactApp/src/components/UI/Layout/ComposedLayouts/TraditionalLayout.jsx index d81ffc16..d1ed4ace 100644 --- a/ReactApp/src/components/UI/Layout/ComposedLayouts/TraditionalLayout.jsx +++ b/ReactApp/src/components/UI/Layout/ComposedLayouts/TraditionalLayout.jsx @@ -3,7 +3,6 @@ import React, { useState, useContext } from "react"; import PropTypes from "prop-types"; import { useTheme } from "@mui/material/styles"; -import makeStyles from "@mui/styles/makeStyles"; import AppBar from "@mui/material/AppBar"; import Toolbar from "@mui/material/Toolbar"; import Typography from "@mui/material/Typography";