fix getAppDashboard job in UI

replicatedhq · Jul 27, 2020 · 6583ebe · 6583ebe
1 parent c7e73d3
commit 6583ebe
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/kotsadm/web/src/components/apps/Dashboard.jsx b/kotsadm/web/src/components/apps/Dashboard.jsx
@@ -56,6 +56,7 @@ class Dashboard extends Component {
     showUpdateCheckerModal: false,
     appStatus: null,
     metrics: [],
+    getAppDashboardJob: new Repeater(),
   }
 
   toggleConfigureGraphs = () => {
@@ -123,41 +124,44 @@ class Dashboard extends Component {
     const { getAppLicense } = this.props.getAppLicense;
 
     this.state.updateChecker.start(this.updateStatus, 1000);
+    this.state.getAppDashboardJob.start(this.getAppDashboard, 2000);
 
     if (app) {
       this.setWatchState(app);
     }
     if (getAppLicense) {
       this.setState({ appLicense: getAppLicense });
     }
-
-    this.getAppDashboardJob = new Repeater()
-    this.getAppDashboardJob.start(this.getAppDashboard, 2000);
   }
 
   componentWillUnmount() {
     this.state.updateChecker.stop();
+    this.state.getAppDashboardJob.stop();
   }
 
-  getAppDashboard = async () => {
-    fetch(`${window.env.API_ENDPOINT}/app/${this.props.app?.slug}/cluster/${this.props.cluster?.id}/dashboard`, {
-      headers: {
-        "Authorization": Utilities.getToken(),
-        "Content-Type": "application/json",
-      },
-      method: "GET",
-    })
-      .then(async (res) => {
-        const response = await res.json();
-        this.setState({
-          appStatus: response.appStatus,
-          promValue: response.prometheusAddress,
-          metrics: response.metrics,
-        })
+  getAppDashboard = () => {
+    return new Promise((resolve, reject) => {
+      fetch(`${window.env.API_ENDPOINT}/app/${this.props.app?.slug}/cluster/${this.props.cluster?.id}/dashboard`, {
+        headers: {
+          "Authorization": Utilities.getToken(),
+          "Content-Type": "application/json",
+        },
+        method: "GET",
       })
-      .catch((err) => {
-        console.log(err);
-      });
+        .then(async (res) => {
+          const response = await res.json();
+          this.setState({
+            appStatus: response.appStatus,
+            promValue: response.prometheusAddress,
+            metrics: response.metrics,
+          });
+          resolve();
+        })
+        .catch((err) => {
+          console.log(err);
+          reject(err);
+        });
+    });
   }
 
   onCheckForUpdates = async () => {