Merge pull request #9755 from nixocio/ui_issue_9752

Remove isolated and controller from the UI

Remove isolated and controller from the UI.
See: #9752

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>

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,

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,

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,

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 (
-        <Split hasGutter>
-          <SplitItem>{item.name}</SplitItem>
-          <SplitItem>
-            <Label aria-label={i18n._(t`isolated instance`)}>
-              {i18n._(t`Isolated`)}
-            </Label>
-          </SplitItem>
-        </Split>
-      );
-    }
-    if (item.is_controller) {
-      return (
-        <Split hasGutter>
-          <SplitItem>{item.name}</SplitItem>
-          <SplitItem>
-            <Label aria-label={i18n._(t`controller instance`)}>
-              {i18n._(t`Controller`)}
-            </Label>
-          </SplitItem>
-        </Split>
-      );
-    }
-    return <>{item.name}</>;
-  };
 
   return (
     <CardBody>
       <DetailList>
         <Detail
           label={i18n._(t`Name`)}
-          value={verifyInstanceGroup(instanceGroup)}
+          value={instanceGroup.name}
           dataCy="instance-group-detail-name"
         />
         <Detail

awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.test.jsx

@@ -21,7 +21,6 @@ const instanceGroups = [
     policy_instance_percentage: 50,
     percent_capacity_remaining: 60,
     is_container_group: false,
-    is_isolated: false,
     created: '2020-07-21T18:41:02.818081Z',
     modified: '2020-07-24T20:32:03.121079Z',
     summary_fields: {
@@ -41,7 +40,6 @@ const instanceGroups = [
     policy_instance_percentage: 0,
     percent_capacity_remaining: 0,
     is_container_group: true,
-    is_isolated: false,
     created: '2020-07-21T18:41:02.818081Z',
     modified: '2020-07-24T20:32:03.121079Z',
     summary_fields: {
@@ -150,18 +148,4 @@ describe('<InstanceGroupDetails/>', () => {
 
     expect(wrapper.find('Button[aria-label="Edit"]').length).toBe(0);
   });
-
-  test('should display isolated label', async () => {
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <InstanceGroupDetails
-          instanceGroup={{ ...instanceGroups[0], is_isolated: true }}
-        />
-      );
-    });
-    wrapper.update();
-    expect(
-      wrapper.find('Label[aria-label="isolated instance"]').prop('children')
-    ).toEqual('Isolated');
-  });
 });

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,

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 (
-        <span css="margin-left: 12px">
-          <Label aria-label={i18n._(t`isolated instance`)}>
-            {i18n._(t`Isolated`)}
-          </Label>
-        </span>
-      );
-    }
-    if (item.is_controller) {
-      return (
-        <span css="margin-left: 12px">
-          <Label aria-label={i18n._(t`controller instance`)}>
-            {i18n._(t`Controller`)}
-          </Label>
-        </span>
-      );
-    }
-    return null;
-  };
-
   return (
     <Tr id={`ig-row-${instanceGroup.id}`}>
       <Td
@@ -87,7 +64,6 @@ function InstanceGroupListItem({
       <Td id={labelId} dataLabel={i18n._(t`Name`)}>
         <Link to={`${detailUrl}`}>
           <b>{instanceGroup.name}</b>
-          {verifyInstanceGroup(instanceGroup)}
         </Link>
       </Td>
       <Td dataLabel={i18n._(t`Type`)}>

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,

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,

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 (
-        <>
-          <Link to={`/instance_groups/${item.id}`}>{item.name}</Link>
-          <span css="margin-left: 12px">
-            <Label aria-label={i18n._(t`isolated instance`)}>
-              {i18n._(t`Isolated`)}
-            </Label>
-          </span>
-        </>
-      );
-    }
     return <Link to={`/instance_groups/${item.id}`}>{item.name}</Link>;
   };
 

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: [],

awx/ui_next/src/screens/Template/shared/JobTemplateForm.test.jsx

@@ -76,8 +76,6 @@ describe('<JobTemplateForm />', () => {
       jobs_total: 3,
       instances: 1,
       controller: null,
-      is_controller: false,
-      is_isolated: false,
       policy_instance_percentage: 100,
       policy_instance_minimum: 0,
       policy_instance_list: [],