Merge pull request #223 from Kitware/more-fix-pyfr-simput

More fix pyfr simput
Kitware · Mar 9, 2016 · 632b5ea · 632b5ea
2 parents 04ebdb2 + 8ac4661
commit 632b5ea
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 10 deletions.
diff --git a/src/pages/Preferences/AWS/index.js b/src/pages/Preferences/AWS/index.js
@@ -9,6 +9,8 @@ import { breadcrumb }   from '..';
 
 import style from 'HPCCloudStyle/PageWithMenu.mcss';
 
+const awsBreadCrumb = Object.assign({}, breadcrumb, { active: 2 });
+
 /* eslint-disable no-alert */
 export default React.createClass({
 
@@ -113,7 +115,7 @@ export default React.createClass({
     return (
       <div className={ style.rootContainer }>
         <Toolbar
-          breadcrumb={breadcrumb}
+          breadcrumb={ awsBreadCrumb }
           title="AWS EC2"
           actions={[{ name: 'add', icon: style.addIcon }]}
           onAction={this.addItem}

diff --git a/src/pages/Preferences/Cluster/index.js b/src/pages/Preferences/Cluster/index.js
@@ -9,6 +9,8 @@ import { breadcrumb }   from '..';
 
 import style from 'HPCCloudStyle/PageWithMenu.mcss';
 
+const clusterBreadCrumb = Object.assign({}, breadcrumb, { active: 1 });
+
 const STATUS_TO_ICON = {
   error: style.statusErrorIcon,
   creating: style.statusCreatingIcon,
@@ -182,7 +184,7 @@ export default React.createClass({
     return (
       <div className={ style.rootContainer }>
         <Toolbar
-          breadcrumb={ breadcrumb }
+          breadcrumb={ clusterBreadCrumb }
           title="Clusters"
           actions={[{ name: 'add', icon: style.addIcon }]}
           onAction={this.addItem}

diff --git a/src/pages/Preferences/User/index.js b/src/pages/Preferences/User/index.js
@@ -7,6 +7,8 @@ import { breadcrumb }   from '..';
 
 import style from 'HPCCloudStyle/PageWithMenu.mcss';
 
+const userBreadCrumb = Object.assign({}, breadcrumb, { active: 0 });
+
 export default React.createClass({
 
   displayName: 'Preferences/User',
@@ -46,7 +48,7 @@ export default React.createClass({
   render() {
     return (
       <div className={ style.rootContainer }>
-        <Toolbar title="User" breadcrumb={breadcrumb} />
+        <Toolbar title="User" breadcrumb={userBreadCrumb} />
         <div className={ style.container }>
             <ActiveList
               className={ style.menu }

diff --git a/src/pages/Preferences/index.js b/src/pages/Preferences/index.js
@@ -12,6 +12,7 @@ export const breadcrumb = {
     style.clusterIcon,
     style.ec2Icon,
   ],
+  active: -1,
 };
 
 export default React.createClass({

diff --git a/src/panels/Toolbar/index.js b/src/panels/Toolbar/index.js
@@ -51,7 +51,12 @@ export default React.createClass({
   render() {
     return (
       <nav className={ style.container }>
-        <Breadcrumb className={ style.breadcrumb } paths={ this.props.breadcrumb.paths } icons={ this.props.breadcrumb.icons } />
+        <Breadcrumb
+          className={ style.breadcrumb }
+          paths={ this.props.breadcrumb.paths }
+          icons={ this.props.breadcrumb.icons }
+          active={ this.props.breadcrumb.active }
+        />
 
         <div className={ style.title }>
             { this.props.title }

diff --git a/src/widgets/Breadcrumb/index.js b/src/widgets/Breadcrumb/index.js
@@ -18,22 +18,24 @@ export default React.createClass({
   displayName: 'LinkIcon',
 
   propTypes: {
+    active: React.PropTypes.number,
     className: React.PropTypes.string,
     icons: React.PropTypes.array,
     paths: React.PropTypes.array,
   },
 
   getDefaultProps() {
     return {
+      active: -1,
       icons: DEFAULT_BREADCRUMB_ICONS,
     };
   },
 
   render() {
     return (
       <div className={ this.props.className }>
-        {this.props.paths.map((path, index) =>
-          <LinkIcon key={index} to={path} icon={this.props.icons[index]} />
+        { this.props.paths.map((path, index) =>
+          <LinkIcon key={index} to={path} icon={this.props.icons[index]} className={ index === this.props.active ? style.activeBreadCrumb : ''} />
         )}
       </div>);
   },

diff --git a/src/widgets/LinkIcon/index.js b/src/widgets/LinkIcon/index.js
@@ -5,11 +5,18 @@ export default React.createClass({
   displayName: 'LinkIcon',
 
   propTypes: {
+    className: React.PropTypes.string,
     icon: React.PropTypes.string,
     to: React.PropTypes.string,
   },
 
+  getDefaultProps() {
+    return {
+      className: '',
+    };
+  },
+
   render() {
-    return (<Link to={this.props.to}><i className={this.props.icon}></i></Link>);
+    return (<Link to={this.props.to}><i className={ [this.props.icon, this.props.className].join(' ') }></i></Link>);
   },
 });
diff --git a/src/workflows/pyfr/components/steps/Input/index.js b/src/workflows/pyfr/components/steps/Input/index.js
@@ -93,11 +93,15 @@ export default React.createClass({
         metadata: { model: JSON.stringify(jsonData) },
       }).then((resp) => {
         var newSim = deepClone(this.props.simulation);
-        newSim.steps[this.props.step].metadata.model = jsonData;
+        newSim.steps[this.props.step].metadata.model = JSON.stringify(jsonData);
         client.invalidateSimulation(newSim);
       });
     } else {
-      jsonData = JSON.parse(jsonData);
+      if (typeof jsonData === 'string') {
+        jsonData = JSON.parse(jsonData);
+      } else {
+        console.log('Can not convert jsonData (?)', jsonData);
+      }
     }
 
     // Push model to state
@@ -116,7 +120,7 @@ export default React.createClass({
       metadata: { model: JSON.stringify(jsonData) },
     }).then((resp) => {
       var newSim = deepClone(this.props.simulation);
-      newSim.steps[this.props.step].metadata.model = jsonData;
+      newSim.steps[this.props.step].metadata.model = JSON.stringify(jsonData);
       client.invalidateSimulation(newSim);
     });
 

diff --git a/style/Theme.mcss b/style/Theme.mcss
@@ -162,3 +162,7 @@
     composes: breadCrumbIcon;
     composes: fa-question   from 'font-awesome/css/font-awesome.css';
 }
+
+.activeBreadCrumb {
+  color: #18e !important;
+}