Skip to content

The open alternative to Salesforce, designed for AI.

Stop stacking record creation forms on repeated Create clicks (#27736)

Thomas Trompette88db862ff1f7
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 fcadbd2597c..20571acf5f1 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
@@ -8,6 +8,8 @@ import {
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { recordCreationFormRequestComponentState } from '@/side-panel/pages/record-creation-form/states/recordCreationFormRequestComponentState';
+import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
+import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
import { t } from '@lingui/core/macro';
import { useStore } from 'jotai';
import { type ReactNode, useCallback, useMemo, useState } from 'react';
@@ -120,6 +122,21 @@ export const RecordCreationFormProvider = ({
draftRecord: Partial<ObjectRecord>,
) => Promise<ObjectRecord>;
}) => {
+ const topSidePanelPage = store.get(isSidePanelOpenedState.atom)
+ ? store.get(sidePanelNavigationStackState.atom).at(-1)
+ : undefined;
+
+ if (
+ topSidePanelPage?.page === SidePanelPages.RecordCreationForm &&
+ store.get(
+ recordCreationFormRequestComponentState.atomFamily({
+ instanceId: topSidePanelPage.pageId,
+ }),
+ )?.objectMetadataId === objectMetadataItem.id
+ ) {
+ return Promise.resolve(null);
+ }
+
const requestId = v4();
store.set(
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
index c5729a52165..6a1122e7c16 100644
--- 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
@@ -27,7 +27,10 @@ const setup = () => {
mockNavigateSidePanelMenu.mockImplementation(
(page: SidePanelNavigationStackItem) => {
store.set(isSidePanelOpenedState.atom, true);
- store.set(sidePanelNavigationStackState.atom, [page]);
+ store.set(sidePanelNavigationStackState.atom, [
+ ...store.get(sidePanelNavigationStackState.atom),
+ page,
+ ]);
},
);
const wrapper = ({ children }: { children: ReactNode }) => (
@@ -125,3 +128,43 @@ it('resolves with the error the server rejected the draft with and keeps the for
expect(settlement).toEqual({ error: rejection });
expect(store.get(sidePanelNavigationStackState.atom)).toEqual([formPage]);
});
+
+it('keeps the open creation form of the same object instead of stacking another', async () => {
+ const { result, store } = setup();
+ act(() => {
+ void result.current.requestRecordCreation({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('company'),
+ createRecord: jest.fn(),
+ });
+ });
+
+ let secondCreation: Promise<ObjectRecord | null> | undefined;
+ act(() => {
+ secondCreation = result.current.requestRecordCreation({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('company'),
+ createRecord: jest.fn(),
+ });
+ });
+
+ expect(store.get(sidePanelNavigationStackState.atom)).toHaveLength(1);
+ await expect(secondCreation).resolves.toBeNull();
+});
+
+it('opens a creation form for another object on top of the open one', () => {
+ const { result, store } = setup();
+ act(() => {
+ void result.current.requestRecordCreation({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('company'),
+ createRecord: jest.fn(),
+ });
+ });
+
+ act(() => {
+ void result.current.requestRecordCreation({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('person'),
+ createRecord: jest.fn(),
+ });
+ });
+
+ expect(store.get(sidePanelNavigationStackState.atom)).toHaveLength(2);
+});