From 78d6c6d5ea2caada301fc7d0b2452deb20502c90 Mon Sep 17 00:00:00 2001
From: kurilova <sonnycactus@gmail.com>
Date: Thu, 18 Apr 2024 09:21:13 +0000
Subject: [PATCH 1/2] Do not show test result "In Progress" when "finished"
 data is present

---
 .../progress-status-card.component.html        |  3 ++-
 .../progress-status-card.component.spec.ts     | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
index 971a58430..c2c46892c 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
@@ -58,7 +58,8 @@
           "></ng-container
       ></ng-container>
     </div>
-    <ng-container *ngIf="data.finished">
+    <ng-container
+      *ngIf="data.finished && data.status !== StatusOfTestrun.InProgress">
       <ng-container
         *ngTemplateOutlet="
           Finished;
diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
index 487153426..de7341897 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
@@ -318,6 +318,24 @@ describe('ProgressStatusCardComponent', () => {
       });
     });
 
+    describe('with available systemStatus$ data, as "In Progress" and finish date', () => {
+      beforeEach(() => {
+        component.systemStatus$ = of({
+          ...MOCK_PROGRESS_DATA_IN_PROGRESS,
+          finished: '2023-06-22T09:26:00.123Z',
+        });
+        fixture.detectChanges();
+      });
+
+      it('should not have progress card result', () => {
+        const progressCardResultEl = compiled.querySelector(
+          '.progress-card-result-text span'
+        );
+
+        expect(progressCardResultEl).toBeNull();
+      });
+    });
+
     describe('with available systemStatus$ data, as Waiting for Device', () => {
       beforeEach(() => {
         component.systemStatus$ = of(MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE);

From 6b7cb69752a5c50056cd3504fad64ae368fc6279 Mon Sep 17 00:00:00 2001
From: kurilova <sonnycactus@gmail.com>
Date: Thu, 18 Apr 2024 13:49:18 +0000
Subject: [PATCH 2/2] Disable device item if device in progress

---
 .../progress-status-card.component.html       | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
index c2c46892c..fb4a404d6 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.html
@@ -58,15 +58,25 @@
           "></ng-container
       ></ng-container>
     </div>
-    <ng-container
-      *ngIf="data.finished && data.status !== StatusOfTestrun.InProgress">
-      <ng-container
-        *ngTemplateOutlet="
-          Finished;
-          context: {
-            data: data
-          }
-        "></ng-container>
+    <ng-container *ngIf="data.finished">
+      <ng-container *ngIf="data.status !== StatusOfTestrun.InProgress">
+        <ng-container
+          *ngTemplateOutlet="
+            Finished;
+            context: {
+              data: data
+            }
+          "></ng-container>
+      </ng-container>
+      <ng-container *ngIf="data.status === StatusOfTestrun.InProgress">
+        <ng-container
+          *ngTemplateOutlet="
+            InProgress;
+            context: {
+              data: data
+            }
+          "></ng-container
+      ></ng-container>
     </ng-container>
   </div>
 </ng-container>