From c01a89ae682360cfc6ec540753126115356473ad Mon Sep 17 00:00:00 2001 From: nixocio Date: Fri, 26 Mar 2021 10:29:18 -0400 Subject: [PATCH] Remove EE field from Project related screens Remove EE field from Project related screens See: https://github.com/ansible/awx/issues/9719 --- .../PromptDetail/PromptProjectDetail.jsx | 7 ----- .../PromptDetail/PromptProjectDetail.test.jsx | 8 ----- .../components/PromptDetail/data.project.json | 10 +------ .../screens/Project/ProjectAdd/ProjectAdd.jsx | 1 - .../Project/ProjectAdd/ProjectAdd.test.jsx | 3 -- .../Project/ProjectDetail/ProjectDetail.jsx | 7 ----- .../ProjectDetail/ProjectDetail.test.jsx | 16 ---------- .../Project/ProjectEdit/ProjectEdit.jsx | 1 - .../screens/Project/shared/ProjectForm.jsx | 30 ------------------- 9 files changed, 1 insertion(+), 82 deletions(-) diff --git a/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx b/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx index 0ab2d6d31f66..f200142cc561 100644 --- a/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx +++ b/awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx @@ -8,12 +8,10 @@ import { Config } from '../../contexts/Config'; import { Detail, DeletedDetail } from '../DetailList'; import CredentialChip from '../CredentialChip'; import { toTitleCase } from '../../util/strings'; -import ExecutionEnvironmentDetail from '../ExecutionEnvironmentDetail'; function PromptProjectDetail({ i18n, resource }) { const { allow_override, - custom_virtualenv, local_path, scm_branch, scm_clean, @@ -65,11 +63,6 @@ function PromptProjectDetail({ i18n, resource }) { ) : ( )} - { assertDetail(wrapper, 'Project Base Path', 'dir/foo/bar'); assertDetail(wrapper, 'Playbook Directory', '_6__demo_project'); assertDetail(wrapper, 'Source Control Credential', 'Scm: mock scm'); - const executionEnvironment = wrapper.find('ExecutionEnvironmentDetail'); - expect(executionEnvironment).toHaveLength(1); - expect(executionEnvironment.find('dt').text()).toEqual( - 'Default Execution Environment' - ); - expect(executionEnvironment.find('dd').text()).toEqual( - mockProject.summary_fields.default_environment.name - ); expect( wrapper .find('Detail[label="Options"]') diff --git a/awx/ui_next/src/components/PromptDetail/data.project.json b/awx/ui_next/src/components/PromptDetail/data.project.json index 24ed7ff1a62d..26c28c8272ed 100644 --- a/awx/ui_next/src/components/PromptDetail/data.project.json +++ b/awx/ui_next/src/components/PromptDetail/data.project.json @@ -28,12 +28,6 @@ "name":"Default", "description":"" }, - "default_environment": { - "id": 1, - "name": "Default EE", - "description": "", - "image": "quay.io/ansible/awx-ee" - }, "credential": { "id": 9, "name": "mock scm", @@ -107,8 +101,6 @@ "scm_update_on_launch":true, "scm_update_cache_timeout":3, "allow_override":true, - "custom_virtualenv": "mock virtual env", "last_update_failed":false, - "last_updated":"2020-03-11T20:18:14Z", - "default_environment": 1 + "last_updated":"2020-03-11T20:18:14Z" } \ No newline at end of file diff --git a/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.jsx b/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.jsx index eaaa4274f363..d0190830e62c 100644 --- a/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.jsx +++ b/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.jsx @@ -27,7 +27,6 @@ function ProjectAdd() { } = await ProjectsAPI.create({ ...values, organization: values.organization.id, - default_environment: values.default_environment?.id, }); history.push(`/projects/${id}/details`); } catch (error) { diff --git a/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.test.jsx b/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.test.jsx index 76bfd492567e..afee9a732a9c 100644 --- a/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.test.jsx +++ b/awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.test.jsx @@ -24,8 +24,6 @@ describe('', () => { scm_update_on_launch: true, scm_update_cache_timeout: 3, allow_override: false, - custom_virtualenv: '/var/lib/awx/venv/custom-env', - default_environment: { id: 1, name: 'Foo' }, }; const projectOptionsResolve = { @@ -106,7 +104,6 @@ describe('', () => { expect(ProjectsAPI.create).toHaveBeenCalledWith({ ...projectData, organization: 2, - default_environment: 1, }); }); diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx index f8bcd351b79b..89b0c88f8edf 100644 --- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx +++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx @@ -15,7 +15,6 @@ import { UserDateDetail, } from '../../../components/DetailList'; import ErrorDetail from '../../../components/ErrorDetail'; -import ExecutionEnvironmentDetail from '../../../components/ExecutionEnvironmentDetail'; import CredentialChip from '../../../components/CredentialChip'; import { ProjectsAPI } from '../../../api'; import { toTitleCase } from '../../../util/strings'; @@ -27,7 +26,6 @@ function ProjectDetail({ project, i18n }) { const { allow_override, created, - custom_virtualenv, description, id, local_path, @@ -129,11 +127,6 @@ function ProjectDetail({ project, i18n }) { label={i18n._(t`Cache Timeout`)} value={`${scm_update_cache_timeout} ${i18n._(t`Seconds`)}`} /> - {({ project_base_dir }) => ( ', () => { id: 10, name: 'Foo', }, - default_environment: { - id: 12, - name: 'Bar', - image: 'quay.io/ansible/awx-ee', - }, credential: { id: 1000, name: 'qux', @@ -76,8 +71,6 @@ describe('', () => { scm_update_on_launch: true, scm_update_cache_timeout: 5, allow_override: true, - custom_virtualenv: '/custom-venv', - default_environment: 1, }; test('initially renders successfully', () => { @@ -105,15 +98,6 @@ describe('', () => { 'Cache Timeout', `${mockProject.scm_update_cache_timeout} Seconds` ); - const executionEnvironment = wrapper.find('ExecutionEnvironmentDetail'); - expect(executionEnvironment).toHaveLength(1); - expect(executionEnvironment.find('dt').text()).toEqual( - 'Default Execution Environment' - ); - expect(executionEnvironment.find('dd').text()).toEqual( - mockProject.summary_fields.default_environment.name - ); - const dateDetails = wrapper.find('UserDateDetail'); expect(dateDetails).toHaveLength(2); expect(dateDetails.at(0).prop('label')).toEqual('Created'); diff --git a/awx/ui_next/src/screens/Project/ProjectEdit/ProjectEdit.jsx b/awx/ui_next/src/screens/Project/ProjectEdit/ProjectEdit.jsx index 3682a01cdc8a..6642e035032f 100644 --- a/awx/ui_next/src/screens/Project/ProjectEdit/ProjectEdit.jsx +++ b/awx/ui_next/src/screens/Project/ProjectEdit/ProjectEdit.jsx @@ -26,7 +26,6 @@ function ProjectEdit({ project }) { } = await ProjectsAPI.update(project.id, { ...values, organization: values.organization.id, - default_environment: values.default_environment?.id || null, }); history.push(`/projects/${id}/details`); } catch (error) { diff --git a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx index 7b110ba3cefc..207084d67424 100644 --- a/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx +++ b/awx/ui_next/src/screens/Project/shared/ProjectForm.jsx @@ -12,7 +12,6 @@ import ContentLoading from '../../../components/ContentLoading'; import FormActionGroup from '../../../components/FormActionGroup/FormActionGroup'; import FormField, { FormSubmitError } from '../../../components/FormField'; import OrganizationLookup from '../../../components/Lookup/OrganizationLookup'; -import ExecutionEnvironmentLookup from '../../../components/Lookup/ExecutionEnvironmentLookup'; import { CredentialTypesAPI, ProjectsAPI } from '../../../api'; import { required } from '../../../util/validators'; import { @@ -100,14 +99,6 @@ function ProjectFormFields({ validate: required(i18n._(t`Select a value for this field`), i18n), }); - const [ - executionEnvironmentField, - executionEnvironmentMeta, - executionEnvironmentHelpers, - ] = useField({ - name: 'default_environment', - }); - /* Save current scm subform field values to state */ const saveSubFormState = form => { const currentScmFormFields = { ...scmFormFields }; @@ -185,25 +176,6 @@ function ProjectFormFields({ required autoPopulate={!project?.id} /> - executionEnvironmentHelpers.setTouched()} - value={executionEnvironmentField.value} - onChange={value => executionEnvironmentHelpers.setValue(value)} - popoverContent={i18n._( - t`Select the default execution environment for this project.` - )} - tooltip={i18n._( - t`Select an organization before editing the default execution environment.` - )} - globallyAvailable - isDisabled={!organizationField.value} - organizationId={organizationField.value?.id} - isDefaultEnvironment - />