Merge remote-tracking branch 'origin/fix/issue-144' into hotfixes

Author: EvgenySafronov

src/app/pages/project/results/results-view/testresult-view.component.html

@@ -34,7 +34,17 @@ <h2 class="col-sm-10" id="test-result-view">Test Result: {{currentState?.id}}</h
         <input (change)="changeDebugState($event.srcElement)" id="debug" type="checkbox" name="debug"
           [(ngModel)]="currentState.debug" [disabled]="!canEdit">
       </div>
-    </div>
+      <div *ngIf="currentState.attachments?.length > 0" class="col-sm-2">
+        <label for="attach">Attach:</label>
+        <button id="attach" class="btn btn-sm btn-outline-dark"
+          (click)="openAttachModal(currentState.test.name, currentState.attachments)">
+          <fa-icon class="icon" [icon]="icons.faFile"></fa-icon>
+        </button>
+      </div>
+  </div>
+  <attachment-modal [(isHidden)]="hideAttachModal" (attachModalClosed)="attachModalClosed()"
+    [testResultAttachments]="testResultAttachments" [title]="attachModalTitle">
+  </attachment-modal>
 
     <div id="tr-result-line" class="row line">
       <div class="col-sm-3 margin-y-sm">

src/app/pages/project/results/results-view/testresult-view.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { TestResult } from '../../../../shared/models/test-result';
+import { faFile } from '@fortawesome/free-solid-svg-icons';
+import { TestResult, TestResultAttachment } from '../../../../shared/models/test-result';
 import { FinalResult } from '../../../../shared/models/final-result';
 import { ActivatedRoute } from '@angular/router';
 import { NotificationsService } from 'angular2-notifications';
@@ -38,6 +39,12 @@ export class TestResultViewComponent implements OnInit {
   canEdit: boolean;
   public types: StepType[];
   public tbCols: TFColumn[];
+  testResultAttachments: TestResultAttachment[];
+  attachModalTitle: string;
+  hideAttachModal = true;
+  icons = {
+    faFile
+  };
 
   constructor(
     private route: ActivatedRoute,
@@ -159,6 +166,18 @@ export class TestResultViewComponent implements OnInit {
     return Promise.all(updates);
   }
 
+  attachModalClosed() {
+    this.attachModalTitle = null;
+    this.testResultAttachments = null;
+    this.hideAttachModal = true;
+  }
+
+  openAttachModal(testname: string, testResultAttachments: TestResultAttachment[]) {
+    this.attachModalTitle = testname;
+    this.testResultAttachments = testResultAttachments;
+    this.hideAttachModal = false;
+  }
+
   private fillStepResults(steps: StepResult[]): StepResult[] {
     steps.forEach(step => step = this.fillStepResult(step));
     return steps;

src/app/pages/project/test/test-view/test-view.component.ts

@@ -28,7 +28,7 @@ export class TestViewComponent implements OnInit, OnDestroy {
   MoveModalTitle = 'Move Test';
   suite: TestSuite;
   test: Test;
-  columns: string[] = ['Started', 'Build Name', 'Execution Environment', 'Fail Reason', 'Result', 'Resolution', 'Assignee', 'Issue'];
+  columns: string[] = ['Started', 'Build Name', 'Execution Environment', 'Fail Reason', 'Result', 'Resolution', 'Assignee', 'Issue', 'Attach'];
   testMoveFrom: Test;
   testResults: TestResult[];
   public testResultTemplate: TestResult;