github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: onboarding workflow (#1286)

Browse Source 
* chore: onboarding steps workflow verification

* chore: onboarding variable update
This commit is contained in:
guru_sainath 2023-06-14 13:17:35 +05:30 committed by GitHub
parent 4b25b7244b
commit 6f7b563712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 96 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/components/onboarding/invite-members.tsx
View File

@ -7,7 +7,7 @@ import { ICurrentUserResponse, IUser } from "types";
import { MultiInput, PrimaryButton, SecondaryButton } from "components/ui"; import { MultiInput, PrimaryButton, SecondaryButton } from "components/ui";
type Props = { type Props = {
setStep: React.Dispatch<React.SetStateAction<number>>; setStep: React.Dispatch<React.SetStateAction<number | null>>;
workspace: any; workspace: any;
user: ICurrentUserResponse | undefined; user: ICurrentUserResponse | undefined;
}; };

2
apps/app/components/onboarding/user-details.tsx
View File

@ -21,7 +21,7 @@ const defaultValues: Partial<IUser> = {
type Props = { type Props = {
user?: IUser; user?: IUser;
setStep: React.Dispatch<React.SetStateAction<number>>; setStep: React.Dispatch<React.SetStateAction<number | null>>;
setUserRole: React.Dispatch<React.SetStateAction<string | null>>; setUserRole: React.Dispatch<React.SetStateAction<string | null>>;
}; };

2
apps/app/components/onboarding/workspace.tsx
View File

@ -17,7 +17,7 @@ import { PrimaryButton } from "components/ui";
import { getFirstCharacters, truncateText } from "helpers/string.helper"; import { getFirstCharacters, truncateText } from "helpers/string.helper";
type Props = { type Props = {
setStep: React.Dispatch<React.SetStateAction<number>>; setStep: React.Dispatch<React.SetStateAction<number | null>>;
setWorkspace: React.Dispatch<React.SetStateAction<any>>; setWorkspace: React.Dispatch<React.SetStateAction<any>>;
user: ICurrentUserResponse | undefined; user: ICurrentUserResponse | undefined;
}; };

188
apps/app/pages/onboarding.tsx
View File

@ -1,4 +1,4 @@
import { useState } from "react"; import { useEffect, useState } from "react";
// next imports // next imports
import Router from "next/router"; import Router from "next/router";
// services // services
@ -24,7 +24,7 @@ import { ONBOARDING_CARDS } from "constants/workspace";
import type { NextPage } from "next"; import type { NextPage } from "next";
const Onboarding: NextPage = () => { const Onboarding: NextPage = () => {
const [step, setStep] = useState(1); const [step, setStep] = useState<null | number>(null);
const [userRole, setUserRole] = useState<string | null>(null); const [userRole, setUserRole] = useState<string | null>(null);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
@ -32,113 +32,111 @@ const Onboarding: NextPage = () => {
const { user, isLoading: userLoading, mutateUser } = useUserAuth("onboarding"); const { user, isLoading: userLoading, mutateUser } = useUserAuth("onboarding");
useEffect(() => {
if (user && step === null) {
let currentStep: null | number = null;
if (user?.role) currentStep = 2;
if (user?.last_workspace_id) currentStep = 4;
if (currentStep != null) setStep(() => currentStep);
}
}, [step, user]);
return ( return (
<DefaultLayout> <DefaultLayout>
{userLoading ? ( {userLoading || isLoading || step === null ? (
<div className="grid h-screen place-items-center"> <div className="grid h-screen place-items-center">
<Spinner /> <Spinner />
</div> </div>
) : ( ) : (
<> <div className="relative grid h-full place-items-center p-5">
{isLoading ? ( {step <= 3 ? (
<div className="grid h-screen place-items-center"> <div className="h-full flex flex-col justify-center w-full py-4">
<Spinner /> <div className="mb-7 flex items-center justify-center text-center">
<OnboardingLogo className="h-12 w-48 fill-current text-brand-base" />
</div>
{step === 1 ? (
<UserDetails user={user} setStep={setStep} setUserRole={setUserRole} />
) : step === 2 ? (
<Workspace setStep={setStep} setWorkspace={setWorkspace} user={user} />
) : (
step === 3 && <InviteMembers setStep={setStep} workspace={workspace} user={user} />
)}
</div> </div>
) : ( ) : (
<div className="relative grid h-full place-items-center p-5"> <div className="flex w-full max-w-2xl flex-col gap-12">
{step <= 3 ? ( <div className="flex flex-col items-center justify-center gap-7 rounded-[10px] bg-brand-base pb-7 text-center shadow-md">
<div className="h-full flex flex-col justify-center w-full py-4"> {step === 4 ? (
<div className="mb-7 flex items-center justify-center text-center"> <OnboardingCard data={ONBOARDING_CARDS.welcome} />
<OnboardingLogo className="h-12 w-48 fill-current text-brand-base" /> ) : step === 5 ? (
</div> <OnboardingCard data={ONBOARDING_CARDS.issue} gradient />
{step === 1 ? ( ) : step === 6 ? (
<UserDetails user={user} setStep={setStep} setUserRole={setUserRole} /> <OnboardingCard data={ONBOARDING_CARDS.cycle} gradient />
) : step === 2 ? ( ) : step === 7 ? (
<Workspace setStep={setStep} setWorkspace={setWorkspace} user={user} /> <OnboardingCard data={ONBOARDING_CARDS.module} gradient />
) : ( ) : (
step === 3 && ( step === 8 && <OnboardingCard data={ONBOARDING_CARDS.commandMenu} />
<InviteMembers setStep={setStep} workspace={workspace} user={user} /> )}
) <div className="mx-auto flex h-1/4 items-end lg:w-1/2">
)} <PrimaryButton
</div> type="button"
) : ( className="flex w-full items-center justify-center text-center "
<div className="flex w-full max-w-2xl flex-col gap-12"> size="md"
<div className="flex flex-col items-center justify-center gap-7 rounded-[10px] bg-brand-base pb-7 text-center shadow-md"> onClick={() => {
{step === 4 ? ( if (step === 8) {
<OnboardingCard data={ONBOARDING_CARDS.welcome} /> setIsLoading(true);
) : step === 5 ? ( userService
<OnboardingCard data={ONBOARDING_CARDS.issue} gradient /> .updateUserOnBoard({ userRole }, user)
) : step === 6 ? ( .then(async () => {
<OnboardingCard data={ONBOARDING_CARDS.cycle} gradient /> mutateUser();
) : step === 7 ? ( const userWorkspaces = await workspaceService.userWorkspaces();
<OnboardingCard data={ONBOARDING_CARDS.module} gradient />
) : (
step === 8 && <OnboardingCard data={ONBOARDING_CARDS.commandMenu} />
)}
<div className="mx-auto flex h-1/4 items-end lg:w-1/2">
<PrimaryButton
type="button"
className="flex w-full items-center justify-center text-center "
size="md"
onClick={() => {
if (step === 8) {
setIsLoading(true);
userService
.updateUserOnBoard({ userRole }, user)
.then(async () => {
mutateUser();
const userWorkspaces = await workspaceService.userWorkspaces();
const lastActiveWorkspace = const lastActiveWorkspace =
userWorkspaces.find( userWorkspaces.find(
(workspace) => workspace.id === user?.last_workspace_id (workspace) => workspace.id === user?.last_workspace_id
) ?? userWorkspaces[0]; ) ?? userWorkspaces[0];
if (lastActiveWorkspace) { if (lastActiveWorkspace) {
userService userService
.updateUser({ .updateUser({
last_workspace_id: lastActiveWorkspace.id, last_workspace_id: lastActiveWorkspace.id,
}) })
.then((res) => { .then((res) => {
mutateUser(); mutateUser();
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });
Router.push(`/${lastActiveWorkspace.slug}`); Router.push(`/${lastActiveWorkspace.slug}`);
return; return;
} else { } else {
const invitations = const invitations = await workspaceService.userWorkspaceInvitations();
await workspaceService.userWorkspaceInvitations(); if (invitations.length > 0) {
if (invitations.length > 0) { Router.push(`/invitations`);
Router.push(`/invitations`); return;
return; } else {
} else { Router.push(`/create-workspace`);
Router.push(`/create-workspace`); return;
return; }
} }
} })
}) .catch((err) => {
.catch((err) => { setIsLoading(false);
setIsLoading(false); console.log(err);
console.log(err); });
}); } else setStep((prevData) => (prevData != null ? prevData + 1 : prevData));
} else setStep((prevData) => prevData + 1); }}
}} >
> {step === 4 || step === 8 ? "Get Started" : "Next"}
{step === 4 || step === 8 ? "Get Started" : "Next"} </PrimaryButton>
</PrimaryButton>
</div>
</div>
</div> </div>
)}
<div className="absolute flex flex-col gap-1 justify-center items-start left-5 top-5">
<span className="text-xs text-brand-secondary">Logged in:</span>
<span className="text-sm text-brand-base">{user?.email}</span>
</div> </div>
</div> </div>
)} )}
</> <div className="absolute flex flex-col gap-1 justify-center items-start left-5 top-5">
<span className="text-xs text-brand-secondary">Logged in:</span>
<span className="text-sm text-brand-base">{user?.email}</span>
</div>
</div>
)} )}
</DefaultLayout> </DefaultLayout>
); );