From b9f921ae46255036ea8a5a25121a834297482117 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 18 Oct 2022 18:58:05 +0100 Subject: [PATCH] output statusMessages --- src/@types/index.ts | 56 ++++++++++++++++---------------------- src/pages/index.tsx | 14 +++++++++- src/styles/Home.module.css | 16 +++++++++++ src/utils/getData.ts | 2 +- 4 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/@types/index.ts b/src/@types/index.ts index 245c662..1b17bd7 100644 --- a/src/@types/index.ts +++ b/src/@types/index.ts @@ -12,54 +12,46 @@ export interface Status { network: string currentBlock: number market: State - port: State faucet: FaucetStatus | Record aquarius: AquariusStatus provider: ProviderStatus subgraph: SubgraphStatus operator: OperatorStatus dataFarming: State - daoGrants: State lastUpdatedOn: number } -export interface ProviderStatus { +export interface ComponentStatusBase { status: State - response?: number - version?: string - latestRelease?: string + statusMessages: string + response: number + version: string } -export interface AquariusStatus { - status: State - response?: number - validChainList?: boolean - version?: string - monitorVersion?: string - latestRelease?: string - block?: number - validQuery?: boolean -} -export interface SubgraphStatus { - status: State - response?: number - version?: string - latestRelease?: string - block?: number +export interface ProviderStatus extends ComponentStatusBase { + latestRelease: string } -export interface OperatorStatus { - status: State - response?: number - version?: string - latestRelease?: string - environments?: number - limitReached?: boolean +export interface AquariusStatus extends ComponentStatusBase { + validChainList: boolean + monitorVersion: string + latestRelease: string + block: number + validQuery: boolean } -export interface FaucetStatus { - status: State - response?: number +export interface SubgraphStatus extends ComponentStatusBase { + latestRelease: string + block: number +} + +export interface OperatorStatus extends ComponentStatusBase { + latestRelease: string + environments: number + limitReached: boolean +} + +export interface FaucetStatus extends ComponentStatusBase { ethBalance?: BigNumber ethBalanceSufficient?: boolean oceanBalance?: BigNumber diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 779a034..c7c491f 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -85,8 +85,20 @@ export default function HomePage(): ReactElement { : value.status )}{' '} {key} + {value.version} - {value.version} + + {value.statusMessages && value.statusMessages !== '' && ( + + )} ))} diff --git a/src/styles/Home.module.css b/src/styles/Home.module.css index 8c33f64..2da5a5f 100644 --- a/src/styles/Home.module.css +++ b/src/styles/Home.module.css @@ -47,6 +47,7 @@ .card h2 { margin: 0 0 1rem 0; font-size: var(--font-size-large); + margin: 0; } .warning { @@ -59,6 +60,8 @@ .version { color: var(--color-secondary); + font-size: var(--font-size-small); + margin-left: calc(var(--spacer) / 4); } .logo { @@ -73,3 +76,16 @@ fill: var(--brand-alert-green); margin-right: calc(var(--spacer) / 6); } + +.messages { + list-style-type: square; + margin-left: 1rem; + margin-top: calc(var(--spacer) / 4); +} + +.messages li { + display: list-item; + margin-top: calc(var(--spacer) / 8); + list-style-position: outside; + color: var(--brand-alert-orange); +} diff --git a/src/utils/getData.ts b/src/utils/getData.ts index 0a2812e..6e0a6de 100644 --- a/src/utils/getData.ts +++ b/src/utils/getData.ts @@ -10,7 +10,7 @@ export async function getData(): Promise<{ [key: string]: Status }> { // transform data into object with network names as keys const output = Object.fromEntries( - response.data.map((item) => [item.network, item]) + response.data?.map((item) => [item.network, item]) ) return output } catch (error) {