#152 Add 'import from template' to create new celltype button

Author: rodriguez-facundo

webapp/components/definition/cellRules/NetPyNECellRule.js

@@ -114,15 +114,6 @@ class NetPyNECellRule extends React.Component {
             >Add new section</Button>
           </Box>
 
-          <Box m={1}>
-            <Button 
-              variant="contained"
-              color="secondary"
-              onClick={() => this.props.openTopbarDialog(this.state.currentName)}
-            >Import cell template</Button>  
-          </Box>
-
-          
         </div>
         {dialogPop}
       </div>

webapp/components/definition/cellRules/NetPyNECellRules.js

@@ -10,10 +10,10 @@ import {
   NetPyNEThumbnail,
   GridLayout,
   Filter,
-  NetPyNESection
+  NetPyNESection,
+  SelectCellTemplate
 } from 'netpyne/components';
 
-import SelectCellTemplate from './SelectCellTemplate'
 import NetPyNEMechanism from './sections/mechanisms/NetPyNEMechanism';
 import NetPyNENewMechanism from './sections/mechanisms/NetPyNENewMechanism';
 

webapp/components/definition/cellRules/SelectCellTemplate.js

@@ -28,6 +28,12 @@ export default class NetPyNENewPlot extends React.Component {
         this.props.callback()
       })
   }
+
+  handleOpenTopbarDialog () {
+    var cellRuleId = Utils.getAvailableKey(this.props.model, "CellType");
+    this.props.openTopbarDialog(cellRuleId)
+    this.props.callback()
+  }
 
   render () {
     const { page, label, tooltip, handleButtonClick, anchorEl, clearAnchorEl } = this.props
@@ -76,6 +82,15 @@ export default class NetPyNENewPlot extends React.Component {
           >
             Ball and stick HH
           </MenuItem>
+
+
+          <MenuItem 
+            key={"fromTemplate"} 
+            value={"fromTemplate"}
+            onClick={() => this.handleOpenTopbarDialog()} 
+          >
+            Import cell template
+          </MenuItem>
 
         </Menu>
       </div>

webapp/components/index.js

@@ -282,6 +282,12 @@ export const Dialog = connect(
   dispatch => ({ handleClose: () => dispatch(closeDialog), })
 )(_Dialog)
 
+
+import _SelectCellTemplate from './definition/cellRules/SelectCellTemplate'
+export const SelectCellTemplate = connect(
+  null,
+  dispatch => ({ openTopbarDialog: cellTemplateName => dispatch(openTopbarDialog(TOPBAR_CONSTANTS.IMPORT_CELL_TEMPLATE, { cellRuleName: cellTemplateName })), })
+)(_SelectCellTemplate)
 // ---------------------------------------------------------------------------------------- //
 
 // DEFAULTS

webapp/components/topbar/Topbar.js

@@ -89,46 +89,46 @@ class Topbar extends Component {
       switch (this.props.topbarDialogName){
       case TOPBAR_CONSTANTS.LOAD:
         content = <LoadFileDialog
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
         />
         break;
       case TOPBAR_CONSTANTS.SAVE:
         content = <SaveFileDialog
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
         />
         break;
       case TOPBAR_CONSTANTS.IMPORT_HLS:
         content = <ImportExportHLSDialog 
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
           mode ={"IMPORT"}/>
         break;
       case TOPBAR_CONSTANTS.EXPORT_HLS:
         content = <ImportExportHLSDialog 
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
           mode ={"EXPORT"}
         />
         break;
       case TOPBAR_CONSTANTS.IMPORT_CELL_TEMPLATE:
         content = <ImportCellParamsDialog
-          open={this.props.openDialog}
-          cellRuleName={this.props.dialogMetadata.cellRuleName}
+          open={this.props.dialogOpen}
+          cellRuleName={this.props.topbarDialogMetadata.cellRuleName}
           onRequestClose={() => this.handleClose()}
         />
         break;
       case TOPBAR_CONSTANTS.NEW_MODEL:
         content = <NewModelDialog
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
           onAction={() => this.resetModel()}
         />
         break;
       case TOPBAR_CONSTANTS.UPLOAD_FILES:
         content = <UploadDownloadFilesDialog
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
           openSnackBar={message => {
             this.handleOpenSnackBar(message)
@@ -137,7 +137,7 @@ class Topbar extends Component {
         break;
       case TOPBAR_CONSTANTS.DOWNLOAD_FILES:
         content = <UploadDownloadFilesDialog 
-          open={this.props.openDialog}
+          open={this.props.dialogOpen}
           onRequestClose={() => this.handleClose()}
           openSnackBar={message => {
             this.handleOpenSnackBar(message)

webapp/components/topbar/dialogs/ImportCellParams.js

@@ -38,7 +38,7 @@ class ImportCellParams extends React.Component {
   constructor (props) {
     super(props);
     this.state = {
-      label: props.dialogMetadata.cellRuleName,
+      label: props.cellRuleName,
       fileName: '',
       cellName: '',
       modFolder: '',