diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts index 380eb59761..8083f1a16b 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts +++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts @@ -502,10 +502,12 @@ export class GitReleaseApiClient implements GitReleaseApi { }); return { - date: singleTag.data.tagger.date, - username: singleTag.data.tagger.name, - userEmail: singleTag.data.tagger.email, - objectSha: singleTag.data.object.sha, + tag: { + date: singleTag.data.tagger.date, + username: singleTag.data.tagger.name, + userEmail: singleTag.data.tagger.email, + objectSha: singleTag.data.object.sha, + }, }; }; } @@ -757,10 +759,12 @@ export interface GitReleaseApi { tagSha: string; } & OwnerRepo, ) => Promise<{ - date: string; - username: string; - userEmail: string; - objectSha: string; + tag: { + date: string; + username: string; + userEmail: string; + objectSha: string; + }; }>; } diff --git a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts index ce76eccc54..05243f83d2 100644 --- a/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts +++ b/plugins/git-release-manager/src/features/Stats/helpers/getTagDates.ts @@ -38,7 +38,10 @@ export const getTagDates = async ({ endTag, }: GetTagDates) => { if (startTag.tagType === 'tag' && endTag.tagType === 'tag') { - const [{ date: startDate }, { date: endDate }] = await Promise.all([ + const [ + { tag: startTagResponse }, + { tag: endTagResponse }, + ] = await Promise.all([ pluginApiClient.getSingleTag({ owner: project.owner, repo: project.repo, @@ -52,8 +55,8 @@ export const getTagDates = async ({ ]); return { - startDate, - endDate, + startDate: startTagResponse.date, + endDate: endTagResponse.date, }; } @@ -123,7 +126,7 @@ async function getCommitFromTag({ project: GetTagDates['project']; tag: GetTagDates['startTag'] | GetTagDates['endTag']; }) { - const singleTag = await pluginApiClient.getSingleTag({ + const { tag: tagResponse } = await pluginApiClient.getSingleTag({ owner: project.owner, repo: project.repo, tagSha: tag.tagSha, @@ -131,7 +134,7 @@ async function getCommitFromTag({ const { commit: startCommit } = await pluginApiClient.getCommit({ owner: project.owner, repo: project.repo, - ref: singleTag.objectSha, + ref: tagResponse.objectSha, }); return { diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts index b88e6dbc65..04d15103df 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -316,9 +316,11 @@ export const mockApiClient: GitReleaseApi = { })), getSingleTag: jest.fn(async () => ({ - date: '2021-04-29T12:48:30.120Z', - username: 'mock_user_single_tag_name', - userEmail: 'mock_user_single_tag_email', - objectSha: 'mock_single_tag_object_sha', + tag: { + date: '2021-04-29T12:48:30.120Z', + username: 'mock_user_single_tag_name', + userEmail: 'mock_user_single_tag_email', + objectSha: 'mock_single_tag_object_sha', + }, })), };