diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts index 4828806c96..8e382e206c 100644 --- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts +++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts @@ -138,18 +138,20 @@ export class GitReleaseApiClient implements GitReleaseApi { ...DISABLE_CACHE, }); - return recentCommitsResponse.data.map(commit => ({ - htmlUrl: commit.html_url, - sha: commit.sha, - author: { - htmlUrl: commit.author?.html_url, - login: commit.author?.login, - }, - commit: { - message: commit.commit.message, - }, - firstParentSha: commit.parents?.[0]?.sha, - })); + return { + recentCommits: recentCommitsResponse.data.map(commit => ({ + htmlUrl: commit.html_url, + sha: commit.sha, + author: { + htmlUrl: commit.author?.html_url, + login: commit.author?.login, + }, + commit: { + message: commit.commit.message, + }, + firstParentSha: commit.parents?.[0]?.sha, + })), + }; }; getLatestRelease: GitReleaseApi['getLatestRelease'] = async ({ @@ -515,8 +517,8 @@ export interface GitReleaseApi { args: { releaseBranchName?: string; } & OwnerRepo, - ) => Promise< - { + ) => Promise<{ + recentCommits: { htmlUrl: string; sha: string; author: { @@ -527,8 +529,8 @@ export interface GitReleaseApi { message: string; }; firstParentSha?: string; - }[] - >; + }[]; + }>; getLatestRelease: ( args: OwnerRepo, @@ -724,7 +726,9 @@ export type GetUserResult = UnboxReturnedPromise; export type GetRecentCommitsResult = UnboxReturnedPromise< GitReleaseApi['getRecentCommits'] >; -export type GetRecentCommitsResultSingle = UnboxArray; +export type GetRecentCommitsResultSingle = UnboxArray< + GetRecentCommitsResult['recentCommits'] +>; export type GetLatestReleaseResult = UnboxReturnedPromise< GitReleaseApi['getLatestRelease'] >; diff --git a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx index 82c99b740a..6bfac03558 100644 --- a/plugins/git-release-manager/src/features/Patch/PatchBody.tsx +++ b/plugins/git-release-manager/src/features/Patch/PatchBody.tsx @@ -73,8 +73,8 @@ export const PatchBody = ({ const gitDataResponse = useAsync(async () => { const [ - recentCommitsOnDefaultBranch, - recentCommitsOnReleaseBranch, + { recentCommits: recentCommitsOnDefaultBranch }, + { recentCommits: recentCommitsOnReleaseBranch }, ] = await Promise.all([ pluginApiClient.getRecentCommits({ owner: project.owner, 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 add41f856c..8edc35d397 100644 --- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts @@ -198,10 +198,12 @@ export const mockApiClient: GitReleaseApi = { }, })), - getRecentCommits: jest.fn(async () => [ - createMockRecentCommit({ sha: 'mock_sha_recent_commits_1' }), - createMockRecentCommit({ sha: 'mock_sha_recent_commits_2' }), - ]), + getRecentCommits: jest.fn(async () => ({ + recentCommits: [ + createMockRecentCommit({ sha: 'mock_sha_recent_commits_1' }), + createMockRecentCommit({ sha: 'mock_sha_recent_commits_2' }), + ], + })), getLatestRelease: jest.fn(async () => createMockRelease()),