[brooklyn-ui] branch master updated: Merging entity data into empty objects

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new 06f4ac5  Merging entity data into empty objects
     new 2c4d8bb  This closes #283
06f4ac5 is described below

commit 06f4ac5ccdeaee665c03d69ecf12609a95336be3
Author: John Athanasiou <jathanas...@users.noreply.github.com>
AuthorDate: Wed Sep 8 14:04:01 2021 +0100

    Merging entity data into empty objects
---
 .../blueprint-composer/app/components/util/model/entity.model.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ui-modules/blueprint-composer/app/components/util/model/entity.model.js 
b/ui-modules/blueprint-composer/app/components/util/model/entity.model.js
index c2446c8..62759bd 100644
--- a/ui-modules/blueprint-composer/app/components/util/model/entity.model.js
+++ b/ui-modules/blueprint-composer/app/components/util/model/entity.model.js
@@ -695,7 +695,8 @@ function addConfigKeyDefinition(param, overwrite, 
skipUpdatesDuringBatch) {
             paramMapped.defaultValue = paramMapped.default;
             delete paramMapped['default'];
         }
-        allConfig[key] = Object.assign(configDef, paramMapped, overwrite ? 
null : configDef);
+        // making sure we assign to empty object to avoid conflicts with 
config items' properties like `type`
+        allConfig[key] = Object.assign({}, configDef, paramMapped, overwrite ? 
null : configDef);
     }
     if (!skipUpdatesDuringBatch) {
         this.miscData.set('config', Object.values(allConfig));