External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 13:11:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

ensure results are always indexed by counter when loading new rows

Browse Source
This commit is contained in:
Jake McDermott 2019-07-22 16:19:50 -04:00 committed by Marliana Lara
parent 161c7706bc
commit 0a3633113e
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
awx/ui_next/src/screens/Job/JobOutput/JobOutput.jsx
View File

@ -46,7 +46,7 @@ class JobOutput extends Component {
this.state = {
contentError: null,
hasContentLoading: true,
results: [],
results: {},
scrollToIndex: -1,
loadedRowCount: 0,
loadedRowsMap: {},
@ -80,12 +80,18 @@ class JobOutput extends Component {
this.setState({ hasContentLoading: true });
try {
const {
data: { results = [], count },
data: { results: newResults = [], count },
} = await JobsAPI.readEvents(job.id, job.type, {
page_size: 50,
order_by: 'start_line',
});
this.setState({ results, remoteRowCount: count + 1 });
this.setState(({ results }) => {
newResults.forEach(jobEvent => {
results[jobEvent.counter] = jobEvent;
});
return { results, remoteRowCount: count + 1 };
});
} catch (err) {
this.setState({ contentError: err });
} finally {
@ -126,7 +132,6 @@ class JobOutput extends Component {
async loadMoreRows({ startIndex, stopIndex }) {
const { job } = this.props;
const { results } = this.state;
let params = {
counter__gte: startIndex,
@ -135,7 +140,12 @@ class JobOutput extends Component {
};
return await JobsAPI.readEvents(job.id, job.type, params).then(response => {
this.setState({ results: [...results, ...response.data.results] });
this.setState(({ results }) => {
response.data.results.forEach(jobEvent => {
results[jobEvent.counter] = jobEvent;
});
return { results };
});
});
}
@ -158,6 +168,7 @@ class JobOutput extends Component {
handleScrollBottom() {
const { remoteRowCount } = this.state;
this.listRef.scrollToRow(remoteRowCount - 1);
this.setState({ scrollToIndex: remoteRowCount - 1 });
}
handleResize({ width }) {