From d7f1f0c7e60528133145caf3eb8c2cb656d6ba23 Mon Sep 17 00:00:00 2001
From: Kia Lam <digitalanime@gmail.com>
Date: Thu, 23 Sep 2021 10:23:51 -0700
Subject: [PATCH] Remove validation and unused vars for EE Lookup.

---
 .../Lookup/ExecutionEnvironmentLookup.js      | 20 ++-----------------
 .../Lookup/ExecutionEnvironmentLookup.test.js |  6 +-----
 awx/ui/src/components/Lookup/Lookup.js        | 10 ++++------
 .../screens/Setting/shared/SharedFields.js    | 10 +++-------
 4 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.js b/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.js
index 9aa29c1d0d..52b8263088 100644
--- a/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.js
+++ b/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.js
@@ -24,9 +24,7 @@ function ExecutionEnvironmentLookup({
   id,
   globallyAvailable,
   helperTextInvalid,
-  isDefaultEnvironment,
   isDisabled,
-  isGlobalDefaultEnvironment,
   isValid,
   onBlur,
   onChange,
@@ -40,7 +38,6 @@ function ExecutionEnvironmentLookup({
   overrideLabel,
 }) {
   const location = useLocation();
-
   const {
     request: fetchProject,
     error: fetchProjectError,
@@ -199,26 +196,17 @@ function ExecutionEnvironmentLookup({
     </>
   );
 
-  const renderLabel = (
-    globalDefaultEnvironment,
-    defaultExecutionEnvironment
-  ) => {
+  const renderLabel = () => {
     if (overrideLabel) {
       return null;
     }
-    if (globalDefaultEnvironment) {
-      return t`Global Default Execution Environment`;
-    }
-    if (defaultExecutionEnvironment) {
-      return t`Default Execution Environment`;
-    }
     return t`Execution Environment`;
   };
 
   return (
     <FormGroup
       fieldId={id}
-      label={renderLabel(isGlobalDefaultEnvironment, isDefaultEnvironment)}
+      label={renderLabel()}
       labelIcon={popoverContent && <Popover content={popoverContent} />}
       helperTextInvalid={helperTextInvalid}
       validated={isValid ? 'default' : 'error'}
@@ -239,8 +227,6 @@ ExecutionEnvironmentLookup.propTypes = {
   value: ExecutionEnvironment,
   popoverContent: string,
   onChange: func.isRequired,
-  isDefaultEnvironment: bool,
-  isGlobalDefaultEnvironment: bool,
   projectId: oneOfType([number, string]),
   organizationId: oneOfType([number, string]),
   validate: func,
@@ -251,8 +237,6 @@ ExecutionEnvironmentLookup.propTypes = {
 ExecutionEnvironmentLookup.defaultProps = {
   id: 'execution-environments',
   popoverContent: '',
-  isDefaultEnvironment: false,
-  isGlobalDefaultEnvironment: false,
   value: null,
   projectId: null,
   organizationId: null,
diff --git a/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.test.js b/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.test.js
index d110059a9b..ea6c82df81 100644
--- a/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.test.js
+++ b/awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.test.js
@@ -54,7 +54,6 @@ describe('ExecutionEnvironmentLookup', () => {
       wrapper = mountWithContexts(
         <Formik>
           <ExecutionEnvironmentLookup
-            isDefaultEnvironment
             value={executionEnvironment}
             onChange={() => {}}
           />
@@ -64,12 +63,9 @@ describe('ExecutionEnvironmentLookup', () => {
     wrapper.update();
     expect(ExecutionEnvironmentsAPI.read).toHaveBeenCalledTimes(1);
     expect(wrapper.find('ExecutionEnvironmentLookup')).toHaveLength(1);
-    expect(
-      wrapper.find('FormGroup[label="Default Execution Environment"]').length
-    ).toBe(1);
     expect(
       wrapper.find('FormGroup[label="Execution Environment"]').length
-    ).toBe(0);
+    ).toBe(1);
   });
 
   test('should fetch execution environments', async () => {
diff --git a/awx/ui/src/components/Lookup/Lookup.js b/awx/ui/src/components/Lookup/Lookup.js
index 5b0241d8d7..357b607d6a 100644
--- a/awx/ui/src/components/Lookup/Lookup.js
+++ b/awx/ui/src/components/Lookup/Lookup.js
@@ -57,12 +57,10 @@ function Lookup(props) {
   useField({
     name: fieldName,
     validate: (val) => {
-      setTimeout(() => {
-        if (!multiple && !val && typedText && typedText !== '') {
-          return t`That value was not found. Please enter or select a valid value.`;
-        }
-        return validate(val);
-      });
+      if (!multiple && !val && typedText && typedText !== '') {
+        return t`That value was not found. Please enter or select a valid value.`;
+      }
+      return validate(val);
     },
   });
 
diff --git a/awx/ui/src/screens/Setting/shared/SharedFields.js b/awx/ui/src/screens/Setting/shared/SharedFields.js
index 8a9c08a38f..887547186b 100644
--- a/awx/ui/src/screens/Setting/shared/SharedFields.js
+++ b/awx/ui/src/screens/Setting/shared/SharedFields.js
@@ -231,9 +231,7 @@ EncryptedField.propTypes = {
 };
 
 const ExecutionEnvField = ({ name, config, isRequired = false }) => {
-  const validate = isRequired ? required(null) : null;
-  const [field, meta, helpers] = useField({ name, validate });
-  const isValid = !meta.error || !meta.touched;
+  const [field, meta, helpers] = useField({ name });
   return config ? (
     <SettingGroup
       defaultValue={config.default ?? ''}
@@ -242,15 +240,13 @@ const ExecutionEnvField = ({ name, config, isRequired = false }) => {
       isRequired={isRequired}
       label={config.label}
       popoverContent={config.help_text}
-      validated={isValid ? 'default' : 'error'}
       isDisabled={field.value === null}
+      onRevertCallback={() => helpers.setValue(config.default)}
     >
       <ExecutionEnvironmentLookup
-        onBlur={() => helpers.setTouched(true)}
         value={field.value}
         onChange={(value) => {
-          helpers.setValue(value);
-          helpers.setTouched(true);
+          helpers.setValue(value, false);
         }}
         overrideLabel
         fieldName={name}