Skip to content

height fixed #13

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

Merged
merged 1 commit into from
Jun 7, 2020
Merged

height fixed #13

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
40 changes: 26 additions & 14 deletions src/pages/ProjectPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import React, { useEffect, useState } from "react";
import { Grid, Dialog, IconButton, Box, Typography } from "@material-ui/core";
import {
Grid,
Dialog,
IconButton,
Box,
Typography,
makeStyles,
} from "@material-ui/core";
import { useParams, useLocation, useHistory } from "react-router-dom";
import { TestRun } from "../types";
import { testRunService } from "../services";
Expand All @@ -26,11 +33,7 @@ const getQueryParams = (guery: string) => {
};
};

const styles: {
modal: React.CSSProperties;
button: React.CSSProperties;
icon: React.CSSProperties;
} = {
const useStyles = makeStyles((theme) => ({
modal: {
margin: 40,
},
Expand All @@ -46,9 +49,18 @@ const styles: {
width: 64,
height: 64,
},
};
buildListContainer: {
maxHeight: "89vh",
overflow: "auto",
},
testRunContainer: {
maxHeight: "83vh",
overflow: "auto",
},
}));

const ProjectPage = () => {
const classes = useStyles();
const { projectId } = useParams();
const location = useLocation();
const history = useHistory();
Expand Down Expand Up @@ -138,7 +150,7 @@ const ProjectPage = () => {
<ProjectSelect selectedId={projectId} />
</Grid>
</Grid>
<Grid item>
<Grid item className={classes.buildListContainer}>
<BuildList />
</Grid>
</Grid>
Expand All @@ -157,7 +169,7 @@ const ProjectPage = () => {
/>
</Box>
</Grid>
<Grid item>
<Grid item className={classes.testRunContainer}>
<TestRunList
items={filteredTestRuns}
selectedId={selectedTestdId}
Expand All @@ -171,39 +183,39 @@ const ProjectPage = () => {
/>
{selectedTestRunIndex !== undefined &&
testRuns[selectedTestRunIndex] && (
<Dialog open={true} fullScreen style={styles.modal}>
<Dialog open={true} fullScreen className={classes.modal}>
<TestDetailsModal
testRun={testRuns[selectedTestRunIndex]}
updateTestRun={updateTestRun}
/>
{selectedTestRunIndex + 1 < testRuns.length && (
<IconButton
color="secondary"
className={classes.button}
style={{
...styles.button,
right: 0,
}}
onClick={() => {
const next = testRuns[selectedTestRunIndex + 1];
history.push(buildTestRunLocation(next));
}}
>
<NavigateNext style={styles.icon} />
<NavigateNext className={classes.icon} />
</IconButton>
)}
{selectedTestRunIndex > 0 && (
<IconButton
color="secondary"
className={classes.button}
style={{
...styles.button,
left: 0,
}}
onClick={() => {
const prev = testRuns[selectedTestRunIndex - 1];
history.push(buildTestRunLocation(prev));
}}
>
<NavigateBefore style={styles.icon} />
<NavigateBefore className={classes.icon} />
</IconButton>
)}
</Dialog>
Expand Down