Skip to content
Snippets Groups Projects
Commit 62fa9fa2 authored by Imre Toth's avatar Imre Toth
Browse files

Merge branch 'ICSHWI-10398_Bugfixing_loading_indicatior_for_statistics' into 'develop'

ICSHWI-10398: Bugfixing loading indicator for statistics page

See merge request !214
parents 7db9dbcb 2a4ff3a3
No related branches found
No related tags found
3 merge requests!270Merging develop branch to master in order to create RC,!222Fixing missing time interval parameter for logs,!214ICSHWI-10398: Bugfixing loading indicator for statistics page
Pipeline #122060 passed
import React, { useEffect } from "react";
import { Paper, Grid, useTheme, makeStyles } from "@material-ui/core";
import { Paper, Grid, useTheme, makeStyles, LinearProgress } from "@material-ui/core";
import { useStatistics } from "../../api/SwaggerApi";
import { useGlobalAppBar } from "../../components/navigation/GlobalAppBar/GlobalAppBar";
import { RootContainer } from "../../components/common/Container/RootContainer";
......@@ -53,10 +53,13 @@ export function StatisticsView() {
return (
<RootContainer>
<Grid container direction="column" spacing={theme.spacing(0.5)}>
{statistics &&
<Grid item xs={12}>
<h2>Statistics</h2>
</Grid>
{statistics ?
<>
<Grid item xs={12}>
<h2>Statistics</h2>
<PrimeKeyValueTable obj={prometheusStats} labels={["Network monitoring"]} />
</Grid>
<Grid item xs={12}>
......@@ -66,8 +69,13 @@ export function StatisticsView() {
<PrimeKeyValueTable obj={statistics.networkScopesIocCount} labels={["IOCs per network scope according to the deployment tool"]} />
</Grid>
</>
:
<Grid item xs={12}>
<div style={{ width: "100%" }}><LinearProgress color="primary" /></div>
</Grid>
}
<Grid item xs={12}>
<Paper className={classes.paper}>
<DeploymentLineChart title="Successful deployments over time by the deployment tool" chartLabel="Deployed IOCs in time" hook={useDeployedIOCStatistics} />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment