From 4954497d445c183816f3cd82b195f92d414afce9 Mon Sep 17 00:00:00 2001 From: kurilova Date: Tue, 1 Apr 2025 11:29:33 +0000 Subject: [PATCH 1/3] Change error status background --- .../testrun-status-card/testrun-status-card.component.scss | 4 ++++ .../testrun-status-card/testrun-status-card.component.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss index 69b4d5ac1..3ebd248a7 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss @@ -102,6 +102,10 @@ &.canceled .progress-card-info-status { background-color: colors.$on-surface; } + + &.error .progress-card-info-status { + background-color: colors.$on-surface-variant; + } } .progress-card-info-tests { 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 77ea36823..e44011d3f 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 @@ -66,6 +66,7 @@ export class TestrunStatusCardComponent { 'completed-success': boolean; 'completed-failed': boolean; canceled: boolean; + error: boolean; } { return { progress: this.isProgressStatus(status), @@ -79,11 +80,11 @@ export class TestrunStatusCardComponent { 'completed-failed': (result === ResultOfTestrun.NonCompliant && status === StatusOfTestrun.Complete) || - status === StatusOfTestrun.Error || status === StatusOfTestrun.DoNotProceed, canceled: status === StatusOfTestrun.Cancelled || status === StatusOfTestrun.Cancelling, + error: status === StatusOfTestrun.Error, }; } From c250e629d3069c684c8b21d71654a201593999ff Mon Sep 17 00:00:00 2001 From: kurilova Date: Tue, 1 Apr 2025 11:59:51 +0000 Subject: [PATCH 2/3] Fix tests --- .../testrun-status-card.component.spec.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 1c3c125c7..77eaf9da2 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 @@ -54,6 +54,7 @@ describe('ProgressStatusCardComponent', () => { 'completed-success': false, 'completed-failed': false, canceled: false, + error: false, }; const statusesForProgressClass = [ @@ -71,7 +72,6 @@ describe('ProgressStatusCardComponent', () => { const statusesForCompletedFailedClass = [ StatusOfTestrun.Complete, - StatusOfTestrun.Error, StatusOfTestrun.DoNotProceed, ]; @@ -127,6 +127,17 @@ describe('ProgressStatusCardComponent', () => { expect(result).toEqual(expectedResult); }); + + it('should have class "error" if status "Error"', () => { + const expectedResult = { + ...availableClasses, + error: true, + }; + + const result = component.getClass(StatusOfTestrun.Error); + + expect(result).toEqual(expectedResult); + }); }); describe('#getTestsResult', () => { From 8523f1dcb7d838b722be9e87d71c9f3228c60355 Mon Sep 17 00:00:00 2001 From: kurilova Date: Wed, 2 Apr 2025 13:17:16 +0000 Subject: [PATCH 3/3] Adds Status for Pilot Assessment; make progress bar width as 100% --- .../testrun-status-card.component.html | 21 ++++++++-- .../testrun-status-card.component.scss | 27 +++++++++++-- .../testrun-status-card.component.spec.ts | 39 +++++++++++++++---- .../testrun-status-card.component.ts | 12 +++--- 4 files changed, 76 insertions(+), 23 deletions(-) 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 377ecdb70..feea24147 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 @@ -28,10 +28,23 @@
-

{{ getTestStatusText(data) }}

-

- {{ getTestStatus(data) }} -

+
+

{{ getTestStatusText(data) }}

+

+ {{ getTestStatus(data) }} +

+
+
+

Preliminary Pilot Recommendation

+

+ {{ data.status }} +

+
{ expect(result).toEqual(expectedText); }); - - it('"Preliminary Pilot Recommendation" if finished and Pilot statuses', () => { - const expectedText = 'Preliminary Pilot Recommendation'; - - const result = component.getTestStatusText(MOCK_PROGRESS_DATA_PROCEED); - - expect(result).toEqual(expectedText); - }); }); describe('#getTestStatus', () => { @@ -459,5 +451,36 @@ describe('ProgressStatusCardComponent', () => { expect(progressCardStatusText?.textContent).toEqual('Monitoring'); }); }); + + describe('with available systemStatus$ data, as "Proceed"', () => { + beforeEach(() => { + component.systemStatus = MOCK_PROGRESS_DATA_PROCEED; + fixture.detectChanges(); + }); + + it('should have status', () => { + const titleEl = compiled.querySelectorAll( + '.progress-card-info-status .progress-card-info-title' + )[0]; + const textEl = compiled.querySelectorAll( + '.progress-card-info-status .progress-card-info-text' + )[0]; + + expect(titleEl.textContent).toEqual('Result'); + expect(textEl.textContent).toEqual('Compliant'); + }); + + it('should have Pilot recommendations', () => { + const titleEl = compiled.querySelectorAll( + '.progress-card-info-status .progress-card-info-title' + )[1]; + const textEl = compiled.querySelectorAll( + '.progress-card-info-status .progress-card-info-text' + )[1]; + + expect(titleEl.textContent).toEqual('Preliminary Pilot Recommendation'); + expect(textEl.textContent).toEqual('Proceed'); + }); + }); }); }); 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 e44011d3f..da0b10bc6 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 @@ -114,19 +114,17 @@ export class TestrunStatusCardComponent { public getTestStatusText(data: TestrunStatus): string { if (!data.finished) { return 'Status'; - } else if ( - data.finished && - (data.status === StatusOfTestrun.Proceed || - data.status === StatusOfTestrun.DoNotProceed) - ) { - return 'Preliminary Pilot Recommendation'; } else { return 'Result'; } } public getTestStatus(data: TestrunStatus): string { - if (data.status === StatusOfTestrun.Complete) { + if ( + data.status === StatusOfTestrun.Complete || + data.status === StatusOfTestrun.Proceed || + data.status === StatusOfTestrun.DoNotProceed + ) { return data.result!; } return data.status;