admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Redirect to previous page after login (#4731)

Browse Source 
fix: #4721
This commit is contained in:
Aditya Pimpalkar
2024-04-03 07:05:18 +01:00
committed by GitHub
parent 5f6109bb53
commit 6ed0a5e2d6
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/twenty-front/src/modules/auth/sign-in-up/hooks/useNavigateAfterSignInUp.ts
View File

@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import { CurrentWorkspace } from '@/auth/states/currentWorkspaceState.ts';
import { previousUrlState } from '@/auth/states/previousUrlState';
import { billingState } from '@/client-config/states/billingState.ts';
import { AppPath } from '@/types/AppPath.ts';
import { WorkspaceMember } from '~/generated/graphql.tsx';
@ -10,6 +11,7 @@ import { WorkspaceMember } from '~/generated/graphql.tsx';
export const useNavigateAfterSignInUp = () => {
const navigate = useNavigate();
const billing = useRecoilValue(billingState);
const previousUrl = useRecoilValue(previousUrlState);
const navigateAfterSignInUp = useCallback(
(
currentWorkspace: CurrentWorkspace,
@ -35,10 +37,10 @@ export const useNavigateAfterSignInUp = () => {
navigate(AppPath.CreateProfile);
return;
}
navigate(AppPath.Index);
if (previousUrl !== '') navigate(previousUrl);
else navigate(AppPath.Index);
},
[billing, navigate],
[billing, previousUrl, navigate],
);
return { navigateAfterSignInUp };
};

6
packages/twenty-front/src/modules/auth/states/previousUrlState.ts Normal file
View File

@ -0,0 +1,6 @@
import { createState } from '@/ui/utilities/state/utils/createState';
export const previousUrlState = createState<string>({
key: 'previousUrlState',
defaultValue: '',
});