Add class to StatusIcon wrapper and fix merge conflicts

awx/ui_next/src/components/Sparkline/StatusIcon.jsx

@@ -75,11 +75,12 @@ const SkippedBottom = styled.div`
 
 const StatusIcon = ({ status, ...props }) => {
   return (
-    <div {...props}>
+    <div className="at-c-statusIcon" {...props}>
       {status === 'running' && <RunningJob />}
-      {(status === 'new' || status === 'pending' || status === 'waiting') && (
+      {(status === 'new' ||
-        <WaitingJob />
+        status === 'pending' ||
-      )}
+        status === 'waiting' ||
+        status === 'never updated') && <WaitingJob />}
       {(status === 'failed' || status === 'error' || status === 'canceled') && (
         <FinishedJob>
           <FailedTop />

awx/ui_next/src/screens/Job/JobDetail/JobDetail.jsx

@@ -41,7 +41,7 @@ const VariablesInput = styled(_VariablesInput)`
 const StatusDetailValue = styled.div`
   align-items: center;
   display: inline-flex;
-  > div {
+  .at-c-statusIcon {
     margin-right: 10px;
   }
 `;
@@ -155,13 +155,11 @@ function JobDetail({ job, i18n, history }) {
         <Detail
           label={i18n._(t`Launched By`)}
           value={
-            <>
+            launchedByLink ? (
-              {launchedByLink ? (
+              <Link to={`${launchedByLink}`}>{launchedByValue}</Link>
-                <Link to={`${launchedByLink}`}>{launchedByValue}</Link>
+            ) : (
-              ) : (
+              launchedByValue
-                launchedByValue
+            )
-              )}
-            </>
           }
         />
         {inventory && (

awx/ui_next/src/screens/Job/JobDetail/JobDetail.test.jsx

@@ -73,19 +73,8 @@ describe('<JobDetail />', () => {
   });
 
   test('should properly delete job', async () => {
-    job = {
+    const wrapper = mountWithContexts(<JobDetail job={mockJobData} />);
-      name: 'Rage',
+    wrapper.find('button[aria-label="Delete"]').simulate('click');
-      id: 1,
-      type: 'job',
-      summary_fields: {
-        job_template: { name: 'Spud' },
-      },
-    };
-    const wrapper = mountWithContexts(<JobDetail job={job} />);
-    wrapper
-      .find('button')
-      .at(0)
-      .simulate('click');
     await sleep(1);
     wrapper.update();
     const modal = wrapper.find('Modal');
@@ -93,17 +82,12 @@ describe('<JobDetail />', () => {
     modal.find('button[aria-label="Delete"]').simulate('click');
     expect(JobsAPI.destroy).toHaveBeenCalledTimes(1);
   });
-  // The test below is skipped until react can be upgraded to at least 16.9.0.  An upgrade to
+  /*
-  // react - router will likely be necessary also.
+  The test below is skipped until react can be upgraded to at least 16.9.0.  An upgrade to
+  react - router will likely be necessary also.
+  See: https://github.com/ansible/awx/issues/4817
+  */
   test.skip('should display error modal when a job does not delete properly', async () => {
-    job = {
-      name: 'Angry',
-      id: 'a',
-      type: 'project_update',
-      summary_fields: {
-        job_template: { name: 'Peanut' },
-      },
-    };
     ProjectUpdatesAPI.destroy.mockRejectedValue(
       new Error({
         response: {
@@ -116,7 +100,7 @@ describe('<JobDetail />', () => {
         },
       })
     );
-    const wrapper = mountWithContexts(<JobDetail job={job} />);
+    const wrapper = mountWithContexts(<JobDetail job={mockJobData} />);
 
     wrapper
       .find('button')

awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx

@@ -32,7 +32,7 @@ const Modal = styled(PFModal)`
 const HostNameDetailValue = styled.div`
   align-items: center;
   display: inline-flex;
-  > div {
+  .at-c-statusIcon {
     margin-right: 10px;
   }
 `;