Skip to content

The open alternative to Salesforce, designed for AI.

[Forms 2/5] Keep the record creation form open when creation fails (#26422)

Thomas des Francs195bfb0c45b3
diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx
index 66b12285b4b..544ff551f6b 100644
--- a/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx
@@ -1,5 +1,4 @@
import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
-import { styled } from '@linaria/react';
import {
type Decorator,
type Meta,
@@ -7,7 +6,6 @@ import {
} from '@storybook/react-vite';
import { Provider as JotaiProvider } from 'jotai';
import { HttpResponse, graphql } from 'msw';
-import { useState, type PropsWithChildren } from 'react';
import { Context as ResponsiveContext } from 'react-responsive';
import { MemoryRouter } from 'react-router-dom';
import { expect, fn, spyOn, userEvent, waitFor, within } from 'storybook/test';
@@ -21,7 +19,6 @@ import { CommandMenuComponentInstanceContext } from '@/command-menu/states/conte
import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';
-import { AppToaster } from '@/ui/feedback/toast/components/AppToaster';
import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
import { navigationDrawerActiveTabState } from '@/ui/navigation/states/navigationDrawerActiveTabState';
import { NAVIGATION_DRAWER_TABS } from '@/ui/navigation/states/navigationDrawerTabs';
@@ -36,6 +33,7 @@ import {
EngineComponentKey,
type CommandMenuItemFieldsFragment,
} from '~/generated-metadata/graphql';
+import { ToastStoryContainer } from '~/testing/components/ToastStoryContainer';
import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
@@ -43,26 +41,6 @@ import { mockedWorkspaceMemberData } from '~/testing/mock-data/users';
const PINNED_ITEM_WIDTH = 100;
-// CI zeroes animation durations, which would immediately dismiss toasts.
-const StyledStoryContainer = styled.div`
- [role='status'] * {
- animation: none !important;
- }
-`;
-
-const ToastStoryContainer = ({ children }: PropsWithChildren) => {
- const [toastContainer, setToastContainer] = useState<HTMLDivElement | null>(
- null,
- );
-
- return (
- <StyledStoryContainer ref={setToastContainer}>
- <AppToaster container={toastContainer} />
- {children}
- </StyledStoryContainer>
- );
-};
-
const createCommandMenuItem = (
overrides: Partial<CommandMenuItemFieldsFragment> &
Pick<CommandMenuItemFieldsFragment, 'id' | 'label'>,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCreateNewRecord.ts b/packages/twenty-front/src/modules/object-record/hooks/useCreateNewRecord.ts
index c6c7d97b401..34c605a0362 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateNewRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateNewRecord.ts
@@ -74,13 +74,40 @@ export const useCreateNewRecord = ({
...mergedRecordInput,
});
+ return createdRecord;
+ },
+ [buildRecordInputFromRLSPredicates, buildRecordInput, createOneRecord],
+ );
+
+ const createNewRecord = useCallback(
+ async (recordInput?: Partial<ObjectRecord>) => {
+ let submittedRecordInput = recordInput;
+
+ const createdRecord = await requestRecordCreation({
+ initialDraftRecord: {
+ ...buildRecordInputFromRLSPredicates(),
+ ...buildRecordInput?.(),
+ ...recordInput,
+ },
+ createRecord: (draftRecord) => {
+ submittedRecordInput = { ...recordInput, ...draftRecord };
+ return createRecord(submittedRecordInput);
+ },
+ });
+
+ if (!isDefined(createdRecord)) {
+ return;
+ }
+
+ const recordId = createdRecord.id;
+
const labelIdentifierFieldMetadataItem =
getLabelIdentifierFieldMetadataItem(objectMetadataItem);
const shouldOpenLabelIdentifierInEditMode =
!isDefined(labelIdentifierFieldMetadataItem) ||
!isDefined(
- recordInput?.[
+ submittedRecordInput?.[
getFieldMetadataItemGqlFieldName(labelIdentifierFieldMetadataItem)
],
);
@@ -116,47 +143,28 @@ export const useCreateNewRecord = ({
});
}
- onRecordCreated?.({ record: createdRecord, recordInput });
-
+ onRecordCreated?.({
+ record: createdRecord,
+ recordInput: submittedRecordInput,
+ });
upsertRecordsInStore({ partialRecords: [createdRecord] });
return createdRecord;
},
[
- store,
buildRecordInputFromRLSPredicates,
buildRecordInput,
- onRecordCreated,
- createOneRecord,
+ createRecord,
+ store,
navigate,
objectMetadataItem,
openRecordInSidePanel,
openRecordIn,
- upsertRecordsInStore,
closeSidePanelMenu,
workspaceSurface.type,
- ],
- );
-
- const createNewRecord = useCallback(
- async (recordInput?: Partial<ObjectRecord>) => {
- const createdRecord = await requestRecordCreation({
- initialDraftRecord: {
- ...buildRecordInputFromRLSPredicates(),
- ...buildRecordInput?.(),
- ...recordInput,
- },
- createRecord: (draftRecord) =>
- createRecord({ ...recordInput, ...draftRecord }),
- });
-
- return createdRecord ?? undefined;
- },
- [
- buildRecordInputFromRLSPredicates,
- buildRecordInput,
- createRecord,
requestRecordCreation,
+ onRecordCreated,
+ upsertRecordsInStore,
],
);
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordCreationFormProvider.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordCreationFormProvider.tsx
index 8c0e343fd1b..584dfc6a75b 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/components/RecordCreationFormProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordCreationFormProvider.tsx
@@ -1,3 +1,6 @@
+import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
+import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
+import { useToast } from 'twenty-ui/primitives/feedback';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { RecordCreationFormCancellationEffect } from '@/object-record/record-form/components/RecordCreationFormCancellationEffect';
import {
@@ -17,7 +20,6 @@ import { v4 } from 'uuid';
type PendingRecordCreation = {
requestId: string;
- objectMetadataLabelSingular: string;
createRecord: (draftRecord: Partial<ObjectRecord>) => Promise<ObjectRecord>;
resolve: (createdRecord: ObjectRecord | null) => void;
isSettling: boolean;
@@ -31,6 +33,8 @@ export const RecordCreationFormProvider = ({
children,
}: RecordCreationFormProviderProps) => {
const store = useStore();
+ const { enqueueToast } = useToast();
+ const { removePageFromSidePanelHistory } = useSidePanelHistory();
const { navigateSidePanelMenu } = useSidePanelMenu();
const [pendingRecordCreations, setPendingRecordCreations] = useState<
@@ -76,18 +80,11 @@ export const RecordCreationFormProvider = ({
),
);
- try {
- const createdRecord =
- await pendingRecordCreation.createRecord(draftRecord);
-
- pendingRecordCreation.resolve(createdRecord);
+ let createdRecord: ObjectRecord;
- setPendingRecordCreations((previousPendingRecordCreations) =>
- previousPendingRecordCreations.filter(
- (candidate) => candidate.requestId !== requestId,
- ),
- );
- } catch {
+ try {
+ createdRecord = await pendingRecordCreation.createRecord(draftRecord);
+ } catch (error) {
setPendingRecordCreations((previousPendingRecordCreations) =>
previousPendingRecordCreations.map((candidate) =>
candidate.requestId === requestId
@@ -96,15 +93,22 @@ export const RecordCreationFormProvider = ({
),
);
- navigateSidePanelMenu({
- page: SidePanelPages.RecordCreationForm,
- pageTitle: t`New ${pendingRecordCreation.objectMetadataLabelSingular}`,
- pageIcon: IconPlus,
- pageId: requestId,
- });
+ enqueueToast(getToastOptionsFromError({ error }));
+
+ return;
}
+
+ removePageFromSidePanelHistory(requestId);
+
+ pendingRecordCreation.resolve(createdRecord);
+
+ setPendingRecordCreations((previousPendingRecordCreations) =>
+ previousPendingRecordCreations.filter(
+ (candidate) => candidate.requestId !== requestId,
+ ),
+ );
},
- [navigateSidePanelMenu, pendingRecordCreations],
+ [enqueueToast, pendingRecordCreations, removePageFromSidePanelHistory],
);
const requestRecordCreation = useCallback(
@@ -137,7 +141,6 @@ export const RecordCreationFormProvider = ({
...previousPendingRecordCreations,
{
requestId,
- objectMetadataLabelSingular: objectMetadataItem.labelSingular,
createRecord,
resolve,
isSettling: false,
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/__tests__/RecordCreationFormProvider.test.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/__tests__/RecordCreationFormProvider.test.tsx
new file mode 100644
index 00000000000..65d32dcb378
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/__tests__/RecordCreationFormProvider.test.tsx
@@ -0,0 +1,90 @@
+import { RecordCreationFormProvider } from '@/object-record/record-form/components/RecordCreationFormProvider';
+import { useRecordCreationFormContextOrThrow } from '@/object-record/record-form/contexts/RecordCreationFormContext';
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
+import {
+ sidePanelNavigationStackState,
+ type SidePanelNavigationStackItem,
+} from '@/side-panel/states/sidePanelNavigationStackState';
+import { act, renderHook } from '@testing-library/react';
+import { createStore, Provider } from 'jotai';
+import { type ReactNode } from 'react';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+
+const mockNavigateSidePanelMenu = jest.fn();
+const mockCloseSidePanelMenu = jest.fn();
+
+jest.mock('@/side-panel/hooks/useSidePanelMenu', () => ({
+ useSidePanelMenu: () => ({
+ navigateSidePanelMenu: mockNavigateSidePanelMenu,
+ closeSidePanelMenu: mockCloseSidePanelMenu,
+ }),
+}));
+jest.mock('twenty-ui/primitives/feedback', () => ({
+ useToast: () => ({ enqueueToast: jest.fn() }),
+}));
+
+const setup = () => {
+ const store = createStore();
+ mockNavigateSidePanelMenu.mockImplementation(
+ (page: SidePanelNavigationStackItem) => {
+ store.set(isSidePanelOpenedState.atom, true);
+ store.set(sidePanelNavigationStackState.atom, [page]);
+ },
+ );
+ const wrapper = ({ children }: { children: ReactNode }) => (
+ <Provider store={store}>
+ <RecordCreationFormProvider>{children}</RecordCreationFormProvider>
+ </Provider>
+ );
+ return {
+ ...renderHook(useRecordCreationFormContextOrThrow, { wrapper }),
+ store,
+ };
+};
+
+beforeEach(() => jest.clearAllMocks());
+
+it('removes the form from deeper in the history when the user moved on before creation finished', async () => {
+ const { result, store } = setup();
+ let completeCreation: (record: ObjectRecord) => void = () => {};
+ const createRecord = jest.fn(
+ () =>
+ new Promise<ObjectRecord>((resolve) => {
+ completeCreation = resolve;
+ }),
+ );
+ act(() => {
+ void result.current.requestRecordCreation({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('company'),
+ createRecord,
+ });
+ });
+ const [formPage] = store.get(sidePanelNavigationStackState.atom);
+ let submission: Promise<void> | undefined;
+ act(() => {
+ submission = result.current.settleRecordCreationDraft({
+ requestId: formPage.pageId,
+ draftRecord: { name: 'Test' },
+ });
+ });
+ await act(async () => {
+ await result.current.settleRecordCreationDraft({
+ requestId: formPage.pageId,
+ draftRecord: { name: 'Test' },
+ });
+ });
+ expect(createRecord).toHaveBeenCalledTimes(1);
+
+ const otherPage = { ...formPage, pageId: 'other-page' };
+ act(() => {
+ store.set(sidePanelNavigationStackState.atom, [formPage, otherPage]);
+ });
+ await act(async () => {
+ completeCreation({ id: 'created-company', __typename: 'Company' });
+ await submission;
+ });
+
+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
+ expect(store.get(sidePanelNavigationStackState.atom)).toEqual([otherPage]);
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-form/contexts/RecordCreationFormContext.ts b/packages/twenty-front/src/modules/object-record/record-form/contexts/RecordCreationFormContext.ts
index 9f617447d1e..d1000127cd9 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/contexts/RecordCreationFormContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-form/contexts/RecordCreationFormContext.ts
@@ -11,7 +11,7 @@ export type RecordCreationFormContextValue = {
settleRecordCreationDraft: (params: {
requestId: string;
draftRecord: Partial<ObjectRecord> | null;
- }) => void;
+ }) => Promise<void>;
};
export const [
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx
index 0bff74f1131..2404e30fee8 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSidePanelHistory.test.tsx
@@ -163,6 +163,46 @@ describe('useSidePanelHistory', () => {
expect(jotaiStore.get(sidePanelNavigationStackState.atom)).toEqual([]);
});
+ it('removes a page from deeper in the history and keeps the current one', () => {
+ const { result } = renderHooks();
+
+ act(() => {
+ result.current.commandMenu.navigateSidePanelMenu({
+ page: SidePanelPages.RecordCreationForm,
+ pageTitle: 'Create Company',
+ pageIcon: IconList,
+ pageId: 'creation-form',
+ });
+ });
+
+ act(() => {
+ result.current.commandMenu.navigateSidePanelMenu({
+ page: SidePanelPages.SearchRecords,
+ pageTitle: 'Search',
+ pageIcon: IconSearch,
+ pageId: 'search',
+ });
+ });
+
+ act(() => {
+ result.current.commandMenuHistory.removePageFromSidePanelHistory(
+ 'creation-form',
+ );
+ });
+
+ const navigationStack = jotaiStore.get(sidePanelNavigationStackState.atom);
+ expect(navigationStack.map(({ pageId }) => pageId)).not.toContain(
+ 'creation-form',
+ );
+ expect(navigationStack.at(-1)?.pageId).toBe('search');
+ expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(true);
+
+ act(() => {
+ result.current.commandMenu.closeSidePanelMenu();
+ result.current.sidePanelCloseAnimationCompleteCleanup.sidePanelCloseAnimationCompleteCleanup();
+ });
+ });
+
it('should navigate to a page in history', () => {
const { result } = renderHooks();
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelHistory.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelHistory.ts
index be59f9a89f8..2e7b565efa9 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelHistory.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelHistory.ts
@@ -16,45 +16,44 @@ export const useSidePanelHistory = () => {
const store = useStore();
const { closeSidePanelMenu } = useSidePanelMenu();
- const cleanupCurrentPage = useCallback(() => {
- const currentNavigationStack = store.get(
- sidePanelNavigationStackState.atom,
- );
-
- const currentMorphItems = store.get(
- sidePanelNavigationMorphItemsByPageState.atom,
- );
+ const cleanupPage = useCallback(
+ (pageId: string) => {
+ const currentMorphItems = store.get(
+ sidePanelNavigationMorphItemsByPageState.atom,
+ );
- if (currentNavigationStack.length > 0) {
- const removedItem = currentNavigationStack.at(-1);
+ const newMorphItems = new Map(currentMorphItems);
+ newMorphItems.delete(pageId);
+ store.set(sidePanelNavigationMorphItemsByPageState.atom, newMorphItems);
- if (isDefined(removedItem)) {
- const newMorphItems = new Map(currentMorphItems);
- newMorphItems.delete(removedItem.pageId);
- store.set(sidePanelNavigationMorphItemsByPageState.atom, newMorphItems);
+ store.set(
+ sidePanelSubPageStackComponentState.atomFamily({ instanceId: pageId }),
+ [],
+ );
+ const morphItems = currentMorphItems.get(pageId);
+ if (isNonEmptyArray(morphItems)) {
store.set(
- sidePanelSubPageStackComponentState.atomFamily({
- instanceId: removedItem.pageId,
+ activeTabIdComponentState.atomFamily({
+ instanceId: getShowPageTabListComponentId({
+ pageId,
+ targetObjectId: morphItems[0].recordId,
+ }),
}),
- [],
+ null,
);
-
- const morphItems = currentMorphItems.get(removedItem.pageId);
- if (isNonEmptyArray(morphItems)) {
- store.set(
- activeTabIdComponentState.atomFamily({
- instanceId: getShowPageTabListComponentId({
- pageId: removedItem.pageId,
- targetObjectId: morphItems[0].recordId,
- }),
- }),
- null,
- );
- }
}
+ },
+ [store],
+ );
+
+ const cleanupCurrentPage = useCallback(() => {
+ const removedItem = store.get(sidePanelNavigationStackState.atom).at(-1);
+
+ if (isDefined(removedItem)) {
+ cleanupPage(removedItem.pageId);
}
- }, [store]);
+ }, [cleanupPage, store]);
const goBackFromSidePanel = useCallback(() => {
const currentNavigationStack = store.get(
@@ -78,6 +77,36 @@ export const useSidePanelHistory = () => {
store.set(hasUserSelectedSidePanelListItemState.atom, false);
}, [cleanupCurrentPage, closeSidePanelMenu, store]);
+ const removePageFromSidePanelHistory = useCallback(
+ (pageId: string) => {
+ const currentNavigationStack = store.get(
+ sidePanelNavigationStackState.atom,
+ );
+
+ if (currentNavigationStack.at(-1)?.pageId === pageId) {
+ goBackFromSidePanel();
+ return;
+ }
+
+ const removedItems = currentNavigationStack.filter(
+ (item) => item.pageId === pageId,
+ );
+
+ if (!isNonEmptyArray(removedItems)) {
+ return;
+ }
+
+ const remainingItems = currentNavigationStack.filter(
+ (item) => item.pageId !== pageId,
+ );
+
+ cleanupPage(pageId);
+ store.set(sidePanelNavigationStackState.atom, remainingItems);
+ releaseRemovedRoutedFlowStateScopes({ removedItems, remainingItems });
+ },
+ [cleanupPage, goBackFromSidePanel, store],
+ );
+
const goBackOneSubPageOrMainPage = useCallback(() => {
const currentNavigationItem = store
.get(sidePanelNavigationStackState.atom)
@@ -174,5 +203,6 @@ export const useSidePanelHistory = () => {
goBackFromSidePanel,
goBackOneSubPageOrMainPage,
navigateSidePanelHistory,
+ removePageFromSidePanelHistory,
};
};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx
index 633446802bf..dbdd5e746c8 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx
@@ -12,7 +12,6 @@ import { useRecordCreationFormSettle } from '@/object-record/record-form/hooks/u
import { useRecordFormFieldMetadataItems } from '@/object-record/record-form/hooks/useRecordFormFieldMetadataItems';
import { computeRecordFormCreateRecordInput } from '@/object-record/record-form/utils/computeRecordFormCreateRecordInput';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
import { recordCreationFormDraftComponentState } from '@/side-panel/pages/record-creation-form/states/recordCreationFormDraftComponentState';
import { recordCreationFormRequestComponentState } from '@/side-panel/pages/record-creation-form/states/recordCreationFormRequestComponentState';
import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';
@@ -79,7 +78,6 @@ const SidePanelRecordCreationForm = ({
const { theme } = useContext(ThemeContext);
const { settleRecordCreationDraft } = useRecordCreationFormSettle();
- const { goBackFromSidePanel } = useSidePanelHistory();
const [recordCreationFormDraft, setRecordCreationFormDraft] =
useAtomComponentState(recordCreationFormDraftComponentState);
@@ -107,21 +105,24 @@ const SidePanelRecordCreationForm = ({
}));
};
- const handleCreateClick = () => {
+ const handleCreateClick = async () => {
if (isSubmitting) {
return;
}
setIsSubmitting(true);
- settleRecordCreationDraft({
- requestId,
- draftRecord: computeRecordFormCreateRecordInput({
- draftRecord,
- fieldMetadataItems: recordFormFieldMetadataItems,
- objectMetadataItems,
- }),
- });
- goBackFromSidePanel();
+ try {
+ await settleRecordCreationDraft({
+ requestId,
+ draftRecord: computeRecordFormCreateRecordInput({
+ draftRecord,
+ fieldMetadataItems: recordFormFieldMetadataItems,
+ objectMetadataItems,
+ }),
+ });
+ } finally {
+ setIsSubmitting(false);
+ }
};
const containerRef = useHotkeysOnFocusedElement({
@@ -163,7 +164,7 @@ const SidePanelRecordCreationForm = ({
startIcon={<IconPlus />}
size="sm"
onClick={handleCreateClick}
- disabled={isSubmitting}
+ loading={isSubmitting}
hotkeys={[getOsControlSymbol(), '⏎']}
data-testid="record-creation-form-create-button"
variant="solid"
diff --git a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx
index 5efb6286b9b..70e69cc10b5 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/__stories__/RecordCreationFlow.stories.tsx
@@ -50,6 +50,7 @@ import {
WidgetConfigurationType,
WidgetType,
} from '~/generated-metadata/graphql';
+import { ToastStoryContainer } from '~/testing/components/ToastStoryContainer';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
@@ -349,6 +350,73 @@ const submitCompany = async (canvasElement: HTMLElement, shortcut?: string) => {
export const SubmitWithButton: Story = {
play: ({ canvasElement }) => submitCompany(canvasElement),
};
+
+const REJECTED_COMPANY_NAME = 'Taken name';
+
+export const RetryAfterFailedCreation: Story = {
+ decorators: [
+ (Story) => (
+ <ToastStoryContainer>
+ <Story />
+ </ToastStoryContainer>
+ ),
+ ],
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.mutation('CreateOneCompany', ({ variables }) => {
+ if (variables.input.name !== REJECTED_COMPANY_NAME) {
+ return;
+ }
+ createCompanyRequest(variables.input);
+ return HttpResponse.json({
+ errors: [
+ {
+ message: 'Duplicate company name',
+ extensions: {
+ userFriendlyMessage: 'This company name is already taken',
+ },
+ },
+ ],
+ });
+ }),
+ ...meta.parameters.msw.handlers,
+ ],
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await userEvent.click(
+ await canvas.findByRole('button', { name: /Create company/ }),
+ );
+ const nameInput = await canvas.findByRole('textbox');
+ await userEvent.click(nameInput);
+ await userEvent.clear(nameInput);
+ await userEvent.type(nameInput, REJECTED_COMPANY_NAME);
+ const createButton = canvas.getByTestId(
+ 'record-creation-form-create-button',
+ );
+ await userEvent.click(createButton);
+
+ await expect(
+ await canvas.findByText('This company name is already taken'),
+ ).toBeVisible();
+ await waitFor(() => expect(createButton).toBeEnabled());
+ await expect(nameInput).toHaveTextContent(REJECTED_COMPANY_NAME);
+ await expect(onRecordCreated).not.toHaveBeenCalled();
+
+ await userEvent.clear(nameInput);
+ await userEvent.type(nameInput, 'Acme');
+ await userEvent.click(createButton);
+
+ await expect(
+ await canvas.findByText('Created Acme with 10 employees'),
+ ).toBeVisible();
+ await expect(createCompanyRequest).toHaveBeenCalledTimes(2);
+ await expect(onRecordCreated).toHaveBeenCalledTimes(1);
+ },
+};
+
export const Cancel: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
diff --git a/packages/twenty-front/src/testing/components/ToastStoryContainer.tsx b/packages/twenty-front/src/testing/components/ToastStoryContainer.tsx
new file mode 100644
index 00000000000..00a7a8fabc7
--- /dev/null
+++ b/packages/twenty-front/src/testing/components/ToastStoryContainer.tsx
@@ -0,0 +1,27 @@
+import { AppToaster } from '@/ui/feedback/toast/components/AppToaster';
+import { styled } from '@linaria/react';
+import { useState, type ReactNode } from 'react';
+
+// CI zeroes animation durations, which would immediately dismiss toasts.
+const StyledStoryContainer = styled.div`
+ [role='status'] * {
+ animation: none !important;
+ }
+`;
+
+type ToastStoryContainerProps = {
+ children: ReactNode;
+};
+
+export const ToastStoryContainer = ({ children }: ToastStoryContainerProps) => {
+ const [toastContainer, setToastContainer] = useState<HTMLDivElement | null>(
+ null,
+ );
+
+ return (
+ <StyledStoryContainer ref={setToastContainer}>
+ <AppToaster container={toastContainer} />
+ {children}
+ </StyledStoryContainer>
+ );
+};