From 7e57bf38122a744b82d37fb4327355184b50d558 Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Sat, 22 Sep 2018 22:26:29 +0800 Subject: [PATCH] fix: hide file explorer when auth error occurs --- src/components/SideBar.js | 7 ++++--- src/driver/core/SideBar.js | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 2e88f48..96c024f 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -94,9 +94,10 @@ export default class Gitako extends React.PureComponent { return (
{metaData && } - {errorDueToAuth && this.renderAccessDeniedError()} - {metaData && - + {errorDueToAuth + ? this.renderAccessDeniedError() + : metaData && + }
) diff --git a/src/driver/core/SideBar.js b/src/driver/core/SideBar.js index edace74..63ecf23 100644 --- a/src/driver/core/SideBar.js +++ b/src/driver/core/SideBar.js @@ -62,6 +62,7 @@ const handleError = dispatch => async (err) => { const repoPageType = await DOMHelper.getRepoPageType() const errorDueToAuth = repoPageType === REPO_TYPE_PRIVATE || err.message === BAD_CREDENTIALS dispatch({ errorDueToAuth }) + dispatch(setShowSettings, true) dispatch(setShouldShow, errorDueToAuth) if (!errorDueToAuth) { dispatch(setError, 'Gitako ate a bug, but it should recovery soon!') @@ -107,6 +108,8 @@ const setError = dispatch => error => { const toggleShowSettings = dispatch => () => dispatch(({ showSettings }) => ({ showSettings: !showSettings })) +const setShowSettings = dispatch => showSettings => dispatch({ showSettings }) + const onAccessTokenChange = dispatch => accessToken => dispatch({ accessToken }) const onShortcutChange = dispatch => shortcut => dispatch({ toggleShowSideBarShortcut: shortcut }) @@ -120,6 +123,7 @@ export default { onPJAXEnd, onKeyDown, setShouldShow, + setShowSettings, toggleShowSideBar, toggleShowSettings, onAccessTokenChange,