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

fix off-by-one error in job output pagination

Browse Source
This commit is contained in:
Keith J. Grant 2022-04-25 13:09:44 -07:00
parent 3a1268de1e
commit 1bd5a880dc
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/src/screens/Job/JobOutput/getEventRequestParams.test.js
View File

@ -44,4 +44,14 @@ describe('getEventRequestParams', () => {
});
expect(loadRange).toEqual(range(121, 126));
});
it('should return last event only', () => {
const [params, loadRange] = getEventRequestParams(job, 72, [72, 72]);
expect(params).toEqual({
page: 72,
page_size: 1,
});
expect(loadRange).toEqual(range(72, 72));
});
});

2
awx/ui/src/screens/Job/JobOutput/shared/jobOutputUtils.js
View File

@ -3,7 +3,7 @@ export default function getRowRangePageSize(startIndex, stopIndex) {
let pageSize;
if (startIndex === stopIndex) {
page = startIndex + 1;
page = startIndex;
pageSize = 1;
} else if (stopIndex >= startIndex + 50) {
page = Math.floor(startIndex / 50) + 1;

16
awx/ui/src/screens/Job/JobOutput/shared/jobOutputUtils.test.js
View File

@ -3,11 +3,20 @@ import getRowRangePageSize from './jobOutputUtils';
describe('getRowRangePageSize', () => {
test('handles range of 1', () => {
expect(getRowRangePageSize(1, 1)).toEqual({
page: 2,
page: 1,
pageSize: 1,
firstIndex: 1,
firstIndex: 0,
});
});
test('handles range of 1 at a higher number', () => {
expect(getRowRangePageSize(72, 72)).toEqual({
page: 72,
pageSize: 1,
firstIndex: 71,
});
});
test('handles range larger than 50 rows', () => {
expect(getRowRangePageSize(55, 125)).toEqual({
page: 2,
@ -15,6 +24,7 @@ describe('getRowRangePageSize', () => {
firstIndex: 50,
});
});
test('handles small range', () => {
expect(getRowRangePageSize(47, 53)).toEqual({
page: 6,
@ -22,6 +32,7 @@ describe('getRowRangePageSize', () => {
firstIndex: 45,
});
});
test('handles perfect range', () => {
expect(getRowRangePageSize(5, 9)).toEqual({
page: 2,
@ -29,6 +40,7 @@ describe('getRowRangePageSize', () => {
firstIndex: 5,
});
});
test('handles range with 0 startIndex', () => {
expect(getRowRangePageSize(0, 50)).toEqual({
page: 1,