Bug fix for tosca function map values in property assignment page

Disabled add/edit/delete operations of property when overall checkbox is checked and fixed for integer key values

Issue-ID: SDC-4392
Signed-off-by: Imam hussain <imam.hussain@est.tech>
Change-Id: I3d299195ecc6215b1b99eb159391cdb79f59cb86

1 files changed, 2 insertions, 1 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index d87549f4d1..142969aa4a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -1986,7 +1986,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                     property.setValue(property.getToscaFunction().getValue());
                 }
                 if (CollectionUtils.isNotEmpty(property.getSubPropertyToscaFunctions())) {
-                    if (StringUtils.isNumeric(property.getSubPropertyToscaFunctions().iterator().next().getSubPropertyPath().get(0))) {
+                    ToscaPropertyType type = ToscaPropertyType.isValidType(property.getType());
+                    if (type.equals(ToscaPropertyType.LIST)) {
                         final JSONArray jsonArray = property.getValue() == null ? new JSONArray() : new JSONArray(property.getValue());
                         property.getSubPropertyToscaFunctions().stream().forEach(subToscaFunction -> {
                             addE(jsonArray, subToscaFunction.getSubPropertyPath(), subToscaFunction.getToscaFunction().getValue());