Skip to content

Commit 1663b93

Browse files
authored
Merge pull request #3252 from illume/nobarrel
frontend: Refactoring mui named imports from top level to individual component imports
2 parents acf6b31 + 9b3b051 commit 1663b93

File tree

91 files changed

+285
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+285
-179
lines changed

frontend/src/components/App/AppContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { GlobalStyles } from '@mui/material';
17+
import GlobalStyles from '@mui/material/GlobalStyles';
1818
import { SnackbarProvider } from 'notistack';
1919
import React from 'react';
2020
import { BrowserRouter, HashRouter } from 'react-router-dom';

frontend/src/components/App/AppLogo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Theme } from '@mui/material';
17+
import { Theme } from '@mui/material/styles';
1818
import { SxProps } from '@mui/system';
1919
import React, { isValidElement, ReactElement } from 'react';
2020
import { getThemeName, useNavBarMode } from '../../lib/themes';

frontend/src/components/App/CreateCluster/AddCluster.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
*/
1616

1717
import { InlineIcon } from '@iconify/react';
18-
import { Button, Card, CardContent, CardHeader, Grid, Typography } from '@mui/material';
18+
import Button from '@mui/material/Button';
19+
import Card from '@mui/material/Card';
20+
import CardContent from '@mui/material/CardContent';
21+
import CardHeader from '@mui/material/CardHeader';
22+
import Grid from '@mui/material/Grid';
23+
import Typography from '@mui/material/Typography';
1924
import React from 'react';
2025
import { useTranslation } from 'react-i18next';
2126
import { useHistory } from 'react-router-dom';

frontend/src/components/App/Home/ClusterTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616

1717
import { Icon } from '@iconify/react';
18-
import { Button, useTheme } from '@mui/material';
1918
import Box from '@mui/material/Box';
19+
import Button from '@mui/material/Button';
20+
import { useTheme } from '@mui/material/styles';
2021
import Typography from '@mui/material/Typography';
2122
import { useTranslation } from 'react-i18next';
2223
import { generatePath, useHistory } from 'react-router-dom';

frontend/src/components/App/Home/RecentClusters.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Button, Grid, ToggleButton as MuiToggledButton, ToggleButtonGroup } from '@mui/material';
17+
import Button from '@mui/material/Button';
18+
import Grid from '@mui/material/Grid';
19+
import MuiToggledButton from '@mui/material/ToggleButton';
20+
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
1821
import { styled } from '@mui/system';
1922
import React from 'react';
2023
import { useTranslation } from 'react-i18next';

frontend/src/components/App/Home/SquareButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616

1717
import { Icon } from '@iconify/react';
18-
import { useTheme } from '@mui/material';
1918
import ButtonBase, { ButtonBaseProps } from '@mui/material/ButtonBase';
2019
import Card from '@mui/material/Card';
2120
import CardContent from '@mui/material/CardContent';
21+
import { useTheme } from '@mui/material/styles';
2222
import Typography from '@mui/material/Typography';
2323

2424
export interface SquareButtonProps extends ButtonBaseProps {

frontend/src/components/App/Layout.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Box, Button } from '@mui/material';
17+
import Box from '@mui/material/Box';
18+
import Button from '@mui/material/Button';
1819
import Container from '@mui/material/Container';
1920
import CssBaseline from '@mui/material/CssBaseline';
2021
import Link from '@mui/material/Link';

frontend/src/components/App/Notifications/List/List.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@
1515
*/
1616

1717
import { Icon } from '@iconify/react';
18-
import { Box, IconButton, Menu, MenuItem, Tooltip, Typography, useTheme } from '@mui/material';
18+
import Box from '@mui/material/Box';
19+
import IconButton from '@mui/material/IconButton';
20+
import Menu from '@mui/material/Menu';
21+
import MenuItem from '@mui/material/MenuItem';
22+
import { useTheme } from '@mui/material/styles';
23+
import Tooltip from '@mui/material/Tooltip';
24+
import Typography from '@mui/material/Typography';
1925
import { useMemo, useState } from 'react';
2026
import { useTranslation } from 'react-i18next';
2127
import { useDispatch } from 'react-redux';

