diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.test.jsx b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.test.jsx index 68ca23f80a..ce4524299c 100644 --- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.test.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupDetails/ContainerGroupDetails.test.jsx @@ -30,8 +30,6 @@ const instanceGroup = { jobs_total: 0, instances: 0, controller: null, - is_controller: false, - is_isolated: false, is_container_group: true, credential: 71, policy_instance_percentage: 0, diff --git a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.test.jsx b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.test.jsx index 6d05e43472..f2d035c56c 100644 --- a/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.test.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/ContainerGroupEdit/ContainerGroupEdit.test.jsx @@ -29,8 +29,6 @@ const instanceGroup = { jobs_total: 0, instances: 0, controller: null, - is_controller: false, - is_isolated: false, is_container_group: true, credential: 71, policy_instance_percentage: 0, diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupAdd/InstanceGroupAdd.test.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupAdd/InstanceGroupAdd.test.jsx index a4ae1e74fc..82633a33de 100644 --- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupAdd/InstanceGroupAdd.test.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupAdd/InstanceGroupAdd.test.jsx @@ -27,8 +27,6 @@ const instanceGroupData = { jobs_total: 0, instances: 1, controller: null, - is_controller: false, - is_isolated: false, is_container_group: false, credential: null, policy_instance_percentage: 46, diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx index c5d435320c..f808f7e391 100644 --- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx @@ -3,7 +3,7 @@ import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import { Link, useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { Button, Label, Split, SplitItem } from '@patternfly/react-core'; +import { Button } from '@patternfly/react-core'; import AlertModal from '../../../components/AlertModal'; import { CardBody, CardActionsRow } from '../../../components/Card'; @@ -43,40 +43,13 @@ function InstanceGroupDetails({ instanceGroup, i18n }) { instanceGroup, i18n ); - const verifyInstanceGroup = item => { - if (item.is_isolated) { - return ( - - {item.name} - - - - - ); - } - if (item.is_controller) { - return ( - - {item.name} - - - - - ); - } - return <>{item.name}; - }; return ( ', () => { expect(wrapper.find('Button[aria-label="Edit"]').length).toBe(0); }); - - test('should display isolated label', async () => { - await act(async () => { - wrapper = mountWithContexts( - - ); - }); - wrapper.update(); - expect( - wrapper.find('Label[aria-label="isolated instance"]').prop('children') - ).toEqual('Isolated'); - }); }); diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupEdit/InstanceGroupEdit.test.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupEdit/InstanceGroupEdit.test.jsx index ea62a60746..876149003e 100644 --- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupEdit/InstanceGroupEdit.test.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupEdit/InstanceGroupEdit.test.jsx @@ -28,8 +28,6 @@ const instanceGroupData = { jobs_total: 0, instances: 1, controller: null, - is_controller: false, - is_isolated: false, is_container_group: false, credential: null, policy_instance_percentage: 46, diff --git a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx index bd7b80573d..f6d7556a20 100644 --- a/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx @@ -6,7 +6,6 @@ import { Link } from 'react-router-dom'; import 'styled-components/macro'; import { Button, - Label, Progress, ProgressMeasureLocation, ProgressSize, @@ -52,28 +51,6 @@ function InstanceGroupListItem({ return null; } - const verifyInstanceGroup = item => { - if (item.is_isolated) { - return ( - - - - ); - } - if (item.is_controller) { - return ( - - - - ); - } - return null; - }; - return ( {instanceGroup.name} - {verifyInstanceGroup(instanceGroup)} diff --git a/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.test.jsx b/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.test.jsx index 3e48389195..2b811d27c4 100644 --- a/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.test.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/shared/ContainerGroupForm.test.jsx @@ -25,8 +25,6 @@ const instanceGroup = { jobs_total: 0, instances: 1, controller: null, - is_controller: false, - is_isolated: false, is_container_group: false, credential: 3, policy_instance_percentage: 46, diff --git a/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.test.jsx b/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.test.jsx index 0dad4fe6d1..ed43558b46 100644 --- a/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.test.jsx +++ b/awx/ui_next/src/screens/InstanceGroup/shared/InstanceGroupForm.test.jsx @@ -25,8 +25,6 @@ const instanceGroup = { jobs_total: 0, instances: 1, controller: null, - is_controller: false, - is_isolated: false, is_container_group: false, credential: null, policy_instance_percentage: 46, diff --git a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx index c4a128eaf9..8fff5d825c 100644 --- a/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx +++ b/awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx @@ -3,7 +3,7 @@ import React, { useCallback, useState } from 'react'; import { Link, useHistory } from 'react-router-dom'; import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; -import { Button, Chip, Label } from '@patternfly/react-core'; +import { Button, Chip } from '@patternfly/react-core'; import styled from 'styled-components'; import AlertModal from '../../../components/AlertModal'; @@ -111,18 +111,6 @@ function JobDetail({ job, i18n }) { }; const buildInstanceGroupLink = item => { - if (item.is_isolated) { - return ( - <> - {item.name} - - - - - ); - } return {item.name}; }; diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx index ae31308f4b..4c37b51ddf 100644 --- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx +++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx @@ -176,8 +176,6 @@ const mockInstanceGroups = [ jobs_total: 3, instances: 1, controller: null, - is_controller: false, - is_isolated: false, policy_instance_percentage: 100, policy_instance_minimum: 0, policy_instance_list: [], diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx index 3eaa244e92..a075be72ea 100644 --- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx +++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx @@ -76,8 +76,6 @@ describe('', () => { jobs_total: 3, instances: 1, controller: null, - is_controller: false, - is_isolated: false, policy_instance_percentage: 100, policy_instance_minimum: 0, policy_instance_list: [],