From 022a0393143f5ec13e09256c4e9a347142ed3e79 Mon Sep 17 00:00:00 2001
From: atu <atu@indeed.com>
Date: Tue, 8 Sep 2020 22:15:04 -0700
Subject: [PATCH 1/5] skip api request when the last request is not completed

---
 client/src/services/api.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/src/services/api.ts b/client/src/services/api.ts
index bc416de..054c71a 100644
--- a/client/src/services/api.ts
+++ b/client/src/services/api.ts
@@ -120,14 +120,20 @@ function oidcFactory() {
     };
 }
 
+let isApiRequestInProgress = false;
+
 function metrics(url: string, cb: DataCallback<Metrics[]>) {
     const handel = setInterval(getMetrics, 10000);
     getMetrics();
 
     async function getMetrics() {
         try {
-            const metric = await request(url);
-            cb(metric.items || metric);
+            if (!isApiRequestInProgress) {
+                isApiRequestInProgress = true;
+                const metric = await request(url);
+                isApiRequestInProgress = false;
+                cb(metric.items || metric);
+            }
         } catch (err) {
             log.error('No metrics', {err, url});
         }

From 304a108b8a9098b53f7bbf2771070842400971b7 Mon Sep 17 00:00:00 2001
From: atu <atu@indeed.com>
Date: Mon, 14 Sep 2020 20:19:54 -0700
Subject: [PATCH 2/5] fix according to CR

---
 client/src/services/api.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/src/services/api.ts b/client/src/services/api.ts
index 054c71a..32edba0 100644
--- a/client/src/services/api.ts
+++ b/client/src/services/api.ts
@@ -120,9 +120,8 @@ function oidcFactory() {
     };
 }
 
-let isApiRequestInProgress = false;
-
 function metrics(url: string, cb: DataCallback<Metrics[]>) {
+    let isApiRequestInProgress = false;
     const handel = setInterval(getMetrics, 10000);
     getMetrics();
 
@@ -130,9 +129,13 @@ function metrics(url: string, cb: DataCallback<Metrics[]>) {
         try {
             if (!isApiRequestInProgress) {
                 isApiRequestInProgress = true;
-                const metric = await request(url);
+                try {
+                    const metric = await request(url);
+                    cb(metric.items || metric);
+                } catch (err) {
+                    log.error('Unable to send request', {err});
+                }
                 isApiRequestInProgress = false;
-                cb(metric.items || metric);
             }
         } catch (err) {
             log.error('No metrics', {err, url});

From fac5d904bf1a90040abc1eecc77acf1613ffd1ee Mon Sep 17 00:00:00 2001
From: atu <atu@indeed.com>
Date: Mon, 14 Sep 2020 20:21:43 -0700
Subject: [PATCH 3/5] use try finally for request block

---
 client/src/services/api.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/services/api.ts b/client/src/services/api.ts
index 32edba0..8eacf0f 100644
--- a/client/src/services/api.ts
+++ b/client/src/services/api.ts
@@ -134,8 +134,9 @@ function metrics(url: string, cb: DataCallback<Metrics[]>) {
                     cb(metric.items || metric);
                 } catch (err) {
                     log.error('Unable to send request', {err});
+                } finally {
+                    isApiRequestInProgress = false;
                 }
-                isApiRequestInProgress = false;
             }
         } catch (err) {
             log.error('No metrics', {err, url});

From cea0d973db1b6f3bf2b1bbbb65221647d561b62a Mon Sep 17 00:00:00 2001
From: Charlie Gao <charlie.gao@utexas.edu>
Date: Tue, 15 Sep 2020 15:31:47 -0500
Subject: [PATCH 4/5] changing github link

https://github.com/herbrandson/k8dash -> https://github.com/indeedeng/k8dash
---
 client/src/views/account.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/views/account.tsx b/client/src/views/account.tsx
index 26c0312..0dac1be 100644
--- a/client/src/views/account.tsx
+++ b/client/src/views/account.tsx
@@ -21,7 +21,7 @@ const Account = () => (
 
         <div className='contentPanel'>
             <h3>Learn More</h3>
-            <div>Follow K8dash on <a href='https://github.com/herbrandson/k8dash'>GitHub</a></div>
+            <div>Follow K8dash on <a href='https://github.com/indeedeng/k8dash'>GitHub</a></div>
             <div>or at <a href='https://hub.docker.com/r/herbrandson/k8dash'>DockerHub</a></div>
         </div>
 

From b1b6bbcd3a64f519be6b9238c93df97f9026adca Mon Sep 17 00:00:00 2001
From: Eric Herbrandson <eherbrandson@indeed.com>
Date: Thu, 24 Sep 2020 19:15:53 -0500
Subject: [PATCH 5/5] #139: Fixing bug with workloads chart not displaying

---
 client/src/views/workloads.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/views/workloads.tsx b/client/src/views/workloads.tsx
index 9b843c9..b2f8022 100644
--- a/client/src/views/workloads.tsx
+++ b/client/src/views/workloads.tsx
@@ -116,7 +116,7 @@ function ControllerStatusChart({items}: {items: ApiItem<any, any>[] | null}) {
 
     return (
         <div className='charts_item'>
-            {items && count && pending ? (
+            {items && count != null && pending != null ? (
                 <Chart used={count - pending} pending={pending} available={count} />
             ) : (
                 <LoadingChart />