fix remotes

src/constants.ts

@@ -10,6 +10,7 @@ const IPC_PUSH_BRANCH = 'IPC_PUSH_BRANCH'
 const IPC_CANCEL_SELECT = 'IPC_CANCEL_SELECT'
 const IPC_HIDE_SELECT = 'IPC_HIDE_SELECT'
 const IPC_REPO_SELECT = 'IPC_REPO_SELECT'
+const IPC_GET_GIT_REMOTE = 'IPC_GET_GIT_REMOTE'
 
 export {
   IPC_SELECTOR,
@@ -24,4 +25,5 @@ export {
   IPC_CANCEL_SELECT,
   IPC_REPO_SELECT,
   IPC_HIDE_SELECT,
+  IPC_GET_GIT_REMOTE,
 }

src/main/index.ts

@@ -20,6 +20,8 @@ import {
   deleteBranch,
   rebaseLocalBranch,
   checkoutLocalBranch,
+  getRepoFromPath,
+  getRemote,
 } from '../plugins/git'
 // import { getInfo } from './plugins/jenkins'
 
@@ -41,6 +43,7 @@ import {
   IPC_REFRESH_TICKETS,
   IPC_REFRESH_GIT,
   IPC_REFRESH_PRS,
+  IPC_GET_GIT_REMOTE,
 } from '../constants'
 
 const logger = electronTimber.create({ name: 'index' })
@@ -96,6 +99,18 @@ function registerShortcuts() {
   )
 }
 
+ipcMain.on(IPC_GET_GIT_REMOTE, async (e, path: string) => {
+  const gitRepo = await getRepoFromPath(path)
+
+  if (gitRepo) {
+    const remote = await getRemote(gitRepo)
+
+    e.returnValue = remote
+  } else {
+    e.returnValue = false
+  }
+})
+
 ipcMain.on(IPC_CREATE_BRANCH, async (e, key) => {
   const result = await createBranchFromTicketId(key)
 

src/plugins/git.ts

@@ -259,48 +259,33 @@ const checkoutLocalBranch = async (repoId: string, branchName: string) => {
   }
 }
 
-type RepoRemote = {
+export type RepoRemote = {
   remoteName: string
   repoId: string
   orgID: string
 }
 
 const getRemote = async (
-  repoOrRepoID: string | git.SimpleGit,
+  gitRepo: git.SimpleGit,
 ): Promise<RepoRemote | false> => {
-  let gitRepo: git.SimpleGit
-
-  if (typeof repoOrRepoID === 'string') {
-    const repoSettings = getRepoSettingsFromId(repoOrRepoID)
-
-    gitRepo = git(okk(repoSettings.path))
-  } else {
-    gitRepo = repoOrRepoID
-  }
-
-  let remotes: RemoteWithRefs[] | false
-
   try {
-    remotes = await gitRepo.getRemotes(true)
-  } catch (error) {
-    logger.error('getRemote', error)
+    const result = await gitRepo.raw(['remote', '--verbose'])
+    const firstSplit = result.split('\n')[0].split('\t')
+    const remoteName = firstSplit[0]
 
-    remotes = false
-  }
-
-  if (remotes && remotes.length) {
-    const remoteName = remotes[0].name
-
-    const fetchRemote = okk(remotes[0].refs.fetch)
+    const secondSplit = firstSplit[1]
+      .split('\n')[0]
+      .split('\t')[0]
+      .split(' ')[0]
+      .split(':')[1]
+      .split('/')
 
-    const orgID = okk(fetchRemote.split(':')[1].split('/')[0])
-
-    const repoId = okk(fetchRemote.split(':')[1].split('/')[1].split('.')[0])
+    const orgID = secondSplit[0]
+    const repoId = secondSplit[1].split('.')[0]
 
     return { remoteName, orgID, repoId }
-  } else {
-    logger.error('getRemote', 'no remotes!')
-
+  } catch (error) {
+    logger.log(error)
     return false
   }
 }

src/store/index.ts

@@ -5,7 +5,6 @@ import { composeWithDevTools } from 'redux-devtools-extension'
 import { settingsReducer } from './settings/reducers'
 import { ticketsReducer } from './tickets/reducers'
 import { branchesReducer } from './branches/reducers'
-import { IRepoSetting } from './settings/types'
 import { okk } from '../helpers/helpers'
 
 const rootReducer = combineReducers({
@@ -22,10 +21,13 @@ const middleWareEnhancer = applyMiddleware(...middlewares)
 const store = createStore(rootReducer, composeWithDevTools(middleWareEnhancer))
 
 const getRepoSettingsFromId = (repoId: string) => {
-  const repo = okk(
-    store.getState().settings.reposList.find((repo) => repo.repoId === repoId),
-  )
-  return repo
+  const state = store.getState()
+
+  const repo = state.settings.reposList.find((repo) => repo.repoId === repoId)
+
+  console.log('getRepoSettingsFromId', { state, repo, repoId })
+
+  return okk(repo)
 }
 
 export { store, getRepoSettingsFromId }

src/windows/modals/Settings.tsx

@@ -10,16 +10,17 @@ import { FieldArray } from 'react-final-form-arrays'
 import { TAppState } from '../../store'
 import { jsx } from '@emotion/core'
 import css from '@emotion/css'
-import { shell } from 'electron'
+import { shell, ipcRenderer } from 'electron'
 import { folderPicker } from '../../plugins/dialogs'
-import { getRepoFromPath, getRemote } from '../../plugins/git'
+import { RepoRemote } from '../../plugins/git'
 import {
   TextFieldWrapper,
   Error,
   Label,
   SupportLink,
   textColor,
 } from '../components/styles'
+import { IPC_GET_GIT_REMOTE } from '../../constants'
 
 const mapState = (state: TAppState) => ({
   settings: state.settings,
@@ -267,25 +268,25 @@ const settings: React.FC<TProps> = ({ settings, saveSettingsAction }) => (
               type="button"
               onClick={async () => {
                 const folder = await folderPicker()
+
                 if (!folder.canceled) {
                   const path = folder.filePaths[0]
-                  const gitRepo = await getRepoFromPath(path)
-                  if (gitRepo) {
-                    const remote = await getRemote(gitRepo)
-
-                    if (remote) {
-                      form.mutators.push('reposList', {
-                        path,
-                        orgID: remote.orgID,
-                        remoteName: remote.remoteName,
-                        repoId: remote.repoId,
-                        enableAutoRefresh: true,
-                      })
-                    } else {
-                      alert("couldn't get git remote details")
-                    }
+
+                  const remote: RepoRemote | false = ipcRenderer.sendSync(
+                    IPC_GET_GIT_REMOTE,
+                    path,
+                  )
+
+                  if (remote) {
+                    form.mutators.push('reposList', {
+                      path,
+                      orgID: remote.orgID,
+                      remoteName: remote.remoteName,
+                      repoId: remote.repoId,
+                      enableAutoRefresh: true,
+                    })
                   } else {
-                    alert('not a git repo')
+                    alert("couldn't get git remote details")
                   }
                 }
               }}