From b730539bbb451ae1ccb339af53e168fcbc42281f Mon Sep 17 00:00:00 2001 From: Michel Pereira Date: Thu, 5 Sep 2019 17:22:39 +0200 Subject: [PATCH] feat(JobsHistory): add maxResult property --- src/client/gitlab.js | 4 +- src/client/index.js | 15 +++---- src/components/JobHistory.js | 4 +- .../__snapshots__/Branches.test.js.snap | 40 +++++++++---------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/client/gitlab.js b/src/client/gitlab.js index e259fcd..6e9733a 100644 --- a/src/client/gitlab.js +++ b/src/client/gitlab.js @@ -93,9 +93,9 @@ class GitLab { })) } - getProjectJobs(projectId) { + getProjectJobs(projectId, maxResult = 40) { return this.makeRequest(`/projects/${encodeURIComponent(projectId)}/jobs`, { - per_page: 40, + per_page: maxResult, }).then(res => ({ items: res.body, pagination: exports.paginationFromHeaders(res.headers), diff --git a/src/client/index.js b/src/client/index.js index 97745e8..106a26e 100644 --- a/src/client/index.js +++ b/src/client/index.js @@ -80,13 +80,14 @@ module.exports = mozaik => { contributors, })) }, - projectJobs({ project }) { - return Promise.all([gitlab.getProject(project), gitlab.getProjectJobs(project)]).then( - ([project, jobs]) => ({ - project, - jobs, - }) - ) + projectJobs({ project, maxResult }) { + return Promise.all([ + gitlab.getProject(project), + gitlab.getProjectJobs(project, maxResult), + ]).then(([project, jobs]) => ({ + project, + jobs, + })) }, projectBranches({ project }) { return Promise.all([ diff --git a/src/components/JobHistory.js b/src/components/JobHistory.js index 7c1af36..9a8e3b3 100644 --- a/src/components/JobHistory.js +++ b/src/components/JobHistory.js @@ -27,10 +27,10 @@ export default class JobHistory extends Component { apiError: PropTypes.object, } - static getApiRequest({ project }) { + static getApiRequest({ project, maxResult = 5 }) { return { id: `gitlab.projectJobs.${project}`, - params: { project }, + params: { project, maxResult }, } } diff --git a/test/components/__snapshots__/Branches.test.js.snap b/test/components/__snapshots__/Branches.test.js.snap index eea2bd1..2f92e25 100644 --- a/test/components/__snapshots__/Branches.test.js.snap +++ b/test/components/__snapshots__/Branches.test.js.snap @@ -155,7 +155,7 @@ exports[`should render as expected 1`] = ` />   - 3 years ago + 4 years ago @@ -244,7 +244,7 @@ exports[`should render as expected 1`] = ` />   - 3 years ago + 4 years ago @@ -333,7 +333,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -422,7 +422,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -511,7 +511,7 @@ exports[`should render as expected 1`] = ` />   - a year ago + 2 years ago @@ -600,7 +600,7 @@ exports[`should render as expected 1`] = ` />   - a year ago + 2 years ago @@ -689,7 +689,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -778,7 +778,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -867,7 +867,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -956,7 +956,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -1045,7 +1045,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -1134,7 +1134,7 @@ exports[`should render as expected 1`] = ` />   - 2 years ago + 3 years ago @@ -1223,7 +1223,7 @@ exports[`should render as expected 1`] = ` />   - a year ago + 3 years ago @@ -1312,7 +1312,7 @@ exports[`should render as expected 1`] = ` />   - a year ago + 2 years ago @@ -1401,7 +1401,7 @@ exports[`should render as expected 1`] = ` />   - 10 months ago + 2 years ago @@ -1490,7 +1490,7 @@ exports[`should render as expected 1`] = ` />   - 6 months ago + 2 years ago @@ -1579,7 +1579,7 @@ exports[`should render as expected 1`] = ` />   - 6 months ago + 2 years ago @@ -1668,7 +1668,7 @@ exports[`should render as expected 1`] = ` />   - 6 months ago + 2 years ago @@ -1757,7 +1757,7 @@ exports[`should render as expected 1`] = ` />   - 6 months ago + 2 years ago @@ -1846,7 +1846,7 @@ exports[`should render as expected 1`] = ` />   - 5 months ago + 2 years ago