luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolved issue regarding openign boards link from channels (#1388)

Browse source 
* Resolved issue regarding openign boards link from channels

* Removed unnecessary check
This commit is contained in:
Harshil Sharma 2021-10-04 14:44:18 +05:30 committed by GitHub
parent 17991b9161
commit 7ce9e44a5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/app.tsx
View file

@ -85,6 +85,7 @@ const App = React.memo((): JSX.Element => {
dispatch(fetchLanguage())
dispatch(fetchMe())
dispatch(fetchClientConfig())
history.replace(window.location.pathname.replace((window as any).frontendBaseURL, ''))
}, [])
useEffect(() => {
@ -106,8 +107,8 @@ const App = React.memo((): JSX.Element => {
setTimeout(() => dispatch(setGlobalError('')), 0)
}
const continueToWelcomeScreen = (boardIdIsValidUUIDV4 = true) => {
return Utils.isFocalboardPlugin() && loggedIn === true && (!UserSettings.welcomePageViewed || !boardIdIsValidUUIDV4)
const continueToWelcomeScreen = () => {
return Utils.isFocalboardPlugin() && loggedIn === true && !UserSettings.welcomePageViewed
}
const buildOriginalPath = (workspaceId = '', boardId = '', viewId = '', cardId = '') => {
@ -231,7 +232,7 @@ const App = React.memo((): JSX.Element => {
return <Redirect to='/login'/>
}
if (continueToWelcomeScreen(boardIdIsValidUUIDV4)) {
if (continueToWelcomeScreen()) {
const originalPath = `/${buildOriginalPath('', boardId, viewId, cardId)}`
const queryString = boardIdIsValidUUIDV4 ? `r=${originalPath}` : ''
return <Redirect to={`/welcome?${queryString}`}/>