promote: develop to stage release

promote: develop to stage release

apps/app/components/onboarding/invite-members.tsx

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

apps/app/components/onboarding/user-details.tsx

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

apps/app/components/onboarding/workspace.tsx

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

apps/app/components/workspace/create-workspace-form.tsx

@@ -6,6 +6,7 @@ import { mutate } from "swr";
 import { Controller, useForm } from "react-hook-form";
 // services
 import workspaceService from "services/workspace.service";
+import userService from "services/user.service";
 // hooks
 import useToast from "hooks/use-toast";
 // ui
@@ -77,7 +78,7 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
                 message: "Workspace created successfully.",
               });
               mutate<IWorkspace[]>(USER_WORKSPACES, (prevData) => [res, ...(prevData ?? [])]);
-              onSubmit(res);
+              updateLastWorkspaceIdUnderUSer(res);
             })
             .catch((err) => {
               console.error(err);
@@ -93,6 +94,18 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
       });
   };
 
+  // update last_workspace_id
+  const updateLastWorkspaceIdUnderUSer = (workspace: any) => {
+    userService
+      .updateUser({ last_workspace_id: workspace.id })
+      .then((res) => {
+        onSubmit(workspace);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  };
+
   useEffect(
     () => () => {
       // when the component unmounts set the default values to whatever user typed in

apps/app/pages/onboarding.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 // next imports
 import Router from "next/router";
 // services
@@ -24,7 +24,7 @@ import { ONBOARDING_CARDS } from "constants/workspace";
 import type { NextPage } from "next";
 
 const Onboarding: NextPage = () => {
-  const [step, setStep] = useState(1);
+  const [step, setStep] = useState<null | number>(null);
   const [userRole, setUserRole] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(false);
 
@@ -32,15 +32,18 @@ const Onboarding: NextPage = () => {
 
   const { user, isLoading: userLoading, mutateUser } = useUserAuth("onboarding");
 
+  useEffect(() => {
+    if (user && step === null) {
+      let currentStep: number = 1;
+      if (user?.role) currentStep = 2;
+      if (user?.last_workspace_id) currentStep = 4;
+      setStep(() => currentStep);
+    }
+  }, [step, user]);
+
   return (
     <DefaultLayout>
-      {userLoading ? (
+      {userLoading || isLoading || step === null ? (
-        <div className="grid h-screen place-items-center">
-          <Spinner />
-        </div>
-      ) : (
-        <>
-          {isLoading ? (
         <div className="grid h-screen place-items-center">
           <Spinner />
         </div>
@@ -56,9 +59,7 @@ const Onboarding: NextPage = () => {
               ) : step === 2 ? (
                 <Workspace setStep={setStep} setWorkspace={setWorkspace} user={user} />
               ) : (
-                    step === 3 && (
+                step === 3 && <InviteMembers setStep={setStep} workspace={workspace} user={user} />
-                      <InviteMembers setStep={setStep} workspace={workspace} user={user} />
-                    )
               )}
             </div>
           ) : (
@@ -95,21 +96,11 @@ const Onboarding: NextPage = () => {
                               ) ?? userWorkspaces[0];
 
                             if (lastActiveWorkspace) {
-                                  userService
-                                    .updateUser({
-                                      last_workspace_id: lastActiveWorkspace.id,
-                                    })
-                                    .then((res) => {
                               mutateUser();
-                                    })
-                                    .catch((err) => {
-                                      console.log(err);
-                                    });
                               Router.push(`/${lastActiveWorkspace.slug}`);
                               return;
                             } else {
-                                  const invitations =
+                              const invitations = await workspaceService.userWorkspaceInvitations();
-                                    await workspaceService.userWorkspaceInvitations();
                               if (invitations.length > 0) {
                                 Router.push(`/invitations`);
                                 return;
@@ -123,7 +114,7 @@ const Onboarding: NextPage = () => {
                             setIsLoading(false);
                             console.log(err);
                           });
-                          } else setStep((prevData) => prevData + 1);
+                      } else setStep((prevData) => (prevData != null ? prevData + 1 : prevData));
                     }}
                   >
                     {step === 4 || step === 8 ? "Get Started" : "Next"}
@@ -138,8 +129,6 @@ const Onboarding: NextPage = () => {
           </div>
         </div>
       )}
-        </>
-      )}
     </DefaultLayout>
   );
 };