44 add blocking middleware payment failed (#4339)

* Add info ui component

* Add info in billing settings

* Add billing middleware

* Handle subscription canceled webhook event

* Stop deleting billingSubscription when subscription canceled

* Handle subscription unpaid recovery

* Handle subscription canceled status

* Fix test

* Add test

* Fix test chatSupport display

* Fix design

packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts

@@ -104,7 +104,13 @@ describe('useOnboardingStatus', () => {
         ...currentWorkspace,
         subscriptionStatus: 'canceled',
       });
-      setCurrentWorkspaceMember(currentWorkspaceMember);
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
     });
 
     expect(result.current.onboardingStatus).toBe('canceled');
@@ -178,4 +184,60 @@ describe('useOnboardingStatus', () => {
 
     expect(result.current.onboardingStatus).toBe('completed');
   });
+
+  it('should return "past_due"', async () => {
+    const { result } = renderHooks();
+    const {
+      setTokenPair,
+      setBilling,
+      setCurrentWorkspace,
+      setCurrentWorkspaceMember,
+    } = result.current;
+
+    act(() => {
+      setTokenPair(tokenPair);
+      setBilling(billing);
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        subscriptionStatus: 'past_due',
+      });
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
+    });
+
+    expect(result.current.onboardingStatus).toBe('past_due');
+  });
+
+  it('should return "unpaid"', async () => {
+    const { result } = renderHooks();
+    const {
+      setTokenPair,
+      setBilling,
+      setCurrentWorkspace,
+      setCurrentWorkspaceMember,
+    } = result.current;
+
+    act(() => {
+      setTokenPair(tokenPair);
+      setBilling(billing);
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        subscriptionStatus: 'unpaid',
+      });
+      setCurrentWorkspaceMember({
+        ...currentWorkspaceMember,
+        name: {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+      });
+    });
+
+    expect(result.current.onboardingStatus).toBe('unpaid');
+  });
 });

packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts

@@ -4,6 +4,8 @@ import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 export enum OnboardingStatus {
   Incomplete = 'incomplete',
   Canceled = 'canceled',
+  Unpaid = 'unpaid',
+  PastDue = 'past_due',
   OngoingUserCreation = 'ongoing_user_creation',
   OngoingWorkspaceActivation = 'ongoing_workspace_activation',
   OngoingProfileCreation = 'ongoing_profile_creation',
@@ -41,10 +43,6 @@ export const getOnboardingStatus = ({
     return OnboardingStatus.Incomplete;
   }
 
-  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'canceled') {
-    return OnboardingStatus.Canceled;
-  }
-
   if (currentWorkspace.activationStatus !== 'active') {
     return OnboardingStatus.OngoingWorkspaceActivation;
   }
@@ -56,5 +54,17 @@ export const getOnboardingStatus = ({
     return OnboardingStatus.OngoingProfileCreation;
   }
 
+  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'canceled') {
+    return OnboardingStatus.Canceled;
+  }
+
+  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'past_due') {
+    return OnboardingStatus.PastDue;
+  }
+
+  if (isBillingEnabled && currentWorkspace.subscriptionStatus === 'unpaid') {
+    return OnboardingStatus.Unpaid;
+  }
+
   return OnboardingStatus.Completed;
 };

packages/twenty-front/src/modules/billing/components/ManageYourSubscription.tsx

@@ -1,24 +0,0 @@
-import { IconCreditCard } from '@/ui/display/icon';
-import { Button } from '@/ui/input/button/components/Button';
-import { useBillingPortalSessionQuery } from '~/generated/graphql.tsx';
-export const ManageYourSubscription = () => {
-  const { data, loading } = useBillingPortalSessionQuery({
-    variables: {
-      returnUrlPath: '/settings/billing',
-    },
-  });
-  const handleButtonClick = () => {
-    if (data) {
-      window.location.replace(data.billingPortalSession.url);
-    }
-  };
-  return (
-    <Button
-      Icon={IconCreditCard}
-      title="View billing details"
-      variant="secondary"
-      onClick={handleButtonClick}
-      disabled={loading}
-    />
-  );
-};

