Skip to content

TestRun. Do not change order when details modal is shown #234

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
Sep 5, 2021
Merged

TestRun. Do not change order when details modal is shown #234

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
27 changes: 13 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"konva": "^7.0.3",
"lint-staged": "^10.5.4",
"material-ui-popup-state": "^1.8.3",
"notistack": "^0.9.17",
"notistack": "^1.0.10",
"prettier": "^2.2.1",
"qs": "^6.9.4",
"react": "^16.13.1",
Expand Down
12 changes: 2 additions & 10 deletions src/components/BuildList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ const useStyles = makeStyles((theme: Theme) =>
listItemSecondaryAction: {
visibility: "hidden",
},
listItem: {
"&:hover $listItemSecondaryAction": {
visibility: "inherit",
},
},
})
);

Expand Down Expand Up @@ -125,9 +120,6 @@ const BuildList: FunctionComponent = () => {
onClick={() => {
selectBuild(buildDispatch, build.id);
}}
classes={{
container: classes.listItem,
}}
>
<ListItemText
disableTypography
Expand All @@ -144,7 +136,7 @@ const BuildList: FunctionComponent = () => {
</Typography>
</Grid>
<Grid item>
<Grid container justify="space-between">
<Grid container justifyContent="space-between">
<Grid item>
<Chip size="small" label={build.branchName} />
</Grid>
Expand Down Expand Up @@ -174,7 +166,7 @@ const BuildList: FunctionComponent = () => {
</List>
</Box>
<Box height="9%">
<Grid container justify="center">
<Grid container justifyContent="center">
<Grid item>
<Pagination
size="small"
Expand Down
2 changes: 1 addition & 1 deletion src/components/DrawArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const DrawArea: FunctionComponent<IDrawArea> = ({
container
direction="column"
alignItems="center"
justify="center"
justifyContent="center"
className={classes.progressContainer}
>
<Grid item>
Expand Down
8 changes: 6 additions & 2 deletions src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,18 @@ const Header: FunctionComponent = () => {
<React.Fragment>
<AppBar position="static" color="default">
<Toolbar>
<Grid container justify="space-between" alignItems="center">
<Grid container justifyContent="space-between" alignItems="center">
<Grid item>
<Link to="/">
<img src={logo} width="60" height="60" alt="logo" />
</Link>
</Grid>
<Grid item>
<Grid container justify="space-between" alignItems="center">
<Grid
container
justifyContent="space-between"
alignItems="center"
>
<GuidedTour />
{loggedIn && (
<IconButton
Expand Down
7 changes: 6 additions & 1 deletion src/components/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@ const LoginForm = () => {
</Grid>
</CardContent>
<CardActions>
<Grid container direction="column" justify="center" spacing={3}>
<Grid
container
direction="column"
justifyContent="center"
spacing={3}
>
<Grid item>
<Button
type="submit"
Expand Down
2 changes: 1 addition & 1 deletion src/components/RegisterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const RegisterForm = () => {
</Grid>
</CardContent>
<CardActions>
<Grid container justify="center">
<Grid container justifyContent="center">
<Grid item>
<Button
type="submit"
Expand Down
2 changes: 1 addition & 1 deletion src/components/TestDetailsDialog/TestDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const TestDetailsModal: React.FunctionComponent<{
<React.Fragment>
<AppBar position="sticky">
<Toolbar>
<Grid container justify="space-between">
<Grid container justifyContent="space-between">
<Grid item>
<Typography variant="h6">{testRun.name}</Typography>
</Grid>
Expand Down
21 changes: 12 additions & 9 deletions src/components/TestRunList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const columnsDef: GridColDef[] = [

const TestRunList: React.FunctionComponent = () => {
const { enqueueSnackbar } = useSnackbar();
const { testRuns, loading } = useTestRunState();
const { testRun, testRuns, loading } = useTestRunState();
const { selectedBuildId } = useBuildState();
const testRunDispatch = useTestRunDispatch();

Expand Down Expand Up @@ -148,14 +148,17 @@ const TestRunList: React.FunctionComponent = () => {
);
}}
onStateChange={(props: GridStateChangeParams) => {
testRunDispatch({
type: "filter",
payload: props.state.visibleRows.visibleRows,
});
testRunDispatch({
type: "sort",
payload: props.state.sorting.sortedRows,
});
if (!testRun) {
// only if testRun modal is not shown
testRunDispatch({
type: "filter",
payload: props.state.visibleRows.visibleRows,
});
testRunDispatch({
type: "sort",
payload: props.state.sorting.sortedRows,
});
}
}}
/>
)}
Expand Down
3 changes: 3 additions & 0 deletions src/contexts/testRun.context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ function testRunReducer(state: State, action: IAction): State {
}
return t;
}),
testRun:
state.testRun &&
action.payload.find((item) => item.id === state.testRun!.id),
};
case "touched":
return {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const LoginPage = () => {
spacing={0}
direction="column"
alignItems="center"
justify="center"
justifyContent="center"
style={{ minHeight: "60vh" }}
>
<Grid item>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/ProfilePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ const ProfilePage = () => {
</Grid>
</CardContent>
<CardActions>
<Grid container justify="center">
<Grid container justifyContent="center">
<Grid item>
<Button
type="submit"
Expand Down Expand Up @@ -226,7 +226,7 @@ const ProfilePage = () => {
</Grid>
</CardContent>
<CardActions>
<Grid container justify="center">
<Grid container justifyContent="center">
<Grid item>
<Button
type="submit"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/RegisterPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const RegisterPage = () => {
spacing={0}
direction="column"
alignItems="center"
justify="center"
justifyContent="center"
style={{ minHeight: "60vh" }}
>
<Grid item>
Expand Down