frontend/src/components/App/Notifications/Notifications.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@
1616

1717
import bellIcon from '@iconify/icons-mdi/bell';
1818
import { Icon } from '@iconify/react';
19-
import {
20-
Badge,
21-
Box,
22-
Button,
23-
Grid,
24-
IconButton,
25-
ListItem,
26-
Popover,
27-
Tooltip,
28-
Typography,
29-
useTheme,
30-
} from '@mui/material';
19+
import Badge from '@mui/material/Badge';
20+
import Box from '@mui/material/Box';
21+
import Button from '@mui/material/Button';
22+
import Grid from '@mui/material/Grid';
23+
import IconButton from '@mui/material/IconButton';
24+
import ListItem from '@mui/material/ListItem';
25+
import Popover from '@mui/material/Popover';
26+
import { useTheme } from '@mui/material/styles';
27+
import Tooltip from '@mui/material/Tooltip';
28+
import Typography from '@mui/material/Typography';
3129
import { useEffect, useMemo, useState } from 'react';
3230
import { useTranslation } from 'react-i18next';
3331
import { useDispatch } from 'react-redux';

frontend/src/components/App/PluginSettings/PluginSettings.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Switch, SwitchProps, Typography, useTheme } from '@mui/material';
1817
import Box from '@mui/material/Box';
1918
import Button from '@mui/material/Button';
2019
import Link from '@mui/material/Link';
20+
import { useTheme } from '@mui/material/styles';
21+
import { SwitchProps } from '@mui/material/Switch';
22+
import Switch from '@mui/material/Switch';
23+
import Typography from '@mui/material/Typography';
2124
import { MRT_Row } from 'material-react-table';
2225
import { useEffect, useState } from 'react';
2326
import { useTranslation } from 'react-i18next';

frontend/src/components/App/PluginSettings/PluginSettingsDetails.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { TextField } from '@mui/material';
17+
import TextField from '@mui/material/TextField';
1818
import { Meta, StoryFn } from '@storybook/react';
1919
import React from 'react';
2020
import { PluginInfo, PluginSettingsDetailsProps } from '../../../plugin/pluginsSlice';

frontend/src/components/App/Settings/DrawerModeSettings.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { FormControlLabel, Switch } from '@mui/material';
17+
import FormControlLabel from '@mui/material/FormControlLabel';
18+
import Switch from '@mui/material/Switch';
1819
import React from 'react';
1920
import { useTranslation } from 'react-i18next';
2021
import { useDispatch } from 'react-redux';

frontend/src/components/App/Settings/NumRowsInput.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515
*/
1616

1717
import { Icon } from '@iconify/react';
18-
import {
19-
Box,
20-
Button,
21-
FormControl,
22-
IconButton,
23-
ListItemSecondaryAction,
24-
ListItemText,
25-
MenuItem,
26-
Select,
27-
SelectChangeEvent,
28-
TextField,
29-
} from '@mui/material';
18+
import Box from '@mui/material/Box';
19+
import Button from '@mui/material/Button';
20+
import FormControl from '@mui/material/FormControl';
21+
import IconButton from '@mui/material/IconButton';
22+
import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
23+
import ListItemText from '@mui/material/ListItemText';
24+
import MenuItem from '@mui/material/MenuItem';
25+
import { SelectChangeEvent } from '@mui/material/Select';
26+
import Select from '@mui/material/Select';
27+
import TextField from '@mui/material/TextField';
3028
import { useCallback, useEffect, useMemo, useState } from 'react';
3129
import { useTranslation } from 'react-i18next';
3230
import { useDispatch } from 'react-redux';

frontend/src/components/App/Settings/Settings.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Box, MenuItem, Select, Switch } from '@mui/material';
17+
import Box from '@mui/material/Box';
18+
import MenuItem from '@mui/material/MenuItem';
19+
import Select from '@mui/material/Select';
20+
import Switch from '@mui/material/Switch';
1821
import { capitalize } from 'lodash';
1922
import { useEffect, useState } from 'react';
2023
import { useTranslation } from 'react-i18next';

frontend/src/components/App/Settings/SettingsCluster.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515
*/
1616

