fix(ui): fix refresh of running campaign execution

chutney-testing · May 12, 2023 · a307923 · a307923
1 parent b6f4e5f
commit a307923
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/ui/src/app/core/model/campaign/campaign-execution-report.model.ts b/ui/src/app/core/model/campaign/campaign-execution-report.model.ts
@@ -15,15 +15,15 @@ export interface CampaignExecutionReport {
 }
 
 export class CampaignReport {
-    readonly report: CampaignExecutionReport;
+    report: CampaignExecutionReport;
 
-    readonly passed: number;
-    readonly running: number;
-    readonly failed: number;
-    readonly stopped: number;
-    readonly notexecuted: number;
-    readonly pause: number;
-    readonly total: number;
+    passed: number;
+    running: number;
+    failed: number;
+    stopped: number;
+    notexecuted: number;
+    pause: number;
+    total: number;
 
     constructor(report: CampaignExecutionReport) {
         this.report = report;
@@ -109,4 +109,17 @@ export class CampaignReport {
     isStopped() {
         return ExecutionStatus.STOPPED === this.report.status;
     }
+
+    refresh(campaignReport: CampaignReport) {
+        if(campaignReport.report.campaignId === this.report.campaignId && campaignReport.report.executionId === this.report.executionId){
+            this.report = campaignReport.report;
+            this.notexecuted = campaignReport.notexecuted;
+            this.running = campaignReport.running;
+            this.passed = campaignReport.passed;
+            this.failed = campaignReport.failed;
+            this.stopped = campaignReport.stopped;
+            this.pause = campaignReport.pause;
+            this.total = campaignReport.total;
+        }
+    }
 }
diff --git a/...pp/modules/campaign/components/execution/history/campaign-executions-history.component.ts b/...pp/modules/campaign/components/execution/history/campaign-executions-history.component.ts
@@ -77,7 +77,8 @@ export class CampaignExecutionsHistoryComponent implements OnInit, OnDestroy {
     private refreshOpenTabs(): void {
         for(var i=0; i<this.tabs.length; i++) {
             if (this.tabs[i].isRunning()) {
-                this.tabs[i] = this.campaignReports.find(cr => cr.report.executionId == this.tabs[i].report.executionId)
+                let campaignReport = this.campaignReports.find(cr => cr.report.executionId == this.tabs[i].report.executionId)
+                this.tabs[i].refresh(campaignReport);
             }
         }
     }