KTB-15: improve pr creation link (#10)

* lint * handle rebase errors
a7madgamal · Mar 27, 2020 · 8d0993a · 8d0993a
1 parent a867664
commit 8d0993a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -115,11 +115,19 @@ ipcMain.on(
 )
 
 ipcMain.on(IPC_REBASE_BRANCH, async (e, repoId, branchName) => {
-  await rebaseLocalBranch(repoId, branchName)
-  showNotification({
-    title: 'branch rebased',
-    body: `${repoId}:${branchName}`,
-  })
+  try {
+    await rebaseLocalBranch(repoId, branchName)
+    showNotification({
+      title: 'branch rebased',
+      body: `${repoId}:${branchName}`,
+    })
+  } catch (error) {
+    showNotification({
+      title: 'branch rebase failed, fix the conflict',
+      body: `${repoId}:${branchName}`,
+    })
+  }
+
   mainWindow.webContents.send(IPC_REFRESH_GIT)
 })
 

diff --git a/src/plugins/github.ts b/src/plugins/github.ts
@@ -129,6 +129,7 @@ const generateNewOrCurrentPRLink = ({
   const ticketID = `${branchNameArray
     .shift()
     ?.toUpperCase()}-${branchNameArray.shift()}`
+
   const state = store.getState()
 
   const hasPR =
@@ -140,7 +141,7 @@ const generateNewOrCurrentPRLink = ({
   if (hasPR) {
     return hasPR.html_url
   } else {
-    return `https://github.com/${orgID}/${repoId}/compare/${branchName}?expand=1&title=${ticketID} - ${branchNameArray.join(
+    return `https://github.com/${orgID}/${repoId}/compare/${branchName}?expand=1&title=${ticketID}: ${branchNameArray.join(
       ' ',
     )}`
   }