Fiddle use cases fixed

Handle use cases:

1) handle case when temp.sol doesn’t exist - due to the new saga updates, the response from retreiving a temp fiddle from the filesystem (even if it doesn’t exist) is forward to the compilation endpoint, which returns an ENOENT, and this is handled in the selector.
2) delete all code - shouldn’t return last fiddle and should compile an empty string.
3) Switch to different tab (ie contracts) then back to fiddle - previous fiddle should remain.

Also fixed an issue (most likely due to latest rebase) when deploying fiddle contracts. The gasLimit was not being specified.

Handled issue where entities stored in the state were not being put in the correct order, so a timestamp was sent with the requests and then sorted when the response was returned.

embark-ui/src/actions/index.js

@@ -170,7 +170,7 @@ export const ensRecords = {
 
 export const FIDDLE = createRequestTypes('FIDDLE');
 export const fiddle = {
-  post: (codeToCompile) => action(FIDDLE[REQUEST], {codeToCompile}),
+  post: (codeToCompile, timestamp) => action(FIDDLE[REQUEST], {codeToCompile, timestamp}),
   success: (fiddle, payload) => {
     return action(FIDDLE[SUCCESS], {fiddles: [{...fiddle, ...payload}]});
   },

embark-ui/src/api/index.js

@@ -4,7 +4,7 @@ import constants from '../constants';
 function get(path, params) {
   return axios.get(constants.httpEndpoint + path, params)
     .then((response) => {
-      return {response};
+      return {response, error: null};
     }).catch((error) => {
       return {response: null, error: error.message || 'Something bad happened'};
     });
@@ -13,7 +13,7 @@ function get(path, params) {
 function post(path, params) {
   return axios.post(constants.httpEndpoint + path, params)
     .then((response) => {
-      return {response};
+      return {response, error: null};
     })
     .catch((error) => {
       return {response: null, error: error.message || 'Something bad happened'};

embark-ui/src/containers/FiddleContainer.js

@@ -22,6 +22,7 @@ class FiddleContainer extends Component {
     this.state = {
       value: undefined,
       loadingMessage: 'Loading...',
+
       readOnly: true
     };
     this.compileTimeout = null;
@@ -31,24 +32,24 @@ class FiddleContainer extends Component {
 
   componentDidMount() {
     this.setState({loadingMessage: 'Loading saved state...'});
-    if (!this.props.fiddle) {
     this.props.fetchLastFiddle();
   }
-  }
 
-  componentDidUpdate() {
-    if(!this.state.value && this.props.fiddle) {
-      this.setState({value: this.props.fiddle.codeToCompile});
+  componentDidUpdate(prevProps) {
+    const {lastFiddle} = this.props;
+    if(this.state.value === '' && prevProps.lastFiddle === lastFiddle) return;
+    if((!this.state.value && lastFiddle && !lastFiddle.error) && this.state.value !== lastFiddle) {
+      this._onCodeChange(lastFiddle, true);
     }
   }
 
-  _onCodeChange(newValue) {
+  _onCodeChange(newValue, immediate = false) {
     this.setState({readOnly: false, value: newValue});
     if (this.compileTimeout) clearTimeout(this.compileTimeout);
     this.compileTimeout = setTimeout(() => {
       this.setState({loadingMessage: 'Compiling...'});
-      this.props.postFiddle(newValue);
-    }, 1000);
+      this.props.postFiddle(newValue, Date.now());
+    }, immediate ? 0 : 1000);
 
   }
 
@@ -166,7 +167,8 @@ function mapStateToProps(state) {
     deployedContracts: deployedFiddle.data,
     fiddleError: fiddle.error,
     fiddleDeployError: deployedFiddle.error,
-    loading: state.loading
+    loading: state.loading,
+    lastFiddle: fiddle.data ? fiddle.data.codeToCompile : undefined
   };
 }
 
@@ -178,7 +180,8 @@ FiddleContainer.propTypes = {
   postFiddle: PropTypes.func,
   postFiddleDeploy: PropTypes.func,
   deployedContracts: PropTypes.string,
-  fetchLastFiddle: PropTypes.func
+  fetchLastFiddle: PropTypes.func,
+  lastFiddle: PropTypes.any
 };
 
 export default connect(

embark-ui/src/general.css

@@ -22,7 +22,8 @@
 }
 
 .text__new-line, .card.warnings-card .list-group-item, .card.errors-card .list-group-item {
-  white-space: pre-line;
+  white-space: pre-wrap;
+  font-family: monospace;
 }
 .card.card-fullscreen{
   z-index: 6;

embark-ui/src/reducers/selectors.js

@@ -109,9 +109,11 @@ export function getMessages(state) {
 }
 
 export function getFiddle(state) {
+  const fiddleCompilation = _.last(state.entities.fiddles.sort((a, b) => { return (a.timestamp || 0) - (b.timestamp || 0); }));
+  const isNoTempFileError = Boolean(fiddleCompilation && fiddleCompilation.codeToCompile && fiddleCompilation.codeToCompile.error && fiddleCompilation.codeToCompile.error.indexOf('ENOENT') > -1);
   return {
-    data: _.last(state.entities.fiddles),
-    error: state.errorEntities.fiddles
+    data: fiddleCompilation,
+    error: isNoTempFileError ? undefined : state.errorEntities.fiddles
   };
 }
 

lib/modules/deployment/contract_deployer.js

@@ -199,7 +199,7 @@ class ContractDeployer {
 
     // TODO: can be moved into a afterDeploy event
     // just need to figure out the gasLimit coupling issue
-    self.events.request('code-generator:contract:vanilla', contract, contract._gasLimit, (contractCode) => {
+    self.events.request('code-generator:contract:vanilla', contract, contract._gasLimit || false, (contractCode) => {
       self.events.request('runcode:eval', contractCode, () => {}, true);
       return callback();
     });

lib/modules/solidity/index.js

@@ -20,6 +20,9 @@ class Solidity {
       'post',
       '/embark-api/contract/compile',
       (req, res) => {
+        if(typeof req.body.codeToCompile !== 'string'){
+          return res.send({error: 'Body parameter \'codeToCompile\' must be a string'});
+        }
         const input = {'fiddle': {content: req.body.codeToCompile.replace(/\r\n/g, '\n')}};
         this.compile_solidity_code(input, {}, true, (errors, compilationResult) => {
           // write code to filesystem so we can view the source after page refresh