Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: [M3-6273] - MUI v5 Migration - SRC > Features > Lish #9774

Merged
merged 11 commits into from
Oct 11, 2023
Merged

refactor: [M3-6273] - MUI v5 Migration - SRC > Features > Lish #9774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
87da676
refactor: [M3-6273] - MUI v5 Migration - SRC > Features > Lish
jaalah Oct 10, 2023
229937f
Update hovers
jaalah Oct 10, 2023
62c3011
Revert
jaalah Oct 10, 2023
3cc982a
Added changeset: MUI v5 Migration - `SRC > Features > Lish`
jaalah Oct 10, 2023
9fafc2c
Add hover to selected
jaalah Oct 10, 2023
7614606
Update packages/manager/src/components/ReachTab.tsx
jaalah-akamai Oct 10, 2023
24b6ef8
Update packages/manager/src/components/ReachTab.tsx
jaalah-akamai Oct 10, 2023
444b603
Review updates
jaalah Oct 11, 2023
0548f76
Merge branch 'develop' of github.com:linode/manager into M3-6273
jaalah Oct 11, 2023
a934aae
Merge branch 'M3-6273' of github.com:jaalah-akamai/manager into M3-6273
jaalah Oct 11, 2023
6c00ff8
Review updates 02
jaalah Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/manager/.changeset/pr-9774-tech-stories-1696952177563.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@linode/manager": Tech Stories
---

