You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/08/16 09:50:23 UTC
[brooklyn-ui] branch master updated (f95ce8c -> aeded0e)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from f95ce8c Merge pull request #266 from algairim/blueprint-composer-fixes
new 2f73970 adjusted logic for identifying unique items
new e550cc6 better identifier format
new aeded0e This closes #267
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
[brooklyn-ui] 03/03: This closes #267
Posted by he...@apache.org.
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
commit aeded0eb76f04e3877e94eb0bdbf26afd9d4aecd
Merge: f95ce8c e550cc6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Aug 16 10:49:51 2021 +0100
This closes #267
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
[brooklyn-ui] 01/03: adjusted logic for identifying unique items
Posted by he...@apache.org.
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
commit 2f73970c500bd0ad99e2e42bb844e4561f7cebd1
Author: John Athanasiou <ja...@users.noreply.github.com>
AuthorDate: Mon Aug 16 10:01:15 2021 +0100
adjusted logic for identifying unique items
---
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
index 4022f2b..ec9c957 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
@@ -305,9 +305,10 @@ export function dslEditorDirective($rootScope, $filter, $log, brUtilsGeneral, bl
function uniqueItems(items) {
const IDs = new Set();
- return items.filter(({ id }) => {
- if (IDs.has(id)) return false;
- IDs.add(id);
+ // filtering with both own and parent's ID in case we have same-type child nodes
+ return items.filter(({ id, entity }) => {
+ if (IDs.has(id+entity.id)) return false;
+ IDs.add(id+entity.id);
return true;
})
}
[brooklyn-ui] 02/03: better identifier format
Posted by he...@apache.org.
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
commit e550cc64f376ad0a7a152943f0c582f9f886da45
Author: John Athanasiou <ja...@users.noreply.github.com>
AuthorDate: Mon Aug 16 10:23:22 2021 +0100
better identifier format
---
.../blueprint-composer/app/components/dsl-editor/dsl-editor.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
index ec9c957..4609cf8 100644
--- a/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
+++ b/ui-modules/blueprint-composer/app/components/dsl-editor/dsl-editor.js
@@ -307,8 +307,9 @@ export function dslEditorDirective($rootScope, $filter, $log, brUtilsGeneral, bl
// filtering with both own and parent's ID in case we have same-type child nodes
return items.filter(({ id, entity }) => {
- if (IDs.has(id+entity.id)) return false;
- IDs.add(id+entity.id);
+ const marker = id + ':' + (entity.id || '-');
+ if (IDs.has(marker)) return false;
+ IDs.add(marker);
return true;
})
}