Fix hook

twentyhq · Jun 10, 2024 · 735c4c1 · 735c4c1
1 parent 3304333
commit 735c4c1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useSetOnboardingStep.ts b/packages/twenty-front/src/modules/onboarding/hooks/useSetOnboardingStep.ts
@@ -1,20 +1,42 @@
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 import { OnboardingStep } from '~/generated/graphql';
 
+const getNextOnboardingState = (
+  currentOnboardingStep: OnboardingStep,
+  workspaceMembers: WorkspaceMember[],
+) => {
+  if (
+    currentOnboardingStep === OnboardingStep.SyncEmail &&
+    workspaceMembers.length > 1
+  ) {
+    return workspaceMembers.length === 1 ? OnboardingStep.InviteTeam : null;
+  }
+  return null;
+};
+
 export const useSetOnboardingStep = () => {
   const setCurrentUser = useSetRecoilState(currentUserState);
+  const { records: workspaceMembers } = useFindManyRecords<WorkspaceMember>({
+    objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
+  });
   return useRecoilCallback(
-    () => (onboardingStep: OnboardingStep | null) => {
+    () => (currentOnboardingStep: OnboardingStep) => {
       setCurrentUser(
         (current) =>
           ({
             ...current,
-            onboardingStep,
+            onboardingStep: getNextOnboardingState(
+              currentOnboardingStep,
+              workspaceMembers,
+            ),
           }) as any,
       );
     },
-    [setCurrentUser],
+    [setCurrentUser, workspaceMembers],
   );
 };
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -24,7 +24,7 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { TextInputV2 } from '@/ui/input/components/TextInputV2';
 import { ActionLink } from '@/ui/navigation/link/components/ActionLink';
-import { useSendInviteLinkMutation } from '~/generated/graphql';
+import { OnboardingStep, useSendInviteLinkMutation } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 const StyledAnimatedInput = styled.div`
@@ -135,7 +135,7 @@ export const InviteTeam = () => {
       );
       const result = await sendInviteLink({ variables: { emails } });
 
-      setOnboardingStep(null);
+      setOnboardingStep(OnboardingStep.InviteTeam);
 
       if (isDefined(result.errors)) {
         throw result.errors;

diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -57,7 +57,7 @@ export const SyncEmails = () => {
 
   const continueWithoutSync = async () => {
     await skipSyncEmailOnboardingStepMutation();
-    setOnboardingStep(OnboardingStep.InviteTeam);
+    setOnboardingStep(OnboardingStep.SyncEmail);
   };
 
   return (

diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -27,8 +27,6 @@ import { DemoEnvGuard } from 'src/engine/guards/demo.env.guard';
 import { JwtAuthGuard } from 'src/engine/guards/jwt.auth.guard';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
-import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { OnboardingStep } from 'src/engine/core-modules/onboarding/enums/onboarding-step.enum';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 
@@ -119,14 +117,14 @@ export class UserResolver {
   }
 
   @ResolveField(() => OnboardingStep)
-  async onboardingStep(
-    @Parent() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ): Promise<OnboardingStep | null> {
-    if (!user || !workspace) {
+  async onboardingStep(@Parent() user: User): Promise<OnboardingStep | null> {
+    if (!user) {
       return null;
     }
 
-    return this.onboardingService.getOnboardingState(user, workspace);
+    return this.onboardingService.getOnboardingState(
+      user,
+      user.defaultWorkspace,
+    );
   }
 }