jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mad redirecting

Browse source
This commit is contained in:
nick-delirium 2024-08-29 15:59:08 +02:00
parent ff2b449c58
commit 0bf63ee7bb
No known key found for this signature in database
GPG key ID: 93ABD695DF5FDBA0
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frontend/app/PrivateRoutes.tsx
View file

@ -98,17 +98,15 @@ const SPOT_PATH = routes.spot();
const SCOPE_SETUP = routes.scopeSetup();
interface Props {
isEnterprise: boolean;
tenantId: string;
siteId: string;
jwt: string;
sites: Map<string, any>;
onboarding: boolean;
spotOnly?: boolean;
}
function PrivateRoutes(props: Props) {
const { onboarding, sites, siteId, jwt } = props;
const { onboarding, sites, siteId } = props;
const redirectToOnboarding =
!onboarding && localStorage.getItem(GLOBAL_HAS_NO_RECORDINGS) === 'true';
const siteIdList: any = sites.map(({ id }) => id).toJS();
@ -266,26 +264,21 @@ function PrivateRoutes(props: Props) {
path={withSiteId(LIVE_SESSION_PATH, siteIdList)}
component={enhancedComponents.LiveSession}
/>
{Object.entries(routes.redirects).map(([fr, to]) => (
<Redirect key={fr} exact strict from={fr} to={to} />
))}
<AdditionalRoutes redirect={withSiteId(routes.sessions(), siteId)} />
{/*{Object.entries(routes.redirects).map(([fr, to]) => (*/}
{/* <Redirect key={fr} exact strict from={fr} to={to} />*/}
{/*))}*/}
{/*<Redirect to={withSiteId(routes.sessions(), siteId)} />*/}
</>}
{props.spotOnly ? <Redirect to={withSiteId(SPOTS_LIST_PATH, siteId)} /> : null}
{props.spotOnly ? <Redirect to={SPOTS_LIST_PATH} /> : null}
</Switch>
</Suspense>
);
}
export default connect((state: any) => ({
changePassword: state.getIn(['user', 'account', 'changePassword']),
onboarding: state.getIn(['user', 'onboarding']),
sites: state.getIn(['site', 'list']),
siteId: state.getIn(['site', 'siteId']),
jwt: state.getIn(['user', 'jwt']),
spotOnly: getScope(state) === 'spot',
tenantId: state.getIn(['user', 'account', 'tenantId']),
isEnterprise:
state.getIn(['user', 'account', 'edition']) === 'ee' ||
state.getIn(['user', 'authDetails', 'edition']) === 'ee',
}))(PrivateRoutes);