1717
import { Icon, InlineIcon } from '@iconify/react';
18-
import {
19-
Box,
20-
Chip,
21-
FormControl,
22-
IconButton,
23-
InputLabel,
24-
MenuItem,
25-
Select,
26-
TextField,
27-
Typography,
28-
} from '@mui/material';
18+
import Box from '@mui/material/Box';
19+
import Chip from '@mui/material/Chip';
20+
import FormControl from '@mui/material/FormControl';
21+
import IconButton from '@mui/material/IconButton';
22+
import InputLabel from '@mui/material/InputLabel';
23+
import MenuItem from '@mui/material/MenuItem';
24+
import Select from '@mui/material/Select';
2925
import { useTheme } from '@mui/material/styles';
26+
import TextField from '@mui/material/TextField';
27+
import Typography from '@mui/material/Typography';
3028
import React from 'react';
3129
import { useTranslation } from 'react-i18next';
3230
import { useDispatch } from 'react-redux';

frontend/src/components/App/VersionDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { DialogContent } from '@mui/material';
17+
import DialogContent from '@mui/material/DialogContent';
1818
import { useTranslation } from 'react-i18next';
1919
import { useDispatch } from 'react-redux';
2020
import { getProductName, getVersion } from '../../helpers/getProductInfo';

frontend/src/components/Sidebar/ListItemLink.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
*/
1616

1717
import { Icon, IconProps } from '@iconify/react';
18-
import { alpha, ListItemButton, styled, Tooltip } from '@mui/material';
18+
import ListItemButton from '@mui/material/ListItemButton';
1919
import ListItemIcon from '@mui/material/ListItemIcon';
2020
import ListItemText from '@mui/material/ListItemText';
21+
import { styled } from '@mui/material/styles';
22+
import Tooltip from '@mui/material/Tooltip';
23+
import { alpha } from '@mui/system/colorManipulator';
2124
import React from 'react';
2225
import { Link as RouterLink, LinkProps as RouterLinkProps } from 'react-router-dom';
2326

frontend/src/components/Sidebar/NavigationTabs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Divider } from '@mui/material';
1817
import Box from '@mui/material/Box';
18+
import Divider from '@mui/material/Divider';
1919
import { useTheme } from '@mui/material/styles';
2020
import useMediaQuery from '@mui/material/useMediaQuery';
2121
import { useTranslation } from 'react-i18next';

frontend/src/components/Sidebar/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
import { InlineIcon } from '@iconify/react';
18-
import { Button } from '@mui/material';
1918
import Box from '@mui/material/Box';
19+
import Button from '@mui/material/Button';
2020
import Drawer from '@mui/material/Drawer';
2121
import Grid from '@mui/material/Grid';
2222
import List from '@mui/material/List';

frontend/src/components/account/Auth.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Typography } from '@mui/material';
1817
import Box from '@mui/material/Box';
1918
import Button from '@mui/material/Button';
2019
import DialogActions from '@mui/material/DialogActions';
@@ -23,6 +22,7 @@ import DialogContentText from '@mui/material/DialogContentText';
2322
import Link from '@mui/material/Link';
2423
import Snackbar, { SnackbarCloseReason } from '@mui/material/Snackbar';
2524
import TextField from '@mui/material/TextField';
25+
import Typography from '@mui/material/Typography';
2626
import React from 'react';
2727
import { Trans, useTranslation } from 'react-i18next';
2828
import { generatePath, useHistory } from 'react-router-dom';

frontend/src/components/authchooser/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616

1717
import { InlineIcon } from '@iconify/react';
18-
import { Box, Button } from '@mui/material';
18+
import Box from '@mui/material/Box';
19+
import Button from '@mui/material/Button';
1920
import { styled } from '@mui/system';
2021
import _ from 'lodash';
2122
import React from 'react';

frontend/src/components/cluster/Chooser.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
*/
1616

