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 fbc201555469976dcaadb4879329929ecb84ccf5 Author: Alex Heneveld <[email protected]> AuthorDate: Mon May 31 19:49:19 2021 +0100 fix logic about yaml state detection, tidy layers/graphical check --- ui-modules/blueprint-composer/app/views/main/main.controller.js | 5 ++++- ui-modules/blueprint-composer/app/views/main/main.template.html | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ui-modules/blueprint-composer/app/views/main/main.controller.js b/ui-modules/blueprint-composer/app/views/main/main.controller.js index 0af26ad..0e55db4 100644 --- a/ui-modules/blueprint-composer/app/views/main/main.controller.js +++ b/ui-modules/blueprint-composer/app/views/main/main.controller.js @@ -137,7 +137,10 @@ export function MainController($scope, $element, $log, $state, $stateParams, brB return $state.is(stateKey); } vm.isYamlMode = () => { - return $state.includes(yamlAutodetectState.name); + return $state && $state.current && $state.current.name && $state.current.name.includes(yamlAutodetectState.name); + } + vm.isLayerDropdownEnabled = () => { + return !vm.isYamlMode(); } if (yaml) { diff --git a/ui-modules/blueprint-composer/app/views/main/main.template.html b/ui-modules/blueprint-composer/app/views/main/main.template.html index 1a24cad..caed095 100644 --- a/ui-modules/blueprint-composer/app/views/main/main.template.html +++ b/ui-modules/blueprint-composer/app/views/main/main.template.html @@ -33,14 +33,13 @@ <blueprint-data-manager></blueprint-data-manager> </div> - <ul class="nav navbar-nav navbar-right navbar-nav-secondary-actions" ng-if="vm.isGraphicalMode()" > + <ul class="nav navbar-nav navbar-right navbar-nav-secondary-actions" ng-if="vm.isLayerDropdownEnabled()" > <li class="dropdown" uib-dropdown> <a href class="dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false"> <i class="fa fa-fw fa-clone"></i> Layers <span class="caret"></span> </a> <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu"> <li role="menuitem" class="layer" - ng-if="vm.isGraphicalMode()" ng-repeat="layer in vm.layers track by layer.id" ng-class="{'active': layer.active}"> <a ng-click="layer.active = !layer.active"><i class="fa fa-fw fa-circle"></i> {{layer.label}}</a>
