feat: add node connecting status (#603)

This commit is contained in:
Cafe137
2023-01-19 12:05:24 +01:00
committed by GitHub
parent 01838dccd1
commit 90f9f91ddb
5 changed files with 48 additions and 11 deletions
+4 -1
View File
@@ -2,6 +2,7 @@ import { createStyles, makeStyles, Theme, Typography } from '@material-ui/core'
import { ReactElement } from 'react'
import Check from 'remixicon-react/CheckLineIcon'
import AlertCircle from 'remixicon-react/ErrorWarningFillIcon'
import Connecting from 'remixicon-react/LinksLineIcon'
import RefreshLine from 'remixicon-react/RefreshLineIcon'
import { SwarmButton, SwarmButtonProps } from './SwarmButton'
@@ -10,7 +11,7 @@ interface Props {
title: string
subtitle: string
buttonProps: SwarmButtonProps
status: 'ok' | 'error' | 'loading'
status: 'ok' | 'error' | 'loading' | 'connecting'
}
const useStyles = (backgroundColor: string) =>
@@ -65,6 +66,8 @@ export default function Card({ buttonProps, icon, title, subtitle, status }: Pro
statusIcon = <AlertCircle size="13" color="#f44336" />
} else if (status === 'loading') {
statusIcon = <RefreshLine size="13" color="orange" />
} else if (status === 'connecting') {
statusIcon = <Connecting size="13" color="#0074D9" />
}
return (
+4 -3
View File
@@ -1,9 +1,9 @@
import { ReactElement, useContext } from 'react'
import { useLocation, matchPath } from 'react-router-dom'
import { matchPath, useLocation } from 'react-router-dom'
import ArrowRight from 'remixicon-react/ArrowRightLineIcon'
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles'
import { ListItemText, ListItemIcon, ListItem, Typography } from '@material-ui/core'
import { ListItem, ListItemIcon, ListItemText, Typography } from '@material-ui/core'
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
import { Context } from '../providers/Bee'
import StatusIcon from './StatusIcon'
@@ -44,6 +44,7 @@ const useStyles = makeStyles((theme: Theme) =>
},
smallerText: {
fontSize: '0.9rem',
whiteSpace: 'nowrap',
},
}),
)
+4 -1
View File
@@ -1,5 +1,5 @@
import type { ReactElement } from 'react'
import { CircularProgress } from '@material-ui/core'
import type { ReactElement } from 'react'
import { CheckState } from '../providers/Bee'
interface Props {
@@ -28,6 +28,9 @@ export default function StatusIcon({ checkState, size, className, isLoading }: P
case CheckState.STARTING:
backgroundColor = 'orange'
break
case CheckState.CONNECTING:
backgroundColor = '#0074D9'
break
default:
// Default is error
backgroundColor = '#ff3a52'
+12
View File
@@ -12,6 +12,18 @@ export default function NodeInfoCard(): ReactElement {
const { status } = useContext(BeeContext)
const navigate = useNavigate()
if (status.all === CheckState.CONNECTING) {
return (
<Card
buttonProps={{ iconType: Settings, children: 'Open node setup', onClick: () => navigate(ROUTES.STATUS) }}
icon={<Globe />}
title="Connecting..."
subtitle="Attempting to establish connection to your Bee node."
status="connecting"
/>
)
}
if (status.all === CheckState.STARTING) {
return (
<Card
+24 -6
View File
@@ -17,11 +17,13 @@ import { Token } from '../models/Token'
import type { Balance, ChequebookBalance, Settlements } from '../types'
import { Context as SettingsContext } from './Settings'
const LAUNCH_GRACE_PERIOD = 15_000
const REFRESH_WHEN_OK = 30_000
const REFRESH_WHEN_ERROR = 5_000
const TIMEOUT = 3_000
export enum CheckState {
CONNECTING = 'Connecting',
OK = 'OK',
WARNING = 'Warning',
ERROR = 'Error',
@@ -128,6 +130,7 @@ function getStatus(
chequebookBalance: ChequebookBalance | null,
error: Error | null,
isDesktop: boolean,
startedAt: number,
): Status {
const status: Status = { ...initialValues.status }
@@ -168,19 +171,32 @@ function getStatus(
} else status.chequebook.checkState = CheckState.OK
}
status.all = determineOverallStatus(debugApiHealth, debugApiReadiness, status)
status.all = determineOverallStatus(debugApiHealth, debugApiReadiness, status, startedAt)
return status
}
function determineOverallStatus(debugApiHealth: Health | null, debugApiReadiness: boolean, status: Status): CheckState {
function determineOverallStatus(
debugApiHealth: Health | null,
debugApiReadiness: boolean,
status: Status,
startedAt: number,
): CheckState {
const hasErrors = Object.values(status).some(
({ isEnabled, checkState }) => isEnabled && checkState === CheckState.ERROR,
)
const hasWarnings = Object.values(status).some(
({ isEnabled, checkState }) => isEnabled && checkState === CheckState.WARNING,
)
const isInGracePeriod = Date.now() - startedAt < LAUNCH_GRACE_PERIOD
if (debugApiHealth?.status === 'ok' && !debugApiReadiness) {
return CheckState.STARTING
} else if (Object.values(status).some(({ isEnabled, checkState }) => isEnabled && checkState === CheckState.ERROR)) {
} else if (hasErrors && isInGracePeriod) {
return CheckState.CONNECTING
} else if (hasErrors) {
return CheckState.ERROR
} else if (
Object.values(status).some(({ isEnabled, checkState }) => isEnabled && checkState === CheckState.WARNING)
) {
} else if (hasWarnings) {
return CheckState.WARNING
} else {
return CheckState.OK
@@ -214,6 +230,7 @@ export function Provider({ children, isDesktop }: Props): ReactElement {
const [settlements, setSettlements] = useState<Settlements | null>(null)
const [chainState, setChainState] = useState<ChainState | null>(null)
const [chainId, setChainId] = useState<number | null>(null)
const [startedAt] = useState(Date.now())
const { latestBeeRelease } = useLatestBeeRelease()
@@ -408,6 +425,7 @@ export function Provider({ children, isDesktop }: Props): ReactElement {
chequebookBalance,
error,
Boolean(isDesktop),
startedAt,
)
useEffect(() => {