prehistoric-systems/Gitako
1
1
Fork 0
mirror of https://github.com/EnixCoda/Gitako.git synced 2026-03-11 08:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: handle projects not set ‘master’ as default branch

Browse source
This commit is contained in:
Enix 2018-09-20 10:33:46 +08:00 committed by EnixCoda
parent 07163774e7
commit 55ce652610
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/driver/core/SideBar.js
View file

@ -12,16 +12,29 @@ const init = dispatch => async () => {
dispatch(setMetaData, metaData)
const { access_token: accessToken, shortcut, compressSingletonFolder } = await configHelper.get()
dispatch({ accessToken, toggleShowSideBarShortcut: shortcut, compressSingletonFolder })
const aggressivelyGotTreeData = GitHubHelper.getTreeData({
const defaultBranchName = 'master'
let aggressivelyGotTreeData = GitHubHelper.getTreeData({
...metaData,
branchName: metaData.branchName || 'master',
branchName: metaData.branchName || defaultBranchName,
accessToken,
}).catch(err => {
nothingWentWrong = false
dispatch(handleError, err)
})
const metaDataFromAPI = await GitHubHelper.getRepoMeta({ ...metaData, accessToken })
const branchName = metaData.branchName || metaDataFromAPI['default_branch']
const projectDefaultBranchName = metaDataFromAPI['default_branch']
if (!metaData.branchName) {
// User accessed repo's homepage(no branch name in URL) and we predicted its default branch to be 'master'
if (projectDefaultBranchName !== defaultBranchName) {
// And the repo do not use {defaultBranchName} as default branch,
aggressivelyGotTreeData = GitHubHelper.getTreeData({
...metaData,
branchName: projectDefaultBranchName,
accessToken,
})
}
}
const branchName = metaData.branchName || projectDefaultBranchName
Object.assign(metaData, { branchName, api: metaDataFromAPI })
dispatch(setMetaData, metaData)
const shouldShow = URLHelper.isInCodePage(metaData)