External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -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

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

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

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

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

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

@@ -119,17 +119,19 @@ class Template extends Component {
<Route <Route
key="not-found" key="not-found"
path="*" path="*"
render={() => ( render={() =>
<ContentError isNotFound> !hasContentLoading && (
{match.params.id && ( <ContentError isNotFound>
<Link {match.params.id && (
to={`/templates/${match.params.templateType}/${match.params.id}/details`} <Link
> to={`/templates/${match.params.templateType}/${match.params.id}/details`}
{i18n._(`View Template Details`)} >
</Link> {i18n._(`View Template Details`)}
)} </Link>
</ContentError> )}
)} </ContentError>
)
}
/>, />,
]} ]}
</Switch> </Switch>