(brooklyn-ui) branch master updated: minor tidies around workflow display

[heneveld]

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 f6d2da52 minor tidies around workflow display
f6d2da52 is described below

commit f6d2da5296d0785b76df0d2b4e6dcf8f924b46bb
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Fri Mar 29 17:31:36 2024 +0000

    minor tidies around workflow display
---
 .../app/components/workflow/workflow-step.template.html             | 6 +++---
 .../app/components/workflow/workflow-steps.directive.js             | 2 +-
 .../app/views/main/inspect/activities/detail/detail.controller.js   | 5 ++++-
 3 files changed, 8 insertions(+), 5 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 6c8c9568..1dc82319 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
@@ -147,9 +147,9 @@
                     <button type="button" class="btn inline-button-small"
                             
ui-sref="main.inspect.activities.detail({applicationId: workflow.applicationId, 
entityId: workflow.entityId, activityId: stepContext.errorHandlerTaskId, 
workflowId})"
                         ><span class="monospace">task 
{{stepContext.errorHandlerTaskId}}</span></button
-                    ><span ng-if="stepCurrentWarning"> which successfully 
completed.</span
-                    ><span ng-if="stepCurrentError"> which threw an 
error.</span
-                    ><span ng-if="isCurrentAndActive"> which is running.</span
+                    ><span ng-if="stepCurrentWarning"> which successfully 
completed</span
+                    ><span ng-if="stepCurrentError"> which threw an error</span
+                    ><span ng-if="isCurrentAndActive"> which is running</span
                     >.
                 </div>
 
diff --git 
a/ui-modules/app-inspector/app/components/workflow/workflow-steps.directive.js 
b/ui-modules/app-inspector/app/components/workflow/workflow-steps.directive.js
index f82d9216..17d99241 100644
--- 
a/ui-modules/app-inspector/app/components/workflow/workflow-steps.directive.js
+++ 
b/ui-modules/app-inspector/app/components/workflow/workflow-steps.directive.js
@@ -253,7 +253,7 @@ function makeArrows(workflow, steps, options) {
         var indexOfId = {};
         for (var i = 0; i < steps.length; i++) {
             const s = workflow.data.stepsDefinition[i];
-            if (!s) console.log("XXX missing step", i, workflow.data, steps);
+            if (!s) console.log("Missing step", i, workflow.data, steps);
             if (s.id) indexOfId[s.id] = i;
         }
 
diff --git 
a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
 
b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
index 11b46ec0..a4f3f221 100644
--- 
a/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
+++ 
b/ui-modules/app-inspector/app/views/main/inspect/activities/detail/detail.controller.js
@@ -239,7 +239,10 @@ function DetailController($scope, $state, $stateParams, 
$location, $log, $uibMod
                 processWorkflowData(wResponse);
 
                 if (vm.model.workflow.data.status === 'RUNNING') 
wResponse.interval(1000);
-                observers.push(wResponse.subscribe(processWorkflowData));
+                observers.push(wResponse.subscribe(processWorkflowData, error 
=> {
+                    console.debug("Workflow no longer available, likely 
completed with retention 0. Removing from view.", error);
+                    vm.model.workflow = {};
+                }));
 
                 function initFromWorkflowFirstReplayTask(task) {
                     if (task) {