From bb337a9c9faedfff2ad9955b150940c3dc17069b Mon Sep 17 00:00:00 2001
From: Bob Gallagher <bob.gallagher@riftio.com>
Date: Mon, 24 Apr 2017 13:57:43 -0400
Subject: [PATCH] Merge from master

Change-Id: I8d374af11a10b7ba37d25a8c6c2b89275a49beb6
Signed-off-by: Bob Gallagher <bob.gallagher@riftio.com>
---
 .../model/DescriptorModelMetaFactory.js        | 18 +++++++++++-------
 .../src/instantiate/instantiateInputParams.jsx |  3 +--
 .../src/instantiate/instantiateStore.js        |  6 +++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js
index 1ba891256..69098ec2d 100644
--- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js
+++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js
@@ -102,15 +102,19 @@ function serialize_leaf_empty(data) {
 function serialize_leaf_list(data) {
 	data = data[this.name];
 	if (data) {
-		data = data.reduce((result, value) => {
-			if (value !== '' && value !== null && value !== undefined && typeof value !== 'object') {
-				result.push(value);
+		commaSeparatedValues = data.reduce((d, v) => {
+			let leaf = Serializer.leaf.call(this, d);
+			let value = leaf & leaf[this.name];
+			if (value && value.length) {
+				if (v.length) {
+					v += ', ';
+				}
+				v += value;
 			}
-			return result;
-		}, []);
-		if (data.length){
+		}, "");
+		if (commaSeparatedValues.length) {
 			let obj = {};
-			obj[this.name] = data;
+			obj[this.name] = commaSeparatedValues;
 			return obj;
 		}
 	}
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 6273d8cab..d1e295c03 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@ -105,13 +105,12 @@ export default class InstantiateInputParams extends Component {
   }
   inputParametersHTML = (props) => {
     let inputParameters = props.inputParameters;
-    const handleChange = (i, event) => props.updateInputParam(i, event.target.value);
     return inputParameters && inputParameters.map(function(input, i) {
         return (
                 <div className="configure-nsd_section" key={i}>
                   <h3 className="launchpadCard_title">Input Parameters</h3>
                   <div className="inputControls">
-                      <TextInput label={ input.label || input.xpath } type="text" onChange={handleChange.bind(this, i)} />
+                      <TextInput label={ input.label || input.xpath } type="text" onChange={props.updateInputParam.bind(self, i)} />
                   </div>
                 </div>
         )
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
index 0e91ee384..3ec2a8029 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
@@ -189,10 +189,10 @@ class LaunchNetworkServiceStore {
         });
         return window.location.hash = 'launchpad/' + tokenizedHash[2];
     }
-    launchNSRError(data) {
+    launchNSRError(error) {
         var msg = 'Something went wrong while trying to instantiate. Check the error logs for more information';
-        if (data.error) {
-            msg = data.error;
+        if(error) {
+            msg = error;
         }
         Alt.actions.global.showNotification.defer(msg);
         Alt.actions.global.hideScreenLoader.defer();
-- 
2.25.1