From 63894bf82217c42cb3393b5fd55c2d57413cfc14 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 12 Apr 2019 14:35:35 -0400
Subject: [PATCH] update Promise.all map functions to not be async

---
 .../screens/Organization/OrganizationEdit.jsx             | 8 ++------
 src/pages/Organizations/screens/OrganizationAdd.jsx       | 5 ++---
 src/pages/Organizations/screens/OrganizationsList.jsx     | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx b/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
index 807f0ea58a..2b5fe68ca1 100644
--- a/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
+++ b/src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
@@ -45,12 +45,8 @@ class OrganizationEdit extends Component {
     const url = organization.related.instance_groups;
 
     try {
-      await Promise.all(groupsToAssociate.map(async id => {
-        await api.associateInstanceGroup(url, id);
-      }));
-      await Promise.all(groupsToDisassociate.map(async id => {
-        await api.disassociate(url, id);
-      }));
+      await Promise.all(groupsToAssociate.map(id => api.associateInstanceGroup(url, id)));
+      await Promise.all(groupsToDisassociate.map(id => api.disassociate(url, id)));
     } catch (err) {
       handleHttpError(err) || this.setState({ error: err });
     }
diff --git a/src/pages/Organizations/screens/OrganizationAdd.jsx b/src/pages/Organizations/screens/OrganizationAdd.jsx
index b957ede9d0..219e5da82d 100644
--- a/src/pages/Organizations/screens/OrganizationAdd.jsx
+++ b/src/pages/Organizations/screens/OrganizationAdd.jsx
@@ -36,9 +36,8 @@ class OrganizationAdd extends React.Component {
       const { data: response } = await api.createOrganization(values);
       const instanceGroupsUrl = response.related.instance_groups;
       try {
-        await Promise.all(groupsToAssociate.map(async id => {
-          await api.associateInstanceGroup(instanceGroupsUrl, id);
-        }));
+        await Promise.all(groupsToAssociate.map(id => api
+          .associateInstanceGroup(instanceGroupsUrl, id)));
         this.handleSuccess(response.id);
       } catch (err) {
         handleHttpError(err) || this.setState({ error: err });
diff --git a/src/pages/Organizations/screens/OrganizationsList.jsx b/src/pages/Organizations/screens/OrganizationsList.jsx
index daeeace8e1..96bf1e83ee 100644
--- a/src/pages/Organizations/screens/OrganizationsList.jsx
+++ b/src/pages/Organizations/screens/OrganizationsList.jsx
@@ -178,7 +178,7 @@ class OrganizationsList extends Component {
     let errorHandled;
 
     try {
-      await Promise.all(orgsToDelete.map(async (org) => api.destroyOrganization(org.id)));
+      await Promise.all(orgsToDelete.map((org) => api.destroyOrganization(org.id)));
       this.handleClearOrgsToDelete();
     } catch (err) {
       errorHandled = handleHttpError(err);