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 ecdf6fa118c113c425fdc0a85d8f04c72e2d67b7 Author: Alex Heneveld <[email protected]> AuthorDate: Mon Nov 18 15:28:01 2019 +0000 address PR comments --- ui-modules/app-inspector/app/components/entity-tree/entity-node.less | 1 - .../app-inspector/app/components/entity-tree/entity-tree.directive.js | 3 +-- ui-modules/utils/icon-generator/icon-generator.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ui-modules/app-inspector/app/components/entity-tree/entity-node.less b/ui-modules/app-inspector/app/components/entity-tree/entity-node.less index ac4f717..6b7e3c4 100644 --- a/ui-modules/app-inspector/app/components/entity-tree/entity-node.less +++ b/ui-modules/app-inspector/app/components/entity-tree/entity-node.less @@ -86,7 +86,6 @@ } } .node-icon { - .pull-right(); flex-grow: 0 !important; max-height: 20px; //let it extend above and below span's boundaries overflow: visible !important; diff --git a/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js b/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js index 9f6d596..76183e7 100644 --- a/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js +++ b/ui-modules/app-inspector/app/components/entity-tree/entity-tree.directive.js @@ -97,7 +97,7 @@ export function entityTreeDirective() { } } -export function entityNodeDirective($log, iconService) { +export function entityNodeDirective() { return { restrict: 'E', template: entityNodeTemplate, @@ -188,4 +188,3 @@ export function entityNodeDirective($log, iconService) { } } -entityNodeDirective.$inject = ['$log', 'iconService']; diff --git a/ui-modules/utils/icon-generator/icon-generator.js b/ui-modules/utils/icon-generator/icon-generator.js index a2695b5..4839d88 100644 --- a/ui-modules/utils/icon-generator/icon-generator.js +++ b/ui-modules/utils/icon-generator/icon-generator.js @@ -147,7 +147,7 @@ function IconService($q, $http, iconGenerator, $log, cache) { } else if (entityOrTypeId.type) { let entity = entityOrTypeId; id = entity.type; - if (id === 'org.apache.brooklyn.entity.stock.BasicApplication' && entity.children.length === 1) { + if (id === 'org.apache.brooklyn.entity.stock.BasicApplication' && entity.children && entity.children.length === 1) { id = entity.children[0].catalogItemId || entity.children[0].type; } }
