Merge pull request ansible#7627 from jakemcdermott/fix-7512

Show grant and client type validation errors Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
ryanpetrello · Jul 16, 2020 · 4db3cd0 · 4db3cd0
2 parents 2e07ac3 + d1a4f01
commit 4db3cd0
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/awx/ui_next/src/screens/Application/shared/ApplicationForm.jsx b/awx/ui_next/src/screens/Application/shared/ApplicationForm.jsx
@@ -39,6 +39,7 @@ function ApplicationFormFields({
     name: 'client_type',
     validate: required(null, i18n),
   });
+
   return (
     <>
       <FormField
@@ -68,8 +69,12 @@ function ApplicationFormFields({
       <FormGroup
         fieldId="authType"
         helperTextInvalid={authorizationTypeMeta.error}
+        validated={
+          !authorizationTypeMeta.touched || !authorizationTypeMeta.error
+            ? 'default'
+            : 'error'
+        }
         isRequired
-        isValid={!authorizationTypeMeta.touched || !authorizationTypeMeta.error}
         label={i18n._(t`Authorization grant type`)}
       >
         <FieldTooltip
@@ -79,6 +84,9 @@ function ApplicationFormFields({
         />
         <AnsibleSelect
           {...authorizationTypeField}
+          isValid={
+            !authorizationTypeMeta.touched || !authorizationTypeMeta.error
+          }
           isDisabled={match.url.endsWith('edit')}
           id="authType"
           data={[{ label: '', key: 1, value: '' }, ...authorizationOptions]}
@@ -105,8 +113,10 @@ function ApplicationFormFields({
       <FormGroup
         fieldId="clientType"
         helperTextInvalid={clientTypeMeta.error}
+        validated={
+          !clientTypeMeta.touched || !clientTypeMeta.error ? 'default' : 'error'
+        }
         isRequired
-        isValid={!clientTypeMeta.touched || !clientTypeMeta.error}
         label={i18n._(t`Client type`)}
       >
         <FieldTooltip
@@ -116,6 +126,7 @@ function ApplicationFormFields({
         />
         <AnsibleSelect
           {...clientTypeField}
+          isValid={!clientTypeMeta.touched || !clientTypeMeta.error}
           id="clientType"
           data={[{ label: '', key: 1, value: '' }, ...clientTypeOptions]}
           onChange={(event, value) => {