External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 00:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mabashian
2019-09-10 10:30:08 -04:00
parent eaf3a28d57
commit d4b2cacb3e
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui_next/src/screens/Job/Job.jsx
View File

@@ -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>

6
awx/ui_next/src/screens/Organization/Organization.jsx
View File

@@ -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>

6
awx/ui_next/src/screens/Template/Template.jsx
View File

@@ -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>