Update delivery-logs build 'result'

src/plugins/cloud-foundry/view/applications/application/delivery-logs/delivery-logs.html

@@ -44,7 +44,6 @@ <h3 translate>You have not set up a delivery pipeline</h3>
       </dd>
     </dl>
   </div>
-  <!--st-pipe="appDelLogsCtrl.updateDisplayed"-->
   <div id="delivery-logs"
        st-table="appDelLogsCtrl.displayedExecutions"
        st-safe-src="appDelLogsCtrl.parsedHceModel.pipelineExecutions"
@@ -96,8 +95,12 @@ <h3 translate>You have not set up a delivery pipeline</h3>
                 <span ng-switch-default class="helion-icon helion-icon-Active_S"></span>
               </div>
               <span translate>{{ execution.result.label }}</span>
-              <a translate ng-if="execution.result.artifact_id"
-                 ng-click="appDelLogsCtrl.viewEventForExecution(execution)">view</a>
+              <a translate
+                 ng-if="execution.result.state === appDelLogsCtrl.eventStates.SUCCEEDED &&
+                        appCtrl.model.application.summary.routes[0]"
+                 target="_blank"
+                 ng-init="route=appCtrl.model.application.summary.routes[0]"
+                 ng-href="http://{{ route.host + '.' + route.domain.name + (route.port ? ':' + route.port : '') + '/' + route.path }}">view</a>
             </td>
             <td>{{ execution.reason.createdDate | amDateFormat:'L - LTS' }}</td>
             <td>{{ execution.reason.author }}</td>

src/plugins/cloud-foundry/view/applications/application/delivery-logs/delivery-logs.module.js

@@ -166,16 +166,6 @@
       });
     },
 
-    viewEventForExecution: function(execution) {
-      var events = this.eventsPerExecution[execution.id];
-
-      if (!events || events.length === 0) {
-        return;
-      }
-
-      this.viewEvent(events[events.length - 1]);
-    },
-
     viewEvent: function(event) {
       this.detailView({
         templateUrl: 'plugins/cloud-foundry/view/applications/application/delivery-logs/details/event.html',
@@ -349,28 +339,32 @@
 
       var event = events[events.length - 1];
 
-      execution.result = {
-        state: this.determineExecutionState(event),
-        label: event.name,
-        hasLog: event.artifact_id
-      };
+      execution.result = this.determineExecutionResult(event);
     },
 
     /**
-     * @name ApplicationDeliveryLogsController.determineExecutionState
-     * @description Determines the execution state from the last received event
+     * @name ApplicationDeliveryLogsController.determineExecutionResult
+     * @description Determines the execution result from the last received event
      * @param {object} event - Last HCE event of an execution
-     * @returns {string} - Updated execution state
+     * @returns {object} - Content required by UX to display the execution result
      */
-    determineExecutionState: function(event) {
-      if (
+    determineExecutionResult: function(event) {
+      var hasCompleted =
         event.type === this.eventTypes.PIPELINE_COMPLETED ||
         event.type === this.eventTypes.WATCHDOG_TERMINATED ||
-        event.state === this.eventStates.FAILED) {
-        return event.state;
-      } else {
-        return this.eventStates.RUNNING;
+        event.state === this.eventStates.FAILED;
+
+      var result = {
+        state: hasCompleted ? event.state : this.eventStates.RUNNING,
+        label: event.name
+      };
+
+      // Override the label for this specific case. This is the real 'result' of the execution
+      if (event.type === this.eventTypes.PIPELINE_COMPLETED) {
+        result.label = event.state === this.eventStates.SUCCEEDED ? gettext('Success') : gettext('Failed');
       }
+
+      return result;
     },
 
     updateVisibleExecutions: function(visibleExecutions) {

src/plugins/cloud-foundry/view/applications/application/delivery-logs/delivery-logs.module.spec.js

@@ -289,55 +289,6 @@
       });
     });
 
-    describe('View Event for execution', function() {
-      var execution = {
-        id: 'two'
-      };
-
-      beforeEach(function() {
-        createController(true);
-        _.set(controller, 'hceCnsi.guid', cnsi.guid);
-      });
-
-      it('Without events', function() {
-        _.set(controller, 'eventsPerExecution', {});
-
-        spyOn(controller, 'viewEvent');
-
-        controller.viewEventForExecution(execution);
-        $rootScope.$apply();
-
-        expect(controller.viewEvent).not.toHaveBeenCalled();
-      });
-
-      it('With events', function() {
-        var event = {
-          event: '1',
-          name: 'name'
-        };
-        var events = [ event ];
-        _.set(controller, 'eventsPerExecution', {
-          one: [
-            {
-              event: '1'
-            },
-            {
-              event: '2'
-            }
-          ],
-          two: events
-        });
-
-        spyOn(controller, 'viewEvent');
-
-        controller.viewEventForExecution(execution);
-        $rootScope.$apply();
-
-        expect(controller.viewEvent).toHaveBeenCalled();
-        expect(controller.viewEvent.calls.argsFor(0)[0]).toEqual(event);
-      });
-    });
-
     describe('Fetching events', function() {
 
       var event1 = {
@@ -583,6 +534,56 @@
       });
     });
 
+    describe('determine execution result', function() {
+
+      beforeEach(function() {
+        createController(true);
+      });
+
+      it('execution completed (pipeline_complete - failed)', function() {
+        var event = {
+          type: controller.eventTypes.PIPELINE_COMPLETED,
+          state: controller.eventStates.FAILED,
+          name: 'label'
+        };
+        var res = controller.determineExecutionResult(event);
+        expect(res.label).toEqual('Failed');
+        expect(res.state).toEqual(event.state);
+      });
+
+      it('execution completed (pipeline_complete - success)', function() {
+        var event = {
+          type: controller.eventTypes.PIPELINE_COMPLETED,
+          state: controller.eventStates.SUCCEEDED,
+          name: 'label'
+        };
+        var res = controller.determineExecutionResult(event);
+        expect(res.label).toEqual('Success');
+        expect(res.state).toEqual(event.state);
+      });
+
+      it('execution completed (failed event)', function() {
+        var event = {
+          type: controller.eventTypes.TESTING,
+          state: controller.eventStates.FAILED,
+          name: 'label'
+        };
+        var res = controller.determineExecutionResult(event);
+        expect(res.label).toEqual(event.name);
+        expect(res.state).toEqual(event.state);
+      });
+
+      it('execution still running', function() {
+        var event = {
+          type: controller.eventTypes.TESTING,
+          name: 'label'
+        };
+        var res = controller.determineExecutionResult(event);
+        expect(res.label).toEqual(event.name);
+        expect(res.state).toEqual(controller.eventStates.RUNNING);
+      });
+    });
+
     describe('determine execution state', function() {
       beforeEach(function() {
         createController(true);