From e6e79227e5c74a4262fe3e6166904863b68b7745 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 28 Jul 2020 11:26:48 -0400
Subject: [PATCH] Fixes console errors thrown about isValid on the credential
 form

---
 .../screens/Credential/shared/CredentialForm.test.jsx |  6 ++++--
 .../shared/CredentialFormFields/BecomeMethodField.jsx |  2 +-
 .../shared/CredentialFormFields/CredentialField.jsx   | 11 +++++------
 .../CredentialPlugins/CredentialPluginField.jsx       |  4 ++--
 .../CredentialFormFields/GceFileUploadField.jsx       |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
index 88a81eaf2c..d23e5347ee 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialForm.test.jsx
@@ -208,8 +208,10 @@ describe('<CredentialForm />', () => {
       });
       wrapper.update();
       expect(
-        wrapper.find('FormGroup[fieldId="credential-gce-file"]').prop('isValid')
-      ).toBe(false);
+        wrapper
+          .find('FormGroup[fieldId="credential-gce-file"]')
+          .prop('validated')
+      ).toBe('error');
 
       expect(
         wrapper
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx
index 1c2577e83d..fb51b1f4c6 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/BecomeMethodField.jsx
@@ -41,7 +41,7 @@ function BecomeMethodField({ fieldOptions, isRequired }) {
         )
       }
       isRequired={isRequired}
-      isValid={!(meta.touched && meta.error)}
+      validated={!(meta.touched && meta.error) ? 'default' : 'error'}
     >
       <Select
         maxHeight={200}
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
index 8c0460fabd..aafa1c74fe 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
@@ -29,7 +29,7 @@ function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
         onChange={(value, event) => {
           subFormField.onChange(event);
         }}
-        isValid={isValid}
+        validated={isValid ? 'default' : 'error'}
       />
     );
   }
@@ -38,7 +38,6 @@ function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
       <PasswordInput
         {...subFormField}
         id={`credential-${fieldOptions.id}`}
-        isValid={isValid}
         {...rest}
       />
     );
@@ -55,7 +54,7 @@ function CredentialInput({ fieldOptions, credentialKind, ...rest }) {
       onChange={(value, event) => {
         subFormField.onChange(event);
       }}
-      isValid={isValid}
+      validated={isValid ? 'default' : 'error'}
     />
   );
 }
@@ -107,7 +106,7 @@ function CredentialField({ credentialType, fieldOptions, i18n }) {
         helperTextInvalid={meta.error}
         label={fieldOptions.label}
         isRequired={isRequired}
-        isValid={isValid}
+        validated={isValid ? 'default' : 'error'}
       >
         <AnsibleSelect
           {...subFormField}
@@ -132,7 +131,7 @@ function CredentialField({ credentialType, fieldOptions, i18n }) {
           )
         }
         isRequired={isRequired}
-        isValid={isValid}
+        validated={isValid ? 'default' : 'error'}
       >
         <CredentialInput
           credentialKind={credentialType.kind}
@@ -150,7 +149,7 @@ function CredentialField({ credentialType, fieldOptions, i18n }) {
     <CredentialPluginField
       fieldOptions={fieldOptions}
       isRequired={isRequired}
-      isValid={isValid}
+      validated={isValid ? 'default' : 'error'}
     >
       <CredentialInput fieldOptions={fieldOptions} />
     </CredentialPluginField>
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx
index 4e7c29767b..3a90676982 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx
@@ -43,7 +43,7 @@ function CredentialPluginInput(props) {
           {React.cloneElement(children, {
             ...inputField,
             isRequired,
-            isValid,
+            validated: isValid ? 'default' : 'error',
             isDisabled: !!passwordPromptField.value,
             onChange: (_, event) => {
               inputField.onChange(event);
@@ -125,7 +125,7 @@ function CredentialPluginField(props) {
           fieldId={`credential-${fieldOptions.id}`}
           helperTextInvalid={meta.error}
           isRequired={isRequired}
-          isValid={isValid}
+          validated={isValid ? 'default' : 'error'}
           label={fieldOptions.label}
           labelIcon={
             fieldOptions.help_text && (
diff --git a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
index 1332aa85c5..e49f44c275 100644
--- a/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
+++ b/awx/ui_next/src/screens/Credential/shared/CredentialFormFields/GceFileUploadField.jsx
@@ -20,7 +20,7 @@ function GceFileUploadField({ i18n }) {
   return (
     <FormGroup
       fieldId="credential-gce-file"
-      isValid={!fileError}
+      validated={!fileError ? 'default' : 'error'}
       label={i18n._(t`Service account JSON file`)}
       helperText={i18n._(
         t`Select a JSON formatted service account key to autopopulate the following fields.`