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

Jump to bottom

Test reports page skeleton #76

Merged
merged 1 commit into from
Aug 9, 2021
Merged

Test reports page skeleton #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 43 additions & 0 deletions ...ents/DataEntityDetails/TestReport/DatasetTestReportSkeleton/DatasetTestReportSkeleton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React from 'react';
import Skeleton from '@material-ui/lab/Skeleton';
import { Grid, withStyles } from '@material-ui/core';
import {
styles,
StylesType,
} from 'components/DataEntityDetails/TestReport/DatasetTestReportSkeleton/DatasetTestReportSkeletonStyles';

interface SkeletonProps extends StylesType {
length?: number;
}

const DatasetTestReportSkeleton: React.FC<SkeletonProps> = ({
classes,
length,
}) => {
const randomSkeletonWidth = () => {
const rand = 75 + Math.random() * 15;
return Math.round(rand);
};

const skeleton = (key: number) => (
<Grid key={key} container className={classes.container}>
<Grid container className={classes.testReportSkeletonContainer}>
<Grid container item xs={6} className={classes.testSkeletons}>
<Skeleton width={`${randomSkeletonWidth()}%`} height="30px" />
<Skeleton width={`${randomSkeletonWidth()}%`} height="30px" />
<Skeleton width={`${randomSkeletonWidth()}%`} height="30px" />
<Skeleton width={`${randomSkeletonWidth()}%`} height="30px" />
<Skeleton width={`${randomSkeletonWidth()}%`} height="30px" />
<Skeleton width={`${randomSkeletonWidth()}%`} height="30px" />
</Grid>
<Grid container item xs={6} className={classes.testCountSkeleton}>
<Skeleton width="150px" height="100%" />
</Grid>
</Grid>
</Grid>
);

return <>{[...Array(length)].map((_, id) => skeleton(id))}</>;
};

export default withStyles(styles)(DatasetTestReportSkeleton);
23 changes: 23 additions & 0 deletions ...DataEntityDetails/TestReport/DatasetTestReportSkeleton/DatasetTestReportSkeletonStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { createStyles, Theme, WithStyles } from '@material-ui/core';

export const styles = (theme: Theme) =>
createStyles({
container: {},
testReportSkeletonContainer: {
margin: theme.spacing(0.25, 0, 4, 0),
alignItems: 'center',
flexWrap: 'nowrap',
},
testSkeletons: {
flexWrap: 'nowrap',
'& > *': {
marginRight: theme.spacing(5),
},
},
testCountSkeleton: {
marginRight: theme.spacing(1),
justifyContent: 'flex-end',
},
});

export type StylesType = WithStyles<typeof styles>;
164 changes: 90 additions & 74 deletions odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { Grid, Paper, Typography } from '@material-ui/core';
import TestRunStatusItem from 'components/shared/TestRunStatusItem/TestRunStatusItem';
import TestReportItemContainer from 'components/DataEntityDetails/TestReport/TestReportItem/TestReportItemContainer';
import TestReportDetailsContainer from 'components/DataEntityDetails/TestReport/TestReportDetails/TestReportDetailsContainer';
import TestReportItemSkeleton from 'components/DataEntityDetails/TestReport/TestReportItem/TestReportItemSkeleton/TestReportItemSkeleton';
import DatasetTestReportSkeleton from 'components/DataEntityDetails/TestReport/DatasetTestReportSkeleton/DatasetTestReportSkeleton';
import { StylesType } from './TestReportStyles';

interface DatasetQualityTestList {
Expand Down Expand Up @@ -39,6 +41,8 @@ interface TestReportProps extends StylesType {
) => void;
testReportBySuitName: TestReportBySuitName;
reportDetailsViewType: string;
isDatasetTestListFetching: boolean;
isDatasetTestReportFetching: boolean;
}

