Add unit tests to check for deleted details

awx/ui_next/src/components/DetailList/DeletedDetail.jsx

@@ -11,12 +11,12 @@ const Detail = styled(_Detail)`
   }
 `;
 
-function MissingDetail({ i18n, label }) {
+function DeletedDetail({ i18n, label }) {
   return <Detail label={label} value={i18n._(t`Deleted`)} />;
 }
 
-MissingDetail.propTypes = {
+DeletedDetail.propTypes = {
   label: node.isRequired,
 };
 
-export default withI18n()(MissingDetail);
+export default withI18n()(DeletedDetail);

awx/ui_next/src/components/DetailList/index.js

@@ -1,4 +1,4 @@
 export { default as DetailList } from './DetailList';
 export { default as Detail, DetailName, DetailValue } from './Detail';
-export { default as MissingDetail } from './MissingDetail';
+export { default as DeletedDetail } from './DeletedDetail';
 export { default as UserDateDetail } from './UserDateDetail';

awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.jsx

@@ -4,7 +4,7 @@ import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 
 import { Chip, ChipGroup, List, ListItem } from '@patternfly/react-core';
-import { Detail, MissingDetail } from '@components/DetailList';
+import { Detail, DeletedDetail } from '@components/DetailList';
 import { VariablesDetail } from '@components/CodeMirrorInput';
 import CredentialChip from '@components/CredentialChip';
 
@@ -69,7 +69,7 @@ function PromptInventorySourceDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <MissingDetail label={i18n._(t`Organization`)} />
+        <DeletedDetail label={i18n._(t`Organization`)} />
       )}
       {summary_fields?.inventory && (
         <Detail

awx/ui_next/src/components/PromptDetail/PromptInventorySourceDetail.test.jsx

@@ -3,6 +3,11 @@ import { mountWithContexts } from '@testUtils/enzymeHelpers';
 import PromptInventorySourceDetail from './PromptInventorySourceDetail';
 import mockInvSource from './data.inventory_source.json';
 
+function assertDetail(wrapper, label, value) {
+  expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
+  expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);
+}
+
 describe('PromptInventorySourceDetail', () => {
   let wrapper;
 
@@ -21,18 +26,13 @@ describe('PromptInventorySourceDetail', () => {
   });
 
   test('should render expected details', () => {
-    function assertDetail(label, value) {
+    assertDetail(wrapper, 'Inventory', 'Demo Inventory');
-      expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
+    assertDetail(wrapper, 'Source', 'scm');
-      expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);
+    assertDetail(wrapper, 'Project', 'Mock Project');
-    }
+    assertDetail(wrapper, 'Inventory File', 'foo');
-
+    assertDetail(wrapper, 'Custom Inventory Script', 'Mock Script');
-    assertDetail('Inventory', 'Demo Inventory');
+    assertDetail(wrapper, 'Verbosity', '2 (More Verbose)');
-    assertDetail('Source', 'scm');
+    assertDetail(wrapper, 'Cache Timeout', '2 Seconds');
-    assertDetail('Project', 'Mock Project');
-    assertDetail('Inventory File', 'foo');
-    assertDetail('Custom Inventory Script', 'Mock Script');
-    assertDetail('Verbosity', '2 (More Verbose)');
-    assertDetail('Cache Timeout', '2 Seconds');
     expect(
       wrapper
         .find('Detail[label="Regions"]')
@@ -74,4 +74,12 @@ describe('PromptInventorySourceDetail', () => {
         ])
     ).toEqual(true);
   });
+
+  test('should render "Deleted" details', () => {
+    delete mockInvSource.summary_fields.organization;
+    wrapper = mountWithContexts(
+      <PromptInventorySourceDetail resource={mockInvSource} />
+    );
+    assertDetail(wrapper, 'Organization', 'Deleted');
+  });
 });

awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.jsx

@@ -4,7 +4,7 @@ import { t } from '@lingui/macro';
 import { Link } from 'react-router-dom';
 
 import { Chip, ChipGroup, List, ListItem } from '@patternfly/react-core';
-import { Detail, MissingDetail } from '@components/DetailList';
+import { Detail, DeletedDetail } from '@components/DetailList';
 import { VariablesDetail } from '@components/CodeMirrorInput';
 import CredentialChip from '@components/CredentialChip';
 import Sparkline from '@components/Sparkline';