packages/twenty-front/src/modules/ui/display/info/components/Info.tsx

@@ -0,0 +1,65 @@
+import React from 'react';
+import { css, useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+
+import { IconInfoCircle } from '@/ui/display/icon';
+import { Button } from '@/ui/input/button/components/Button.tsx';
+
+export type InfoAccent = 'blue' | 'danger';
+export type InfoProps = {
+  accent?: InfoAccent;
+  text: string;
+  buttonTitle: string;
+  onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+};
+
+const StyledTextContainer = styled.div`
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledInfo = styled.div<Pick<InfoProps, 'accent'>>`
+  align-items: center;
+  border-radius: ${({ theme }) => theme.border.radius.md};
+  display: flex;
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  justify-content: space-between;
+  max-width: 512px;
+  padding: ${({ theme }) => theme.spacing(2)};
+  ${({ theme, accent }) => {
+    switch (accent) {
+      case 'blue':
+        return css`
+          background: ${theme.color.blueAccent20};
+          color: ${theme.color.blue50};
+        `;
+      case 'danger':
+        return css`
+          background: ${theme.color.red10};
+          color: ${theme.color.red};
+        `;
+    }
+  }}
+`;
+export const Info = ({
+  accent = 'blue',
+  text,
+  buttonTitle,
+  onClick,
+}: InfoProps) => {
+  const theme = useTheme();
+  return (
+    <StyledInfo accent={accent}>
+      <StyledTextContainer>
+        <IconInfoCircle size={theme.icon.size.md} />
+        {text}
+      </StyledTextContainer>
+      <Button
+        title={buttonTitle}
+        onClick={onClick}
+        size={'small'}
+        variant={'secondary'}
+      />
+    </StyledInfo>
+  );
+};

packages/twenty-front/src/modules/ui/display/info/components/__stories__/Info.stories.tsx

@@ -0,0 +1,45 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { Info, InfoAccent } from '@/ui/display/info/components/Info.tsx';
+import { CatalogDecorator } from '~/testing/decorators/CatalogDecorator.tsx';
+import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator.tsx';
+import { CatalogStory } from '~/testing/types.ts';
+
+const meta: Meta<typeof Info> = {
+  title: 'UI/Display/Info/Info',
+  component: Info,
+};
+
+export default meta;
+type Story = StoryObj<typeof Info>;
+
+export const Default: Story = {
+  args: {
+    accent: 'blue',
+    text: 'An info component',
+    buttonTitle: 'Update',
+  },
+  decorators: [ComponentDecorator],
+};
+
+export const Catalog: CatalogStory<Story, typeof Info> = {
+  args: {
+    text: 'An info component',
+    buttonTitle: 'Update',
+  },
+  argTypes: {
+    accent: { control: false },
+  },
+  parameters: {
+    catalog: {
+      dimensions: [
+        {
+          name: 'accents',
+          values: ['blue', 'danger'] satisfies InfoAccent[],
+          props: (accent: InfoAccent) => ({ accent }),
+        },
+      ],
+    },
+  },
+  decorators: [CatalogDecorator],
+};

packages/twenty-front/src/modules/ui/layout/page/DefaultLayout.tsx

@@ -76,7 +76,13 @@ export const DefaultLayout = ({ children }: DefaultLayoutProps) => {
   const isMatchingLocation = useIsMatchingLocation();
   const showAuthModal = useMemo(() => {
     return (
-      (onboardingStatus && onboardingStatus !== OnboardingStatus.Completed) ||
+      (onboardingStatus &&
+        [
+          OnboardingStatus.Incomplete,
+          OnboardingStatus.OngoingUserCreation,
+          OnboardingStatus.OngoingProfileCreation,
+          OnboardingStatus.OngoingWorkspaceActivation,
+        ].includes(onboardingStatus)) ||
       isMatchingLocation(AppPath.ResetPassword)
     );
   }, [isMatchingLocation, onboardingStatus]);