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 32364c67 show nested code indicator better 32364c67 is described below commit 32364c677988e04ccf1dc44ae23190d7619663f1 Author: Alex Heneveld <a...@cloudsoft.io> AuthorDate: Wed Feb 21 15:46:41 2024 +0000 show nested code indicator better for subworkflows and anonymous steps, and complete previous change --- .../app/components/workflow/workflow-step.directive.js | 9 +++++++-- .../app/components/workflow/workflow-step.template.html | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ui-modules/app-inspector/app/components/workflow/workflow-step.directive.js b/ui-modules/app-inspector/app/components/workflow/workflow-step.directive.js index 9bb88005..5ca07ca7 100644 --- a/ui-modules/app-inspector/app/components/workflow/workflow-step.directive.js +++ b/ui-modules/app-inspector/app/components/workflow/workflow-step.directive.js @@ -108,9 +108,14 @@ export function workflowStepDirective() { $scope.stepTitle.code = shorthand; if (!shorthand) { $scope.stepTitle.code = step.shorthandTypeName || step.type || ''; - if (step.input) $scope.stepTitle.code += ' ...'; + if (!$scope.stepTitle.code) { + if (step.steps) $scope.stepTitle.leftCodeAlternative = "nested workflow"; + else $scope.stepTitle.leftCodeAlternative = "workflow step"; // odd... + } else { + if (step.input) $scope.stepTitle.code += ' ...'; + } } - if ("workflow" === $scope.stepTitle.code) { + if (["workflow","subworkflow"].includes($scope.stepTitle.code)) { $scope.stepTitle.code = null; $scope.stepTitle.leftCodeAlternative = "nested workflow"; } diff --git a/ui-modules/app-inspector/app/components/workflow/workflow-step.template.html b/ui-modules/app-inspector/app/components/workflow/workflow-step.template.html index 9b10e33c..1eb67f7d 100644 --- a/ui-modules/app-inspector/app/components/workflow/workflow-step.template.html +++ b/ui-modules/app-inspector/app/components/workflow/workflow-step.template.html @@ -68,7 +68,7 @@ {{ stepTitle.name}} </span> <span ng-if="stepTitle.code && !stepTitle.name" class="step-title-code">{{ stepTitle.code }}</span> - <span ng-if="stepTitle.leftCodeAlternative && !stepTitle.name" class="step-left-extra">{{ stepTitle.leftExtra}}</span> + <span ng-if="stepTitle.leftCodeAlternative && !stepTitle.name" class="step-left-extra">{{ stepTitle.leftCodeAlternative}}</span> </div> <div ng-if="expanded" class="step-details">