External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix panel reloading and clean up unneeded code

Browse Source
This commit is contained in:
Jake McDermott 2020-03-05 15:21:01 -05:00
parent 6c22ddf608
commit a5afac62ca
No known key found for this signature in database
GPG Key ID: 0E56ED990CDFCB4F
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
awx/ui_next/src/screens/Template/WorkflowJobTemplate.jsx
View File

@ -46,7 +46,7 @@ class WorkflowJobTemplate extends Component {
const { setBreadcrumb, match } = this.props;
const { id } = match.params;
this.setState({ contentError: null, hasContentLoading: true });
this.setState({ contentError: null });
try {
const { data } = await WorkflowJobTemplatesAPI.readDetail(id);
if (data?.related?.webhook_key) {
@ -107,22 +107,17 @@ class WorkflowJobTemplate extends Component {
tab.id = n;
});
let cardHeader = hasContentLoading ? null : (
<TabbedCardHeader>
<RoutedTabs tabsArray={tabsArray} />
<CardActions>
<CardCloseButton linkTo="/templates" />
</CardActions>
</TabbedCardHeader>
);
if (location.pathname.endsWith('edit')) {
cardHeader = null;
}
if (hasContentLoading) {
return <ContentLoading />;
return (
<PageSection>
<Card>
<ContentLoading />
</Card>
</PageSection>
);
}
if (!hasContentLoading && contentError) {
if (contentError) {
return (
<PageSection>
<Card>
@ -139,10 +134,19 @@ class WorkflowJobTemplate extends Component {
);
}
const cardHeader = (
<TabbedCardHeader>
<RoutedTabs tabsArray={tabsArray} />
<CardActions>
<CardCloseButton linkTo="/templates" />
</CardActions>
</TabbedCardHeader>
);
return (
<PageSection>
<Card>
{cardHeader}
{location.pathname.endsWith('edit') ? null : cardHeader}
<Switch>
<Redirect
from="/templates/workflow_job_template/:id"
@ -195,7 +199,7 @@ class WorkflowJobTemplate extends Component {
/>
</Route>
)}
{template.id && (
{template?.id && (
<Route
path="/templates/:templateType/:id/schedules"
render={() => (
@ -206,19 +210,17 @@ class WorkflowJobTemplate extends Component {
<Route
key="not-found"
path="*"
render={() =>
!hasContentLoading && (
<ContentError isNotFound>
{match.params.id && (
<Link
to={`/templates/workflow_job_template/${match.params.id}/details`}
>
{i18n._(`View Template Details`)}
</Link>
)}
</ContentError>
)
}
render={() => (
<ContentError isNotFound>
{match.params.id && (
<Link
to={`/templates/workflow_job_template/${match.params.id}/details`}
>
{i18n._(`View Template Details`)}
</Link>
)}
</ContentError>
)}
/>
</Switch>
</Card>