diff --git a/awx/ui_next/src/api/models/Jobs.js b/awx/ui_next/src/api/models/Jobs.js index a0f2f874fd..06b929c0ba 100644 --- a/awx/ui_next/src/api/models/Jobs.js +++ b/awx/ui_next/src/api/models/Jobs.js @@ -20,12 +20,12 @@ class Jobs extends RelaunchMixin(Base) { return this.http.get(`/api/v2${BASE_URLS[type]}${id}/`); } - readEvents(id, jobType = 'job', params = {}) { + readEvents(id, type = 'playbook', params = {}) { let endpoint; - if (jobType === 'job') { - endpoint = `${this.baseUrl}${id}/job_events/`; + if (type === 'playbook') { + endpoint = `/api/v2${BASE_URLS[type]}${id}/job_events/`; } else { - endpoint = `${this.baseUrl}${id}/events/`; + endpoint = `/api/v2${BASE_URLS[type]}${id}/events/`; } return this.http.get(endpoint, { params }); } diff --git a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx index bde17d7b0d..9966a96a40 100644 --- a/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx +++ b/awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx @@ -112,7 +112,7 @@ class JobOutput extends Component { } async loadJobEvents() { - const { job } = this.props; + const { job, type } = this.props; const loadRange = range(1, 50); this._isMounted && @@ -123,7 +123,7 @@ class JobOutput extends Component { try { const { data: { results: newResults = [], count }, - } = await JobsAPI.readEvents(job.id, job.type, { + } = await JobsAPI.readEvents(job.id, type, { page_size: 50, order_by: 'start_line', }); @@ -220,7 +220,7 @@ class JobOutput extends Component { if (startIndex === 0 && stopIndex === 0) { return Promise.resolve(null); } - const { job } = this.props; + const { job, type } = this.props; const loadRange = range(startIndex, stopIndex); this._isMounted && @@ -233,7 +233,7 @@ class JobOutput extends Component { order_by: 'start_line', }; - return JobsAPI.readEvents(job.id, job.type, params).then(response => { + return JobsAPI.readEvents(job.id, type, params).then(response => { this._isMounted && this.setState(({ results, currentlyLoading }) => { response.data.results.forEach(jobEvent => {