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 (
-
- Agree to the end user license agreement and click submit.
-
-
+
-
);
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() {
<>
', () => {
});
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('', () => {
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);