Add container ready count before total count

[portal/ric-dashboard.git] / webapp-frontend / src / app / caas-ingress / caas-ingress.datasource.ts

diff --git a/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts b/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts
index 8b72e09..0134bb6 100644 (file)
--- a/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts
+++ b/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts
@@ -2,14 +2,14 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
 
 import { CollectionViewer, DataSource } from '@angular/cdk/collections';
 import { HttpErrorResponse } from '@angular/common/http';
-import { MatSort } from '@angular/material';
+import { MatSort } from '@angular/material/sort';
 import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { of } from 'rxjs/observable/of';
@@ -59,10 +59,14 @@ export class CaasIngressDataSource extends DataSource<V1Pod> {
       )
       .subscribe((pl: V1PodList) => {
         this.rowCount = pl.items.length;
-        // precompute the restart count to keep HTML simple
+        // precompute container ready, restart counts to keep HTML simple
         for (const v1pod of pl.items) {
+          v1pod['readyCount'] = 0;
           v1pod['restartCount'] = 0;
           for (const cs of v1pod.status.containerStatuses) {
+            if (cs.ready) {
+              v1pod['readyCount'] = v1pod['readyCount'] + 1;
+            }
             v1pod['restartCount'] = v1pod['restartCount'] + cs.restartCount;
           }
         }