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 2023/06/26 12:55:35 UTC
[brooklyn-ui] branch master updated (6773ce71 -> 63c52038)
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 6773ce71 Merge branch 'workflow-ui-tweaks'
new 53f297eb better display for fringe error cases
new 63c52038 sort tasks by start time if end times are the same
The 2 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:
.../app-inspector/app/components/task-list/task-list.directive.js | 5 ++++-
.../app/components/workflow/workflow-step.template.html | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
[brooklyn-ui] 01/02: better display for fringe error cases
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 53f297ebaccb47dfb5f37a9157d0498ba1b78986
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Wed Jun 21 15:23:56 2023 +0100
better display for fringe error cases
if error occurs prior to running a step, output could be clearer
---
.../app/components/workflow/workflow-step.template.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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 1f612cff..6a542b17 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
@@ -46,13 +46,13 @@
<i class="fa fa-id-card-o"></i>
{{ stepTitle.id }}
</div>
- <div ng-if="stepTitle.id && !isFocusTask" class="workflow-step-pill step-id handy"
+ <div ng-if="stepTitle.id && !isFocusTask && stepContext.taskId" class="workflow-step-pill step-id handy"
title="Select this task"
ui-sref="main.inspect.activities.detail({applicationId: workflow.applicationId, entityId: workflow.entityId, activityId: stepContext.taskId, workflowId })">
<i class="fa fa-id-card-o"></i>
{{ stepTitle.id }}
</div>
- <div ng-if="!stepTitle.id && !isFocusTask" class="workflow-step-pill step-id handy hover-only"
+ <div ng-if="!stepTitle.id && !isFocusTask && stepContext.taskId" class="workflow-step-pill step-id handy hover-only"
title="Select this task"
ui-sref="main.inspect.activities.detail({applicationId: workflow.applicationId, entityId: workflow.entityId, activityId: stepContext.taskId, workflowId })">
<i class="fa fa-id-card-o"></i>
@@ -74,6 +74,7 @@
<div>
<span ng-if="!osi.countStarted" class="space-above">
This step has not been run<span ng-if="isRunning"> yet</span>.
+ {{ stepCurrentError ? 'There was an error prior to running this step. More information can be found in the Details panel on the task for the workflow.' : '' }}
</span>
<span ng-if="osi.countStarted">
<span ng-if="osi.countCompleted == osi.countStarted">
[brooklyn-ui] 02/02: sort tasks by start time if end times are the same
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 63c520386f605bf4c1db943587e46a490ece0c6a
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 26 13:55:21 2023 +0100
sort tasks by start time if end times are the same
---
.../app-inspector/app/components/task-list/task-list.directive.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ui-modules/app-inspector/app/components/task-list/task-list.directive.js b/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
index d951609b..689ed909 100644
--- a/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
+++ b/ui-modules/app-inspector/app/components/task-list/task-list.directive.js
@@ -102,7 +102,10 @@ export function taskListDirective() {
if (t1.endTimeUtc) return 1;
return -1;
}
- return t2.endTimeUtc - t1.endTimeUtc;
+ return t2.endTimeUtc - t1.endTimeUtc ||
+ // if same end time, sort by start time
+ (t2.startTimeUtc && t1.startTimeUtc && t2.startTimeUtc - t1.startTimeUtc) ||
+ (t2.submitTimeUtc && t1.submitTimeUtc && t2.submitTimeUtc - t1.submitTimeUtc);
});
// do this to update the counts