From d324baf1b049db1c42a4c0b9510de5e7b9fc95f7 Mon Sep 17 00:00:00 2001 From: nixocio Date: Fri, 23 Oct 2020 15:30:32 -0400 Subject: [PATCH] Hide max hosts field on org form Hide max hosts field on org form. Also, simplify the usage of context API to read the value of me parameter. Hide max hosts field on org form. See: https://github.com/ansible/awx/issues/4950 --- .../OrganizationAdd/OrganizationAdd.jsx | 16 +++----- .../OrganizationDetail/OrganizationDetail.jsx | 6 ++- .../OrganizationEdit/OrganizationEdit.jsx | 18 +++----- .../Organization/shared/OrganizationForm.jsx | 41 +++++++++---------- 4 files changed, 36 insertions(+), 45 deletions(-) diff --git a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx index 6cb8c08891..d9c14765ac 100644 --- a/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx +++ b/awx/ui_next/src/screens/Organization/OrganizationAdd/OrganizationAdd.jsx @@ -4,7 +4,6 @@ import { useHistory } from 'react-router-dom'; import { PageSection, Card } from '@patternfly/react-core'; import { OrganizationsAPI } from '../../../api'; -import { Config } from '../../../contexts/Config'; import { CardBody } from '../../../components/Card'; import OrganizationForm from '../shared/OrganizationForm'; @@ -38,16 +37,11 @@ function OrganizationAdd() { - - {({ me }) => ( - - )} - + diff --git a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx index 2054c18c52..6b55780333 100644 --- a/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx +++ b/awx/ui_next/src/screens/Organization/OrganizationDetail/OrganizationDetail.jsx @@ -18,6 +18,7 @@ import ContentLoading from '../../../components/ContentLoading'; import DeleteButton from '../../../components/DeleteButton'; import ErrorDetail from '../../../components/ErrorDetail'; import useRequest, { useDismissableError } from '../../../util/useRequest'; +import { useConfig } from '../../../contexts/Config'; function OrganizationDetail({ i18n, organization }) { const { @@ -37,6 +38,7 @@ function OrganizationDetail({ i18n, organization }) { const [hasContentLoading, setHasContentLoading] = useState(true); const [instanceGroups, setInstanceGroups] = useState([]); const history = useHistory(); + const { license_info = {} } = useConfig(); useEffect(() => { (async () => { @@ -85,7 +87,9 @@ function OrganizationDetail({ i18n, organization }) { dataCy="organization-detail-name" /> - + {license_info?.license_type !== 'open' && ( + + )} - - {({ me }) => ( - - )} - + ); } diff --git a/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx b/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx index cba0d62224..c78b178943 100644 --- a/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx +++ b/awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx @@ -6,7 +6,7 @@ import { t } from '@lingui/macro'; import { Form, FormGroup } from '@patternfly/react-core'; import { OrganizationsAPI } from '../../../api'; -import { ConfigContext } from '../../../contexts/Config'; +import { ConfigContext, useConfig } from '../../../contexts/Config'; import AnsibleSelect from '../../../components/AnsibleSelect'; import ContentError from '../../../components/ContentError'; import ContentLoading from '../../../components/ContentLoading'; @@ -18,14 +18,10 @@ import { required, minMaxValue } from '../../../util/validators'; import { FormColumnLayout } from '../../../components/FormLayout'; import CredentialLookup from '../../../components/Lookup/CredentialLookup'; -function OrganizationFormFields({ - i18n, - me, - instanceGroups, - setInstanceGroups, -}) { +function OrganizationFormFields({ i18n, instanceGroups, setInstanceGroups }) { const { setFieldValue } = useFormikContext(); const [venvField] = useField('custom_virtualenv'); + const { license_info = {}, me = {} } = useConfig(); const [ galaxyCredentialsField, @@ -63,20 +59,23 @@ function OrganizationFormFields({ type="text" label={i18n._(t`Description`)} /> - + {license_info?.license_type !== 'open' && ( + + )} + {custom_virtualenvs && custom_virtualenvs.length > 1 && (