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

Fixes contentLoading issue in PR and enables Launch on JT List

Browse Source
This commit is contained in:
Alex Corey
2020-02-19 09:47:06 -05:00
parent 3ee6f1f3c7
commit b757fdebf8
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui_next/src/api/models/WorkflowJobTemplates.js
View File

@@ -51,7 +51,6 @@ class WorkflowJobTemplates extends Base {
params params
}); });
} }
} }
export default WorkflowJobTemplates; export default WorkflowJobTemplates;

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

@@ -11,6 +11,7 @@ import FullPage from '@components/FullPage';
import JobList from '@components/JobList'; import JobList from '@components/JobList';
import RoutedTabs from '@components/RoutedTabs'; import RoutedTabs from '@components/RoutedTabs';
import ScheduleList from '@components/ScheduleList'; import ScheduleList from '@components/ScheduleList';
import ContentLoading from '@components/ContentLoading';
import { WorkflowJobTemplatesAPI, CredentialsAPI } from '@api'; import { WorkflowJobTemplatesAPI, CredentialsAPI } from '@api';
import WorkflowJobTemplateDetail from './WorkflowJobTemplateDetail'; import WorkflowJobTemplateDetail from './WorkflowJobTemplateDetail';
import WorkflowJobTemplateEdit from './WorkflowJobTemplateEdit'; import WorkflowJobTemplateEdit from './WorkflowJobTemplateEdit';
@@ -51,12 +52,14 @@ class WorkflowJobTemplate extends Component {
const { const {
data: { webhook_key }, data: { webhook_key },
} = await WorkflowJobTemplatesAPI.readWebhookKey(id); } = await WorkflowJobTemplatesAPI.readWebhookKey(id);
this.setState({ webHookKey: webhook_key }); this.setState({ webhook_key });
} }
if (data?.summary_fields?.webhook_credential) { if (data?.summary_fields?.webhook_credential) {
const { const {
data: { data: {
summary_fields: { credential_type: name }, summary_fields: {
credential_type: { name },
},
}, },
} = await CredentialsAPI.readDetail( } = await CredentialsAPI.readDetail(
data.summary_fields.webhook_credential.id data.summary_fields.webhook_credential.id
@@ -84,7 +87,7 @@ class WorkflowJobTemplate extends Component {
contentError, contentError,
hasContentLoading, hasContentLoading,
template, template,
webHookKey, webhook_key,
} = this.state; } = this.state;
const tabsArray = [ const tabsArray = [
@@ -116,7 +119,9 @@ class WorkflowJobTemplate extends Component {
if (location.pathname.endsWith('edit')) { if (location.pathname.endsWith('edit')) {
cardHeader = null; cardHeader = null;
} }
if (hasContentLoading) {
return <ContentLoading />;
}
if (!hasContentLoading && contentError) { if (!hasContentLoading && contentError) {
return ( return (
<PageSection> <PageSection>
@@ -151,7 +156,7 @@ class WorkflowJobTemplate extends Component {
render={() => ( render={() => (
<WorkflowJobTemplateDetail <WorkflowJobTemplateDetail
template={template} template={template}
webHookKey={webHookKey} webhook_key={webhook_key}
/> />
)} )}
/> />
@@ -163,7 +168,7 @@ class WorkflowJobTemplate extends Component {
render={() => ( render={() => (
<WorkflowJobTemplateEdit <WorkflowJobTemplateEdit
template={template} template={template}
webHookKey={webHookKey} webhook_key={webhook_key}
/> />
)} )}
/> />
@@ -200,7 +205,7 @@ class WorkflowJobTemplate extends Component {
/> />
</Route> </Route>
)} )}
{template && ( {template.id && (
<Route <Route
path="/templates/:templateType/:id/schedules" path="/templates/:templateType/:id/schedules"
render={() => ( render={() => (

4
awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
View File

@@ -25,7 +25,7 @@ import LaunchButton from '@components/LaunchButton';
import Sparkline from '@components/Sparkline'; import Sparkline from '@components/Sparkline';
import { toTitleCase } from '@util/strings'; import { toTitleCase } from '@util/strings';
function WorkflowJobTemplateDetail({ template, i18n, webHookKey }) { function WorkflowJobTemplateDetail({ template, i18n, webhook_key }) {
const { const {
id, id,
ask_inventory_on_launch, ask_inventory_on_launch,
@@ -143,7 +143,7 @@ function WorkflowJobTemplateDetail({ template, i18n, webHookKey }) {
value={`${urlOrigin}${template.related.webhook_receiver}`} value={`${urlOrigin}${template.related.webhook_receiver}`}
/> />
)} )}
<Detail label={i18n._(t`Webhook Key`)} value={webHookKey} /> <Detail label={i18n._(t`Webhook Key`)} value={webhook_key} />
{webhook_credential && ( {webhook_credential && (
<Detail <Detail
fullWidth fullWidth

2
awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.test.jsx
View File

@@ -51,7 +51,7 @@ describe('<WorkflowJobTemplateDetail/>', () => {
component={() => ( component={() => (
<WorkflowJobTemplateDetail <WorkflowJobTemplateDetail
template={template} template={template}
webHookKey="Foo webhook key" webhook_key="Foo webhook key"
hasContentLoading={false} hasContentLoading={false}
onSetContentLoading={() => {}} onSetContentLoading={() => {}}
/> />

10
awx/ui_next/src/screens/Template/WorkflowJobTemplateEdit/WorkflowJobTemplateEdit.jsx
View File

@@ -4,14 +4,9 @@ import { useHistory } from 'react-router-dom';
import { CardBody } from '@components/Card'; import { CardBody } from '@components/Card';
import { getAddedAndRemoved } from '@util/lists'; import { getAddedAndRemoved } from '@util/lists';
import { WorkflowJobTemplatesAPI, OrganizationsAPI } from '@api'; import { WorkflowJobTemplatesAPI, OrganizationsAPI } from '@api';
import ContentLoading from '@components/ContentLoading';
import { WorkflowJobTemplateForm } from '../shared'; import { WorkflowJobTemplateForm } from '../shared';
function WorkflowJobTemplateEdit({ function WorkflowJobTemplateEdit({ template, webhook_key }) {
template,
hasTemplateLoading,
webhook_key,
}) {
const [formSubmitError, setFormSubmitError] = useState(); const [formSubmitError, setFormSubmitError] = useState();
const history = useHistory(); const history = useHistory();
@@ -65,9 +60,6 @@ function WorkflowJobTemplateEdit({
history.push(`/templates`); history.push(`/templates`);
}; };
if (hasTemplateLoading) {
return <ContentLoading />;
}
return ( return (
<> <>
<CardBody> <CardBody>