Update Material-UI imports to MUI imports
parent
95d92db790
commit
d9501339c6
|
@ -1,12 +1,7 @@
|
|||
import React, { useState } from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import {
|
||||
InputAdornment,
|
||||
TextField,
|
||||
makeStyles,
|
||||
IconButton
|
||||
} from "@material-ui/core";
|
||||
import { Visibility, VisibilityOff, LockOutlined } from "@material-ui/icons";
|
||||
import { InputAdornment, TextField, makeStyles, IconButton } from "@mui/material";
|
||||
import { Visibility, VisibilityOff, LockOutlined } from "@mui/icons-material";
|
||||
|
||||
const useStyles = makeStyles(theme => ({
|
||||
margin: {
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
import React from "react";
|
||||
import { IconButton } from "@material-ui/core";
|
||||
import {
|
||||
Brightness2 as MoonIcon,
|
||||
WbSunny as SunIcon
|
||||
} from "@material-ui/icons";
|
||||
import { Brightness2 as MoonIcon, WbSunny as SunIcon } from "@mui/icons-material";
|
||||
import { useApplicationTheme } from "../../providers/ThemeProvider";
|
||||
|
||||
const LightDarkToggle = () => {
|
||||
|
@ -12,11 +9,7 @@ const LightDarkToggle = () => {
|
|||
const handleChange = () => onDarkModeChanged(!isDark);
|
||||
|
||||
return (
|
||||
<IconButton
|
||||
aria-label="light-dark-toggle"
|
||||
color="inherit"
|
||||
onClick={handleChange}
|
||||
>
|
||||
<IconButton aria-label="light-dark-toggle" color="inherit" onClick={handleChange}>
|
||||
{isDark ? <SunIcon /> : <MoonIcon />}
|
||||
</IconButton>
|
||||
);
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
import React from "react";
|
||||
import { IconButton } from "@material-ui/core";
|
||||
import {
|
||||
Visibility as VisibilityIcon,
|
||||
VisibilityOff as VisibilityOffIcon
|
||||
} from "@material-ui/icons";
|
||||
import { Visibility as VisibilityIcon, VisibilityOff as VisibilityOffIcon } from "@mui/icons-material";
|
||||
import { useSensitiveInfo } from "../../hooks";
|
||||
|
||||
const SensitiveInfoToggle = () => {
|
||||
|
@ -12,11 +9,7 @@ const SensitiveInfoToggle = () => {
|
|||
const handleChange = () => onSensitiveInfoEnabled(!enabled);
|
||||
|
||||
return (
|
||||
<IconButton
|
||||
aria-label="sensitive-info-toggle"
|
||||
color="inherit"
|
||||
onClick={handleChange}
|
||||
>
|
||||
<IconButton aria-label="sensitive-info-toggle" color="inherit" onClick={handleChange}>
|
||||
{enabled ? <VisibilityOffIcon /> : <VisibilityIcon />}
|
||||
</IconButton>
|
||||
);
|
||||
|
|
|
@ -29,7 +29,7 @@ import {
|
|||
Star,
|
||||
Whatshot,
|
||||
Widgets
|
||||
} from "@material-ui/icons";
|
||||
} from "@mui/icons-material";
|
||||
|
||||
const timelineIcons = [
|
||||
Announcement,
|
||||
|
@ -84,10 +84,7 @@ const TimelineComponent = ({ releases }) => {
|
|||
</Typography>
|
||||
</TimelineOppositeContent>
|
||||
<TimelineSeparator>
|
||||
<TimelineDot
|
||||
color={release.dot.color}
|
||||
variant={release.dot.variant}
|
||||
>
|
||||
<TimelineDot color={release.dot.color} variant={release.dot.variant}>
|
||||
<release.icon />
|
||||
</TimelineDot>
|
||||
{!release.isLast && <TimelineConnector />}
|
||||
|
|
|
@ -1,14 +1,8 @@
|
|||
import React from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import { makeStyles } from "@material-ui/core/styles";
|
||||
import {
|
||||
TextField,
|
||||
InputAdornment,
|
||||
Button,
|
||||
CardActions,
|
||||
CardContent
|
||||
} from "@material-ui/core";
|
||||
import { AccountCircleOutlined } from "@material-ui/icons";
|
||||
import { TextField, InputAdornment, Button, CardActions, CardContent } from "@material-ui/core";
|
||||
import { AccountCircleOutlined } from "@mui/icons-material";
|
||||
import PasswordField from "../../../components/common/inputs/PasswordField";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import styles from "../styles";
|
||||
|
@ -49,12 +43,7 @@ const LoginComponent = ({ credentials, onChange, onLogin }) => {
|
|||
/>
|
||||
</CardContent>
|
||||
<CardActions className={classes.actions}>
|
||||
<Button
|
||||
className={classes.onRight}
|
||||
variant="contained"
|
||||
color="primary"
|
||||
onClick={onLogin}
|
||||
>
|
||||
<Button className={classes.onRight} variant="contained" color="primary" onClick={onLogin}>
|
||||
{t("Login.Label")}
|
||||
</Button>
|
||||
</CardActions>
|
||||
|
|
|
@ -4,7 +4,7 @@ import MachineTableRow from "./MachineTableRow";
|
|||
import MachineAccordion from "./MachineAccordion";
|
||||
import { ViewModes } from "./ViewModeSelection";
|
||||
import { useToast } from "../../../hooks";
|
||||
import { LastPage, RotateLeft, Launch, Stop } from "@material-ui/icons";
|
||||
import { LastPage, RotateLeft, Launch, Stop } from "@mui/icons-material";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { routes, post } from "../../../utils/api";
|
||||
|
||||
|
@ -106,20 +106,10 @@ const MachineContainer = ({ machine, viewMode }) => {
|
|||
return (
|
||||
<>
|
||||
{viewMode === ViewModes.TABLE && (
|
||||
<MachineTableRow
|
||||
machine={machine}
|
||||
actions={actions}
|
||||
logs={logs}
|
||||
addLog={addLog}
|
||||
/>
|
||||
<MachineTableRow machine={machine} actions={actions} logs={logs} addLog={addLog} />
|
||||
)}
|
||||
{viewMode === ViewModes.ACCORDION && (
|
||||
<MachineAccordion
|
||||
machine={machine}
|
||||
actions={actions}
|
||||
logs={logs}
|
||||
addLog={addLog}
|
||||
/>
|
||||
<MachineAccordion machine={machine} actions={actions} logs={logs} addLog={addLog} />
|
||||
)}
|
||||
</>
|
||||
);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import { TableCell, TableRow, IconButton, Collapse } from "@material-ui/core";
|
||||
import { KeyboardArrowDown, KeyboardArrowUp } from "@material-ui/icons";
|
||||
import { KeyboardArrowDown, KeyboardArrowUp } from "@mui/icons-material";
|
||||
import { makeStyles } from "@material-ui/core/styles";
|
||||
import MachineCollapsedContent from "./common/MachineCollapsedContent";
|
||||
import { useSensitiveInfo } from "../../../hooks";
|
||||
|
@ -24,11 +24,7 @@ const MachineTableRow = ({ machine, actions, logs, addLog }) => {
|
|||
<React.Fragment>
|
||||
<TableRow className={classes.root}>
|
||||
<TableCell>
|
||||
<IconButton
|
||||
aria-label="expand row"
|
||||
size="small"
|
||||
onClick={() => setOpen(!open)}
|
||||
>
|
||||
<IconButton aria-label="expand row" size="small" onClick={() => setOpen(!open)}>
|
||||
{open ? <KeyboardArrowUp /> : <KeyboardArrowDown />}
|
||||
</IconButton>
|
||||
</TableCell>
|
||||
|
@ -45,11 +41,7 @@ const MachineTableRow = ({ machine, actions, logs, addLog }) => {
|
|||
<TableRow>
|
||||
<TableCell style={{ paddingBottom: 0, paddingTop: 0 }} colSpan={6}>
|
||||
<Collapse in={open} timeout="auto" unmountOnExit>
|
||||
<MachineCollapsedContent
|
||||
description={machine.description}
|
||||
logs={logs}
|
||||
style={{ paddingBottom: "10px" }}
|
||||
/>
|
||||
<MachineCollapsedContent description={machine.description} logs={logs} style={{ paddingBottom: "10px" }} />
|
||||
</Collapse>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
|
|
|
@ -3,7 +3,7 @@ import PropTypes from "prop-types";
|
|||
import WakeComponent from "./WakeComponent";
|
||||
import ActionButton from "./ActionButton";
|
||||
import { Menu } from "@material-ui/core";
|
||||
import { MoreHoriz } from "@material-ui/icons";
|
||||
import { MoreHoriz } from "@mui/icons-material";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { usePermissions } from "../../../../hooks";
|
||||
|
||||
|
@ -13,15 +13,9 @@ const ActionsGroup = ({ machine, actions, addLog }) => {
|
|||
const { t } = useTranslation();
|
||||
const { operateMachines: canOperateMachines } = usePermissions();
|
||||
|
||||
const mainActions = useMemo(
|
||||
() => actions.filter(a => a.main === true),
|
||||
[actions]
|
||||
);
|
||||
const mainActions = useMemo(() => actions.filter(a => a.main === true), [actions]);
|
||||
|
||||
const secondaryActions = useMemo(
|
||||
() => actions.filter(a => a.main === false),
|
||||
[actions]
|
||||
);
|
||||
const secondaryActions = useMemo(() => actions.filter(a => a.main === false), [actions]);
|
||||
|
||||
const handleMenuOpen = (_, event) => {
|
||||
setMenuAnchor(event.currentTarget);
|
||||
|
@ -33,11 +27,7 @@ const ActionsGroup = ({ machine, actions, addLog }) => {
|
|||
|
||||
return (
|
||||
<>
|
||||
<WakeComponent
|
||||
machine={machine}
|
||||
addLog={addLog}
|
||||
disabled={!canOperateMachines}
|
||||
/>
|
||||
<WakeComponent machine={machine} addLog={addLog} disabled={!canOperateMachines} />
|
||||
{mainActions.map(action => (
|
||||
<ActionButton
|
||||
key={`machine-item-${machine.machineId}-${action.code}`}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, { useState, useEffect, useCallback } from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import { IconButton, Tooltip } from "@material-ui/core";
|
||||
import { PowerSettingsNew } from "@material-ui/icons";
|
||||
import { PowerSettingsNew } from "@mui/icons-material";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useToast } from "../../../../hooks";
|
||||
import { msToMinAndSec } from "../../../../utils/time";
|
||||
|
@ -18,10 +18,8 @@ const WakeComponent = ({ machine, addLog, disabled }) => {
|
|||
const { t } = useTranslation();
|
||||
const { success, error } = useToast();
|
||||
|
||||
const pingInterval =
|
||||
process.env.REACT_APP_MACHINE_PING_INTERVAL || defaultPingInterval;
|
||||
const startingTime =
|
||||
process.env.REACT_APP_MACHINE_STARTING_TIME || defaultStartingTime;
|
||||
const pingInterval = process.env.REACT_APP_MACHINE_PING_INTERVAL || defaultPingInterval;
|
||||
const startingTime = process.env.REACT_APP_MACHINE_STARTING_TIME || defaultStartingTime;
|
||||
|
||||
const getCurrentDateTime = useCallback(() => {
|
||||
const currentDateTime = Date.now();
|
||||
|
@ -31,10 +29,7 @@ const WakeComponent = ({ machine, addLog, disabled }) => {
|
|||
return result;
|
||||
}, [t]);
|
||||
|
||||
const log = useCallback(
|
||||
message => addLog(`[${getCurrentDateTime()}] ${message}`),
|
||||
[addLog, getCurrentDateTime]
|
||||
);
|
||||
const log = useCallback(message => addLog(`[${getCurrentDateTime()}] ${message}`), [addLog, getCurrentDateTime]);
|
||||
|
||||
const wakeMachine = useCallback(async () => {
|
||||
await post(
|
||||
|
@ -48,11 +43,7 @@ const WakeComponent = ({ machine, addLog, disabled }) => {
|
|||
success(result.status);
|
||||
|
||||
//retrigger
|
||||
log(
|
||||
`Periodic ping will be re-triggered in ${startingTime} ms [${msToMinAndSec(
|
||||
startingTime
|
||||
)}]`
|
||||
);
|
||||
log(`Periodic ping will be re-triggered in ${startingTime} ms [${msToMinAndSec(startingTime)}]`);
|
||||
setTimeout(() => {
|
||||
setTrigger(prev => !prev);
|
||||
}, startingTime);
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
import React, { Suspense } from "react";
|
||||
import ReactDOM from "react-dom";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import ThemeProvider from "./providers/ThemeProvider";
|
||||
import CssBaseline from "@material-ui/core/CssBaseline";
|
||||
import { CssBaseline } from "@mui/material";
|
||||
import AppRouter from "./components/AppRouter";
|
||||
import { TuitioProvider } from "@flare/tuitio-client-react";
|
||||
import { ToastProvider } from "./providers";
|
||||
import env from "./utils/env";
|
||||
import "./utils/i18n";
|
||||
|
||||
ReactDOM.render(
|
||||
const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
|
||||
|
||||
root.render(
|
||||
<TuitioProvider tuitioUrl={env.REACT_APP_TUITIO_URL}>
|
||||
<ThemeProvider>
|
||||
<CssBaseline />
|
||||
|
@ -18,6 +20,5 @@ ReactDOM.render(
|
|||
</ToastProvider>
|
||||
</Suspense>
|
||||
</ThemeProvider>
|
||||
</TuitioProvider>,
|
||||
document.getElementById("root")
|
||||
</TuitioProvider>
|
||||
);
|
|
@ -1,6 +1,6 @@
|
|||
import React, { useReducer, useMemo, useContext } from "react";
|
||||
import PropTypes from "prop-types";
|
||||
import { ThemeProvider as MuiThemeProvider } from "@material-ui/styles";
|
||||
import { ThemeProvider as MuiThemeProvider } from "@mui/material/styles";
|
||||
import { localStorage } from "@flare/js-utils";
|
||||
import { getThemes } from "../themes";
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ const handleError = err => {
|
|||
};
|
||||
|
||||
const defaultOptions = {
|
||||
onCompleted: () => {},
|
||||
onCompleted: () => null,
|
||||
onError: handleError
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue