summaryrefslogtreecommitdiffstats
path: root/catalog-be/src
diff options
context:
space:
mode:
authorimamSidero <imam.hussain@est.tech>2023-02-14 14:10:25 +0000
committerMichael Morris <michael.morris@est.tech>2023-02-16 12:49:24 +0000
commit589afc753f2cadd9688715b4e5fe54075600060b (patch)
tree398216895498de937d11ecae557bb0223779270f /catalog-be/src
parent2c30bf8b461108e687d874acad3b444fc732ef4c (diff)
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
Diffstat (limited to 'catalog-be/src')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java3
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());