From b26de8b922568322686e0e276b3b0a7ff1eb43ee Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 30 Jan 2020 10:56:17 -0800
Subject: [PATCH] pass Host form API errors back into Formik for display

---
 .../src/screens/Host/HostAdd/HostAdd.jsx      | 23 ++++++++++++++++---
 .../src/screens/Host/HostEdit/HostEdit.jsx    | 23 ++++++++++++++++---
 .../src/screens/Host/shared/HostForm.jsx      |  8 ++++++-
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/awx/ui_next/src/screens/Host/HostAdd/HostAdd.jsx b/awx/ui_next/src/screens/Host/HostAdd/HostAdd.jsx
index f9d78a00e4..43aa5ecec8 100644
--- a/awx/ui_next/src/screens/Host/HostAdd/HostAdd.jsx
+++ b/awx/ui_next/src/screens/Host/HostAdd/HostAdd.jsx
@@ -1,10 +1,14 @@
 import React, { useState } from 'react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
+import { t } from '@lingui/macro';
+import { withI18n } from '@lingui/react';
 import { CardBody } from '@components/Card';
+import ErrorDetail from '@components/ErrorDetail';
+import AlertModal from '@components/AlertModal';
 import { HostsAPI } from '@api';
 import HostForm from '../shared';
 
-function HostAdd() {
+function HostAdd({ i18n }) {
   const [formError, setFormError] = useState(null);
   const history = useHistory();
   const hostsMatch = useRouteMatch('/hosts');
@@ -23,6 +27,9 @@ function HostAdd() {
       const { data: response } = await HostsAPI.create(values);
       history.push(`${url}/${response.id}/details`);
     } catch (error) {
+      if (error.response && error.response.data) {
+        throw error.response.data;
+      }
       setFormError(error);
     }
   };
@@ -34,9 +41,19 @@ function HostAdd() {
   return (
     <CardBody>
       <HostForm handleSubmit={handleSubmit} handleCancel={handleCancel} />
-      {formError ? <div>error</div> : ''}
+      {formError && (
+        <AlertModal
+          variant="danger"
+          title={i18n._(t`Error!`)}
+          isOpen={formError}
+          onClose={() => setFormError(null)}
+        >
+          {i18n._(t`An error occurred when saving Host`)}
+          <ErrorDetail error={formError} />
+        </AlertModal>
+      )}
     </CardBody>
   );
 }
 
-export default HostAdd;
+export default withI18n()(HostAdd);
diff --git a/awx/ui_next/src/screens/Host/HostEdit/HostEdit.jsx b/awx/ui_next/src/screens/Host/HostEdit/HostEdit.jsx
index 529ebbf425..e62fe7268c 100644
--- a/awx/ui_next/src/screens/Host/HostEdit/HostEdit.jsx
+++ b/awx/ui_next/src/screens/Host/HostEdit/HostEdit.jsx
@@ -1,11 +1,15 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useHistory, useRouteMatch } from 'react-router-dom';
+import { t } from '@lingui/macro';
+import { withI18n } from '@lingui/react';
 import { CardBody } from '@components/Card';
+import ErrorDetail from '@components/ErrorDetail';
+import AlertModal from '@components/AlertModal';
 import { HostsAPI } from '@api';
 import HostForm from '../shared';
 
-function HostEdit({ host }) {
+function HostEdit({ host, i18n }) {
   const [formError, setFormError] = useState(null);
   const hostsMatch = useRouteMatch('/hosts/:id/edit');
   const inventoriesMatch = useRouteMatch(
@@ -31,6 +35,9 @@ function HostEdit({ host }) {
       await HostsAPI.update(host.id, values);
       history.push(detailsUrl);
     } catch (error) {
+      if (error.response && error.response.data) {
+        throw error.response.data;
+      }
       setFormError(error);
     }
   };
@@ -46,7 +53,17 @@ function HostEdit({ host }) {
         handleSubmit={handleSubmit}
         handleCancel={handleCancel}
       />
-      {formError ? <div>error</div> : null}
+      {formError && (
+        <AlertModal
+          variant="danger"
+          title={i18n._(t`Error!`)}
+          isOpen={formError}
+          onClose={() => setFormError(null)}
+        >
+          {i18n._(t`An error occurred when saving Host`)}
+          <ErrorDetail error={formError} />
+        </AlertModal>
+      )}
     </CardBody>
   );
 }
@@ -56,4 +73,4 @@ HostEdit.propTypes = {
 };
 
 export { HostEdit as _HostEdit };
-export default HostEdit;
+export default withI18n()(HostEdit);
diff --git a/awx/ui_next/src/screens/Host/shared/HostForm.jsx b/awx/ui_next/src/screens/Host/shared/HostForm.jsx
index 4c2a1c38b4..e8348dbfc1 100644
--- a/awx/ui_next/src/screens/Host/shared/HostForm.jsx
+++ b/awx/ui_next/src/screens/Host/shared/HostForm.jsx
@@ -30,7 +30,13 @@ function HostForm({ handleSubmit, handleCancel, host, i18n }) {
         inventory: host.inventory || '',
         variables: host.variables,
       }}
-      onSubmit={handleSubmit}
+      onSubmit={async (values, formik) => {
+        try {
+          await handleSubmit(values);
+        } catch (errors) {
+          formik.setErrors(errors);
+        }
+      }}
     >
       {formik => (
         <Form autoComplete="off" onSubmit={formik.handleSubmit}>