diff --git a/modules/ui/src/app/mocks/testrun.mock.ts b/modules/ui/src/app/mocks/testrun.mock.ts index 3decf9973..af25ee3a4 100644 --- a/modules/ui/src/app/mocks/testrun.mock.ts +++ b/modules/ui/src/app/mocks/testrun.mock.ts @@ -15,6 +15,7 @@ */ import { IResult, + RequiredResult, StatusOfTestrun, TestrunStatus, TestsData, @@ -26,17 +27,20 @@ export const TEST_DATA_RESULT: IResult[] = [ name: 'dns.network.hostname_resolution', description: 'The device should resolve hostnames', result: 'Compliant', + required_result: RequiredResult.Required, }, { name: 'dns.network.from_dhcp', description: 'The device should use the DNS server provided by the DHCP server', result: 'Non-Compliant', + required_result: RequiredResult.Informational, }, { name: 'dns.mdns', description: 'Does the device has MDNS (or any kind of IP multicast)', result: 'Not Started', + required_result: RequiredResult.RequiredIfApplicable, }, ]; @@ -50,6 +54,7 @@ export const TEST_DATA_RESULT_WITH_RECOMMENDATIONS: IResult[] = [ 'An example of a step to resolve', 'Disable any running NTP server', ], + required_result: RequiredResult.Required, }, ]; @@ -58,17 +63,20 @@ export const TEST_DATA_RESULT_WITH_ERROR: IResult[] = [ name: 'dns.network.hostname_resolution', description: 'The device should resolve hostnames', result: 'Compliant', + required_result: RequiredResult.Required, }, { name: 'dns.network.from_dhcp', description: 'The device should use the DNS server provided by the DHCP server', result: 'Error', + required_result: RequiredResult.Required, }, { name: 'dns.mdns', description: 'Does the device has MDNS (or any kind of IP multicast)', result: 'Not Started', + required_result: RequiredResult.Required, }, ]; diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts index f14dce652..5080c7c92 100644 --- a/modules/ui/src/app/model/testrun-status.ts +++ b/modules/ui/src/app/model/testrun-status.ts @@ -50,6 +50,13 @@ export interface IResult { description: string; result: string; recommendations?: string[]; + required_result: RequiredResult; +} + +export enum RequiredResult { + Informational = 'Informational', + Required = 'Required', + RequiredIfApplicable = 'Required if Applicable', } export enum StatusOfTestrun { @@ -67,6 +74,8 @@ export enum StatusOfTestrun { Monitoring = 'Monitoring', Error = 'Error', Validating = 'Validating Network', + Proceed = 'Proceed', + DoNotProceed = 'Do Not Proceed', } export enum StatusOfTestResult { diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html index 9ca1d80b2..c6fb361fb 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html @@ -125,7 +125,16 @@
-

Test result

+

+ Test result +

+

+ Pilot Recommendation +

{{ data.status }}

diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts index 2e35d0581..079534b12 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts @@ -65,11 +65,13 @@ describe('ProgressStatusCardComponent', () => { StatusOfTestrun.Compliant, StatusOfTestrun.CompliantLimited, StatusOfTestrun.CompliantHigh, + StatusOfTestrun.Proceed, ]; const statusesForCompletedFailedClass = [ StatusOfTestrun.NonCompliant, StatusOfTestrun.Error, + StatusOfTestrun.DoNotProceed, ]; statusesForProgressClass.forEach(testCase => { diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts index 101591c98..7f2120138 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts @@ -21,6 +21,7 @@ import { TestrunStatus, TestsData, } from '../../../../model/testrun-status'; +import { TestingType } from '../../../../model/device'; @Component({ selector: 'app-testrun-status-card', @@ -32,6 +33,7 @@ export class TestrunStatusCardComponent { @Input() systemStatus!: TestrunStatus; public readonly StatusOfTestrun = StatusOfTestrun; + public readonly TestingType = TestingType; public getClass(status: string): { progress: boolean; @@ -43,11 +45,13 @@ export class TestrunStatusCardComponent { progress: this.isProgressStatus(status), 'completed-success': status === StatusOfTestrun.Compliant || + status === StatusOfTestrun.Proceed || status === StatusOfTestrun.CompliantLimited || status === StatusOfTestrun.CompliantHigh || status === StatusOfTestrun.SmartReady, 'completed-failed': status === StatusOfTestrun.NonCompliant || + status === StatusOfTestrun.DoNotProceed || status === StatusOfTestrun.Error, canceled: status === StatusOfTestrun.Cancelled || diff --git a/modules/ui/src/app/pages/testrun/components/testrun-table/testrun-table.component.html b/modules/ui/src/app/pages/testrun/components/testrun-table/testrun-table.component.html index a94d48004..5cc7e479f 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-table/testrun-table.component.html +++ b/modules/ui/src/app/pages/testrun/components/testrun-table/testrun-table.component.html @@ -16,9 +16,10 @@
+ Result Name Description - Result + Required result