MUI v5 Migration - `SRC > Features > Lish` ([#9774](https://github.com/linode/manager/pull/9774))
5 changes: 5 additions & 0 deletions packages/manager/src/assets/weblish/weblish.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,8 @@ body > div.terminal {
.osx b, .osx strong {
font-weight: 500;
}

[data-qa-tab="Glish"] canvas {
margin: 0 !important;
padding: 24px;
}
12 changes: 9 additions & 3 deletions packages/manager/src/components/CircleProgress/CircleProgress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box } from 'src/components/Box';
import { styled } from '@mui/material/styles';
import { SxProps, styled } from '@mui/material/styles';
import * as React from 'react';

import { Box } from 'src/components/Box';
import {
CircularProgress,
CircularProgressProps,
Expand All @@ -15,6 +15,7 @@ interface CircleProgressProps extends CircularProgressProps {
noInner?: boolean;
noPadding?: boolean;
size?: number;
sx?: SxProps;
}

const CircleProgress = (props: CircleProgressProps) => {
Expand All @@ -25,6 +26,7 @@ const CircleProgress = (props: CircleProgressProps) => {
noInner,
noPadding,
size,
sx,
...rest
} = props;

Expand All @@ -46,7 +48,11 @@ const CircleProgress = (props: CircleProgressProps) => {
}

return (
<StyledRootDiv aria-label="Content is loading" className={className}>
<StyledRootDiv
aria-label="Content is loading"
className={className}
sx={sx}
>
{children !== undefined && (
<Box sx={{ marginTop: 4, position: 'absolute' }}>{children}</Box>
)}
Expand Down
5 changes: 4 additions & 1 deletion packages/manager/src/components/ReachTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const useStyles = makeStyles()((theme: Theme) => ({
},
'&:hover': {
backgroundColor: theme.color.grey7,
color: `${theme.palette.primary.main} !important`,
Copy link
Contributor Author

@jaalah-akamai jaalah-akamai Oct 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This !important was added because there was no hover style for selected tabs. I added that styled and the hover color for selected tabs should stay blue.

You can test this by going through the create linode flow and looking at the plan tabs
Screenshot 2023-10-10 at 11 41 08 AM

color: theme.palette.primary.main,
},
alignItems: 'center',
borderBottom: '2px solid transparent',
Expand All @@ -28,6 +28,9 @@ const useStyles = makeStyles()((theme: Theme) => ({
textDecoration: 'none',
},
'&[data-reach-tab][data-selected]': {
'&:hover': {
color: theme.palette.primary.main,
},
borderBottom: `3px solid ${theme.textColors.linkActiveLight}`,
color: theme.textColors.headlineStatic,
fontFamily: theme.font.bold,
Expand Down
4 changes: 2 additions & 2 deletions packages/manager/src/features/Lish/Glish.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { makeStyles } from '@mui/styles';
import * as React from 'react';
import { VncScreen, VncScreenHandle } from 'react-vnc';

import { CircleProgress } from 'src/components/CircleProgress';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { StyledCircleProgress } from 'src/features/Lish/Lish';

import { getLishSchemeAndHostname, resizeViewPort } from './lishUtils';

Expand Down Expand Up @@ -133,7 +133,7 @@ const Glish = (props: Props) => {
return (
<VncScreen
autoConnect={false}
loadingUI={<CircleProgress />}
loadingUI={<StyledCircleProgress />}
ref={ref}
showDotCursor
url={`${getLishSchemeAndHostname(region)}:8080/${token}`}
Expand Down
149 changes: 63 additions & 86 deletions packages/manager/src/features/Lish/Lish.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,27 @@
import { Theme } from '@mui/material/styles';
import { makeStyles } from '@mui/styles';
import { styled } from '@mui/material/styles';
import * as React from 'react';
import { useHistory, useParams } from 'react-router-dom';

import { CircleProgress } from 'src/components/CircleProgress';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { TabPanels } from 'src/components/ReachTabPanels';
import { Tabs } from 'src/components/ReachTabs';
import { SafeTabPanel } from 'src/components/SafeTabPanel/SafeTabPanel';
import { TabLinkList } from 'src/components/TabLinkList/TabLinkList';
import { Tab } from 'src/components/TabLinkList/TabLinkList';
import { TabPanels } from 'src/components/ReachTabPanels';
import { Tabs } from 'src/components/ReachTabs';
import {
useLinodeLishTokenQuery,
useLinodeQuery,
} from 'src/queries/linodes/linodes';

import '../../assets/weblish/weblish.css';
import '../../assets/weblish/xterm.css';
import Glish from './Glish';
import Weblish from './Weblish';

const AUTH_POLLING_INTERVAL = 2000;

const useStyles = makeStyles((theme: Theme) => ({
notFound: {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was never used

'& h1': {
color: '#f4f4f4 !important',
},
color: '#f4f4f4 !important',
},
progress: {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has no effect whatsoever, so I removed since we're centering this anyways

height: 'auto',
},
tabs: {
'& [role="tab"]': {
'&[aria-selected="true"]': {
'&:hover': {
backgroundColor: theme.palette.primary.light,
color: 'white',
},
backgroundColor: theme.palette.primary.main,
borderBottom: 'none !important',
color: 'white !important',
},
backgroundColor: theme.bg.offWhite,
color: theme.color.tableHeaderText,
flex: 'auto',
margin: 0,
maxWidth: 'none !important',
},
'& [role="tablist"]': {
backgroundColor: theme.bg.offWhite,
display: 'flex',
margin: 0,
overflow: 'hidden',
},
backgroundColor: 'black',
margin: 0,
},
}));

const Lish = () => {
const classes = useStyles();
const history = useHistory();

const { linodeId, type } = useParams<{ linodeId: string; type: string }>();
Expand All @@ -83,10 +45,6 @@ const Lish = () => {
const token = data?.lish_token;

React.useEffect(() => {
const webLishCss = import('' + '../../assets/weblish/weblish.css');
const xtermCss = import('' + '../../assets/weblish/xterm.css');
Promise.all([webLishCss, xtermCss]);

const interval = setInterval(checkAuthentication, AUTH_POLLING_INTERVAL);

return () => {
Expand Down Expand Up @@ -127,7 +85,7 @@ const Lish = () => {
};

if (isLoading) {
return <CircleProgress className={classes.progress} noInner />;
return <StyledCircleProgress />;
}

if (linodeError) {
Expand All @@ -149,44 +107,63 @@ const Lish = () => {
);
}

return (
// eslint-disable-next-line react/jsx-no-useless-fragment
<React.Fragment>
{linode && token && (
<Tabs
index={
type &&
tabs.findIndex((tab) => tab.title.toLocaleLowerCase() === type) !==
-1
? tabs.findIndex((tab) => tab.title.toLocaleLowerCase() === type)
: 0
}
className={classes.tabs}
onChange={navToURL}
>
<TabLinkList tabs={tabs} />
<TabPanels>
<SafeTabPanel data-qa-tab="Weblish" index={0}>
<Weblish
linode={linode}
refreshToken={refreshToken}
token={token}
/>
</SafeTabPanel>
{!isBareMetal && (
<SafeTabPanel data-qa-tab="Glish" index={1}>
<Glish
linode={linode}
refreshToken={refreshToken}
token={token}
/>
</SafeTabPanel>
)}
</TabPanels>
</Tabs>
)}
</React.Fragment>
);
return linode && token ? (
<StyledTabs
index={
type &&
tabs.findIndex((tab) => tab.title.toLocaleLowerCase() === type) !== -1
? tabs.findIndex((tab) => tab.title.toLocaleLowerCase() === type)
: 0
}
onChange={navToURL}
>
<TabLinkList tabs={tabs} />
<TabPanels>
<SafeTabPanel data-qa-tab="Weblish" index={0}>
<Weblish linode={linode} refreshToken={refreshToken} token={token} />
</SafeTabPanel>
{!isBareMetal && (
<SafeTabPanel data-qa-tab="Glish" index={1}>
<Glish linode={linode} refreshToken={refreshToken} token={token} />
</SafeTabPanel>
)}
</TabPanels>
</StyledTabs>
) : null;
};

export default Lish;

const StyledTabs = styled(Tabs)(({ theme }) => ({
'& [data-reach-tab][role="tab"]': {
'&[aria-selected="true"]': {
'&:hover': {
backgroundColor: theme.palette.primary.light,
color: theme.name === 'light' ? theme.color.white : theme.color.black,
},
backgroundColor: theme.palette.primary.main,
borderBottom: 'none !important',
color: theme.name === 'light' ? theme.color.white : theme.color.black,
},
backgroundColor: theme.bg.offWhite,
color: theme.color.tableHeaderText,
flex: 'auto',
margin: 0,
maxWidth: 'none !important',
},
'& [role="tablist"]': {
backgroundColor: theme.bg.offWhite,
display: 'flex',
margin: 0,
overflow: 'hidden',
},
backgroundColor: 'black',
margin: 0,
}));

export const StyledCircleProgress = styled(CircleProgress)(() => ({
left: '50%',
position: 'absolute',
top: '50%',
transform: 'translate(-50%, -50%)',
}));
4 changes: 2 additions & 2 deletions packages/manager/src/features/Lish/Weblish.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { WithStyles, createStyles, withStyles } from '@mui/styles';
import * as React from 'react';
import { Terminal } from 'xterm';

import { CircleProgress } from 'src/components/CircleProgress';
import { ErrorState } from 'src/components/ErrorState/ErrorState';
import { StyledCircleProgress } from 'src/features/Lish/Lish';

import { getLishSchemeAndHostname, resizeViewPort } from './lishUtils';

Expand Down Expand Up @@ -94,7 +94,7 @@ export class Weblish extends React.Component<CombinedProps, State> {
{this.socket && this.socket.readyState === this.socket.OPEN ? (
<div className="terminal" id="terminal" />
) : (
<CircleProgress />
<StyledCircleProgress />
)}
</div>
);
Expand Down