#311 confirm user action for file imports

Author: Muhaddatha

webapp/components/general/ConfirmationDialog.js

@@ -20,10 +20,7 @@ class ConfirmationDialog extends React.Component {
   handleConfirmation = () => {
     if (this.props.confirmationDialogOnConfirm) {
       if (this.props.confirmationDialogOnConfirm.type === PYTHON_CALL) {
-        this.props.pythonCall({
-          cmd: this.props.confirmationDialogOnConfirm.cmd,
-          args: this.props.confirmationDialogOnConfirm.args,
-        });
+        this.props.pythonCall(this.props.confirmationDialogOnConfirm.cmd, this.props.confirmationDialogOnConfirm.args);
       } else if (this.props.confirmationDialogOnConfirm.type === LOAD_TUTORIAL) {
         if (this.props.confirmationDialogOnConfirm.payload !== undefined) {
           this.props.dispatchAction(this.props.confirmationDialogOnConfirm.action(this.props.confirmationDialogOnConfirm.payload));
@@ -38,7 +35,6 @@ class ConfirmationDialog extends React.Component {
 
   render () {
     const {
-      classes,
       confirmationDialogOpen,
       confirmationDialogTitle,
       confirmationDialogMessage,
@@ -51,10 +47,9 @@ class ConfirmationDialog extends React.Component {
         maxWidth="sm"
         open={confirmationDialogOpen}
         onClose={() => closeConfirmationDialog()}
-        className={classes.root}
       >
         <DialogTitle>{confirmationDialogTitle}</DialogTitle>
-        <DialogContent>
+        <DialogContent style={{ color: 'white' }}>
           {confirmationDialogMessage}
         </DialogContent>
         <DialogActions>

webapp/components/topbar/Topbar.js

@@ -92,7 +92,7 @@ class Topbar extends Component {
           this.props.openConfirmationDialog({
             title: 'Warning',
             message: 'A NetPyNE model has already been instantiated or simulated.'
-            + 'Continuing with this action will use the old value of netParams and simConfig for the new model. Do you want to continue?',
+            + ' Continuing with this action will use the old value of netParams and simConfig for the new model. Do you want to continue?',
             onConfirm: {
               type: LOAD_TUTORIAL,
               action,
@@ -123,9 +123,12 @@ class Topbar extends Component {
       classes,
       modelLoaded,
       dialogOpen,
+      modelState,
       topbarDialogName,
       topbarDialogMetadata,
+      openConfirmationDialog,
     } = this.props;
+
     let content;
     if (dialogOpen) {
       switch (topbarDialogName) {
@@ -151,6 +154,8 @@ class Topbar extends Component {
               open={dialogOpen}
               onRequestClose={() => this.handleClose()}
               mode="IMPORT"
+              modelState={modelState}
+              openConfirmationDialog={(payload) => openConfirmationDialog(payload)}
             />
           );
           break;

webapp/components/topbar/dialogs/ActionDialog.js

@@ -38,8 +38,12 @@ class ActionDialog extends React.Component {
   performAction = () => {
     if (this.props.command) {
       if (this.props.isFormValid === undefined || this.props.isFormValid()) {
-        GEPPETTO.trigger(GEPPETTO.Events.Show_spinner, this.props.message);
-        this.props.pythonCall(this.props.command, this.props.args);
+        if (typeof this.props.callback !== 'undefined' || this.props.callback !== null) {
+          this.props.callback(this.props.command, this.props.args);
+        } else {
+          GEPPETTO.trigger(GEPPETTO.Events.Show_spinner, this.props.message);
+          this.props.pythonCall(this.props.command, this.props.args);
+        }
       }
     }
     this.setState({ hide: true });

webapp/components/topbar/dialogs/ImportExportHLS.js

@@ -7,7 +7,8 @@ import Box from '@material-ui/core/Box';
 import { withStyles } from '@material-ui/core/styles';
 
 import { ActionDialog, Tooltip } from 'netpyne/components';
-import { NETPYNE_COMMANDS } from '../../../constants';
+import { NETPYNE_COMMANDS, MODEL_STATE } from '../../../constants';
+import { PYTHON_CALL } from '../../../redux/actions/general';
 import FileBrowser from '../../general/FileBrowser';
 import Checkbox from '../../general/Checkbox';
 
@@ -179,8 +180,21 @@ class ImportExportHLS extends React.Component {
     }
   }
 
+  handleConfirmation (command, args) {
+    this.props.openConfirmationDialog({
+      title: 'Warning',
+      message: 'A NetPyNE model has already been instantiated or simulated.'
+      + ' Continuing with this import action will use the old value of netParams and simConfig for the new model. Do you want to continue?',
+      onConfirm: {
+        type: PYTHON_CALL,
+        cmd: command,
+        args,
+      },
+    });
+  }
+
   render () {
-    const { classes } = this.props;
+    const { classes, modelState } = this.props;
     switch (this.props.mode) {
       case 'IMPORT':
         var content = (
@@ -309,18 +323,34 @@ class ImportExportHLS extends React.Component {
         var title = 'Export as Python script';
         break;
     }
+
     return (
-      <ActionDialog
-        command={command}
-        message={message}
-        buttonLabel={buttonLabel}
-        args={this.state}
-        title={title}
-        isFormValid={this.isFormValid}
-        {...this.props}
-      >
-        {content}
-      </ActionDialog>
+      this.props.mode === 'IMPORT' ? (
+        <ActionDialog
+          command={command}
+          message={message}
+          buttonLabel={buttonLabel}
+          args={this.state}
+          title={title}
+          isFormValid={this.isFormValid}
+          callback={modelState === MODEL_STATE.INSTANTIATED || modelState === MODEL_STATE.SIMULATED ? (command, args) => { this.handleConfirmation(command, args); } : undefined}
+          {...this.props}
+        >
+          {content}
+        </ActionDialog>
+      ) : (
+        <ActionDialog
+          command={command}
+          message={message}
+          buttonLabel={buttonLabel}
+          args={this.state}
+          title={title}
+          isFormValid={this.isFormValid}
+          {...this.props}
+        >
+          {content}
+        </ActionDialog>
+      )
     );
   }
 }