fix(webhook): Show 'Progress' as Info instead of Warning (#8088)

Co-authored-by: Kevin Woo <kevinawoo@gmail.com>
spinnaker · Mar 25, 2020 · 8d15878 · 8d15878
1 parent bbb9bae
commit 8d15878
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...pts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.controller.ts b/...pts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.controller.ts
@@ -39,8 +39,15 @@ export class WebhookExecutionDetailsCtrl implements IController {
 
   private getProgressMessage(): string {
     const context = this.stage.context || {};
+    const webhook = context.webhook || {};
+    const monitor = webhook.monitor || {};
     const buildInfo = context.buildInfo || {};
-    return buildInfo.progressMessage;
+
+    if (monitor.progressMessage) {
+      return monitor.progressMessage;
+    } else {
+      return buildInfo.progressMessage;
+    }
   }
 
   private getFailureMessage(): string {
@@ -52,8 +59,6 @@ export class WebhookExecutionDetailsCtrl implements IController {
 
     if (error) {
       failureMessage = `Webhook failed: ${error}`;
-    } else if (monitor.progressMessage) {
-      failureMessage = `Webhook failed. Last known progress message: ${monitor.progressMessage}`;
     }
 
     return failureMessage;

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.html b/app/scripts/modules/core/src/pipeline/config/stages/webhook/webhookExecutionDetails.html
@@ -38,13 +38,15 @@ <h5>Parameters</h5>
       is-failed="ctrl.stage.isFailed"
       message="ctrl.getException(stage) || ctrl.failureMessage"
     ></stage-failure-message>
-    <div class="well alert-info" ng-if="ctrl.stage.context.progressMessage || ctrl.stage.status">
+    <div class="well alert-info" ng-if="ctrl.progressMessage || ctrl.stage.status">
       <h4>Results</h4>
       <dl class="dl-narrow dl-horizontal ng-scope">
         <dt>Status</dt>
         <dd class="ng-binding">{{ctrl.stage.status}}</dd>
         <dt>Info</dt>
-        <dd class="ng-binding"><p ng-bind-html="ctrl.stage.context.progressMessage | linky:'_blank'"></p></dd>
+        <dd class="ng-binding">
+          <p ng-bind-html="ctrl.progressMessage | linky:'_blank'" style="white-space: pre-line;"></p>
+        </dd>
         <dt>Code</dt>
         <dd class="ng-binding">
           {{ctrl.stage.context.webhook.monitor.statusCodeValue || ctrl.stage.context.webhook.statusCodeValue}}