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 63b8ffa2 tidy workflow steps display
new 7a0acc87 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/brooklyn-ui
63b8ffa2 is described below
commit 63b8ffa22d8a1fe3800b346f357f198cb2b2ca16
Author: Alex Heneveld <[email protected]>
AuthorDate: Fri Feb 9 19:03:48 2024 +0000
tidy workflow steps display
- index number is better aligned
- step name is shown at left instead of code, if present
- step success indicator is clickable
---
.../app/components/workflow/workflow-step.directive.js | 2 +-
.../components/workflow/workflow-step.template.html | 14 ++++++++------
.../app/components/workflow/workflow-steps.less | 18 +++++++++++++++---
3 files changed, 24 insertions(+), 10 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 fd81d670..9bb88005 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
@@ -112,7 +112,7 @@ export function workflowStepDirective() {
}
if ("workflow" === $scope.stepTitle.code) {
$scope.stepTitle.code = null;
- $scope.stepTitle.leftExtra = "nested workflow";
+ $scope.stepTitle.leftCodeAlternative = "nested workflow";
}
if (step.name) {
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 73fb42c3..9b10e33c 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
@@ -18,7 +18,9 @@
-->
<div class="workflow-step-outer">
- <div class="workflow-step-status-indicators">
+ <div class="workflow-step-status-indicators handy"
+ ui-sref="main.inspect.activities.detail({applicationId:
workflow.applicationId, entityId: workflow.entityId, activityId:
stepContext.taskId, workflowId })"
+ >
<span ng-if="isCurrentAndActive" class="running-status">
<brooklyn-status-icon value="STARTING"></brooklyn-status-icon>
</span>
@@ -35,9 +37,6 @@
<div class="workflow-step" id="workflow-step-{{stepIindex}}"
ng-class="vm.getWorkflowStepClasses(stepIndex)">
<div class="rhs-icons">
- <div ng-if="stepTitle.name" class="step-name">
- {{ stepTitle.name}}
- </div>
<div ng-if="isFocusTask" class="workflow-step-pill focus-step
label-info" title="This step instance is for the task currently selected in the
activity view.">
selected
</div>
@@ -65,8 +64,11 @@
<div class="step-block-title">
<span class="step-index">{{ stepTitle.index }}</span>
- <span ng-if="stepTitle.code" class="step-title-code">{{
stepTitle.code }}</span>
- <span ng-if="stepTitle.leftExtra" class="step-left-extra">{{
stepTitle.leftExtra}}</span>
+ <span ng-if="stepTitle.name" class="step-name">
+ {{ 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>
</div>
<div ng-if="expanded" class="step-details">
diff --git
a/ui-modules/app-inspector/app/components/workflow/workflow-steps.less
b/ui-modules/app-inspector/app/components/workflow/workflow-steps.less
index bd96ee38..643135bd 100644
--- a/ui-modules/app-inspector/app/components/workflow/workflow-steps.less
+++ b/ui-modules/app-inspector/app/components/workflow/workflow-steps.less
@@ -93,14 +93,18 @@
text-overflow: ellipsis;
white-space: nowrap;
padding-right: 1.5ex;
+ top: 1px;
+ position: relative;
.step-index {
font-size: 70%;
- border: solid 1px black;
+ border: solid 1px @text-color;
padding: 0px 3px;
- border-radius: 14px;
+ border-radius: 15px;
margin-right: 1ex;
- //font-style: italic;
+ top: -2px;
+ position: relative;
+ padding-bottom: 1px;
}
.step-title-code {
@@ -108,11 +112,15 @@
font-size: 85%;
font-weight: 300;
color: @gray-light;
+ top: -1px;
+ position: relative;
}
.step-left-extra {
font-size: 90%;
//font-weight: 300;
color: @gray-light;
+ top: -1px;
+ position: relative;
}
}
@@ -206,6 +214,10 @@
.color-cancelled { color: @color-cancelled; }
.color-active { color: @color-active; }
+ &.handy {
+ cursor: pointer;
+ }
+
.running-status {
svg {
//margin: 0 auto;
