Merge branch 'master' into nwchem-neb

Author: chetnieter

dist/simput-pyfr.js

@@ -55,7 +55,7 @@
     "babel-polyfill": "6.9.1",
     "paraviewweb": "2.0.5",
     "pvw-visualizer": "2.0.6",
-    "simput": "1.2.8",
+    "simput": "1.3.4",
     "candela": "0.6.2",
 
     "kw-web-suite": "2.0.0"

package.json

@@ -24,6 +24,32 @@ function createItemForSimulation(simulation, name, file) {
     });
 }
 
+export function addFileForSimulationWithContents(simulation, name, contents) {
+  let fileId;
+  return girder.createItem(simulation.metadata.inputFolder._id, name)
+    .then(resp => {
+      const parentId = resp.data._id;
+      return girder.newFile({
+        parentType: 'item',
+        parentId,
+        name,
+        size: 0,
+      });
+    })
+    .then(resp => {
+      fileId = resp.data._id;
+      const blob = new Blob([contents], { type: 'text/plain' });
+      return girder.updateFileContent(resp.data._id, contents.length)
+        .then(upload => {
+          girder.uploadChunk(fileId, 0, blob);
+        });
+    })
+    .then(resp => ({ _id: fileId }))
+    .catch(err => {
+      console.log('Error adding ini content', err);
+    });
+}
+
 export function addEmptyFileForSimulation(simulation, name) {
   return girder.createItem(simulation.metadata.inputFolder._id, name)
     .then(resp => {

src/network/helpers/simulations.js

@@ -103,6 +103,10 @@ export default function ({ client, filterQuery, mustContain, busy, encodeQueryAs
 
     uploadFileToItem,
 
+    getFile(id) {
+      return busy(client._.get(`/file/${id}`));
+    },
+
     getUploadOffset(id) {
       return busy(client._.get('/file/offset', { params: { uploadId: id } }));
     },
@@ -133,6 +137,10 @@ export default function ({ client, filterQuery, mustContain, busy, encodeQueryAs
       return missingKeys ? promise : busy(client._.put(`/file/${file._id}${encodeQueryAsString(params)}`));
     },
 
+    copyFile(fileId, itemId) {
+      return busy(client._.post(`/file/${fileId}/copy?itemId=${itemId}`));
+    },
+
     newFile(file) {
       const expected = ['parentType', 'parentId', 'name', 'size', 'mimeType', 'linkUrl'],
         params = filterQuery(file, ...expected),

src/network/remote/file.js

@@ -51,7 +51,8 @@ const ProjectEdit = React.createClass({
     }
 
     const childComponent = project.type ? Workflows[project.type].components.EditProject : null;
-    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container }) : null;
+    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container,
+      parentProps: this.props }) : null;
 
     return (
       <ItemEditor
@@ -65,7 +66,9 @@ const ProjectEdit = React.createClass({
           { name: 'delete', label: 'Delete project' },
           { name: 'editProject', label: 'Save project' }]}
         onAction={ this.onAction }
-      >{ workflowAddOn }</ItemEditor>);
+      >
+        { workflowAddOn }
+      </ItemEditor>);
   },
 });
 

src/pages/Project/Edit/index.js

@@ -90,7 +90,9 @@ const ProjectNew = React.createClass({
 
   render() {
     const childComponent = this.state.type ? Workflows[this.state.type].components.NewProject : null;
-    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container }) : null;
+    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container,
+      parentProps: this.props }) : null;
+
     return (
       <ItemEditor
         error={ this.state._error || this.props.error }

src/pages/Project/New/index.js

@@ -53,7 +53,8 @@ const SimulationEdit = React.createClass({
     const { simulation, project, error } = this.props;
     const projectId = simulation.projectId;
     const childComponent = project.type ? Workflows[project.type].components.EditSimulation : null;
-    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container }) : null;
+    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container,
+      parentProps: this.props }) : null;
 
     return (
       <ItemEditor

src/pages/Simulation/Edit/index.js

@@ -83,7 +83,9 @@ const SimulationNew = React.createClass({
 
     const type = this.props.project.type;
     const childComponent = type ? Workflows[type].components.NewSimulation : null;
-    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container }) : null;
+    const workflowAddOn = childComponent ? React.createElement(childComponent, { owner: () => this.refs.container,
+      parentProps: this.props }) : null;
+
     return (
       <ItemEditor
         breadcrumb={{

src/pages/Simulation/New/index.js

@@ -58,6 +58,9 @@ const FileUploadEntry = React.createClass({
           Object.keys(metadata).forEach(key => {
             this.props.owner().addMetadata(key, metadata[key]);
           });
+        })
+        .catch(err => {
+          this.refs.input.value = '';
         });
     }
   },
@@ -67,6 +70,7 @@ const FileUploadEntry = React.createClass({
       <div className={style.group}>
         <label className={style.label}>{this.props.label}</label>
         <input
+          ref="input"
           className={style.input}
           data-name={this.props.name}
           accept={this.props.accept}
@@ -155,6 +159,10 @@ export default React.createClass({
     };
   },
 
+  componentDidMount() {
+    this.attachment = {};
+  },
+
   onAction(action) {
     if (this.props.onAction) {
       this.props.onAction(action, this.state, this.attachment);
@@ -177,7 +185,17 @@ export default React.createClass({
     this.attachment = {};
   },
 
-  removeMetadata() {
+  removeMetadata(key = null) {
+    if (key) {
+      const metadata = Object.assign({}, this.state.metadata || {});
+      delete metadata[key];
+      if (this.attachment[key]) {
+        delete this.attachment[key];
+      }
+      this.setState({ metadata });
+      return;
+    }
+
     const metadata = Object.assign({}, this.state.metadata || {});
     if (this.attachment) {
       Object.keys(this.attachment).forEach((el) => {

src/panels/ItemEditor/index.js

@@ -110,6 +110,7 @@ const visualizer = React.createClass({
     this.props.setTimeStep(timeStep);
   },
 
+/* eslint-disable react/jsx-no-bind */
   render() {
     if (!this.session) {
       return <LoadingPanel large center />;