From 25ac796b95435b5ffbff55e4a6de5b1d907aa329 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Mon, 2 Sep 2024 14:38:18 +0000
Subject: [PATCH] 362724933: (feat) add program type to results tab

---
 modules/ui/src/app/mocks/reports.mock.ts           | 13 ++++++++++++-
 modules/ui/src/app/model/testrun-status.ts         |  1 +
 .../src/app/pages/reports/reports.component.html   | 14 ++++++++++++++
 .../ui/src/app/pages/reports/reports.store.spec.ts |  1 +
 modules/ui/src/app/pages/reports/reports.store.ts  |  2 ++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/modules/ui/src/app/mocks/reports.mock.ts b/modules/ui/src/app/mocks/reports.mock.ts
index 82e0a48ef..803994640 100644
--- a/modules/ui/src/app/mocks/reports.mock.ts
+++ b/modules/ui/src/app/mocks/reports.mock.ts
@@ -1,6 +1,6 @@
 import { HistoryTestrun, TestrunStatus } from '../model/testrun-status';
 import { MatTableDataSource } from '@angular/material/table';
-import { DeviceStatus } from '../model/device';
+import { DeviceStatus, TestingType } from '../model/device';
 
 export const HISTORY = [
   {
@@ -12,6 +12,7 @@ export const HISTORY = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:06',
       firmware: '1.2.2',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-06-23T10:11:00.123Z',
@@ -26,6 +27,7 @@ export const HISTORY = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:07',
       firmware: '1.2.3',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-07-23T10:11:00.123Z',
@@ -40,6 +42,7 @@ export const HISTORY = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:08',
       firmware: '1.2.2',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-06-23T10:11:00.123Z',
@@ -57,6 +60,7 @@ export const HISTORY_AFTER_REMOVE = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:06',
       firmware: '1.2.2',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-06-23T10:11:00.123Z',
@@ -71,6 +75,7 @@ export const HISTORY_AFTER_REMOVE = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:08',
       firmware: '1.2.2',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-06-23T10:11:00.123Z',
@@ -88,6 +93,7 @@ export const FORMATTED_HISTORY = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:06',
       firmware: '1.2.2',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-06-23T10:11:00.123Z',
@@ -95,6 +101,7 @@ export const FORMATTED_HISTORY = [
     deviceFirmware: '1.2.2',
     deviceInfo: 'Delta 03-DIN-SRC',
     duration: '06m 10s',
+    program: 'Device Qualification',
   },
   {
     status: 'compliant',
@@ -105,6 +112,7 @@ export const FORMATTED_HISTORY = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:07',
       firmware: '1.2.3',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-07-23T10:11:00.123Z',
@@ -112,6 +120,7 @@ export const FORMATTED_HISTORY = [
     deviceFirmware: '1.2.3',
     deviceInfo: 'Delta 03-DIN-SRC',
     duration: '06m 10s',
+    program: 'Device Qualification',
   },
   {
     mac_addr: null,
@@ -122,6 +131,7 @@ export const FORMATTED_HISTORY = [
       model: '03-DIN-SRC',
       mac_addr: '01:02:03:04:05:08',
       firmware: '1.2.2',
+      test_pack: TestingType.Qualification,
     },
     report: 'https://api.testrun.io/report.pdf',
     started: '2023-06-23T10:11:00.123Z',
@@ -129,6 +139,7 @@ export const FORMATTED_HISTORY = [
     deviceFirmware: '1.2.2',
     deviceInfo: 'Delta 03-DIN-SRC',
     duration: '06m 10s',
+    program: 'Device Qualification',
   },
 ];
 
diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts
index 3bc63804c..2dc7f5cb1 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -28,6 +28,7 @@ export interface TestrunStatus {
 export interface HistoryTestrun extends TestrunStatus {
   deviceFirmware: string;
   deviceInfo: string;
+  program: string;
   duration: string;
 }
 
diff --git a/modules/ui/src/app/pages/reports/reports.component.html b/modules/ui/src/app/pages/reports/reports.component.html
index 6b32a2f01..e01bafd0c 100644
--- a/modules/ui/src/app/pages/reports/reports.component.html
+++ b/modules/ui/src/app/pages/reports/reports.component.html
@@ -112,6 +112,20 @@ <h2 class="title" tabindex="-1">Reports</h2>
             <td *matCellDef="let data" mat-cell>{{ data.deviceFirmware }}</td>
           </ng-container>
 
+          <!-- Program Column -->
+          <ng-container matColumnDef="program">
+            <th
+              *matHeaderCellDef
+              mat-header-cell
+              mat-sort-header
+              sortActionDescription="Sort by program type">
+              Program
+            </th>
+            <td *matCellDef="let data" mat-cell>
+              {{ data.program }}
+            </td>
+          </ng-container>
+
           <!-- Result Column -->
           <ng-container matColumnDef="status">
             <th
diff --git a/modules/ui/src/app/pages/reports/reports.store.spec.ts b/modules/ui/src/app/pages/reports/reports.store.spec.ts
index 6e6d1656a..e6b7ec2f3 100644
--- a/modules/ui/src/app/pages/reports/reports.store.spec.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.spec.ts
@@ -136,6 +136,7 @@ describe('ReportsStore', () => {
             'duration',
             'deviceInfo',
             'deviceFirmware',
+            'program',
             'status',
             'report',
           ],
diff --git a/modules/ui/src/app/pages/reports/reports.store.ts b/modules/ui/src/app/pages/reports/reports.store.ts
index 39db74fd2..7b13bf5e9 100644
--- a/modules/ui/src/app/pages/reports/reports.store.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.ts
@@ -253,6 +253,7 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
         deviceFirmware: item.device.firmware,
         deviceInfo: item.device.manufacturer + ' ' + item.device.model,
         duration: this.getDuration(item.started, item.finished),
+        program: item.device.test_pack ?? '',
       };
     });
   }
@@ -367,6 +368,7 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
         'duration',
         'deviceInfo',
         'deviceFirmware',
+        'program',
         'status',
         'report',
       ],