From 46499e70ff039b6bebd7de54a5f2a42b55eaa07e Mon Sep 17 00:00:00 2001 From: Bob Gallagher Date: Thu, 20 Apr 2017 17:31:19 -0400 Subject: [PATCH] Fix serialization of a leaf-list field. Change-Id: I313bfc02d6a6311ef096ca28527153465c131271 Signed-off-by: Bob Gallagher --- .../model/DescriptorModelMetaFactory.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js index 69098ec2d..1ba891256 100644 --- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js +++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js @@ -102,19 +102,15 @@ function serialize_leaf_empty(data) { function serialize_leaf_list(data) { data = data[this.name]; if (data) { - 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; + data = data.reduce((result, value) => { + if (value !== '' && value !== null && value !== undefined && typeof value !== 'object') { + result.push(value); } - }, ""); - if (commaSeparatedValues.length) { + return result; + }, []); + if (data.length){ let obj = {}; - obj[this.name] = commaSeparatedValues; + obj[this.name] = data; return obj; } } -- 2.17.1