From ff559a81dbdcfb0dbe6ac704d3be9dabf2593e9d Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 25 May 2021 14:17:48 -0400
Subject: [PATCH] Remove eula checkbox from UI

---
 .../SubscriptionEdit/EulaStep.jsx             | 30 ++-----------------
 .../SubscriptionEdit/SubscriptionEdit.jsx     |  7 -----
 .../SubscriptionEdit.test.jsx                 | 25 ----------------
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx
index be8852ade1..528f04b135 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/EulaStep.jsx
@@ -1,31 +1,17 @@
 import React from 'react';
 
-import { Trans, t } from '@lingui/macro';
-import { useField } from 'formik';
+import { t } from '@lingui/macro';
 import { Flex, FormGroup, TextArea } from '@patternfly/react-core';
-import { required } from '../../../../util/validators';
 import { useConfig } from '../../../../contexts/Config';
-import { CheckboxField } from '../../../../components/FormField';
 
 function EulaStep() {
-  const { eula, me } = useConfig();
-  const [, meta] = useField('eula');
-  const isValid = !(meta.touched && meta.error);
+  const { eula } = useConfig();
   return (
     <Flex
       spaceItems={{ default: 'spaceItemsMd' }}
       direction={{ default: 'column' }}
     >
-      <b>
-        <Trans>Agree to the end user license agreement and click submit.</Trans>
-      </b>
-      <FormGroup
-        fieldId="eula"
-        label={t`End User License Agreement`}
-        validated={isValid ? 'default' : 'error'}
-        helperTextInvalid={meta.error}
-        isRequired
-      >
+      <FormGroup fieldId="eula" label={t`End User License Agreement`}>
         <TextArea
           id="eula-container"
           style={{ minHeight: '200px' }}
@@ -34,16 +20,6 @@ function EulaStep() {
         >
           {eula}
         </TextArea>
-        <CheckboxField
-          name="eula"
-          aria-label={t`Agree to end user license agreement`}
-          label={t`I agree to the End User License Agreement`}
-          id="eula"
-          isDisabled={!me.is_superuser}
-          validate={required(
-            t`Please agree to End User License Agreement before proceeding.`
-          )}
-        />
       </FormGroup>
     </Flex>
   );
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
index ef0c8680f9..2b20ef1de6 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.jsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect } from 'react';
 import { useHistory, Link, useRouteMatch } from 'react-router-dom';
-
 import { t, Trans } from '@lingui/macro';
 import { Formik, useFormikContext } from 'formik';
 import {
@@ -41,7 +40,6 @@ const CustomFooter = ({ isSubmitLoading }) => {
                 isDisabled={
                   (!values.manifest_file && !values.subscription) ||
                   !me?.is_superuser ||
-                  !values.eula ||
                   Object.keys(errors).length !== 0
                 }
                 type="button"
@@ -133,13 +131,9 @@ function SubscriptionEdit() {
       if (form.manifest_file) {
         await ConfigAPI.create({
           manifest: form.manifest_file,
-          eula_accepted: form.eula,
         });
       } else if (form.subscription) {
         await ConfigAPI.attach({ pool_id: form.subscription.pool_id });
-        await ConfigAPI.create({
-          eula_accepted: form.eula,
-        });
       }
 
       if (!hasValidKey) {
@@ -223,7 +217,6 @@ function SubscriptionEdit() {
     <>
       <Formik
         initialValues={{
-          eula: false,
           insights: true,
           manifest_file: null,
           manifest_filename: '',
diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
index 9f69eb9fd5..dd3f173804 100644
--- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
+++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.jsx
@@ -186,20 +186,7 @@ describe('<SubscriptionEdit />', () => {
       });
       wrapper.update();
       expect(wrapper.find('EulaStep').length).toBe(1);
-      expect(wrapper.find('CheckboxField').length).toBe(1);
       expect(wrapper.find('button#subscription-wizard-submit').length).toBe(1);
-    });
-
-    test('checking EULA agreement should enable Submit button', async () => {
-      expect(
-        wrapper.find('button#subscription-wizard-submit').prop('disabled')
-      ).toBe(true);
-      await act(async () => {
-        wrapper.find('Checkbox[name="eula"] input').simulate('change', {
-          target: { value: true, name: 'eula' },
-        });
-      });
-      wrapper.update();
       expect(
         wrapper.find('button#subscription-wizard-submit').prop('disabled')
       ).toBe(false);
@@ -369,18 +356,6 @@ describe('<SubscriptionEdit />', () => {
       expect(wrapper.find('SubscriptionStep').length).toBe(0);
       expect(wrapper.find('AnalyticsStep').length).toBe(0);
       expect(wrapper.find('EulaStep').length).toBe(1);
-    });
-
-    test('submit should be disabled until EULA agreement checked', async () => {
-      expect(
-        wrapper.find('button#subscription-wizard-submit').prop('disabled')
-      ).toBe(true);
-      await act(async () => {
-        wrapper.find('Checkbox[name="eula"] input').simulate('change', {
-          target: { value: true, name: 'eula' },
-        });
-      });
-      wrapper.update();
       expect(
         wrapper.find('button#subscription-wizard-submit').prop('disabled')
       ).toBe(false);