From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Fri, 5 May 2017 03:35:24 +0000 (-0400)
Subject: NOTICKET: Bug with VNFD view for some choices
X-Git-Tag: v2.0.1~11
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c8e0a3426f19f230e6067cc8f449c86111c370fa;p=osm%2FUI.git

NOTICKET: Bug with VNFD view for some choices

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
---

diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index c923ede7f..ad2bf3dc9 100644
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -538,7 +538,7 @@ export default function EditDescriptorModelProperties(props) {
 				selectedOptionValue = utils.resolvePath(container.model, ['uiState.choice', pathToChoice, 'selected'].join('.'));
 			} else {
 				property.properties.map(function(p) {
-					let pname = p.properties[0].name;
+					let pname = p.properties[0] && p.properties[0].name;
 					if(container.model.hasOwnProperty(pname)) {
 						utils.assignPathValue(container.model, ['uiState.choice', pathToChoice, 'selected'].join('.'), [p.name, pname].join('.'));
 					}
@@ -747,7 +747,7 @@ export default function EditDescriptorModelProperties(props) {
 			value = utils.resolvePath(container.model, ['uiState.choice'].concat(path, 'selected').join('.'));
 			if(!value) {
 				property.properties.map(function(p) {
-					let pname = p.properties[0].name;
+					let pname = p.properties[0] && p.properties[0].name;
 					if(container.model.hasOwnProperty(pname)) {
 						value = container.model[pname];
 					}