@@ -97,7 +97,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <MissingDetail label={i18n._(t`Organization`)} />
+        <DeletedDetail label={i18n._(t`Organization`)} />
       )}
       {summary_fields?.inventory ? (
         <Detail
@@ -112,7 +112,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
         />
       ) : (
         !ask_inventory_on_launch && (
-          <MissingDetail label={i18n._(t`Inventory`)} />
+          <DeletedDetail label={i18n._(t`Inventory`)} />
         )
       )}
       {summary_fields?.project ? (
@@ -125,7 +125,7 @@ function PromptJobTemplateDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <MissingDetail label={i18n._(t`Project`)} />
+        <DeletedDetail label={i18n._(t`Project`)} />
       )}
       <Detail label={i18n._(t`Source Control Branch`)} value={scm_branch} />
       <Detail label={i18n._(t`Playbook`)} value={playbook} />

awx/ui_next/src/components/PromptDetail/PromptJobTemplateDetail.test.jsx

@@ -18,6 +18,11 @@ const mockJT = {
   ],
 };
 
+function assertDetail(wrapper, label, value) {
+  expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
+  expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);
+}
+
 describe('PromptJobTemplateDetail', () => {
   let wrapper;
 
@@ -34,24 +39,19 @@ describe('PromptJobTemplateDetail', () => {
   });
 
   test('should render expected details', () => {
-    function assertDetail(label, value) {
+    assertDetail(wrapper, 'Job Type', 'Run');
-      expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
+    assertDetail(wrapper, 'Inventory', 'Demo Inventory');
-      expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);
+    assertDetail(wrapper, 'Project', 'Mock Project');
-    }
+    assertDetail(wrapper, 'Source Control Branch', 'Foo branch');
-
+    assertDetail(wrapper, 'Playbook', 'ping.yml');
-    assertDetail('Job Type', 'Run');
+    assertDetail(wrapper, 'Forks', '2');
-    assertDetail('Inventory', 'Demo Inventory');
+    assertDetail(wrapper, 'Limit', 'alpha:beta');
-    assertDetail('Project', 'Mock Project');
+    assertDetail(wrapper, 'Verbosity', '3 (Debug)');
-    assertDetail('Source Control Branch', 'Foo branch');
+    assertDetail(wrapper, 'Show Changes', 'Off');
-    assertDetail('Playbook', 'ping.yml');
+    assertDetail(wrapper, 'Job Slicing', '1');
-    assertDetail('Forks', '2');
+    assertDetail(wrapper, 'Host Config Key', 'a1b2c3');
-    assertDetail('Limit', 'alpha:beta');
+    assertDetail(wrapper, 'Webhook Service', 'Github');
-    assertDetail('Verbosity', '3 (Debug)');
+    assertDetail(wrapper, 'Webhook Key', 'PiM3n2');
-    assertDetail('Show Changes', 'Off');
-    assertDetail('Job Slicing', '1');
-    assertDetail('Host Config Key', 'a1b2c3');
-    assertDetail('Webhook Service', 'Github');
-    assertDetail('Webhook Key', 'PiM3n2');
     expect(wrapper.find('StatusIcon')).toHaveLength(2);
     expect(wrapper.find('Detail[label="Webhook URL"] dd').text()).toEqual(
       expect.stringContaining('/api/v2/job_templates/7/github/')
@@ -112,4 +112,16 @@ describe('PromptJobTemplateDetail', () => {
       '---foo: bar'
     );
   });
+
+  test('should render "Deleted" details', () => {
+    delete mockJT.summary_fields.inventory;
+    delete mockJT.summary_fields.organization;
+    delete mockJT.summary_fields.project;
+
+    wrapper = mountWithContexts(<PromptJobTemplateDetail resource={mockJT} />);
+
+    assertDetail(wrapper, 'Inventory', 'Deleted');
+    assertDetail(wrapper, 'Organization', 'Deleted');
+    assertDetail(wrapper, 'Project', 'Deleted');
+  });
 });

awx/ui_next/src/components/PromptDetail/PromptProjectDetail.jsx

@@ -5,7 +5,7 @@ import { Config } from '@contexts/Config';
 import { List, ListItem } from '@patternfly/react-core';
 import { Link } from 'react-router-dom';
 
-import { Detail, MissingDetail } from '@components/DetailList';
+import { Detail, DeletedDetail } from '@components/DetailList';
 import CredentialChip from '@components/CredentialChip';
 import { toTitleCase } from '@util/strings';
 
@@ -62,7 +62,7 @@ function PromptProjectDetail({ i18n, resource }) {
           }
         />
       ) : (
-        <MissingDetail label={i18n._(t`Organization`)} />
+        <DeletedDetail label={i18n._(t`Organization`)} />
       )}
       <Detail
         label={i18n._(t`Source Control Type`)}

