1 files changed, 8 insertions, 1 deletions
diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/services/properties.utils.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/services/properties.utils.ts
index 34d2a53afd..02dbf91868 100644
--- a/catalog-ui/src/app/ng2/pages/properties-assignment/services/properties.utils.ts
+++ b/catalog-ui/src/app/ng2/pages/properties-assignment/services/properties.utils.ts
@@ -129,7 +129,14 @@ export class PropertiesUtils {
             if (property.derivedDataType == DerivedPropertyType.LIST || property.derivedDataType == DerivedPropertyType.MAP) {
                 property.flattenedChildren = [];
                 Object.keys(property.valueObj).forEach((key) => {
-                    property.flattenedChildren.push(...this.createListOrMapChildren(property, key, property.valueObj[key]))
+                    property.flattenedChildren.push(...this.createListOrMapChildren(property, key, property.valueObj[key]));
+                    const lastCreatedChild = property.flattenedChildren.slice(-1)[0];
+                    if (property.schemaType == PROPERTY_TYPES.MAP && property.valueObj[key]){
+                        const nestedValue:object = property.valueObj[key];
+                        Object.keys(nestedValue).forEach((keyNested) => {
+                            property.flattenedChildren.push(...this.createListOrMapChildren(lastCreatedChild, keyNested, nestedValue[keyNested]));
+                        });
+                    };
                 });
             } else if (property.derivedDataType === DerivedPropertyType.COMPLEX) {
                 property.flattenedChildren = this.createFlattenedChildren(property.type, property.name);