From 0bfeedc42510f9ed90842546c5e162f9ea7bbe24 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Mon, 27 Jan 2025 14:43:45 +0000
Subject: [PATCH 1/2] 392561371: (fix) changes for pilot statuses on the report
 page

---
 .../components/filter-dialog/filter-dialog.component.ts   | 8 +++++---
 modules/ui/src/app/services/test-run.service.spec.ts      | 2 ++
 modules/ui/src/app/services/test-run.service.ts           | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts b/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
index 3d8ac231a..e0d86cca6 100644
--- a/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
+++ b/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
@@ -58,7 +58,7 @@ import {
   DateRange as LocalDateRange,
 } from '../../../../model/filters';
 import { EscapableDialogComponent } from '../../../../components/escapable-dialog/escapable-dialog.component';
-import { StatusOfTestResult } from '../../../../model/testrun-status';
+import { StatusOfTestrun } from '../../../../model/testrun-status';
 import { DeviceValidators } from '../../../devices/components/device-form/device.validators';
 
 interface DialogData {
@@ -97,8 +97,10 @@ export class FilterDialogComponent
   implements OnInit
 {
   resultList = [
-    { value: StatusOfTestResult.Compliant, enabled: false },
-    { value: StatusOfTestResult.NonCompliant, enabled: false },
+    { value: StatusOfTestrun.Compliant, enabled: false },
+    { value: StatusOfTestrun.NonCompliant, enabled: false },
+    { value: StatusOfTestrun.Proceed, enabled: false },
+    { value: StatusOfTestrun.DoNotProceed, enabled: false },
   ];
   filterForm!: FormGroup;
   selectedRangeValue!: DateRange<Date> | undefined;
diff --git a/modules/ui/src/app/services/test-run.service.spec.ts b/modules/ui/src/app/services/test-run.service.spec.ts
index 9496392a8..955fd9986 100644
--- a/modules/ui/src/app/services/test-run.service.spec.ts
+++ b/modules/ui/src/app/services/test-run.service.spec.ts
@@ -263,6 +263,7 @@ describe('TestRunService', () => {
 
     const statusesForGreenRes = [
       StatusOfTestResult.Compliant,
+      StatusOfTestrun.Proceed,
       StatusOfTestResult.CompliantLimited,
       StatusOfTestResult.CompliantHigh,
     ];
@@ -276,6 +277,7 @@ describe('TestRunService', () => {
 
     const statusesForRedRes = [
       StatusOfTestResult.NonCompliant,
+      StatusOfTestrun.DoNotProceed,
       StatusOfTestResult.Error,
     ];
 
diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts
index 94a3f7aab..ee5b99f7c 100644
--- a/modules/ui/src/app/services/test-run.service.ts
+++ b/modules/ui/src/app/services/test-run.service.ts
@@ -164,10 +164,12 @@ export class TestRunService {
     return {
       green:
         result === StatusOfTestResult.Compliant ||
+        result === StatusOfTestrun.Proceed ||
         result === StatusOfTestResult.CompliantLimited ||
         result === StatusOfTestResult.CompliantHigh,
       red:
         result === StatusOfTestResult.NonCompliant ||
+        result === StatusOfTestrun.DoNotProceed ||
         result === StatusOfTestResult.Error,
       blue:
         result === StatusOfTestResult.SmartReady ||

From 88c839254b8e99fc1661aae9be553c1ed35e22f8 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Wed, 5 Feb 2025 07:44:58 +0000
Subject: [PATCH 2/2] 392561371: (fix) changes for result column on the report
 page

---
 modules/ui/src/app/mocks/reports.mock.ts          |  3 +++
 modules/ui/src/app/model/testrun-status.ts        |  1 +
 .../filter-dialog/filter-dialog.component.ts      |  9 ++++++---
 .../src/app/pages/reports/reports.component.html  |  4 ++--
 modules/ui/src/app/pages/reports/reports.store.ts | 15 ++++++++++++++-
 resources/test_packs/pilot/config.json            |  4 ++--
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/modules/ui/src/app/mocks/reports.mock.ts b/modules/ui/src/app/mocks/reports.mock.ts
index d20808a94..0c127b18c 100644
--- a/modules/ui/src/app/mocks/reports.mock.ts
+++ b/modules/ui/src/app/mocks/reports.mock.ts
@@ -112,6 +112,7 @@ export const FORMATTED_HISTORY = [
     finished: '2023-06-23T10:17:10.123Z',
     deviceFirmware: '1.2.2',
     deviceInfo: 'Delta 03-DIN-SRC',
+    testResult: 'Compliant',
     duration: '06m 10s',
     program: 'Device Qualification',
   },
@@ -133,6 +134,7 @@ export const FORMATTED_HISTORY = [
     finished: '2023-07-23T10:17:10.123Z',
     deviceFirmware: '1.2.3',
     deviceInfo: 'Delta 03-DIN-SRC',
+    testResult: 'Compliant',
     duration: '06m 10s',
     program: 'Device Qualification',
   },
@@ -154,6 +156,7 @@ export const FORMATTED_HISTORY = [
     finished: '2023-06-23T10:17:10.123Z',
     deviceFirmware: '1.2.2',
     deviceInfo: 'Delta 03-DIN-SRC',
+    testResult: 'Compliant',
     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 344db09dc..04596d5e4 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -31,6 +31,7 @@ export interface TestrunStatus {
 export interface HistoryTestrun extends TestrunStatus {
   deviceFirmware: string;
   deviceInfo: string;
+  testResult: string;
   program: string;
   duration: string;
 }
diff --git a/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts b/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
index e0d86cca6..6dd78f401 100644
--- a/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
+++ b/modules/ui/src/app/pages/reports/components/filter-dialog/filter-dialog.component.ts
@@ -58,7 +58,10 @@ import {
   DateRange as LocalDateRange,
 } from '../../../../model/filters';
 import { EscapableDialogComponent } from '../../../../components/escapable-dialog/escapable-dialog.component';
-import { StatusOfTestrun } from '../../../../model/testrun-status';
+import {
+  ResultOfTestrun,
+  StatusOfTestrun,
+} from '../../../../model/testrun-status';
 import { DeviceValidators } from '../../../devices/components/device-form/device.validators';
 
 interface DialogData {
@@ -97,8 +100,8 @@ export class FilterDialogComponent
   implements OnInit
 {
   resultList = [
-    { value: StatusOfTestrun.Compliant, enabled: false },
-    { value: StatusOfTestrun.NonCompliant, enabled: false },
+    { value: ResultOfTestrun.Compliant, enabled: false },
+    { value: ResultOfTestrun.NonCompliant, enabled: false },
     { value: StatusOfTestrun.Proceed, enabled: false },
     { value: StatusOfTestrun.DoNotProceed, enabled: false },
   ];
diff --git a/modules/ui/src/app/pages/reports/reports.component.html b/modules/ui/src/app/pages/reports/reports.component.html
index beb538149..c187a6c27 100644
--- a/modules/ui/src/app/pages/reports/reports.component.html
+++ b/modules/ui/src/app/pages/reports/reports.component.html
@@ -147,9 +147,9 @@ <h2 class="title" tabindex="-1">Reports</h2>
             </th>
             <td *matCellDef="let data" mat-cell>
               <span
-                [ngClass]="getResultClass(data.status)"
+                [ngClass]="getResultClass(data.testResult)"
                 class="cell-result-text">
-                {{ data.status }}
+                {{ data.testResult }}
               </span>
             </td>
           </ng-container>
diff --git a/modules/ui/src/app/pages/reports/reports.store.ts b/modules/ui/src/app/pages/reports/reports.store.ts
index 7b13bf5e9..de0bf20c3 100644
--- a/modules/ui/src/app/pages/reports/reports.store.ts
+++ b/modules/ui/src/app/pages/reports/reports.store.ts
@@ -12,6 +12,7 @@ import { selectReports, selectRiskProfiles } from '../../store/selectors';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../store/state';
 import { fetchReports, setReports } from '../../store/actions';
+import { TestingType } from '../../model/device';
 
 export interface ReportsComponentState {
   displayedColumns: string[];
@@ -252,12 +253,24 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
         ...item,
         deviceFirmware: item.device.firmware,
         deviceInfo: item.device.manufacturer + ' ' + item.device.model,
+        testResult: this.getTestResult(item),
         duration: this.getDuration(item.started, item.finished),
         program: item.device.test_pack ?? '',
       };
     });
   }
 
+  private getTestResult(item: TestrunStatus): string {
+    let result = '';
+    if (item.device.test_pack === TestingType.Qualification) {
+      result = item.result ? item.result : item.status;
+    }
+    if (item.device.test_pack === TestingType.Pilot) {
+      result = item.status;
+    }
+    return result;
+  }
+
   private getDuration(started: string | null, finished: string | null): string {
     if (!started || !finished) {
       return '';
@@ -290,7 +303,7 @@ export class ReportsStore extends ComponentStore<ReportsComponentState> {
 
       const isIncludeStatus =
         searchString.results?.length === 0 ||
-        searchString.results?.includes(data.status);
+        searchString.results?.includes(data.testResult);
       const isIncludeStartedDate = this.filterStartedDateRange(
         data.started,
         searchString
diff --git a/resources/test_packs/pilot/config.json b/resources/test_packs/pilot/config.json
index 7920db8b6..c7c1c47c6 100644
--- a/resources/test_packs/pilot/config.json
+++ b/resources/test_packs/pilot/config.json
@@ -1,8 +1,8 @@
 {
     "name": "Pilot Assessment",
     "language": {
-      "compliant_description": "Your device has met the initial pilot assessment requirements. Please send your Testrun ZIP file to the qualification lab for verification. The lab will then contact you with further instructions.",
-      "non_compliant_description": "Your device didn't quite meet the initial pilot assessment requirements. The Testrun report will provide guidance on how to resolve any issues. If you require further support, please get in touch with the qualification lab."
+      "compliant_description": "This is a preliminary test result. Please attach the Risk Profile and download the test results. A full evaluation and recommendation will be provided by the lab team.",
+      "non_compliant_description": "This is a preliminary test result. Please attach the Risk Profile and download the test results. A full evaluation and recommendation will be provided by the lab team."
     },
     "tests": [
       {