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

Fixed bug where match didn't receive current router's route (#2598)

Browse source 
* Fixed bug where match didn't receive current router's route

* Lint fiX

* Simplified the FBRoute

Co-authored-by: Jesús Espino <jespinog@gmail.com>
Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
This commit is contained in:
Harshil Sharma 2022-03-28 10:22:25 +05:30 committed by GitHub
parent abc438ef9e
commit d0d18f207f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
webapp/src/route.tsx
View file

@ -4,7 +4,6 @@ import React from 'react'
import {
Redirect,
Route,
useRouteMatch,
} from 'react-router-dom'
import {Utils} from './utils'
@ -27,14 +26,10 @@ type RouteProps = {
function FBRoute(props: RouteProps) {
const loggedIn = useAppSelector<boolean|null>(getLoggedIn)
const match = useRouteMatch<any>()
const me = useAppSelector<IUser|null>(getMe)
const clientConfig = useAppSelector<ClientConfig>(getClientConfig)
let originalPath
if (props.getOriginalPath) {
originalPath = props.getOriginalPath(match)
}
let redirect: React.ReactNode = null
const showWelcomePage = !clientConfig.featureFlags.disableTour &&
Utils.isFocalboardPlugin() &&
@ -44,37 +39,38 @@ function FBRoute(props: RouteProps) {
!me?.props[UserPropPrefix + UserSettingKey.WelcomePageViewed]
if (showWelcomePage) {
if (originalPath) {
return <Redirect to={`/welcome?r=${originalPath}`}/>
}
return <Redirect to='/welcome'/>
}
if (loggedIn === false && props.loginRequired) {
if (originalPath) {
let redirectUrl = '/' + Utils.buildURL(originalPath)
if (redirectUrl.indexOf('//') === 0) {
redirectUrl = redirectUrl.slice(1)
redirect = ({match}: any) => {
if (props.getOriginalPath) {
return <Redirect to={`/welcome?r=${props.getOriginalPath!(match)}`}/>
}
const loginUrl = `/error?id=not-logged-in&r=${encodeURIComponent(redirectUrl)}`
return <Redirect to={loginUrl}/>
return <Redirect to='/welcome'/>
}
return <Redirect to='/error?id=not-logged-in'/>
}
if (loggedIn === true || !props.loginRequired) {
return (
<Route
path={props.path}
render={props.render}
component={props.component}
exact={props.exact}
>
{props.children}
</Route>
)
if (redirect === null && loggedIn === false && props.loginRequired) {
redirect = ({match}: any) => {
if (props.getOriginalPath) {
let redirectUrl = '/' + Utils.buildURL(props.getOriginalPath!(match))
if (redirectUrl.indexOf('//') === 0) {
redirectUrl = redirectUrl.slice(1)
}
const loginUrl = `/error?id=not-logged-in&r=${encodeURIComponent(redirectUrl)}`
return <Redirect to={loginUrl}/>
}
return <Redirect to='/error?id=not-logged-in'/>
}
}
return null
return (
<Route
path={props.path}
render={props.render}
component={props.component}
exact={props.exact}
>
{redirect || props.children}
</Route>
)
}
export default React.memo(FBRoute)