Fix model for show messages to ingest

Author: jozefbakus

ui/src/app/components/workflows/workflows-home/workflows-home.component.html

@@ -249,12 +249,12 @@ <h3 class="modal-title">Upload workflow</h3>
           <clr-dg-row *ngFor="let job of ingestionStatus" [clrDgItem]="job">
             <clr-dg-cell>{{job.jobName}}</clr-dg-cell>
             <clr-dg-cell>{{job.jobType}}</clr-dg-cell>
-            <clr-dg-cell *ngIf="job?.topic">
-              <b>Topic:</b> {{job?.topic?.topic}} <br/>
-              <div *ngIf="job?.topic?.messagesToIngest >= 0"><b>Messages to ingest:</b> {{job?.topic?.messagesToIngest}}</div>
-              <b *ngIf="job?.topic?.messagesToIngest < 0" [style.color]="'red'">Offset inconsistency detected. Please contact support team!</b>
+            <clr-dg-cell *ngIf="job?.topicStatus">
+              <b>Topic:</b> {{job?.topicStatus?.topic}} <br/>
+              <div *ngIf="job?.topicStatus?.messagesToIngest >= 0"><b>Messages to ingest:</b> {{job?.topicStatus?.messagesToIngest}}</div>
+              <b *ngIf="job?.topicStatus?.messagesToIngest < 0" [style.color]="'red'">Offset inconsistency detected. Please contact support team!</b>
             </clr-dg-cell>
-            <clr-dg-cell *ngIf="!job?.topic">
+            <clr-dg-cell *ngIf="!job?.topicStatus">
               <b>Not available</b>
             </clr-dg-cell>
           </clr-dg-row>

ui/src/app/models/ingestionStatus.model.ts

@@ -28,11 +28,11 @@ export class IngestionStatusModelFactory {
     return this.create(
       ingestionStatusResponse.jobName,
       ingestionStatusResponse.jobType,
-      ingestionStatusResponse?.topic
+      ingestionStatusResponse?.topicStatus
         ? TopicModelFactory.create(
-            ingestionStatusResponse.topic.topic,
-            Object.keys(ingestionStatusResponse.topic.messagesToIngest)
-              .map((key) => ingestionStatusResponse.topic.messagesToIngest[key])
+            ingestionStatusResponse.topicStatus.topic,
+            Object.keys(ingestionStatusResponse.topicStatus.messagesToIngest)
+              .map((key) => ingestionStatusResponse.topicStatus.messagesToIngest[key])
               .reduce((acc, cur) => acc + Number(cur), 0),
           )
         : null,
@@ -54,12 +54,12 @@ export class TopicModelFactory {
 export type IngestionStatusResponseModel = {
   jobName: string;
   jobType: string;
-  topic?: TopicResponseModel;
+  topicStatus?: TopicResponseModel;
 };
 
 export class IngestionStatusResponseModelFactory {
-  static create(jobName: string, jobType: string, topic?: TopicResponseModel): IngestionStatusResponseModel {
-    return { jobName: jobName, jobType: jobType, topic: topic };
+  static create(jobName: string, jobType: string, topicStatus?: TopicResponseModel): IngestionStatusResponseModel {
+    return { jobName: jobName, jobType: jobType, topicStatus: topicStatus };
   }
 }