Api refactor, return object for merge

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

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

@@ -407,11 +407,13 @@ export class GitReleaseApiClient implements GitReleaseApi {
     });
 
     return {
-      htmlUrl: merge.html_url,
-      commit: {
-        message: merge.commit.message,
-        tree: {
-          sha: merge.commit.tree.sha,
+      merge: {
+        htmlUrl: merge.html_url,
+        commit: {
+          message: merge.commit.message,
+          tree: {
+            sha: merge.commit.tree.sha,
+          },
         },
       },
     };
@@ -693,11 +695,13 @@ export interface GitReleaseApi {
       head: string;
     } & OwnerRepo,
   ) => Promise<{
-    htmlUrl: string;
-    commit: {
-      message: string;
-      tree: {
-        sha: string;
+    merge: {
+      htmlUrl: string;
+      commit: {
+        message: string;
+        tree: {
+          sha: string;
+        };
       };
     };
   }>;

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

@@ -154,7 +154,7 @@ export function usePatch({
     abortIfError(forceBranchRes.error);
     if (!forceBranchRes.value || !releaseBranchRes.value) return undefined;
 
-    const merge = await pluginApiClient
+    const { merge } = await pluginApiClient
       .merge({
         owner: project.owner,
         repo: project.repo,

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

@@ -274,11 +274,13 @@ export const mockApiClient: GitReleaseApi = {
   })),
 
   merge: jest.fn(async () => ({
-    htmlUrl: 'mock_merge_html_url',
-    commit: {
-      message: 'mock_merge_commit_message',
-      tree: {
-        sha: 'mock_merge_commit_tree_sha',
+    merge: {
+      htmlUrl: 'mock_merge_html_url',
+      commit: {
+        message: 'mock_merge_commit_message',
+        tree: {
+          sha: 'mock_merge_commit_tree_sha',
+        },
       },
     },
   })),