Merge pull request #5 from alexpilotti/master

Handle properly data types when saving endpoints CD-17 #resolve

src/components/AddCloudConnection/AddCloudConnection.js

@@ -138,6 +138,31 @@ class AddCloudConnection extends Reflux.Component {
         if (credentials[key].label) {
           credentials[key] = credentials[key].value
         }
+
+        let field = this.state.currentCloud.endpoint.fields.find(function findByName(f) { return f.name == this }, key);
+        // Convert datatype
+        switch (field.dataType) {
+          case 'boolean':
+            credentials[key] = (credentials[key] === true ||
+              ((typeof credentials[key] === 'string' || credentials[key] instanceof String) &&
+               credentials[key].toLowerCase() == "true"));
+            break;
+          case 'integer':
+            let value = parseInt(credentials[key], 10);
+            if (value.toString() != credentials[key]) {
+              valid = false;
+              NotificationActions.notify('"' + key + '" needs to be an integer', 'error');
+            }
+            credentials[key] = value;
+            break;
+          default:
+            // retain original value
+            break;
+        }
+      }
+
+      if (!valid) {
+        return;
       }
 
       // If Azure, explicitly setting the fields right
@@ -227,10 +252,10 @@ class AddCloudConnection extends Reflux.Component {
 
     cloud.endpoint.fields.forEach(field => {
       if (typeof currentCloudData[field.name] == "undefined") {
-        if (field.type == "dropdown") {
-          currentCloudData[field.name] = field.options[0]
+        if (typeof field.defaultValue === 'undefined') {
+          currentCloudData[field.name] = "";
         } else {
-          currentCloudData[field.name] = ""
+          currentCloudData[field.name] = field.defaultValue.toString();
         }
       }
       if (field.required) {
@@ -275,7 +300,7 @@ class AddCloudConnection extends Reflux.Component {
         case 'dropdown':
           field.options.forEach(option => {
             if (option.default === true && typeof currentCloudData[field.name] == "undefined") {
-              currentCloudData[field.name] = option
+              currentCloudData[field.name] = option.value
               this.setState({ currentCloudData: currentCloudData })
             }
           }, this)
@@ -336,7 +361,7 @@ class AddCloudConnection extends Reflux.Component {
   handleCloudFieldChange(e, field) {
     let currentCloudData = this.state.currentCloudData
     if (field.type == 'dropdown') {
-      currentCloudData[field.name] = e
+      currentCloudData[field.name] = e.value
     } else {
       currentCloudData[field.name] = e.target.value
     }
@@ -417,8 +442,9 @@ class AddCloudConnection extends Reflux.Component {
             <Dropdown
               options={field.options}
               onChange={(e) => this.handleCloudFieldChange(e, field)}
-              placeholder={field.label + (field.required ? " *" : "")}
-              value={this.state.currentCloudData[field.name]}
+              placeholder="Choose a value"
+              value={field.options.find(function findOption(option) { return option.value == this},
+                     this.state.currentCloudData[field.name])}
             />
           </div>
         )

src/stores/ConnectionsStore/ConnectionsStore.js

@@ -353,8 +353,9 @@ class ConnectionsStore extends Reflux.Store
           case "boolean":
             field.type = "dropdown"
             field.options = [
-              {label: field.label + ": Yes", value: "true", default: cloudData.properties[propName].default == "true"},
-              {label: field.label + ": No", value: "false", default: cloudData.properties[propName].default == "false"}
+              // Values need to be strings, due to a limitation in react-dropdown
+              {label: "Yes", value: "true"},
+              {label: "No", value: "false"}
             ]
 
             break
@@ -368,10 +369,10 @@ class ConnectionsStore extends Reflux.Store
               field.type = "dropdown"
               field.options = []
               for (let i = cloudData.properties[propName].minimum; i <= cloudData.properties[propName].maximum; i++) {
+                // Values need to be strings, due to a limitation in react-dropdown
                 field.options.push({
-                    label: field.label + ": " + i,
-                    value: i,
-                    default: cloudData.properties[propName].default === i
+                    label: i.toString(),
+                    value: i.toString()
                   },
                 )
               }
@@ -381,6 +382,9 @@ class ConnectionsStore extends Reflux.Store
             break
         }
 
+        field.defaultValue = cloudData.properties[propName].default;
+        field.dataType = cloudData.properties[propName].type;
+
         if (field.name == 'username') {
           field.required = true
           sortedFields[0] = field