const TestReport: React.FC<TestReportProps> = ({
Expand All @@ -51,6 +55,8 @@ const TestReport: React.FC<TestReportProps> = ({
fetchDataSetQualityTestReport,
testReportBySuitName,
reportDetailsViewType,
isDatasetTestListFetching,
isDatasetTestReportFetching,
}) => {
React.useEffect(() => {
fetchDataSetQualityTestReport({ dataEntityId });
Expand All @@ -61,85 +67,95 @@ const TestReport: React.FC<TestReportProps> = ({
<Grid container className={classes.container}>
{datasetQualityTestList ? (
<>
<Grid container className={classes.testReportContainer}>
<Grid container item className={classes.testReport}>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem
}}
count={datasetTestReport?.successTotal}
typeName={DataQualityTestRunStatusEnum.SUCCESS}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem
}}
count={datasetTestReport?.failedTotal}
typeName={DataQualityTestRunStatusEnum.FAILED}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem
}}
count={datasetTestReport?.brokenTotal}
typeName={DataQualityTestRunStatusEnum.BROKEN}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem
}}
count={datasetTestReport?.abortedTotal}
typeName={DataQualityTestRunStatusEnum.ABORTED}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem
}}
count={datasetTestReport?.skippedTotal}
typeName={DataQualityTestRunStatusEnum.SKIPPED}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem
}}
count={datasetTestReport?.unknownTotal}
typeName={DataQualityTestRunStatusEnum.UNKNOWN}
size="large"
/>
</Grid>
<Grid container item className={classes.testCount}>
<Typography
variant="body2"
color="textSecondary"
>{` ${datasetTestReport?.total} tests`}</Typography>
{isDatasetTestReportFetching ? (
<DatasetTestReportSkeleton />
) : (
<Grid container className={classes.testReportContainer}>
<Grid container item className={classes.testReport}>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem,
}}
count={datasetTestReport?.successTotal}
typeName={DataQualityTestRunStatusEnum.SUCCESS}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem,
}}
count={datasetTestReport?.failedTotal}
typeName={DataQualityTestRunStatusEnum.FAILED}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem,
}}
count={datasetTestReport?.brokenTotal}
typeName={DataQualityTestRunStatusEnum.BROKEN}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem,
}}
count={datasetTestReport?.abortedTotal}
typeName={DataQualityTestRunStatusEnum.ABORTED}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem,
}}
count={datasetTestReport?.skippedTotal}
typeName={DataQualityTestRunStatusEnum.SKIPPED}
size="large"
/>
<TestRunStatusItem
classes={{
filledContainer: classes.testStatusItem,
}}
count={datasetTestReport?.unknownTotal}
typeName={DataQualityTestRunStatusEnum.UNKNOWN}
size="large"
/>
</Grid>
<Grid container item className={classes.testCount}>
<Typography
variant="body2"
color="textSecondary"
>{` ${datasetTestReport?.total} tests`}</Typography>
</Grid>
</Grid>
</Grid>
)}
<>
{datasetQualityTestList ? (
<Grid container spacing={2}>
<Grid item xs={9}>
<Grid
container
className={classes.testReportItemContainer}
>
{Object.entries(datasetQualityTestList).map(
([suitName, dataQATestList]) => (
<TestReportItemContainer
dataqatestId={dataqatestId}
dataSetId={dataEntityId}
dataQATestReport={testReportBySuitName[suitName]}
key={suitName}
suitName={suitName}
dataQATestList={dataQATestList}
/>
)
)}
</Grid>
{isDatasetTestListFetching ? (
<TestReportItemSkeleton length={5} />
) : (
<Grid
container
className={classes.testReportItemContainer}
>
{Object.entries(datasetQualityTestList).map(
([suitName, dataQATestList]) => (
<TestReportItemContainer
dataqatestId={dataqatestId}
dataSetId={dataEntityId}
dataQATestReport={
testReportBySuitName[suitName]
}
key={suitName}
suitName={suitName}
dataQATestList={dataQATestList}
/>
)
)}
</Grid>
)}
</Grid>
<Grid item xs={3}>
{dataqatestId ? (
Expand Down
4 changes: 4 additions & 0 deletions odd-platform-ui/src/components/DataEntityDetails/TestReport/TestReportContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {
} from 'redux/thunks';
import {
getDatasetQualityTestsBySuiteNames,
getDatasetTestListFetching,
getDatasetTestReport,
getDatasetTestReportFetching,
getTestReportListBySuiteName,
} from 'redux/selectors/dataQualityTest.selectors';
import TestReport from './TestReport';
Expand Down Expand Up @@ -40,6 +42,8 @@ const mapStateToProps = (
dataEntityId
),
testReportBySuitName: getTestReportListBySuiteName(state),
isDatasetTestListFetching: getDatasetTestListFetching(state),
isDatasetTestReportFetching: getDatasetTestReportFetching(state),
});

const mapDispatchToProps = {
Expand Down
Loading