From 212a8fc7defb6900dc9ee60d4f3fae870f54bbc4 Mon Sep 17 00:00:00 2001 From: Dajahi Wiley Date: Fri, 30 Jun 2023 13:12:37 -0400 Subject: [PATCH 1/6] Moved Di vider.tsx out of /core and updated code patterns; added Create menu-specific styling to match prod --- .../components/AccessPanel/AccessPanel.tsx | 2 +- .../CheckoutBar/DisplaySectionList.tsx | 2 +- packages/manager/src/components/Divider.tsx | 33 +++++++++++++++ .../LongviewLineGraph/LongviewLineGraph.tsx | 2 +- .../src/components/PrimaryNav/NavItem.tsx | 2 +- .../src/components/PrimaryNav/PrimaryNav.tsx | 2 +- .../components/StackScript/StackScript.tsx | 2 +- .../manager/src/components/core/Divider.tsx | 42 ------------------- .../BillingSummary/BillingSummary.tsx | 2 +- .../PaymentDrawer/PaymentDrawer.tsx | 2 +- .../AddPaymentMethodDrawer.tsx | 2 +- .../DatabaseCreate/DatabaseCreate.tsx | 2 +- .../DatabaseSettings/DatabaseSettings.tsx | 2 +- .../DatabaseSummary/DatabaseSummary.tsx | 2 +- .../KubeCheckoutBar/KubeCheckoutBar.tsx | 2 +- .../KubeCheckoutBar/NodePoolSummary.tsx | 2 +- .../features/Linodes/CloneLanding/Details.tsx | 2 +- .../Linodes/LinodesCreate/AddonsPanel.tsx | 2 +- .../Linodes/LinodesCreate/AppPanelSection.tsx | 2 +- .../LinodeConfigs/LinodeConfigDialog.tsx | 2 +- .../LinodeNetworking/IPSharing.tsx | 2 +- .../LinodeNetworking/IPTransfer.tsx | 2 +- .../LinodeRebuild/RebuildFromImage.tsx | 2 +- .../LinodeSettings/AlertSection.tsx | 2 +- .../LinodeSettings/InterfaceSelect.tsx | 2 +- .../NodeBalancers/NodeBalancerConfigNode.tsx | 2 +- .../NodeBalancers/NodeBalancerConfigPanel.tsx | 2 +- .../NotificationData/RenderEvent.tsx | 2 +- .../NotificationData/RenderNotification.tsx | 2 +- .../NotificationData/RenderProgressEvent.tsx | 2 +- .../BucketDetail/ObjectDetailsDrawer.tsx | 2 +- .../BucketLanding/BucketDetailsDrawer.tsx | 2 +- .../AuthenticationSettings.tsx | 2 +- .../AuthenticationSettings/TPAProviders.tsx | 2 +- .../TwoFactor/EnableTwoFactorForm.tsx | 2 +- .../DisplaySettings/DisplaySettings.tsx | 2 +- .../UserDefinedFieldsPanel.tsx | 2 +- .../manager/src/features/Support/Hively.tsx | 2 +- .../TopMenu/AddNewMenu/AddNewMenu.tsx | 8 +++- .../src/features/Users/UserPermissions.tsx | 2 +- 40 files changed, 77 insertions(+), 80 deletions(-) create mode 100644 packages/manager/src/components/Divider.tsx delete mode 100644 packages/manager/src/components/core/Divider.tsx diff --git a/packages/manager/src/components/AccessPanel/AccessPanel.tsx b/packages/manager/src/components/AccessPanel/AccessPanel.tsx index e6a229dbcff..1a05958634e 100644 --- a/packages/manager/src/components/AccessPanel/AccessPanel.tsx +++ b/packages/manager/src/components/AccessPanel/AccessPanel.tsx @@ -4,7 +4,7 @@ import Paper from 'src/components/core/Paper'; import { Notice } from 'src/components/Notice/Notice'; import SuspenseLoader from 'src/components/SuspenseLoader'; import { makeStyles } from 'tss-react/mui'; -import Divider from '../core/Divider'; +import Divider from '../Divider'; import UserSSHKeyPanel from './UserSSHKeyPanel'; const PasswordInput = React.lazy( diff --git a/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx b/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx index e662538a316..fcf7f6381ce 100644 --- a/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx +++ b/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from '../core/Divider'; +import Divider from '../Divider'; import { DisplaySection } from './DisplaySection'; interface DisplaySectionListProps { diff --git a/packages/manager/src/components/Divider.tsx b/packages/manager/src/components/Divider.tsx new file mode 100644 index 00000000000..800241def02 --- /dev/null +++ b/packages/manager/src/components/Divider.tsx @@ -0,0 +1,33 @@ +import Divider, { DividerProps as _DividerProps } from '@mui/material/Divider'; +import * as React from 'react'; +import { styled } from '@mui/material/styles'; +import { isPropValid } from 'src/utilities/isPropValid'; + +export interface DividerProps extends _DividerProps { + dark?: boolean; + light?: boolean; + spacingTop?: number; + spacingBottom?: number; +} + +const _Divider = (props: DividerProps) => { + return ; +}; + +export default _Divider; + +const StyledDivider = styled(Divider, { + label: 'StyledDivider', + shouldForwardProp: (prop) => + isPropValid(['spacingTop', 'spacingBottom'], prop), +})(({ theme, ...props }) => ({ + borderColor: props.dark + ? theme.color.border2 + : props.light + ? theme.name === 'light' + ? '#e3e5e8' + : '#2e3238' + : '', + marginTop: props.spacingTop, + marginBottom: props.spacingBottom, +})); diff --git a/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx b/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx index 10311f30f10..107530e14ce 100644 --- a/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx +++ b/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/components/PrimaryNav/NavItem.tsx b/packages/manager/src/components/PrimaryNav/NavItem.tsx index 1dc8e0ca648..798e167a3f5 100644 --- a/packages/manager/src/components/PrimaryNav/NavItem.tsx +++ b/packages/manager/src/components/PrimaryNav/NavItem.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router-dom'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import ListItem from 'src/components/core/ListItem'; import ListItemText from 'src/components/core/ListItemText'; import Tooltip from 'src/components/core/Tooltip'; diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx index b2e02e1f2b9..cd6ab6b4f67 100644 --- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx +++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx @@ -18,7 +18,7 @@ import TooltipIcon from 'src/assets/icons/get_help.svg'; import Longview from 'src/assets/icons/longview.svg'; import AkamaiLogo from 'src/assets/logo/akamai-logo.svg'; import { BetaChip } from 'src/components/BetaChip/BetaChip'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import useAccountManagement from 'src/hooks/useAccountManagement'; import useFlags from 'src/hooks/useFlags'; import usePrefetch from 'src/hooks/usePreFetch'; diff --git a/packages/manager/src/components/StackScript/StackScript.tsx b/packages/manager/src/components/StackScript/StackScript.tsx index eba8f6b6bff..4ca9d78a101 100644 --- a/packages/manager/src/components/StackScript/StackScript.tsx +++ b/packages/manager/src/components/StackScript/StackScript.tsx @@ -6,7 +6,7 @@ import { Link, useHistory } from 'react-router-dom'; import { Button } from 'src/components/Button/Button'; import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip'; import { Chip } from 'src/components/core/Chip'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import { DateTimeDisplay } from 'src/components/DateTimeDisplay'; import { H1Header } from 'src/components/H1Header/H1Header'; diff --git a/packages/manager/src/components/core/Divider.tsx b/packages/manager/src/components/core/Divider.tsx deleted file mode 100644 index 60e55abc367..00000000000 --- a/packages/manager/src/components/core/Divider.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import Divider, { DividerProps as _DividerProps } from '@mui/material/Divider'; -import classNames from 'classnames'; -import * as React from 'react'; -import { makeStyles } from '@mui/styles'; -import { Theme } from '@mui/material/styles'; - -const useStyles = makeStyles((theme: Theme) => ({ - light: { - borderColor: theme.name === 'light' ? '#e3e5e8' : '#2e3238', - }, - dark: { - borderColor: theme.color.border2, - }, -})); - -/* eslint-disable-next-line */ -export interface DividerProps extends _DividerProps {} - -interface Props extends _DividerProps { - dark?: boolean; - light?: boolean; - spacingTop?: number; - spacingBottom?: number; -} - -const _Divider: React.FC = (props) => { - const classes = useStyles(); - const { dark, light, spacingTop, spacingBottom, ...rest } = props; - - return ( - - ); -}; - -export default _Divider; diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx index 77437a439f7..fe66d774110 100644 --- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Box } from 'src/components/Box'; import { Button } from 'src/components/Button/Button'; import { Currency } from 'src/components/Currency'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import Grid from '@mui/material/Unstable_Grid2'; import PaymentDrawer from './PaymentDrawer'; import PromoDialog from './PromoDialog'; diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx index ff0927858d7..4a504b213ab 100644 --- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx @@ -4,7 +4,7 @@ import { APIWarning } from '@linode/api-v4/lib/types'; import { useSnackbar } from 'notistack'; import * as React from 'react'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import InputAdornment from 'src/components/core/InputAdornment'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx index 40cd5ed623e..61442ea5a0e 100644 --- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { PaymentMethod } from '@linode/api-v4/lib/account'; import { VariantType } from 'notistack'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import Drawer from 'src/components/Drawer'; import Grid from '@mui/material/Unstable_Grid2'; diff --git a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx index ae4d4cb9ae2..4243601dfbf 100644 --- a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx +++ b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx @@ -20,7 +20,7 @@ import PostgreSQLIcon from 'src/assets/icons/postgresql.svg'; import { BetaChip } from 'src/components/BetaChip/BetaChip'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import FormControl from 'src/components/core/FormControl'; import FormControlLabel from 'src/components/core/FormControlLabel'; import Paper from 'src/components/core/Paper'; diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx index c3160183e87..da16b12d3e1 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx @@ -1,6 +1,6 @@ import { Database } from '@linode/api-v4/lib/databases/types'; import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import Paper from 'src/components/core/Paper'; import { Typography } from 'src/components/Typography'; import { useProfile } from 'src/queries/profile'; diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx index fcfd9bb611d..68dbeadcb58 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx @@ -1,6 +1,6 @@ import { Database } from '@linode/api-v4/lib/databases/types'; import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import Paper from 'src/components/core/Paper'; import { Typography } from 'src/components/Typography'; import Grid from '@mui/material/Unstable_Grid2'; diff --git a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx index e53225401be..1eddb5fd5cc 100644 --- a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx +++ b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx @@ -2,7 +2,7 @@ import { KubeNodePoolResponse } from '@linode/api-v4'; import * as React from 'react'; import { CheckoutBar } from 'src/components/CheckoutBar/CheckoutBar'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Notice } from 'src/components/Notice/Notice'; import renderGuard from 'src/components/RenderGuard'; import EUAgreementCheckbox from 'src/features/Account/Agreements/EUAgreementCheckbox'; diff --git a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx index c7fd6808bec..3c4415dd830 100644 --- a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx +++ b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx @@ -1,7 +1,7 @@ import Close from '@mui/icons-material/Close'; import * as React from 'react'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx index 1a71d501c34..0c2faad0dbc 100644 --- a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx +++ b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx @@ -2,7 +2,7 @@ import { Disk, Linode } from '@linode/api-v4/lib/linodes'; import Close from '@mui/icons-material/Close'; import * as React from 'react'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import List from 'src/components/core/List'; import ListItem from 'src/components/core/ListItem'; import Paper from 'src/components/core/Paper'; diff --git a/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx b/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx index 048de854ae8..cdae40eab78 100644 --- a/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx +++ b/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx @@ -2,7 +2,7 @@ import { Interface, Linode } from '@linode/api-v4/lib/linodes'; import * as React from 'react'; import { Link } from 'react-router-dom'; import CheckBox from 'src/components/CheckBox'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import FormControlLabel from 'src/components/core/FormControlLabel'; import Paper from 'src/components/core/Paper'; import { makeStyles } from '@mui/styles'; diff --git a/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx b/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx index a7dcbb05e50..43cbe06929a 100644 --- a/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx +++ b/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx @@ -1,7 +1,7 @@ import { StackScript, UserDefinedField } from '@linode/api-v4/lib/stackscripts'; import { decode } from 'he'; import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { styled } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; import Grid from '@mui/material/Unstable_Grid2'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx index d4bd055c719..143c6b8f936 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx @@ -11,7 +11,7 @@ import { StyledActionPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import FormControl from 'src/components/core/FormControl'; import FormControlLabel from 'src/components/core/FormControlLabel'; import FormGroup from 'src/components/core/FormGroup'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx index 66647adfdb0..0b38a66a9e0 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx @@ -7,7 +7,7 @@ import { StyledActionPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { Link } from 'src/components/Link'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx index ff20215d86e..c903f19e535 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx @@ -16,7 +16,7 @@ import * as React from 'react'; import { StyledActionPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx index c297d455f75..635ec0ed787 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx @@ -15,7 +15,7 @@ import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import CheckBox from 'src/components/CheckBox'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import Grid from '@mui/material/Unstable_Grid2'; import ImageSelect from 'src/components/ImageSelect'; import { TypeToConfirm } from 'src/components/TypeToConfirm/TypeToConfirm'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx index 7ecedf2968b..9eb2d4e9cc6 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import FormControlLabel from 'src/components/core/FormControlLabel'; import InputAdornment from 'src/components/core/InputAdornment'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx index 35684ee2ac7..94d57b966a7 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx @@ -3,7 +3,7 @@ import { InterfacePurpose, } from '@linode/api-v4/lib/linodes/types'; import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { makeStyles } from '@mui/styles'; import { Theme, useTheme } from '@mui/material/styles'; import Select, { Item } from 'src/components/EnhancedSelect/Select'; diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx index 97cd5120f2f..06a56b0619f 100644 --- a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx +++ b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import Grid from '@mui/material/Unstable_Grid2'; import MenuItem from 'src/components/core/MenuItem'; import { TextField } from 'src/components/TextField'; diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx index b773d378c3f..54f5931aac6 100644 --- a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx +++ b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import FormHelperText from 'src/components/core/FormHelperText'; import Grid from '@mui/material/Unstable_Grid2'; import { Link } from 'src/components/Link'; diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx index 1adc040e7f3..41b3a9aa071 100644 --- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx +++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Box } from 'src/components/Box'; import classNames from 'classnames'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { HighlightedMarkdown } from 'src/components/HighlightedMarkdown/HighlightedMarkdown'; import { Typography } from 'src/components/Typography'; import useEventInfo from './useEventInfo'; diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx index 5f544a7930c..9b2a2e0db5f 100644 --- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx +++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx @@ -2,7 +2,7 @@ import { NotificationType } from '@linode/api-v4/lib/account'; import ErrorIcon from '@mui/icons-material/Error'; import WarningIcon from '@mui/icons-material/Warning'; import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { useTheme, styled } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; import Box from '@mui/material/Box'; diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx index 8705dff018b..c6a0d89768f 100644 --- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx +++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import BarPercent from 'src/components/BarPercent'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import { Duration } from 'luxon'; import { Event } from '@linode/api-v4/lib/account/types'; diff --git a/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx index e0a16d0e32c..333d24619f3 100644 --- a/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx +++ b/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import Drawer from 'src/components/Drawer'; import ExternalLink from 'src/components/ExternalLink'; import formatDate from 'src/utilities/formatDate'; diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx index 403ed670935..54e1d49ed03 100644 --- a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx +++ b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx @@ -6,7 +6,7 @@ import { import * as React from 'react'; import { Link } from 'react-router-dom'; import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import Drawer from 'src/components/Drawer'; import ExternalLink from 'src/components/ExternalLink'; diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx index b33073c042d..48daa57bd72 100644 --- a/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx +++ b/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Link } from 'src/components/Link'; import Paper from 'src/components/core/Paper'; import TrustedDevices from './TrustedDevices'; diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx index 09842369505..55f99a6ca89 100644 --- a/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx +++ b/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import AkamaiWaveOnlyIcon from 'src/assets/icons/providers/akamai-logo-rgb-waveOnly.svg'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import EnabledIcon from 'src/assets/icons/checkmark-enabled.svg'; import ExternalLink from 'src/components/ExternalLink'; import GitHubIcon from 'src/assets/icons/providers/github-logo.svg'; diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx index 8279d66ecea..7833e943a0d 100644 --- a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx +++ b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import scrollErrorIntoView from 'src/utilities/scrollErrorIntoView'; import { APIError } from '@linode/api-v4/lib/types'; import { CircleProgress } from 'src/components/CircleProgress'; diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx index 8623c1341bd..6c216d841c1 100644 --- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx +++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import ExternalLink from 'src/components/ExternalLink'; import { Link } from 'src/components/Link'; import Paper from 'src/components/core/Paper'; diff --git a/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx b/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx index ec136d3c9e9..9968971b9ed 100644 --- a/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx +++ b/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx @@ -9,7 +9,7 @@ import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; import Grid from '@mui/material/Unstable_Grid2'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Notice } from 'src/components/Notice/Notice'; import RenderGuard from 'src/components/RenderGuard'; import ShowMoreExpansion from 'src/components/ShowMoreExpansion'; diff --git a/packages/manager/src/features/Support/Hively.tsx b/packages/manager/src/features/Support/Hively.tsx index 878dcbb4f4d..fbba8c1b889 100644 --- a/packages/manager/src/features/Support/Hively.tsx +++ b/packages/manager/src/features/Support/Hively.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DateTime } from 'luxon'; import { parseAPIDate } from 'src/utilities/date'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx b/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx index ab67002741b..9ee8710b2fd 100644 --- a/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx +++ b/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx @@ -11,7 +11,7 @@ import OneClickIcon from 'src/assets/icons/entityIcons/oneclick.svg'; import VolumeIcon from 'src/assets/icons/entityIcons/volume.svg'; import DatabaseIcon from 'src/assets/icons/entityIcons/database.svg'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import { Link } from 'react-router-dom'; import { Box, @@ -127,6 +127,12 @@ export const AddNewMenu = () => { // If we revise our theme's shadows, we could consider removing sx: { boxShadow: '0 2px 3px 3px rgba(0, 0, 0, 0.1)' }, }} + sx={{ + '& hr': { + marginTop: '0 !important', + marginBottom: '0 !important', + }, + }} > {links.map((link, i) => [ i !== 0 && , diff --git a/packages/manager/src/features/Users/UserPermissions.tsx b/packages/manager/src/features/Users/UserPermissions.tsx index 7f360561e75..e5923f86791 100644 --- a/packages/manager/src/features/Users/UserPermissions.tsx +++ b/packages/manager/src/features/Users/UserPermissions.tsx @@ -13,7 +13,7 @@ import * as React from 'react'; import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/core/Divider'; +import Divider from 'src/components/Divider'; import FormControlLabel from 'src/components/core/FormControlLabel'; import Paper from 'src/components/core/Paper'; import { withStyles } from 'tss-react/mui'; From 93917b875e1bc96d65e566bec6df9f2cf7681b74 Mon Sep 17 00:00:00 2001 From: Dajahi Wiley Date: Fri, 30 Jun 2023 13:29:40 -0400 Subject: [PATCH 2/6] Changeset added --- packages/manager/.changeset/pr-9353-changed-1688145967385.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/manager/.changeset/pr-9353-changed-1688145967385.md diff --git a/packages/manager/.changeset/pr-9353-changed-1688145967385.md b/packages/manager/.changeset/pr-9353-changed-1688145967385.md new file mode 100644 index 00000000000..15b6d5cdbed --- /dev/null +++ b/packages/manager/.changeset/pr-9353-changed-1688145967385.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Changed +--- + +MUI v5 Migration - `Components > Divider` ([#9353](https://github.com/linode/manager/pull/9353)) From 888a1342a9a14fbd447b1d200328c6882a69e9ea Mon Sep 17 00:00:00 2001 From: Dajahi Wiley Date: Fri, 30 Jun 2023 14:35:05 -0400 Subject: [PATCH 3/6] Feedback --- .../src/components/AccessPanel/AccessPanel.tsx | 2 +- .../CheckoutBar/DisplaySectionList.tsx | 2 +- .../manager/src/components/Divider.stories.tsx | 16 ++++++++++++++++ packages/manager/src/components/Divider.tsx | 10 ++++------ .../LongviewLineGraph/LongviewLineGraph.tsx | 2 +- .../src/components/PrimaryNav/NavItem.tsx | 2 +- .../src/components/PrimaryNav/PrimaryNav.tsx | 2 +- .../src/components/StackScript/StackScript.tsx | 2 +- .../BillingSummary/BillingSummary.tsx | 2 +- .../PaymentDrawer/PaymentDrawer.tsx | 2 +- .../AddPaymentMethodDrawer.tsx | 2 +- .../Databases/DatabaseCreate/DatabaseCreate.tsx | 2 +- .../DatabaseSettings/DatabaseSettings.tsx | 2 +- .../DatabaseSummary/DatabaseSummary.tsx | 2 +- .../KubeCheckoutBar/KubeCheckoutBar.tsx | 2 +- .../KubeCheckoutBar/NodePoolSummary.tsx | 2 +- .../NodeBalancers/NodeBalancerConfigNode.tsx | 2 +- .../NodeBalancers/NodeBalancerConfigPanel.tsx | 2 +- .../NotificationData/RenderEvent.tsx | 2 +- .../NotificationData/RenderNotification.tsx | 2 +- .../NotificationData/RenderProgressEvent.tsx | 2 +- .../BucketDetail/ObjectDetailsDrawer.tsx | 2 +- .../BucketLanding/BucketDetailsDrawer.tsx | 2 +- .../AuthenticationSettings.tsx | 2 +- .../AuthenticationSettings/TPAProviders.tsx | 2 +- .../TwoFactor/EnableTwoFactorForm.tsx | 2 +- .../Profile/DisplaySettings/DisplaySettings.tsx | 2 +- .../UserDefinedFieldsPanel.tsx | 2 +- packages/manager/src/features/Support/Hively.tsx | 2 +- .../features/TopMenu/AddNewMenu/AddNewMenu.tsx | 2 +- .../src/features/Users/UserPermissions.tsx | 2 +- 31 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 packages/manager/src/components/Divider.stories.tsx diff --git a/packages/manager/src/components/AccessPanel/AccessPanel.tsx b/packages/manager/src/components/AccessPanel/AccessPanel.tsx index 1a05958634e..e603a4000d7 100644 --- a/packages/manager/src/components/AccessPanel/AccessPanel.tsx +++ b/packages/manager/src/components/AccessPanel/AccessPanel.tsx @@ -4,7 +4,7 @@ import Paper from 'src/components/core/Paper'; import { Notice } from 'src/components/Notice/Notice'; import SuspenseLoader from 'src/components/SuspenseLoader'; import { makeStyles } from 'tss-react/mui'; -import Divider from '../Divider'; +import { Divider } from '../Divider'; import UserSSHKeyPanel from './UserSSHKeyPanel'; const PasswordInput = React.lazy( diff --git a/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx b/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx index fcf7f6381ce..141a347bda0 100644 --- a/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx +++ b/packages/manager/src/components/CheckoutBar/DisplaySectionList.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from '../Divider'; +import { Divider } from '../Divider'; import { DisplaySection } from './DisplaySection'; interface DisplaySectionListProps { diff --git a/packages/manager/src/components/Divider.stories.tsx b/packages/manager/src/components/Divider.stories.tsx new file mode 100644 index 00000000000..ef923f1678f --- /dev/null +++ b/packages/manager/src/components/Divider.stories.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import { Meta, StoryObj } from '@storybook/react'; +import { Divider } from 'src/components/Divider'; + +const meta: Meta = { + title: 'Components/Divider', + component: Divider, +}; + +type Story = StoryObj; + +export const Default: Story = { + render: (args) => , +}; + +export default meta; diff --git a/packages/manager/src/components/Divider.tsx b/packages/manager/src/components/Divider.tsx index 800241def02..d9a2a2e977c 100644 --- a/packages/manager/src/components/Divider.tsx +++ b/packages/manager/src/components/Divider.tsx @@ -1,4 +1,4 @@ -import Divider, { DividerProps as _DividerProps } from '@mui/material/Divider'; +import _Divider, { DividerProps as _DividerProps } from '@mui/material/Divider'; import * as React from 'react'; import { styled } from '@mui/material/styles'; import { isPropValid } from 'src/utilities/isPropValid'; @@ -10,16 +10,14 @@ export interface DividerProps extends _DividerProps { spacingBottom?: number; } -const _Divider = (props: DividerProps) => { +export const Divider = (props: DividerProps) => { return ; }; -export default _Divider; - -const StyledDivider = styled(Divider, { +const StyledDivider = styled(_Divider, { label: 'StyledDivider', shouldForwardProp: (prop) => - isPropValid(['spacingTop', 'spacingBottom'], prop), + isPropValid(['spacingTop', 'spacingBottom', 'light', 'dark'], prop), })(({ theme, ...props }) => ({ borderColor: props.dark ? theme.color.border2 diff --git a/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx b/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx index 107530e14ce..fcee0723e15 100644 --- a/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx +++ b/packages/manager/src/components/LongviewLineGraph/LongviewLineGraph.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/components/PrimaryNav/NavItem.tsx b/packages/manager/src/components/PrimaryNav/NavItem.tsx index 798e167a3f5..82ce410c7b6 100644 --- a/packages/manager/src/components/PrimaryNav/NavItem.tsx +++ b/packages/manager/src/components/PrimaryNav/NavItem.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router-dom'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import ListItem from 'src/components/core/ListItem'; import ListItemText from 'src/components/core/ListItemText'; import Tooltip from 'src/components/core/Tooltip'; diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx index cd6ab6b4f67..feda3357c64 100644 --- a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx +++ b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx @@ -18,7 +18,7 @@ import TooltipIcon from 'src/assets/icons/get_help.svg'; import Longview from 'src/assets/icons/longview.svg'; import AkamaiLogo from 'src/assets/logo/akamai-logo.svg'; import { BetaChip } from 'src/components/BetaChip/BetaChip'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import useAccountManagement from 'src/hooks/useAccountManagement'; import useFlags from 'src/hooks/useFlags'; import usePrefetch from 'src/hooks/usePreFetch'; diff --git a/packages/manager/src/components/StackScript/StackScript.tsx b/packages/manager/src/components/StackScript/StackScript.tsx index 4ca9d78a101..c5daadaaa4a 100644 --- a/packages/manager/src/components/StackScript/StackScript.tsx +++ b/packages/manager/src/components/StackScript/StackScript.tsx @@ -6,7 +6,7 @@ import { Link, useHistory } from 'react-router-dom'; import { Button } from 'src/components/Button/Button'; import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip'; import { Chip } from 'src/components/core/Chip'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import { DateTimeDisplay } from 'src/components/DateTimeDisplay'; import { H1Header } from 'src/components/H1Header/H1Header'; diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx index fe66d774110..b91b04c9b26 100644 --- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/BillingSummary.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { Box } from 'src/components/Box'; import { Button } from 'src/components/Button/Button'; import { Currency } from 'src/components/Currency'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import Grid from '@mui/material/Unstable_Grid2'; import PaymentDrawer from './PaymentDrawer'; import PromoDialog from './PromoDialog'; diff --git a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx index 4a504b213ab..a797ef47239 100644 --- a/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/BillingSummary/PaymentDrawer/PaymentDrawer.tsx @@ -4,7 +4,7 @@ import { APIWarning } from '@linode/api-v4/lib/types'; import { useSnackbar } from 'notistack'; import * as React from 'react'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import InputAdornment from 'src/components/core/InputAdornment'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; diff --git a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx index 61442ea5a0e..2955cf9c4bc 100644 --- a/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx +++ b/packages/manager/src/features/Billing/BillingPanels/PaymentInfoPanel/AddPaymentMethodDrawer/AddPaymentMethodDrawer.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { PaymentMethod } from '@linode/api-v4/lib/account'; import { VariantType } from 'notistack'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import Drawer from 'src/components/Drawer'; import Grid from '@mui/material/Unstable_Grid2'; diff --git a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx index 4243601dfbf..03127b33869 100644 --- a/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx +++ b/packages/manager/src/features/Databases/DatabaseCreate/DatabaseCreate.tsx @@ -20,7 +20,7 @@ import PostgreSQLIcon from 'src/assets/icons/postgresql.svg'; import { BetaChip } from 'src/components/BetaChip/BetaChip'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import FormControl from 'src/components/core/FormControl'; import FormControlLabel from 'src/components/core/FormControlLabel'; import Paper from 'src/components/core/Paper'; diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx index da16b12d3e1..f65e96b040a 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSettings/DatabaseSettings.tsx @@ -1,6 +1,6 @@ import { Database } from '@linode/api-v4/lib/databases/types'; import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import Paper from 'src/components/core/Paper'; import { Typography } from 'src/components/Typography'; import { useProfile } from 'src/queries/profile'; diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx index 68dbeadcb58..38914b671ab 100644 --- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx +++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseSummary/DatabaseSummary.tsx @@ -1,6 +1,6 @@ import { Database } from '@linode/api-v4/lib/databases/types'; import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import Paper from 'src/components/core/Paper'; import { Typography } from 'src/components/Typography'; import Grid from '@mui/material/Unstable_Grid2'; diff --git a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx index 1eddb5fd5cc..1803706729d 100644 --- a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx +++ b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/KubeCheckoutBar.tsx @@ -2,7 +2,7 @@ import { KubeNodePoolResponse } from '@linode/api-v4'; import * as React from 'react'; import { CheckoutBar } from 'src/components/CheckoutBar/CheckoutBar'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Notice } from 'src/components/Notice/Notice'; import renderGuard from 'src/components/RenderGuard'; import EUAgreementCheckbox from 'src/features/Account/Agreements/EUAgreementCheckbox'; diff --git a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx index 3c4415dd830..c1854485519 100644 --- a/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx +++ b/packages/manager/src/features/Kubernetes/KubeCheckoutBar/NodePoolSummary.tsx @@ -1,7 +1,7 @@ import Close from '@mui/icons-material/Close'; import * as React from 'react'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx index 06a56b0619f..4625242fff9 100644 --- a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx +++ b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigNode.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import Grid from '@mui/material/Unstable_Grid2'; import MenuItem from 'src/components/core/MenuItem'; import { TextField } from 'src/components/TextField'; diff --git a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx index 54f5931aac6..1b4cbdbacb2 100644 --- a/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx +++ b/packages/manager/src/features/NodeBalancers/NodeBalancerConfigPanel.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import FormHelperText from 'src/components/core/FormHelperText'; import Grid from '@mui/material/Unstable_Grid2'; import { Link } from 'src/components/Link'; diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx index 41b3a9aa071..bea8afff855 100644 --- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx +++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderEvent.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Box } from 'src/components/Box'; import classNames from 'classnames'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { HighlightedMarkdown } from 'src/components/HighlightedMarkdown/HighlightedMarkdown'; import { Typography } from 'src/components/Typography'; import useEventInfo from './useEventInfo'; diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx index 9b2a2e0db5f..d1a5d3a4f4d 100644 --- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx +++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderNotification.tsx @@ -2,7 +2,7 @@ import { NotificationType } from '@linode/api-v4/lib/account'; import ErrorIcon from '@mui/icons-material/Error'; import WarningIcon from '@mui/icons-material/Warning'; import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { useTheme, styled } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; import Box from '@mui/material/Box'; diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx index c6a0d89768f..49d9ca4a717 100644 --- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx +++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import BarPercent from 'src/components/BarPercent'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import { Duration } from 'luxon'; import { Event } from '@linode/api-v4/lib/account/types'; diff --git a/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx index 333d24619f3..b03f99c4eee 100644 --- a/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx +++ b/packages/manager/src/features/ObjectStorage/BucketDetail/ObjectDetailsDrawer.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import Drawer from 'src/components/Drawer'; import ExternalLink from 'src/components/ExternalLink'; import formatDate from 'src/utilities/formatDate'; diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx index 54e1d49ed03..416abff4627 100644 --- a/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx +++ b/packages/manager/src/features/ObjectStorage/BucketLanding/BucketDetailsDrawer.tsx @@ -6,7 +6,7 @@ import { import * as React from 'react'; import { Link } from 'react-router-dom'; import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; import Drawer from 'src/components/Drawer'; import ExternalLink from 'src/components/ExternalLink'; diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx index 48daa57bd72..ffe9ba62064 100644 --- a/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx +++ b/packages/manager/src/features/Profile/AuthenticationSettings/AuthenticationSettings.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Link } from 'src/components/Link'; import Paper from 'src/components/core/Paper'; import TrustedDevices from './TrustedDevices'; diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx index 55f99a6ca89..02b983cf6eb 100644 --- a/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx +++ b/packages/manager/src/features/Profile/AuthenticationSettings/TPAProviders.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import AkamaiWaveOnlyIcon from 'src/assets/icons/providers/akamai-logo-rgb-waveOnly.svg'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import EnabledIcon from 'src/assets/icons/checkmark-enabled.svg'; import ExternalLink from 'src/components/ExternalLink'; import GitHubIcon from 'src/assets/icons/providers/github-logo.svg'; diff --git a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx index 7833e943a0d..bf51161c0a7 100644 --- a/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx +++ b/packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/EnableTwoFactorForm.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import scrollErrorIntoView from 'src/utilities/scrollErrorIntoView'; import { APIError } from '@linode/api-v4/lib/types'; import { CircleProgress } from 'src/components/CircleProgress'; diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx index 6c216d841c1..cfb36e4a143 100644 --- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx +++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import ExternalLink from 'src/components/ExternalLink'; import { Link } from 'src/components/Link'; import Paper from 'src/components/core/Paper'; diff --git a/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx b/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx index 9968971b9ed..7884db7acb0 100644 --- a/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx +++ b/packages/manager/src/features/StackScripts/UserDefinedFieldsPanel/UserDefinedFieldsPanel.tsx @@ -9,7 +9,7 @@ import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; import Grid from '@mui/material/Unstable_Grid2'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Notice } from 'src/components/Notice/Notice'; import RenderGuard from 'src/components/RenderGuard'; import ShowMoreExpansion from 'src/components/ShowMoreExpansion'; diff --git a/packages/manager/src/features/Support/Hively.tsx b/packages/manager/src/features/Support/Hively.tsx index fbba8c1b889..9b0f6b03c14 100644 --- a/packages/manager/src/features/Support/Hively.tsx +++ b/packages/manager/src/features/Support/Hively.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { DateTime } from 'luxon'; import { parseAPIDate } from 'src/utilities/date'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx b/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx index 9ee8710b2fd..eda45029016 100644 --- a/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx +++ b/packages/manager/src/features/TopMenu/AddNewMenu/AddNewMenu.tsx @@ -11,7 +11,7 @@ import OneClickIcon from 'src/assets/icons/entityIcons/oneclick.svg'; import VolumeIcon from 'src/assets/icons/entityIcons/volume.svg'; import DatabaseIcon from 'src/assets/icons/entityIcons/database.svg'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { Link } from 'react-router-dom'; import { Box, diff --git a/packages/manager/src/features/Users/UserPermissions.tsx b/packages/manager/src/features/Users/UserPermissions.tsx index e5923f86791..23f3bbc2c2b 100644 --- a/packages/manager/src/features/Users/UserPermissions.tsx +++ b/packages/manager/src/features/Users/UserPermissions.tsx @@ -13,7 +13,7 @@ import * as React from 'react'; import ActionsPanel from 'src/components/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import FormControlLabel from 'src/components/core/FormControlLabel'; import Paper from 'src/components/core/Paper'; import { withStyles } from 'tss-react/mui'; From 84ce59f03c7c9a45bebcd6d8998a64537b39577d Mon Sep 17 00:00:00 2001 From: Dajahi Wiley Date: Fri, 30 Jun 2023 14:37:38 -0400 Subject: [PATCH 4/6] Fix imports in other files --- .../Linodes/LinodesCreate/AddonsPanel.tsx | 16 ++++++++-------- .../Linodes/LinodesCreate/AppPanelSection.tsx | 8 ++++---- .../LinodeRebuild/RebuildFromImage.tsx | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx b/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx index cdae40eab78..2d907fb8baa 100644 --- a/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx +++ b/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx @@ -1,19 +1,19 @@ import { Interface, Linode } from '@linode/api-v4/lib/linodes'; +import Grid from '@mui/material/Unstable_Grid2'; +import { Theme } from '@mui/material/styles'; +import { makeStyles } from '@mui/styles'; import * as React from 'react'; import { Link } from 'react-router-dom'; import CheckBox from 'src/components/CheckBox'; -import Divider from 'src/components/Divider'; -import FormControlLabel from 'src/components/core/FormControlLabel'; -import Paper from 'src/components/core/Paper'; -import { makeStyles } from '@mui/styles'; -import { Theme } from '@mui/material/styles'; -import { Typography } from 'src/components/Typography'; import { Currency } from 'src/components/Currency'; -import Grid from '@mui/material/Unstable_Grid2'; +import { Divider } from 'src/components/Divider'; import { TooltipIcon } from 'src/components/TooltipIcon/TooltipIcon'; +import { Typography } from 'src/components/Typography'; +import FormControlLabel from 'src/components/core/FormControlLabel'; +import Paper from 'src/components/core/Paper'; import { CreateTypes } from 'src/store/linodeCreate/linodeCreate.actions'; -import AttachVLAN from './AttachVLAN'; import { privateIPRegex } from 'src/utilities/ipUtils'; +import AttachVLAN from './AttachVLAN'; const useStyles = makeStyles((theme: Theme) => ({ vlan: { diff --git a/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx b/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx index 43cbe06929a..4e2ddbba340 100644 --- a/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx +++ b/packages/manager/src/features/Linodes/LinodesCreate/AppPanelSection.tsx @@ -1,12 +1,12 @@ import { StackScript, UserDefinedField } from '@linode/api-v4/lib/stackscripts'; +import Grid from '@mui/material/Unstable_Grid2'; +import { styled } from '@mui/material/styles'; import { decode } from 'he'; import * as React from 'react'; -import Divider from 'src/components/Divider'; -import { styled } from '@mui/material/styles'; +import { Divider } from 'src/components/Divider'; import { Typography } from 'src/components/Typography'; -import Grid from '@mui/material/Unstable_Grid2'; -import SelectionCardWrapper from 'src/features/Linodes/LinodesCreate/SelectionCardWrapper'; import { Chip } from 'src/components/core/Chip'; +import SelectionCardWrapper from 'src/features/Linodes/LinodesCreate/SelectionCardWrapper'; const AppPanelGrid = styled(Grid)(({ theme }) => ({ marginTop: theme.spacing(2), diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx index 635ec0ed787..f01f3e625bd 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/RebuildFromImage.tsx @@ -5,6 +5,7 @@ import { } from '@linode/api-v4/lib/linodes'; import { RebuildLinodeSchema } from '@linode/validation/lib/linodes.schema'; import { Theme } from '@mui/material/styles'; +import Grid from '@mui/material/Unstable_Grid2'; import { makeStyles } from '@mui/styles'; import { Formik, FormikProps } from 'formik'; import { useSnackbar } from 'notistack'; @@ -12,11 +13,10 @@ import { isEmpty } from 'ramda'; import * as React from 'react'; import AccessPanel from 'src/components/AccessPanel/AccessPanel'; import ActionsPanel from 'src/components/ActionsPanel'; +import { Box } from 'src/components/Box'; import { Button } from 'src/components/Button/Button'; import CheckBox from 'src/components/CheckBox'; -import { Box } from 'src/components/Box'; -import Divider from 'src/components/Divider'; -import Grid from '@mui/material/Unstable_Grid2'; +import { Divider } from 'src/components/Divider'; import ImageSelect from 'src/components/ImageSelect'; import { TypeToConfirm } from 'src/components/TypeToConfirm/TypeToConfirm'; From 950878b5bf95bdf01bfbddf69abdc30d9ae149f3 Mon Sep 17 00:00:00 2001 From: Dajahi Wiley Date: Fri, 30 Jun 2023 14:38:51 -0400 Subject: [PATCH 5/6] Fix imports in a few more files --- packages/manager/src/features/Linodes/CloneLanding/Details.tsx | 2 +- .../Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx | 2 +- .../Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx | 2 +- .../Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx | 2 +- .../Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx | 2 +- .../Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx index 0c2faad0dbc..1b479040c25 100644 --- a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx +++ b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx @@ -2,7 +2,7 @@ import { Disk, Linode } from '@linode/api-v4/lib/linodes'; import Close from '@mui/icons-material/Close'; import * as React from 'react'; import { Button } from 'src/components/Button/Button'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import List from 'src/components/core/List'; import ListItem from 'src/components/core/ListItem'; import Paper from 'src/components/core/Paper'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx index 143c6b8f936..b97e2678040 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx @@ -11,7 +11,7 @@ import { StyledActionPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; import { Box } from 'src/components/Box'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import FormControl from 'src/components/core/FormControl'; import FormControlLabel from 'src/components/core/FormControlLabel'; import FormGroup from 'src/components/core/FormGroup'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx index 0b38a66a9e0..185b60fbd4f 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPSharing.tsx @@ -7,7 +7,7 @@ import { StyledActionPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { Link } from 'src/components/Link'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx index c903f19e535..3d7ec58e87c 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/IPTransfer.tsx @@ -16,7 +16,7 @@ import * as React from 'react'; import { StyledActionPanel } from 'src/components/ActionsPanel/ActionsPanel'; import { Button } from 'src/components/Button/Button'; import { CircleProgress } from 'src/components/CircleProgress'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { makeStyles } from 'tss-react/mui'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx index 9eb2d4e9cc6..8b720209ade 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/AlertSection.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import FormControlLabel from 'src/components/core/FormControlLabel'; import InputAdornment from 'src/components/core/InputAdornment'; import { Typography } from 'src/components/Typography'; diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx index 94d57b966a7..41af2bc8b4d 100644 --- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx +++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx @@ -3,7 +3,7 @@ import { InterfacePurpose, } from '@linode/api-v4/lib/linodes/types'; import * as React from 'react'; -import Divider from 'src/components/Divider'; +import { Divider } from 'src/components/Divider'; import { makeStyles } from '@mui/styles'; import { Theme, useTheme } from '@mui/material/styles'; import Select, { Item } from 'src/components/EnhancedSelect/Select'; From 83b2a145e0cd6efdf258f7a2db671bf1f25d5906 Mon Sep 17 00:00:00 2001 From: Dajahi Wiley Date: Thu, 6 Jul 2023 11:19:39 -0400 Subject: [PATCH 6/6] Resolve merge conflict --- .../Linodes/LinodesCreate/AddonsPanel.tsx | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx b/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx index c2b10a5d2c7..b20843e9d90 100644 --- a/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx +++ b/packages/manager/src/features/Linodes/LinodesCreate/AddonsPanel.tsx @@ -1,29 +1,19 @@ import { Interface, Linode } from '@linode/api-v4/lib/linodes'; -import Grid from '@mui/material/Unstable_Grid2'; -import { Theme } from '@mui/material/styles'; -import { makeStyles } from '@mui/styles'; import * as React from 'react'; import { Link } from 'react-router-dom'; -<<<<<<< HEAD -import CheckBox from 'src/components/CheckBox'; -======= import { Checkbox } from 'src/components/Checkbox'; -import Divider from 'src/components/core/Divider'; +import { Divider } from 'src/components/Divider'; import FormControlLabel from 'src/components/core/FormControlLabel'; import Paper from 'src/components/core/Paper'; import { makeStyles } from '@mui/styles'; import { Theme } from '@mui/material/styles'; import { Typography } from 'src/components/Typography'; ->>>>>>> develop import { Currency } from 'src/components/Currency'; -import { Divider } from 'src/components/Divider'; +import Grid from '@mui/material/Unstable_Grid2'; import { TooltipIcon } from 'src/components/TooltipIcon/TooltipIcon'; -import { Typography } from 'src/components/Typography'; -import FormControlLabel from 'src/components/core/FormControlLabel'; -import Paper from 'src/components/core/Paper'; import { CreateTypes } from 'src/store/linodeCreate/linodeCreate.actions'; -import { privateIPRegex } from 'src/utilities/ipUtils'; import AttachVLAN from './AttachVLAN'; +import { privateIPRegex } from 'src/utilities/ipUtils'; const useStyles = makeStyles((theme: Theme) => ({ vlan: {