Merge pull request #4699 from mabashian/4549-not-found

Don't render the 404 not found page until the content's finished loading

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

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

@@ -149,7 +149,8 @@ class Job extends Component {
               <Route
                 key="not-found"
                 path="*"
-                render={() => (
+                render={() =>
+                  !hasContentLoading && (
                     <ContentError isNotFound>
                       <Link
                         to={`/jobs/${match.params.type}/${match.params.id}/details`}
@@ -157,7 +158,8 @@ class Job extends Component {
                         {i18n._(`View Job Details`)}
                       </Link>
                     </ContentError>
-                )}
+                  )
+                }
               />,
             ]}
           </Switch>

awx/ui_next/src/screens/Organization/Organization.jsx

@@ -238,7 +238,8 @@ class Organization extends Component {
             <Route
               key="not-found"
               path="*"
-              render={() => (
+              render={() =>
+                !hasContentLoading && (
                   <ContentError isNotFound>
                     {match.params.id && (
                       <Link to={`/organizations/${match.params.id}/details`}>
@@ -246,7 +247,8 @@ class Organization extends Component {
                       </Link>
                     )}
                   </ContentError>
-              )}
+                )
+              }
             />
             ,
           </Switch>

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

@@ -119,7 +119,8 @@ class Template extends Component {
               <Route
                 key="not-found"
                 path="*"
-                render={() => (
+                render={() =>
+                  !hasContentLoading && (
                     <ContentError isNotFound>
                       {match.params.id && (
                         <Link
@@ -129,7 +130,8 @@ class Template extends Component {
                         </Link>
                       )}
                     </ContentError>
-                )}
+                  )
+                }
               />,
             ]}
           </Switch>