got rid of a bunch of old material-ui references and fixed a map import

This commit is contained in:
Carter 2025-03-17 16:28:29 -06:00
parent b7c2354b83
commit c84f6194fa
25 changed files with 614 additions and 68 deletions

View file

@ -22,17 +22,14 @@ import {
ExpandMore,
Close as CloseIcon
} from "@mui/icons-material";
// import { Alert, AlertTitle } from "@material-ui/lab";
import PeriodSelect from "common/time/PeriodSelect";
import SearchSelect, { Option } from "common/SearchSelect";
// import { GrainOptions } from "grain/GrainDescriber";
import { cloneDeep } from "lodash";
import { Component, Device } from "models";
import {
extension,
getMeasurements,
hasDimensions,
hasFan,
isController,
isMultiSensor,
primaryMeasurement
@ -42,16 +39,12 @@ import { pond } from "protobuf-ts/pond";
import { quack } from "protobuf-ts/quack";
import React, { useEffect, useState } from "react";
import { bestUnit, milliToX } from "common/time/duration";
// import CompModes from "component/ComponentMode.json";
// import green from "@material-ui/core/colors/green";
// import red from "@material-ui/core/colors/red";
// import FanPicker from "fans/fanPicker";
import { useGlobalState } from "providers";
import { green, red } from "@mui/material/colors";
import { makeStyles } from "@mui/styles";
import { getDistanceUnit } from "utils";
import { GrainOptions } from "grain";
// import { getDistanceUnit } from "utils";
import CompModes from "component/ComponentMode.json";
const useStyles = makeStyles((theme: Theme) => {
return ({
@ -168,11 +161,11 @@ export default function ComponentForm(props: Props) {
formComponent.settings.measurementPeriodMs !== formComponent.settings.reportPeriodMs
);
setDataUsageWarningDismissed(localStorage.getItem("dataUsageWarningDismissed") !== null);
// CompModes.forEach((mode: any) => {
// if (formComponent.type() === mode.type && formComponent.subType() === mode.subtype) {
// setCompMode(mode);
// }
// });
CompModes.forEach((mode: any) => {
if (formComponent.type() === mode.type && formComponent.subType() === mode.subtype) {
setCompMode(mode);
}
});
//get the dimension values for the form and convert them to the form display values (m or ft)
let length = formComponent.settings.containerDimensions?.lengthCm ?? 0;

View file

@ -15,7 +15,6 @@ import {
Theme
} from "@mui/material";
import { makeStyles } from "@mui/styles";
//import DragIcon from "@material-ui/icons/DragHandle";
import { DragHandle as DragIcon } from "@mui/icons-material";
import ResponsiveDialog from "common/ResponsiveDialog";
import { useDeviceAPI, usePrevious, useSnackbar } from "hooks";
@ -23,11 +22,11 @@ import { cloneDeep } from "lodash";
import { Component, Device } from "models";
import { sortComponents } from "pbHelpers/Component";
import { pond, quack } from "protobuf-ts/pond";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { DragDropContext, Draggable, Droppable, DropResult } from "react-beautiful-dnd";
import { useThemeType } from "../hooks/useThemeType";
const useStyles = makeStyles((theme: Theme) => {
const useStyles = makeStyles((_theme: Theme) => {
const themeType = useThemeType()
return ({
item: {

View file

@ -54,10 +54,6 @@ import { or } from "utils/types";
import { ConfigurablePin } from "pbHelpers/AddressTypes";
import ColourPicker from "common/ColourPicker";
import classNames from "classnames";
// import green from "@material-ui/core/colors/green";
// import AddIcon from "@material-ui/icons/AddCircle";
// import RemoveIcon from "@material-ui/icons/RemoveCircle";
// import red from "@material-ui/core/colors/red";
import { getContextKeys, getContextTypes } from "pbHelpers/Context";
import ComponentForm from "./ComponentForm";
import { green, red } from "@mui/material/colors";

View file

@ -13,8 +13,6 @@ import {
Typography,
Theme
} from "@mui/material"
//import { Theme } from "@material-ui/core/styles/createMuiTheme";
//import withStyles, { WithStyles } from "@material-ui/core/styles/withStyles";
import { withStyles, WithStyles } from "@mui/styles";
import DateSelect from "common/time/DateSelect";
@ -93,7 +91,7 @@ class ExportDataSettings extends React.Component<Props, State> {
};
submit = () => {
const { device, component, newMeasurements, user } = this.props;
const { device, component, user } = this.props;
const { startDate, endDate } = this.state;
const { sampleMeasurements, listUnitMeasurements } = this.context;

View file

@ -1,4 +1,3 @@
//import { withStyles, Theme, WithTheme, createStyles, WithStyles } from "@material-ui/core/styles";
import { Theme } from "@mui/material"
import { withStyles, createStyles, WithTheme, WithStyles } from "@mui/styles";
import React from "react";

View file

@ -1,11 +1,10 @@
//import { Box, createStyles, makeStyles, Theme } from "@material-ui/core";
import { Box, Theme } from "@mui/material";
import { makeStyles } from "@mui/styles";
import { Component } from "models";
import { getMeasurementSummary } from "pbHelpers/ComponentType";
import { pond } from "protobuf-ts/pond";
import { quack } from "protobuf-ts/quack";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { or } from "utils";
interface Props {

View file

@ -5,7 +5,6 @@ import { convertedUnitMeasurement } from "models/UnitMeasurement";
import moment from "moment";
import { pond } from "protobuf-ts/pond";
import React, { useEffect, useState } from "react";
// import Divider from "@material-ui/core/Divider";
import { Plenum } from "models/Plenum";
import { Pressure } from "models/Pressure";
import { GrainCable } from "models/GrainCable";