Merge branch 'master' into 14604-ui-improvements

[arvados-workbench2.git] / src / components / confirmation-dialog / confirmation-dialog.tsx

diff --git a/src/components/confirmation-dialog/confirmation-dialog.tsx b/src/components/confirmation-dialog/confirmation-dialog.tsx
index 6e87416781eb01a02866bc9f2bcea65dc0c59a68..257eadf3f8ff75bf7fb8152d4bb9a7d79d98e3ed 100644 (file)
--- a/src/components/confirmation-dialog/confirmation-dialog.tsx
+++ b/src/components/confirmation-dialog/confirmation-dialog.tsx
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from "react";
-import { defaultTo, property } from 'lodash';
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography, DialogContentText, CircularProgress } from "@material-ui/core";
-import { WithDialogProps } from "../../store/dialog/with-dialog";
-import { TextField } from "../text-field/text-field";
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button, DialogContentText } from "@material-ui/core";
+import { WithDialogProps } from "~/store/dialog/with-dialog";
+import { WarningIcon } from '~/components/icon/icon';
 
 export interface ConfirmationDialogDataProps {
     title: string;
     text: string;
+    info?: string; 
     cancelButtonLabel?: string;
     confirmButtonLabel?: string;
 }
@@ -22,14 +22,16 @@ export interface ConfirmationDialogProps {
 export const ConfirmationDialog = (props: ConfirmationDialogProps & WithDialogProps<ConfirmationDialogDataProps>) =>
     <Dialog open={props.open}>
         <DialogTitle>{props.data.title}</DialogTitle>
-        <DialogContent>
-            <DialogContentText>
-                {props.data.text}
+        <DialogContent style={{ display: 'flex', alignItems: 'center' }}>
+            <WarningIcon />
+            <DialogContentText style={{ paddingLeft: '8px' }}>
+                <div>{props.data.text}</div>
+                <div>{props.data.info}</div>
             </DialogContentText>
         </DialogContent>
-        <DialogActions>
+        <DialogActions style={{ margin: '0px 24px 24px' }}>
             <Button
-                variant='flat'
+                variant='text'
                 color='primary'
                 onClick={props.closeDialog}>
                 {props.data.cancelButtonLabel || 'Cancel'}