awx/ui_next/src/components/PromptDetail/PromptProjectDetail.test.jsx

@@ -3,13 +3,18 @@ import { mountWithContexts } from '@testUtils/enzymeHelpers';
 import PromptProjectDetail from './PromptProjectDetail';
 import mockProject from './data.project.json';
 
+function assertDetail(wrapper, label, value) {
+  expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
+  expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);
+}
+
 describe('PromptProjectDetail', () => {
   let wrapper;
+  const config = {
+    project_base_dir: 'dir/foo/bar',
+  };
 
   beforeAll(() => {
-    const config = {
-      project_base_dir: 'dir/foo/bar',
-    };
     wrapper = mountWithContexts(
       <PromptProjectDetail resource={mockProject} />,
       {
@@ -27,23 +32,19 @@ describe('PromptProjectDetail', () => {
   });
 
   test('should render expected details', () => {
-    function assertDetail(label, value) {
+    assertDetail(wrapper, 'Source Control Type', 'Git');
-      expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
-      expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);
-    }
-
-    assertDetail('Source Control Type', 'Git');
     assertDetail(
+      wrapper,
       'Source Control URL',
       'https://github.com/ansible/ansible-tower-samples'
     );
-    assertDetail('Source Control Branch', 'foo');
+    assertDetail(wrapper, 'Source Control Branch', 'foo');
-    assertDetail('Source Control Refspec', 'refs/');
+    assertDetail(wrapper, 'Source Control Refspec', 'refs/');
-    assertDetail('Cache Timeout', '3 Seconds');
+    assertDetail(wrapper, 'Cache Timeout', '3 Seconds');
-    assertDetail('Ansible Environment', 'mock virtual env');
+    assertDetail(wrapper, 'Ansible Environment', 'mock virtual env');
-    assertDetail('Project Base Path', 'dir/foo/bar');
+    assertDetail(wrapper, 'Project Base Path', 'dir/foo/bar');
-    assertDetail('Playbook Directory', '_6__demo_project');
+    assertDetail(wrapper, 'Playbook Directory', '_6__demo_project');
-    assertDetail('Source Control Credential', 'Scm: mock scm');
+    assertDetail(wrapper, 'Source Control Credential', 'Scm: mock scm');
     expect(
       wrapper
         .find('Detail[label="Options"]')
@@ -55,4 +56,15 @@ describe('PromptProjectDetail', () => {
         ])
     ).toEqual(true);
   });
+
+  test('should render "Deleted" details', () => {
+    delete mockProject.summary_fields.organization;
+    wrapper = mountWithContexts(
+      <PromptProjectDetail resource={mockProject} />,
+      {
+        context: { config },
+      }
+    );
+    assertDetail(wrapper, 'Organization', 'Deleted');
+  });
 });

awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx

@@ -20,7 +20,7 @@ import CredentialChip from '@components/CredentialChip';
 import {
   Detail,
   DetailList,
-  MissingDetail,
+  DeletedDetail,
   UserDateDetail,
 } from '@components/DetailList';
 import DeleteButton from '@components/DeleteButton';
@@ -174,7 +174,7 @@ function JobTemplateDetail({ i18n, template }) {
             }
           />
         ) : (
-          <MissingDetail label={i18n._(t`Organization`)} />
+          <DeletedDetail label={i18n._(t`Organization`)} />
         )}
         {summary_fields.inventory ? (
           <Detail
@@ -186,7 +186,7 @@ function JobTemplateDetail({ i18n, template }) {
           />
         ) : (
           !ask_inventory_on_launch && (
-            <MissingDetail label={i18n._(t`Inventory`)} />
+            <DeletedDetail label={i18n._(t`Inventory`)} />
           )
         )}
         {summary_fields.project ? (
@@ -199,7 +199,7 @@ function JobTemplateDetail({ i18n, template }) {
             }
           />
         ) : (
-          <MissingDetail label={i18n._(t`Project`)} />
+          <DeletedDetail label={i18n._(t`Project`)} />
         )}
         <Detail
           label={i18n._(t`Source Control Branch`)}