π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1929] chore: improve finishOnboarding logic to handle case where user profile setup is done and user already has a workspace. (#5105)
Prateek Shouryace89c7dcff4a
diff --git a/web/app/onboarding/page.tsx b/web/app/onboarding/page.tsxindex b8cd881adf..ecfa07fccd 100644--- a/web/app/onboarding/page.tsx+++ b/web/app/onboarding/page.tsx@@ -47,9 +47,12 @@ const OnboardingPage = observer(() => {user?.id && fetchWorkspaces();});// fetching user workspace invitations- const { isLoading: invitationsLoader, data: invitations } = useSWR("USER_WORKSPACE_INVITATIONS_LIST", () => {- if (user?.id) return workspaceService.userWorkspaceInvitations();- });+ const { isLoading: invitationsLoader, data: invitations } = useSWR(+ `USER_WORKSPACE_INVITATIONS_LIST_${user?.id}`,+ () => {+ if (user?.id) return workspaceService.userWorkspaceInvitations();+ }+ );// handle step changeconst stepChange = async (steps: Partial<TOnboardingSteps>) => {if (!user) return;@@ -103,6 +106,16 @@ const OnboardingPage = observer(() => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [userLoader, workspaceListLoader]);+ // If the user completes the profile setup and has workspaces (through invitations), then finish the onboarding.+ useEffect(() => {+ if (userLoader === false && profile && workspaceListLoader === false) {+ const onboardingStep = profile.onboarding_step;+ if (onboardingStep.profile_complete && !onboardingStep.workspace_create && workspacesList.length > 0)+ finishOnboarding();+ }+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [userLoader, profile, workspaceListLoader]);+useEffect(() => {const handleStepChange = async () => {if (!user) return;@@ -111,10 +124,10 @@ const OnboardingPage = observer(() => {if (!onboardingStep.profile_complete) setStep(EOnboardingSteps.PROFILE_SETUP);- // For Invited Users, they will skip all other steps.- if (totalSteps && totalSteps <= 2) return;-- if (onboardingStep.profile_complete && !(onboardingStep.workspace_join || onboardingStep.workspace_create)) {+ if (+ onboardingStep.profile_complete &&+ !(onboardingStep.workspace_join || onboardingStep.workspace_create || workspacesList?.length > 0)+ ) {setStep(EOnboardingSteps.WORKSPACE_CREATE_OR_JOIN);}diff --git a/web/core/lib/wrappers/authentication-wrapper.tsx b/web/core/lib/wrappers/authentication-wrapper.tsxindex 21690cf15a..c868fd5424 100644--- a/web/core/lib/wrappers/authentication-wrapper.tsx+++ b/web/core/lib/wrappers/authentication-wrapper.tsx@@ -35,7 +35,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((propsconst { isLoading: isUserLoading, data: currentUser, fetchCurrentUser } = useUser();const { data: currentUserProfile } = useUserProfile();const { data: currentUserSettings } = useUserSettings();- const { workspaces } = useWorkspace();+ const { loader: workspacesLoader, workspaces } = useWorkspace();const { isLoading: isUserSWRLoading } = useSWR("USER_INFORMATION", async () => await fetchCurrentUser(), {revalidateOnFocus: false,@@ -73,7 +73,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((propsreturn redirectionRoute;};- if ((isUserSWRLoading || isUserLoading) && !currentUser?.id)+ if ((isUserSWRLoading || isUserLoading || workspacesLoader) && !currentUser?.id)return (<div className="relative flex h-screen w-full items-center justify-center"><LogoSpinner />