From 94a39619b55d9fc04281b5f3dc136480b0393f95 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Wed, 8 Mar 2017 12:26:03 +0100
Subject: [PATCH] Fix default values for contract queries (#4819)

---
 js/src/views/Contract/Queries/inputQuery.js | 35 ++++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js/src/views/Contract/Queries/inputQuery.js
index a93fe74d0..8d4bddf02 100644
--- a/js/src/views/Contract/Queries/inputQuery.js
+++ b/js/src/views/Contract/Queries/inputQuery.js
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { isEqual } from 'lodash';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import LinearProgress from 'material-ui/LinearProgress';
@@ -24,6 +25,7 @@ import { bindActionCreators } from 'redux';
 import { newError } from '~/redux/actions';
 import { Button, TypedInput } from '~/ui';
 import { arrayOrObjectProptype } from '~/util/proptypes';
+import { parseAbiType } from '~/util/abi';
 
 import styles from './queries.css';
 
@@ -44,11 +46,35 @@ class InputQuery extends Component {
   };
 
   state = {
+    inputs: [],
     isValid: true,
     results: [],
     values: {}
   };
 
+  componentWillMount () {
+    this.parseInputs();
+  }
+
+  componentWillReceiveProps (nextProps) {
+    const prevInputTypes = this.props.inputs.map((input) => input.type);
+    const nextInputTypes = nextProps.inputs.map((input) => input.type);
+
+    if (!isEqual(prevInputTypes, nextInputTypes)) {
+      this.parseInputs(nextProps);
+    }
+  }
+
+  parseInputs (props = this.props) {
+    const inputs = props.inputs.map((input) => ({ ...input, parsed: parseAbiType(input.type) }));
+    const values = inputs.reduce((values, input, index) => {
+      values[index] = input.parsed.default;
+      return values;
+    }, {});
+
+    this.setState({ inputs, values });
+  }
+
   render () {
     const { name, className } = this.props;
 
@@ -64,10 +90,9 @@ class InputQuery extends Component {
   }
 
   renderContent () {
-    const { inputs } = this.props;
+    const { inputs } = this.state;
 
     const { isValid } = this.state;
-
     const inputsFields = inputs
       .map((input, index) => this.renderInput(input, index));
 
@@ -190,15 +215,15 @@ class InputQuery extends Component {
   }
 
   onClick = () => {
-    const { values } = this.state;
-    const { inputs, contract, name, outputs, signature } = this.props;
+    const { inputs, values } = this.state;
+    const { contract, name, outputs, signature } = this.props;
 
     this.setState({
       isLoading: true,
       results: []
     });
 
-    const inputValues = inputs.map((input, index) => values[index] || '');
+    const inputValues = inputs.map((input, index) => values[index]);
 
     contract
       .instance[signature]