projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17426-plug-ins' refs #17426
[arvados-workbench2.git]
/
src
/
components
/
form-dialog
/
form-dialog.tsx
diff --git
a/src/components/form-dialog/form-dialog.tsx
b/src/components/form-dialog/form-dialog.tsx
index e95693df188309706edf3accbd09809faf760a98..6970a38af8595087344d0ed4e5b52071c578f99a 100644
(file)
--- a/
src/components/form-dialog/form-dialog.tsx
+++ b/
src/components/form-dialog/form-dialog.tsx
@@
-16,22
+16,24
@@
const styles: StyleRulesCallback<CssRules> = theme => ({
},
lastButton: {
marginLeft: theme.spacing.unit,
},
lastButton: {
marginLeft: theme.spacing.unit,
- marginRight: "
20px
",
+ marginRight: "
0
",
},
formContainer: {
display: "flex",
flexDirection: "column",
},
formContainer: {
display: "flex",
flexDirection: "column",
-
marginTop: "20px
",
+
paddingBottom: "0
",
},
dialogTitle: {
},
dialogTitle: {
- paddingBottom: "0"
+ paddingTop: theme.spacing.unit,
+ paddingBottom: theme.spacing.unit,
},
progressIndicator: {
position: "absolute",
minWidth: "20px",
},
dialogActions: {
},
progressIndicator: {
position: "absolute",
minWidth: "20px",
},
dialogActions: {
- marginBottom: theme.spacing.unit * 3
+ marginBottom: theme.spacing.unit,
+ marginRight: theme.spacing.unit * 3,
}
});
}
});
@@
-40,6
+42,7
@@
interface DialogProjectDataProps {
dialogTitle: string;
formFields: React.ComponentType<InjectedFormProps<any> & WithDialogProps<any>>;
submitLabel?: string;
dialogTitle: string;
formFields: React.ComponentType<InjectedFormProps<any> & WithDialogProps<any>>;
submitLabel?: string;
+ enableWhenPristine?: boolean;
}
type DialogProjectProps = DialogProjectDataProps & WithDialogProps<{}> & InjectedFormProps<any> & WithStyles<CssRules>;
}
type DialogProjectProps = DialogProjectDataProps & WithDialogProps<{}> & InjectedFormProps<any> & WithStyles<CssRules>;
@@
-52,7
+55,7
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps) =>
disableEscapeKeyDown={props.submitting}
fullWidth
maxWidth='md'>
disableEscapeKeyDown={props.submitting}
fullWidth
maxWidth='md'>
- <form>
+ <form
data-cy='form-dialog'
>
<DialogTitle className={props.classes.dialogTitle}>
{props.dialogTitle}
</DialogTitle>
<DialogTitle className={props.classes.dialogTitle}>
{props.dialogTitle}
</DialogTitle>
@@
-61,6
+64,7
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps) =>
</DialogContent>
<DialogActions className={props.classes.dialogActions}>
<Button
</DialogContent>
<DialogActions className={props.classes.dialogActions}>
<Button
+ data-cy='form-cancel-btn'
onClick={props.closeDialog}
className={props.classes.button}
color="primary"
onClick={props.closeDialog}
className={props.classes.button}
color="primary"
@@
-68,11
+72,12
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps) =>
{props.cancelLabel || 'Cancel'}
</Button>
<Button
{props.cancelLabel || 'Cancel'}
</Button>
<Button
+ data-cy='form-submit-btn'
type="submit"
onClick={props.handleSubmit}
className={props.classes.lastButton}
color="primary"
type="submit"
onClick={props.handleSubmit}
className={props.classes.lastButton}
color="primary"
- disabled={props.invalid || props.submitting ||
props.pristine
}
+ disabled={props.invalid || props.submitting ||
(props.pristine && !props.enableWhenPristine)
}
variant="contained">
{props.submitLabel || 'Submit'}
{props.submitting && <CircularProgress size={20} className={props.classes.progressIndicator} />}
variant="contained">
{props.submitLabel || 'Submit'}
{props.submitting && <CircularProgress size={20} className={props.classes.progressIndicator} />}
@@
-81,5
+86,3
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps) =>
</form>
</Dialog>
);
</form>
</Dialog>
);
-
-