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

Merge pull request #8938 from jakemcdermott/fix-8936

Browse Source 
Don't build job redirect until data available

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-17 15:24:40 +00:00
committed by GitHub
parent 793764283d 19f855717d
commit 1937c0cc08
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui_next/src/screens/Job/JobTypeRedirect.jsx
View File

@@ -18,8 +18,11 @@ function JobTypeRedirect({ id, path, view, i18n }) {
request: loadJob, request: loadJob,
} = useRequest( } = useRequest(
useCallback(async () => { useCallback(async () => {
const { data } = await UnifiedJobsAPI.read({ id }); const {
return { job: data }; data: { results },
} = await UnifiedJobsAPI.read({ id });
const [item] = results;
return { job: item };
}, [id]), }, [id]),
{ job: {} } { job: {} }
); );
@@ -42,7 +45,7 @@ function JobTypeRedirect({ id, path, view, i18n }) {
</PageSection> </PageSection>
); );
} }
if (isLoading) { if (isLoading || !job?.id) {
// TODO show loading state // TODO show loading state
return <div>Loading...</div>; return <div>Loading...</div>;
} }

2
awx/ui_next/src/screens/Template/Templates.jsx
View File

@@ -35,7 +35,7 @@ function Templates({ i18n }) {
[`${templatePath}/notifications`]: i18n._(t`Notifications`), [`${templatePath}/notifications`]: i18n._(t`Notifications`),
[`${templatePath}/completed_jobs`]: i18n._(t`Completed Jobs`), [`${templatePath}/completed_jobs`]: i18n._(t`Completed Jobs`),
[surveyPath]: i18n._(t`Survey`), [surveyPath]: i18n._(t`Survey`),
[`${surveyPath}add`]: i18n._(t`Add Question`), [`${surveyPath}/add`]: i18n._(t`Add Question`),
[`${surveyPath}/edit`]: i18n._(t`Edit Question`), [`${surveyPath}/edit`]: i18n._(t`Edit Question`),
[schedulesPath]: i18n._(t`Schedules`), [schedulesPath]: i18n._(t`Schedules`),
[`${schedulesPath}/add`]: i18n._(t`Create New Schedule`), [`${schedulesPath}/add`]: i18n._(t`Create New Schedule`),