From d01f3ea09ee4f7b3d17c0239c7dcd0d3fbd86c69 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Wed, 3 Jan 2018 14:53:34 -0800
Subject: [PATCH] Refactor multiple promises to use async await

---
 ui/src/hosts/apis/index.js           |  2 +-
 ui/src/hosts/containers/HostsPage.js | 99 ++++++++++++++++------------
 2 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/ui/src/hosts/apis/index.js b/ui/src/hosts/apis/index.js
index 6da5961055..dab9f0e5e4 100644
--- a/ui/src/hosts/apis/index.js
+++ b/ui/src/hosts/apis/index.js
@@ -120,7 +120,7 @@ export const getLayouts = () =>
     resource: 'layouts',
   })
 
-export function getAppsForHosts(proxyLink, hosts, appLayouts, telegrafDB) {
+export const getAppsForHosts = (proxyLink, hosts, appLayouts, telegrafDB) => {
   const measurements = appLayouts.map(m => `^${m.measurement}$`).join('|')
   const measurementsToApps = _.zipObject(
     appLayouts.map(m => m.measurement),
diff --git a/ui/src/hosts/containers/HostsPage.js b/ui/src/hosts/containers/HostsPage.js
index ce801b2580..a58c446803 100644
--- a/ui/src/hosts/containers/HostsPage.js
+++ b/ui/src/hosts/containers/HostsPage.js
@@ -24,50 +24,67 @@ class HostsPage extends Component {
 
     const {telegrafSystemInterval} = await getEnv(links.environment)
 
-    Promise.all([
-      getCpuAndLoadForHosts(
+    const hostsError = 'Unable to get apps for hosts'
+    let hosts, layouts
+
+    try {
+      const [h, {data}] = await Promise.all([
+        getCpuAndLoadForHosts(
+          source.links.proxy,
+          source.telegraf,
+          telegrafSystemInterval
+        ),
+        getLayouts(),
+        new Promise(resolve => {
+          this.setState({hostsLoading: true})
+          resolve()
+        }),
+      ])
+
+      hosts = h
+      layouts = data.layouts
+
+      this.setState({
+        hosts,
+        hostsLoading: false,
+      })
+    } catch (error) {
+      this.setState({
+        hostsError: error.toString(),
+        hostsLoading: false,
+      })
+
+      console.error(error)
+    }
+
+    if (!hosts || !layouts) {
+      addFlashMessage({type: 'error', text: hostsError})
+      return this.setState({
+        hostsError,
+        hostsLoading: false,
+      })
+    }
+
+    try {
+      const newHosts = await getAppsForHosts(
         source.links.proxy,
-        source.telegraf,
-        telegrafSystemInterval
-      ),
-      getLayouts(),
-      new Promise(resolve => {
-        this.setState({hostsLoading: true})
-        resolve()
-      }),
-    ])
-      .then(([hosts, {data: {layouts}}]) => {
-        this.setState({
-          hosts,
-          hostsLoading: false,
-        })
-        getAppsForHosts(source.links.proxy, hosts, layouts, source.telegraf)
-          .then(newHosts => {
-            this.setState({
-              hosts: newHosts,
-              hostsError: '',
-              hostsLoading: false,
-            })
-          })
-          .catch(error => {
-            console.error(error)
-            const reason = 'Unable to get apps for hosts'
-            addFlashMessage({type: 'error', text: reason})
-            this.setState({
-              hostsError: reason,
-              hostsLoading: false,
-            })
-          })
+        hosts,
+        layouts,
+        source.telegraf
+      )
+      this.setState({
+        hosts: newHosts,
+        hostsError: '',
+        hostsLoading: false,
       })
-      .catch(reason => {
-        this.setState({
-          hostsError: reason.toString(),
-          hostsLoading: false,
-        })
-        // TODO: this isn't reachable at the moment, because getCpuAndLoadForHosts doesn't fail when it should.
-        // (like with a bogus proxy link). We should provide better messaging to the user in this catch after that's fixed.
-        console.error(reason)
+    } catch (error) {
+      console.error(error)
+      addFlashMessage({type: 'error', text: hostsError})
+      this.setState({
+        hostsError,
+        hostsLoading: false,
       })
+    }
   }
 
   render() {