1717
import { Icon, InlineIcon } from '@iconify/react';
18-
import { DialogActions, IconButton } from '@mui/material';
1918
import Autocomplete from '@mui/material/Autocomplete';
2019
import Box from '@mui/material/Box';
2120
import ButtonBase from '@mui/material/ButtonBase';
2221
import Card from '@mui/material/Card';
2322
import CardContent from '@mui/material/CardContent';
2423
import Container from '@mui/material/Container';
2524
import Dialog, { DialogProps } from '@mui/material/Dialog';
25+
import DialogActions from '@mui/material/DialogActions';
2626
import DialogContent from '@mui/material/DialogContent';
2727
import DialogContentText from '@mui/material/DialogContentText';
2828
import Grid from '@mui/material/Grid';
29+
import IconButton from '@mui/material/IconButton';
2930
import { useTheme } from '@mui/material/styles';
3031
import TextField from '@mui/material/TextField';
3132
import Typography from '@mui/material/Typography';

frontend/src/components/cluster/ClusterChooserPopup.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@
1515
*/
1616

1717
import { Icon } from '@iconify/react';
18-
import {
19-
ListItemIcon,
20-
ListSubheader,
21-
MenuItem,
22-
MenuList,
23-
Popover,
24-
useMediaQuery,
25-
} from '@mui/material';
2618
import Box from '@mui/material/Box';
2719
import Button from '@mui/material/Button';
2820
import Divider from '@mui/material/Divider';
21+
import ListItemIcon from '@mui/material/ListItemIcon';
2922
import ListItemText from '@mui/material/ListItemText';
23+
import ListSubheader from '@mui/material/ListSubheader';
24+
import MenuItem from '@mui/material/MenuItem';
25+
import MenuList from '@mui/material/MenuList';
26+
import Popover from '@mui/material/Popover';
3027
import { useTheme } from '@mui/material/styles';
3128
import TextField from '@mui/material/TextField';
29+
import useMediaQuery from '@mui/material/useMediaQuery';
3230
import React from 'react';
3331
import { useTranslation } from 'react-i18next';
3432
import { generatePath } from 'react-router';

frontend/src/components/cluster/ClusterGroupErrorMessage.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { Alert, AlertTitle, Box, Button } from '@mui/material';
17+
import Alert from '@mui/material/Alert';
18+
import AlertTitle from '@mui/material/AlertTitle';
19+
import Box from '@mui/material/Box';
20+
import Button from '@mui/material/Button';
1821
import { useState } from 'react';
1922
import { useTranslation } from 'react-i18next';
2023
import { useSelectedClusters } from '../../lib/k8s';

frontend/src/components/cluster/KubeConfigLoader.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
*/
1616

1717
import { InlineIcon } from '@iconify/react';
18-
import { Button, Checkbox, FormControl, Grid, Tooltip } from '@mui/material';
1918
import Box from '@mui/material/Box';
19+
import Button from '@mui/material/Button';
20+
import Checkbox from '@mui/material/Checkbox';
21+
import FormControl from '@mui/material/FormControl';
2022
import FormControlLabel from '@mui/material/FormControlLabel';
23+
import Grid from '@mui/material/Grid';
24+
import Tooltip from '@mui/material/Tooltip';
2125
import Typography from '@mui/material/Typography';
2226
import { styled } from '@mui/system';
2327
import * as yaml from 'js-yaml';

frontend/src/components/cluster/Overview.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { FormControlLabel, Switch, Theme } from '@mui/material';
17+
import FormControlLabel from '@mui/material/FormControlLabel';
1818
import Grid from '@mui/material/Grid';
19+
import { Theme } from '@mui/material/styles';
20+
import Switch from '@mui/material/Switch';
1921
import React from 'react';
2022
import { useTranslation } from 'react-i18next';
2123
import { useLocation } from 'react-router';

frontend/src/components/common/ActionButton/ActionButton.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
*/
1616

1717
import { Icon, IconifyIcon, IconProps } from '@iconify/react';
18-
import { ListItemIcon, ListItemText, MenuItem } from '@mui/material';
1918
import IconButton, { IconButtonProps } from '@mui/material/IconButton';
19+
import ListItemIcon from '@mui/material/ListItemIcon';
20+
import ListItemText from '@mui/material/ListItemText';
21+
import MenuItem from '@mui/material/MenuItem';
2022
import Tooltip from '@mui/material/Tooltip';
2123
import React from 'react';
2224

0 commit comments

Comments
 (0)