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 dee89249e231dc3b17e406572e4e8de5952b7870..6970a38af8595087344d0ed4e5b52071c578f99a 100644
(file)
--- a/
src/components/form-dialog/form-dialog.tsx
+++ b/
src/components/form-dialog/form-dialog.tsx
@@
-16,40
+16,46
@@
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: "24px"
+ marginBottom: theme.spacing.unit,
+ marginRight: theme.spacing.unit * 3,
}
});
}
});
-interface DialogProjectProps {
+interface DialogProject
Data
Props {
cancelLabel?: string;
dialogTitle: string;
formFields: React.ComponentType<InjectedFormProps<any> & WithDialogProps<any>>;
submitLabel?: string;
cancelLabel?: string;
dialogTitle: string;
formFields: React.ComponentType<InjectedFormProps<any> & WithDialogProps<any>>;
submitLabel?: string;
+ enableWhenPristine?: boolean;
}
}
-export const FormDialog = withStyles(styles)((props: DialogProjectProps & WithDialogProps<{}> & InjectedFormProps<any> & WithStyles<CssRules>) =>
+type DialogProjectProps = DialogProjectDataProps & WithDialogProps<{}> & InjectedFormProps<any> & WithStyles<CssRules>;
+
+export const FormDialog = withStyles(styles)((props: DialogProjectProps) =>
<Dialog
open={props.open}
onClose={props.closeDialog}
<Dialog
open={props.open}
onClose={props.closeDialog}
- disableBackdropClick
={props.submitting}
+ disableBackdropClick
disableEscapeKeyDown={props.submitting}
disableEscapeKeyDown={props.submitting}
- fullWidth>
- <form>
+ fullWidth
+ maxWidth='md'>
+ <form data-cy='form-dialog'>
<DialogTitle className={props.classes.dialogTitle}>
{props.dialogTitle}
</DialogTitle>
<DialogTitle className={props.classes.dialogTitle}>
{props.dialogTitle}
</DialogTitle>
@@
-58,6
+64,7
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps & WithDi
</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"
@@
-65,10
+72,12
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps & WithDi
{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"
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} />}
@@
-77,5
+86,3
@@
export const FormDialog = withStyles(styles)((props: DialogProjectProps & WithDi
</form>
</Dialog>
);
</form>
</Dialog>
);
-
-