Fix Import status

Fix Resolution chart

Author: VladislavKostyukevich

e2e/data/import/cucumber.json

@@ -26,7 +26,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -39,7 +39,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 86
+              "duration": 1684328900
             }
           }
         ]
@@ -61,7 +61,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 2667613100
             }
           },
           {
@@ -74,7 +74,7 @@
             },
             "result": {
               "status": "failed",
-              "duration": 86,
+              "duration": 2667613100,
               "error_message": "step was failed"
             }
           }
@@ -97,7 +97,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 2667613100
             }
           },
           {
@@ -110,7 +110,7 @@
             },
             "result": {
               "status": "skipped",
-              "duration": 86,
+              "duration": 1684328900,
               "error_message": "step was skipped"
             }
           }

e2e/data/import/cucumberSpecialSymbols.json

@@ -26,7 +26,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -39,7 +39,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 86
+              "duration": 1684328900
             }
           }
         ]
@@ -61,7 +61,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -74,7 +74,7 @@
             },
             "result": {
               "status": "failed",
-              "duration": 86,
+              "duration": 1684328900,
               "error_message": "step was failed !”#$%&’()*+,-./:;<=>?@[\\]^_`{|}~"
             }
           }
@@ -97,7 +97,7 @@
             },
             "result": {
               "status": "passed",
-              "duration": 7033
+              "duration": 1684328900
             }
           },
           {
@@ -110,7 +110,7 @@
             },
             "result": {
               "status": "skipped",
-              "duration": 86,
+              "duration": 1684328900,
               "error_message": "step was skipped"
             }
           }

src/app/pages/project/import/import.component.ts

@@ -47,12 +47,18 @@ export class ImportComponent {
   importResults: Import[];
   resultsColumnsToShow: TFColumn[];
   timerToken: any;
-  statuses: { name: string, color: number }[] = [{
+  statuses: { id: number, name: string, color: number }[] = [{
+    id: 1,
     name: 'Finished',
     color: 5
   }, {
+    id: 0,
     name: 'In Progress',
     color: 2
+  }, {
+    id: 2,
+    name: 'Failed',
+    color: 1
   }];
   sortBy = { order: TFOrder.asc, property: 'started' };
   imports: { name: string, key: string }[] = [
@@ -92,9 +98,7 @@ export class ImportComponent {
     this.importService.importResults(this.route.snapshot.params.projectId).subscribe(res => {
       this.importResults = res;
       this.importResults.forEach(result => {
-        result['status'] = result.is_finished === 1
-          ? this.statuses.find(status => status.color === 5)
-          : this.statuses.find(status => status.color === 2);
+        result['status'] = this.statuses.find(status => status.id === result.finish_status);
       });
       this.resultsColumnsToShow = [
         {

src/app/pages/project/results/results-grid/results.grid.component.ts

@@ -34,7 +34,7 @@ export class ResultGridComponent implements OnInit {
   @Input() testResults: TestResult[];
   @Input() sortBy = { property: 'final_result.name', order: TFOrder.desc };
   @Input() showOnly: string[] = ['Test Name', 'Fail Reason', 'Result', 'Resolution', 'Assignee', 'Comment', 'Last Results'];
-  @Output() resultUpdated = new EventEmitter;
+  @Output() resultUpdated = new EventEmitter<TestResult[]>();
   listOfResolutions: ResultResolution[];
   finalResults: FinalResult[];
   users: LocalPermissions[];
@@ -98,11 +98,12 @@ export class ResultGridComponent implements OnInit {
       assignee: result.assigned_user ? result.assigned_user.user_id : undefined
     };
     await this.testResultService.createTestResult(testResultUpdateTemplate);
-    this.resultUpdated.emit(result);
+    this.resultUpdated.emit([result]);
   }
 
-  bulkResultUpdate(results: TestResult[]) {
-    return this.testResultService.bulkUpdate(results);
+  async bulkResultUpdate(results: TestResult[]) {
+    await this.testResultService.bulkUpdate(results);
+    this.resultUpdated.emit(results);
   }
 
   async getResults(testResultTemplate: TestResult) {

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

@@ -144,8 +144,10 @@ export class TestRunViewComponent implements OnInit {
     testUpdatedTestRun = await this.testRunService.createTestRun(testUpdatedTestRun);
   }
 
-  updateResult($event: TestResult) {
-    this.testResults[this.testResults.findIndex(x => x.id === $event.id)] = $event;
+  updateResult(updatedResults: TestResult[]) {
+    updatedResults.forEach(updatedResult => {
+      this.testResults[this.testResults.findIndex(x => x.id === updatedResult.id)] = updatedResult;
+    });
     this.resultResolutionsCharts.ngOnChanges();
   }
 

src/app/shared/models/import.ts

@@ -2,7 +2,7 @@ export class Import {
   id?: number;
   testrun_id?: number;
   project_id?: number;
-  is_finished?: number;
+  finish_status?: number;
   started?: Date|String|number;
   finished?: Date|String|number;
   log?: string;