diff --git a/striker-ui/components/FileSystem/FileSystems.tsx b/striker-ui/components/FileSystem/FileSystems.tsx index 7af696fc..ce16a550 100644 --- a/striker-ui/components/FileSystem/FileSystems.tsx +++ b/striker-ui/components/FileSystem/FileSystems.tsx @@ -3,7 +3,7 @@ import { useContext } from 'react'; import { Box } from '@mui/material'; import { styled } from '@mui/material/styles'; import { BodyText, HeaderText } from '../Text'; -import { Panel, InnerPanel, PanelHeader } from '../Panels'; +import { Panel, InnerPanel, InnerPanelHeader } from '../Panels'; import SharedStorageHost from './FileSystemsHost'; import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import { AnvilContext } from '../AnvilContext'; @@ -48,7 +48,7 @@ const SharedStorage = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => { data.file_systems.map( (fs: AnvilFileSystem): JSX.Element => ( - + { - + {fs?.hosts && fs.hosts.map( ( diff --git a/striker-ui/components/Hosts/AnvilHost.tsx b/striker-ui/components/Hosts/AnvilHost.tsx index fb4cb41d..c8f07927 100644 --- a/striker-ui/components/Hosts/AnvilHost.tsx +++ b/striker-ui/components/Hosts/AnvilHost.tsx @@ -1,6 +1,6 @@ import { Box, Switch } from '@mui/material'; import { styled } from '@mui/material/styles'; -import { InnerPanel, PanelHeader } from '../Panels'; +import { InnerPanel, InnerPanelHeader } from '../Panels'; import { ProgressBar } from '../Bars'; import { BodyText } from '../Text'; import Decorator, { Colours } from '../Decorator'; @@ -91,7 +91,7 @@ const AnvilHost = ({ // TODO: figure out why there are undefined host entries. return host ? ( - + @@ -109,7 +109,7 @@ const AnvilHost = ({ /> - + diff --git a/striker-ui/components/Panels/PanelHeader.tsx b/striker-ui/components/Panels/InnerPanelHeader.tsx similarity index 77% rename from striker-ui/components/Panels/PanelHeader.tsx rename to striker-ui/components/Panels/InnerPanelHeader.tsx index 812f4dbb..9d7a09b9 100644 --- a/striker-ui/components/Panels/PanelHeader.tsx +++ b/striker-ui/components/Panels/InnerPanelHeader.tsx @@ -1,9 +1,9 @@ import { ReactNode } from 'react'; -import { Box } from '@mui/material'; -import { styled } from '@mui/material/styles'; +import { Box, styled } from '@mui/material'; + import { BORDER_RADIUS, DIVIDER } from '../../lib/consts/DEFAULT_THEME'; -const PREFIX = 'PanelHeader'; +const PREFIX = 'InnerPanelHeader'; const classes = { header: `${PREFIX}-header`, @@ -32,7 +32,7 @@ type Props = { children: ReactNode; }; -const PanelHeader = ({ children }: Props): JSX.Element => { +const InnerPanelHeader = ({ children }: Props): JSX.Element => { return (
@@ -41,4 +41,4 @@ const PanelHeader = ({ children }: Props): JSX.Element => { ); }; -export default PanelHeader; +export default InnerPanelHeader; diff --git a/striker-ui/components/Panels/index.tsx b/striker-ui/components/Panels/index.tsx index cdf96af7..ca7f7481 100644 --- a/striker-ui/components/Panels/index.tsx +++ b/striker-ui/components/Panels/index.tsx @@ -1,5 +1,5 @@ -import PanelHeader from './PanelHeader'; import InnerPanel from './InnerPanel'; +import InnerPanelHeader from './InnerPanelHeader'; import Panel from './Panel'; -export { Panel, PanelHeader, InnerPanel }; +export { InnerPanel, InnerPanelHeader, Panel }; diff --git a/striker-ui/components/Resource/ResourceVolumes.tsx b/striker-ui/components/Resource/ResourceVolumes.tsx index 21b3de87..12c84dc0 100644 --- a/striker-ui/components/Resource/ResourceVolumes.tsx +++ b/striker-ui/components/Resource/ResourceVolumes.tsx @@ -2,7 +2,7 @@ import * as prettyBytes from 'pretty-bytes'; import { Box, Divider } from '@mui/material'; import { styled } from '@mui/material/styles'; import InsertLinkIcon from '@mui/icons-material/InsertLink'; -import { InnerPanel, PanelHeader } from '../Panels'; +import { InnerPanel, InnerPanelHeader } from '../Panels'; import { BodyText } from '../Text'; import Decorator, { Colours } from '../Decorator'; import { DIVIDER } from '../../lib/consts/DEFAULT_THEME'; @@ -78,7 +78,7 @@ const ResourceVolumes = ({ resource.volumes.map((volume) => { return ( - + @@ -91,7 +91,7 @@ const ResourceVolumes = ({ /> - + {volume.connections.map( (connection, index): JSX.Element => { return ( diff --git a/striker-ui/components/SharedStorage/SharedStorage.tsx b/striker-ui/components/SharedStorage/SharedStorage.tsx index 4c1a2500..4022bd3a 100644 --- a/striker-ui/components/SharedStorage/SharedStorage.tsx +++ b/striker-ui/components/SharedStorage/SharedStorage.tsx @@ -3,7 +3,7 @@ import { useContext } from 'react'; import { Box } from '@mui/material'; import { styled } from '@mui/material/styles'; import { BodyText, HeaderText } from '../Text'; -import { Panel, InnerPanel, PanelHeader } from '../Panels'; +import { Panel, InnerPanel, InnerPanelHeader } from '../Panels'; import SharedStorageHost from './SharedStorageHost'; import PeriodicFetch from '../../lib/fetchers/periodicFetch'; import { AnvilContext } from '../AnvilContext'; @@ -49,7 +49,7 @@ const SharedStorage = (): JSX.Element => { data.storage_groups.map( (storageGroup: AnvilSharedStorageGroup): JSX.Element => ( - + { - +