Api refactor, return object for getBranch

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>

plugins/git-release-manager/src/api/GitReleaseApiClient.ts

@@ -233,15 +233,17 @@ export class GitReleaseApiClient implements GitReleaseApi {
     });
 
     return {
-      name: branchData.name,
-      links: {
-        html: branchData._links.html,
-      },
-      commit: {
-        sha: branchData.commit.sha,
+      branch: {
+        name: branchData.name,
+        links: {
+          html: branchData._links.html,
+        },
         commit: {
-          tree: {
-            sha: branchData.commit.commit.tree.sha,
+          sha: branchData.commit.sha,
+          commit: {
+            tree: {
+              sha: branchData.commit.commit.tree.sha,
+            },
           },
         },
       },
@@ -579,15 +581,17 @@ export interface GitReleaseApi {
       branch: string;
     } & OwnerRepo,
   ) => Promise<{
-    name: string;
-    links: {
-      html: string;
-    };
-    commit: {
-      sha: string;
+    branch: {
+      name: string;
+      links: {
+        html: string;
+      };
       commit: {
-        tree: {
-          sha: string;
+        sha: string;
+        commit: {
+          tree: {
+            sha: string;
+          };
         };
       };
     };

plugins/git-release-manager/src/features/CreateReleaseCandidate/CreateReleaseCandidate.tsx

@@ -44,7 +44,7 @@ import { useProjectContext } from '../../contexts/ProjectContext';
 interface CreateReleaseCandidateProps {
   defaultBranch: GetRepositoryResult['repository']['defaultBranch'];
   latestRelease: GetLatestReleaseResult['latestRelease'];
-  releaseBranch: GetBranchResult | null;
+  releaseBranch: GetBranchResult['branch'] | null;
   successCb?: ComponentConfigCreateRc['successCb'];
 }
 

plugins/git-release-manager/src/features/Info/Info.tsx

@@ -30,7 +30,7 @@ import { useProjectContext } from '../../contexts/ProjectContext';
 import flowImage from './flow.png';
 
 interface InfoCardProps {
-  releaseBranch: GetBranchResult | null;
+  releaseBranch: GetBranchResult['branch'] | null;
   latestRelease: GetLatestReleaseResult['latestRelease'];
   statsEnabled: boolean;
 }

plugins/git-release-manager/src/features/Patch/Patch.tsx

@@ -31,7 +31,7 @@ import { useProjectContext } from '../../contexts/ProjectContext';
 
 interface PatchProps {
   latestRelease: GetLatestReleaseResult['latestRelease'];
-  releaseBranch: GetBranchResult | null;
+  releaseBranch: GetBranchResult['branch'] | null;
   successCb?: ComponentConfigPatch['successCb'];
 }
 

plugins/git-release-manager/src/features/Patch/PatchBody.tsx

@@ -55,7 +55,7 @@ import { useProjectContext } from '../../contexts/ProjectContext';
 interface PatchBodyProps {
   bumpedTag: string;
   latestRelease: NonNullable<GetLatestReleaseResult['latestRelease']>;
-  releaseBranch: GetBranchResult;
+  releaseBranch: GetBranchResult['branch'];
   successCb?: ComponentConfigPatch['successCb'];
   tagParts: NonNullable<CalverTagParts | SemverTagParts>;
 }

plugins/git-release-manager/src/features/Patch/hooks/usePatch.ts

@@ -67,7 +67,7 @@ export function usePatch({
    */
   const [releaseBranchRes, run] = useAsyncFn(
     async (selectedPatchCommit: GetRecentCommitsResultSingle) => {
-      const releaseBranch = await pluginApiClient
+      const { branch: releaseBranch } = await pluginApiClient
         .getBranch({
           owner: project.owner,
           repo: project.repo,

plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts

@@ -50,7 +50,7 @@ export const useGetGitBatchInfo = ({
       };
     }
 
-    const releaseBranch = await pluginApiClient.getBranch({
+    const { branch: releaseBranch } = await pluginApiClient.getBranch({
       owner: project.owner,
       repo: project.repo,
       branch: latestRelease.targetCommitish,

plugins/git-release-manager/src/test-helpers/test-helpers.ts

@@ -135,7 +135,7 @@ export const mockReleaseVersionSemver = createMockRelease({
  */
 const createMockBranch = ({
   ...rest
-}: Partial<GetBranchResult> = {}): GetBranchResult => ({
+}: Partial<GetBranchResult> = {}): GetBranchResult['branch'] => ({
   name: MOCK_RELEASE_BRANCH_NAME_SEMVER,
   commit: {
     sha: 'mock_branch_commit_sha',
@@ -226,7 +226,9 @@ export const mockApiClient: GitReleaseApi = {
     createdAt: '2021-01-01T10:11:12Z',
   })),
 
-  getBranch: jest.fn(async () => createMockBranch()),
+  getBranch: jest.fn(async () => ({
+    branch: createMockBranch(),
+  })),
 
   createRef: jest.fn(async () => ({
     ref: 'mock_createRef_ref',