Skip to content

The open alternative to Salesforce, designed for AI.

feat(record-form): make the record creation form the default path (#25907)

Thomas Trompette89a2b556424d
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 3c08da44693..8225a4e87c0 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -1995,7 +1995,6 @@ enum FeatureFlagKey {
IS_API_RATE_LIMIT_V2_ENABLED
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED
IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED
- IS_RECORD_CREATION_FORM_ENABLED
IS_RECORD_SHARING_ENABLED
IS_INITIAL_OBJECT_VIEW_ENABLED
IS_WEBHOOK_RATE_LIMIT_ENABLED
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 2a5b77b08b6..b4a9fb7fd62 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1607,7 +1607,7 @@ export interface FeatureFlag {
__typename: 'FeatureFlag'
}
-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' | 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED'
+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_API_RATE_LIMIT_V2_ENABLED' | 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' | 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' | 'IS_RECORD_SHARING_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_WEBHOOK_RATE_LIMIT_ENABLED'
export interface WorkspaceUrls {
customUrl?: Scalars['String']
@@ -10756,7 +10756,6 @@ export const enumFeatureFlagKey = {
IS_API_RATE_LIMIT_V2_ENABLED: 'IS_API_RATE_LIMIT_V2_ENABLED' as const,
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED: 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED' as const,
IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED: 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED' as const,
- IS_RECORD_CREATION_FORM_ENABLED: 'IS_RECORD_CREATION_FORM_ENABLED' as const,
IS_RECORD_SHARING_ENABLED: 'IS_RECORD_SHARING_ENABLED' as const,
IS_INITIAL_OBJECT_VIEW_ENABLED: 'IS_INITIAL_OBJECT_VIEW_ENABLED' as const,
IS_WEBHOOK_RATE_LIMIT_ENABLED: 'IS_WEBHOOK_RATE_LIMIT_ENABLED' as const
diff --git a/packages/twenty-e2e-testing/tests/create-record.spec.ts b/packages/twenty-e2e-testing/tests/create-record.spec.ts
index 151b937721a..cf472af5573 100644
--- a/packages/twenty-e2e-testing/tests/create-record.spec.ts
+++ b/packages/twenty-e2e-testing/tests/create-record.spec.ts
@@ -60,30 +60,41 @@ test('Create and update record', async ({ page }) => {
// Generate a random email for testing
const randomEmail = `testuser_${Math.random().toString(36).substring(2, 10)}@example.com`;
- // Fill first name and last name
- const firstNameInput = page.getByRole('textbox', { name: 'F‌‌irst name' });
+
+ // Fill the record creation form in the side panel
+ const firstNameInput = page.locator('[contenteditable]').filter({
+ has: page.locator('p[data-placeholder="F‌‌irst name"]'),
+ });
+ await expect(firstNameInput).toBeVisible();
+ await firstNameInput.click();
await expect(firstNameInput).toBeFocused();
- await firstNameInput.fill('John');
- const lastNameInput = page.getByPlaceholder('L‌‌ast name');
- await expect(lastNameInput).toBeVisible();
- await lastNameInput.fill('Doe');
- await lastNameInput.press('Enter');
+ await page.keyboard.type('John');
- // Focus on recordFieldList
- const recordFieldList = page.getByTestId('record-fields-widget');
- await expect(recordFieldList).toBeVisible();
- await recordFieldList.getByText('Emails').first().click();
+ const lastNameInput = page.locator('[contenteditable]').filter({
+ has: page.locator('p[data-placeholder="L‌‌ast name"]'),
+ });
+ await lastNameInput.click();
+ await expect(lastNameInput).toBeFocused();
+ await page.keyboard.type('Doe');
+
+ const emailInput = page.locator('[contenteditable]').filter({
+ has: page.locator('p[data-placeholder="Primary Email"]'),
+ });
+ await emailInput.click();
+ await expect(emailInput).toBeFocused();
+ await page.keyboard.type(randomEmail);
- // Fill email
- const emailInput = recordFieldList.getByText('Emails').nth(1);
- await expect(emailInput).toBeVisible();
- await emailInput.click({ force: true });
- await page.getByPlaceholder('Email').fill(randomEmail);
- await page.keyboard.press('Enter');
- await recordFieldList.getByText('Emails').first().click();
+ await page.getByTestId('record-creation-form-create-button').click();
+
+ // The created record opens in the side panel
+ const recordFieldList = page.getByTestId('record-fields-widget');
+ await expect(recordFieldList).toBeVisible({ timeout: 15_000 });
+ await expect(recordFieldList.getByText(randomEmail)).toBeVisible({
+ timeout: 15_000,
+ });
// Fill intro
- const introInput = recordFieldList.getByText('Intro').nth(1);
+ const introInput = recordFieldList.getByText('Intro', { exact: true }).nth(1);
await expect(introInput).toBeVisible();
await introInput.click({ force: true });
await introInput.click({ force: true });
@@ -91,8 +102,8 @@ test('Create and update record', async ({ page }) => {
await page.getByPlaceholder('Intro').press('Enter');
// Fill URL
- await recordFieldList.getByText('Linkedin').first().click();
- const urlInput = recordFieldList.getByText('Linkedin').nth(1);
+ await recordFieldList.getByText('Linkedin', { exact: true }).first().click();
+ const urlInput = recordFieldList.getByText('Linkedin', { exact: true }).nth(1);
await expect(urlInput).toBeVisible();
await urlInput.click({ force: true });
await page.getByPlaceholder('URL').fill('linkedin.com/johndoe');
@@ -100,15 +111,15 @@ test('Create and update record', async ({ page }) => {
// Click on 4th star to rate
await recordFieldList
- .getByText('Performance Rating')
+ .getByText('Performance Rating', { exact: true })
.first()
.click({ force: true });
const ratingContainer = recordFieldList.locator('div[aria-label="Rating"]');
await ratingContainer.locator('svg').nth(3).click({ force: true });
// Fill phone field
- await recordFieldList.getByText('Phones').first().click();
- const phoneInput = recordFieldList.getByText('Phones').nth(1);
+ await recordFieldList.getByText('Phones', { exact: true }).first().click();
+ const phoneInput = recordFieldList.getByText('Phones', { exact: true }).nth(1);
await expect(phoneInput).toBeVisible();
await phoneInput.click({ force: true });
await page.getByPlaceholder('Phone').fill('+336 1 122 3344');
@@ -116,16 +127,19 @@ test('Create and update record', async ({ page }) => {
// Fill work preference
await recordFieldList
- .getByText('Work Preference')
+ .getByText('Work Preference', { exact: true })
.first()
.click({ force: true });
await recordFieldList
- .getByText('Work Preference')
+ .getByText('Work Preference', { exact: true })
.nth(1)
.click({ force: true });
const options = page.getByRole('listbox');
await options.getByText('Hybrid').first().click({ force: true });
- recordFieldList.getByText('Work Preference').first().click({ force: true });
+ await recordFieldList
+ .getByText('Work Preference', { exact: true })
+ .first()
+ .click({ force: true });
// Open full record page to get person ID
await page.getByRole('button', { name: 'Expand record' }).click();
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index 3ea5d512feb..91af30a0202 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -433,7 +433,6 @@ export enum FeatureFlagKey {
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED = 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED',
- IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index d4e70ccf40d..5748e32331e 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -2054,7 +2054,6 @@ export enum FeatureFlagKey {
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED = 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED',
- IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',
diff --git a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx
index 6d7e2041879..10afa181ae8 100644
--- a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx
@@ -40,13 +40,11 @@ export const CommandMenuContextProviderContent = ({
}: CommandMenuContextProviderContentProps) => {
const commandMenuItems = useAtomStateValue(commandMenuItemsSelector);
const {
- isRecordCreationFormEnabled,
hasGlobalRecordCreationCommandTemplate,
globalRecordCreationCommandMenuItems,
} = useGlobalRecordCreationCommandMenuItems(commandMenuItems);
const shouldDisplayGlobalRecordCreationCommands =
containerType === CommandMenuItemContainerType.CommandMenuList &&
- isRecordCreationFormEnabled &&
hasGlobalRecordCreationCommandTemplate;
const isLayoutCustomizationAllowedOnCurrentPage =
useIsLayoutCustomizationAllowedOnCurrentPage();
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useGlobalRecordCreationCommandMenuItems.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useGlobalRecordCreationCommandMenuItems.ts
index fee1c2847cb..6b5ed20d08e 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useGlobalRecordCreationCommandMenuItems.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useGlobalRecordCreationCommandMenuItems.ts
@@ -2,10 +2,8 @@ import { buildGlobalRecordCreationCommandMenuItems } from '@/command-menu-item/u
import { type CommandMenuItemDefinition } from '@/command-menu-item/types/CommandMenuItemDefinition';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { useLingui } from '@lingui/react/macro';
import { useMemo } from 'react';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { EngineComponentKey } from '~/generated-metadata/graphql';
@@ -13,9 +11,6 @@ export const useGlobalRecordCreationCommandMenuItems = (
commandMenuItems: CommandMenuItemDefinition[],
) => {
const { t } = useLingui();
- const isRecordCreationFormEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED,
- );
const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
const createRecordCommand = commandMenuItems.find(
@@ -26,7 +21,7 @@ export const useGlobalRecordCreationCommandMenuItems = (
const hasGlobalRecordCreationCommandTemplate = isDefined(createRecordCommand);
const globalRecordCreationCommandMenuItems = useMemo(() => {
- if (!isRecordCreationFormEnabled || !isDefined(createRecordCommand)) {
+ if (!isDefined(createRecordCommand)) {
return [];
}
@@ -37,7 +32,6 @@ export const useGlobalRecordCreationCommandMenuItems = (
getLabel: (objectLabelSingular) => t`Create ${objectLabelSingular}`,
});
}, [
- isRecordCreationFormEnabled,
createRecordCommand,
activeObjectMetadataItems,
objectPermissionsByObjectMetadataId,
@@ -45,7 +39,6 @@ export const useGlobalRecordCreationCommandMenuItems = (
]);
return {
- isRecordCreationFormEnabled,
hasGlobalRecordCreationCommandTemplate,
globalRecordCreationCommandMenuItems,
};
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 f6ce06500c8..07d347d464c 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useCreateNewRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useCreateNewRecord.ts
@@ -48,8 +48,9 @@ export const useCreateNewRecord = ({
const { upsertRecordsInStore } = useUpsertRecordsInStore();
- const { shouldOpenRecordCreationForm, requestRecordCreation } =
- useRecordCreationForm({ objectMetadataItem });
+ const { requestRecordCreation } = useRecordCreationForm({
+ objectMetadataItem,
+ });
const navigate = useNavigateApp();
@@ -141,10 +142,6 @@ export const useCreateNewRecord = ({
const createNewRecord = useCallback(
async (recordInput?: Partial<ObjectRecord>) => {
- if (!shouldOpenRecordCreationForm) {
- return createRecord(recordInput);
- }
-
const createdRecord = await requestRecordCreation({
initialDraftRecord: {
...buildRecordInputFromRLSPredicates(),
@@ -162,7 +159,6 @@ export const useCreateNewRecord = ({
buildRecordInput,
createRecord,
requestRecordCreation,
- shouldOpenRecordCreationForm,
],
);
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 552003885a4..b32b6ec033d 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,7 +1,7 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { RecordCreationFormCancellationEffect } from '@/object-record/record-form/components/RecordCreationFormCancellationEffect';
import {
- RecordCreationFormContext,
+ RecordCreationFormContextProvider,
type RecordCreationFormContextValue,
} from '@/object-record/record-form/contexts/RecordCreationFormContext';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
@@ -168,7 +168,7 @@ export const RecordCreationFormProvider = ({
);
return (
- <RecordCreationFormContext.Provider value={contextValue}>
+ <RecordCreationFormContextProvider value={contextValue}>
{children}
{pendingRecordCreations.map(({ requestId }) => (
<RecordCreationFormCancellationEffect
@@ -177,6 +177,6 @@ export const RecordCreationFormProvider = ({
onCancel={cancelPendingRecordCreation}
/>
))}
- </RecordCreationFormContext.Provider>
+ </RecordCreationFormContextProvider>
);
};
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 6eb6747dfdc..9f617447d1e 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
@@ -1,6 +1,6 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { createContext } from 'react';
+import { createRequiredContext } from '~/utils/createRequiredContext';
export type RecordCreationFormContextValue = {
requestRecordCreation: (params: {
@@ -14,5 +14,9 @@ export type RecordCreationFormContextValue = {
}) => void;
};
-export const RecordCreationFormContext =
- createContext<RecordCreationFormContextValue | null>(null);
+export const [
+ RecordCreationFormContextProvider,
+ useRecordCreationFormContextOrThrow,
+] = createRequiredContext<RecordCreationFormContextValue>(
+ 'RecordCreationFormContext',
+);
diff --git a/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationForm.ts b/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationForm.ts
index d53cebcaf0e..a8576c3cf0d 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationForm.ts
+++ b/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationForm.ts
@@ -1,31 +1,15 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { RecordCreationFormContext } from '@/object-record/record-form/contexts/RecordCreationFormContext';
-import { useRecordFormFieldMetadataItems } from '@/object-record/record-form/hooks/useRecordFormFieldMetadataItems';
+import { useRecordCreationFormContextOrThrow } from '@/object-record/record-form/contexts/RecordCreationFormContext';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { useCallback, useContext } from 'react';
-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
+import { useCallback } from 'react';
export const useRecordCreationForm = ({
objectMetadataItem,
}: {
objectMetadataItem: EnrichedObjectMetadataItem;
}) => {
- const recordCreationFormContext = useContext(RecordCreationFormContext);
-
- const isRecordCreationFormEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED,
- );
-
- const { recordFormFieldMetadataItems } = useRecordFormFieldMetadataItems({
- objectMetadataItem,
- });
-
- const shouldOpenRecordCreationForm =
- isRecordCreationFormEnabled &&
- isDefined(recordCreationFormContext) &&
- isNonEmptyArray(recordFormFieldMetadataItems);
+ const { requestRecordCreation: requestRecordCreationInContext } =
+ useRecordCreationFormContextOrThrow();
const requestRecordCreation = useCallback(
({
@@ -37,15 +21,13 @@ export const useRecordCreationForm = ({
draftRecord: Partial<ObjectRecord>,
) => Promise<ObjectRecord>;
}) =>
- isDefined(recordCreationFormContext)
- ? recordCreationFormContext.requestRecordCreation({
- objectMetadataItem,
- initialDraftRecord,
- createRecord,
- })
- : createRecord(initialDraftRecord ?? {}),
- [recordCreationFormContext, objectMetadataItem],
+ requestRecordCreationInContext({
+ objectMetadataItem,
+ initialDraftRecord,
+ createRecord,
+ }),
+ [requestRecordCreationInContext, objectMetadataItem],
);
- return { shouldOpenRecordCreationForm, requestRecordCreation };
+ return { requestRecordCreation };
};
diff --git a/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationFormSettle.ts b/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationFormSettle.ts
index 41eb98967ad..e605b12ddc1 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationFormSettle.ts
+++ b/packages/twenty-front/src/modules/object-record/record-form/hooks/useRecordCreationFormSettle.ts
@@ -1,28 +1,7 @@
-import { RecordCreationFormContext } from '@/object-record/record-form/contexts/RecordCreationFormContext';
-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { useCallback, useContext } from 'react';
-import { isDefined } from 'twenty-shared/utils';
+import { useRecordCreationFormContextOrThrow } from '@/object-record/record-form/contexts/RecordCreationFormContext';
export const useRecordCreationFormSettle = () => {
- const recordCreationFormContext = useContext(RecordCreationFormContext);
-
- const settleRecordCreationDraft = useCallback(
- ({
- requestId,
- draftRecord,
- }: {
- requestId: string;
- draftRecord: Partial<ObjectRecord> | null;
- }) => {
- if (isDefined(recordCreationFormContext)) {
- recordCreationFormContext.settleRecordCreationDraft({
- requestId,
- draftRecord,
- });
- }
- },
- [recordCreationFormContext],
- );
+ const { settleRecordCreationDraft } = useRecordCreationFormContextOrThrow();
return { settleRecordCreationDraft };
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
index 7d92d04886b..9123e126ccb 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
@@ -54,10 +54,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Partial<
label: msg`Credit allowance quotas`,
description: msg`Use the quota engine to enforce credit allowances.`,
},
- [FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED]: {
- label: msg`Record creation form`,
- description: msg`Use a dedicated form when creating records.`,
- },
[FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: {
label: msg`Record sharing`,
description: msg`Allow sharing individual records with workspace members.`,
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 1aeba45e57c..956ca93efd6 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
@@ -37,7 +37,6 @@ import { Button } from 'twenty-ui/primitives/input';
import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
import {
EngineComponentKey,
- FeatureFlagKey,
PageLayoutTabLayoutMode,
PageLayoutType,
WidgetConfigurationType,
@@ -55,14 +54,10 @@ const LAYOUT_ID = 'record-creation-story-layout';
const TAB_ID = 'record-creation-story-tab';
type RecordCreationFlowProps = {
- isFormEnabled: boolean;
commandOrigin?: 'task' | 'no-object';
};
-const RecordCreationFlow = ({
- isFormEnabled,
- commandOrigin,
-}: RecordCreationFlowProps) => {
+const RecordCreationFlow = ({ commandOrigin }: RecordCreationFlowProps) => {
const store = useStore();
const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular: 'company',
@@ -149,29 +144,14 @@ const RecordCreationFlow = ({
);
}
applyChanges();
- store.set(currentWorkspaceState.atom, {
- ...mockCurrentWorkspace,
- featureFlags: [
- {
- key: FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED,
- value: isFormEnabled,
- },
- ],
- });
+ store.set(currentWorkspaceState.atom, mockCurrentWorkspace);
store.set(currentWorkspaceMemberState.atom, (member) =>
isDefined(member)
? { ...member, openRecordIn: OpenRecordIn.SIDE_PANEL }
: member,
);
setIsReady(true);
- }, [
- applyChanges,
- commandOrigin,
- isFormEnabled,
- objectMetadataItem,
- replaceDraft,
- store,
- ]);
+ }, [applyChanges, commandOrigin, objectMetadataItem, replaceDraft, store]);
return isReady ? (
<WorkspaceRouteObjectsContext.Provider
@@ -285,7 +265,6 @@ const meta = {
RouterDecorator,
ComponentDecorator,
],
- args: { isFormEnabled: true },
parameters: {
container: { width: 420, height: 600 },
msw: {
@@ -375,28 +354,6 @@ export const Cancel: Story = {
},
};
-export const FlagDisabled: Story = {
- args: { isFormEnabled: false },
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
- await userEvent.click(
- await canvas.findByRole('button', { name: /Create company/ }),
- );
- await waitFor(() =>
- expect(canvas.getByRole('status')).toHaveTextContent(
- 'Created Filter default with 10 employees',
- ),
- );
- await expect(
- canvas.queryByTestId('record-creation-form-create-button'),
- ).not.toBeInTheDocument();
- await expect(createCompanyRequest).toHaveBeenCalledTimes(1);
- await expect(createCompanyRequest).toHaveBeenCalledWith(
- expect.objectContaining({ name: 'Filter default', employees: 10 }),
- );
- },
-};
-
const createCompanyFromCommandMenu = async (canvasElement: HTMLElement) => {
const canvas = within(canvasElement);
await userEvent.click(await canvas.findByText('Create Company'));
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index 8f8a9914283..c773844d584 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -24,6 +24,7 @@ import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainCo
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
import { PreComputedChipGeneratorsProvider } from '@/object-metadata/components/PreComputedChipGeneratorsProvider';
import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
+import { RecordCreationFormProvider } from '@/object-record/record-form/components/RecordCreationFormProvider';
import { ToastProvider } from 'twenty-ui/primitives/feedback';
import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';
import { i18n } from '@lingui/core';
@@ -102,7 +103,9 @@ const Providers = () => {
<HelmetProvider>
<IconsProvider>
<RecordComponentInstanceContextsWrapper componentInstanceId="storybook-test-record">
- <MinimalMetadataGate />
+ <RecordCreationFormProvider>
+ <MinimalMetadataGate />
+ </RecordCreationFormProvider>
</RecordComponentInstanceContextsWrapper>
</IconsProvider>
</HelmetProvider>
diff --git a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
index f7ae48e0332..96165142e11 100644
--- a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
@@ -9,6 +9,7 @@ import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMeta
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
+import { RecordCreationFormProvider } from '@/object-record/record-form/components/RecordCreationFormProvider';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
@@ -242,10 +243,12 @@ export const RecordTableDecorator: Decorator = (Story, context) => {
<InternalTableContextProviders
objectMetadataItem={objectMetadataItem}
>
- <InternalTableStateLoaderEffect
- objectMetadataItem={objectMetadataItem}
- />
- <Story />
+ <RecordCreationFormProvider>
+ <InternalTableStateLoaderEffect
+ objectMetadataItem={objectMetadataItem}
+ />
+ <Story />
+ </RecordCreationFormProvider>
</InternalTableContextProviders>
</CommandMenuComponentInstanceContext.Provider>
</RecordComponentInstanceContextsWrapper>
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
index 8c1c54b5433..3a904dbdb7a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts
@@ -10,7 +10,6 @@ const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {
[FeatureFlagKey.IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED]: true,
[FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED]: true,
[FeatureFlagKey.IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED]: false,
- [FeatureFlagKey.IS_RECORD_CREATION_FORM_ENABLED]: false,
[FeatureFlagKey.IS_RECORD_SHARING_ENABLED]: false,
[FeatureFlagKey.IS_INITIAL_OBJECT_VIEW_ENABLED]: false,
};
diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.ts
index dbcc25a31a6..4a8f2c78206 100644
--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts
+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts
@@ -11,7 +11,6 @@ export enum FeatureFlagKey {
IS_API_RATE_LIMIT_V2_ENABLED = 'IS_API_RATE_LIMIT_V2_ENABLED',
IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED = 'IS_MESSAGE_CALENDAR_TARGET_READ_ENABLED',
IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED = 'IS_QUOTA_ENGINE_CREDIT_BOUND_ENABLED',
- IS_RECORD_CREATION_FORM_ENABLED = 'IS_RECORD_CREATION_FORM_ENABLED',
IS_RECORD_SHARING_ENABLED = 'IS_RECORD_SHARING_ENABLED',
IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',
IS_WEBHOOK_RATE_LIMIT_ENABLED = 'IS_WEBHOOK_RATE_LIMIT_ENABLED',