The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Migrate workflow and import pickers (#26999)
Raphaël Bosi479a04ed2f14
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsxindex 5cb15f218d2..6069527e182 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx@@ -200,7 +200,7 @@ export const FormAdvancedTextFieldInput = ({? focusedHtmlEditor: editor;- variableTargetEditor.commands.insertVariableTag(variableName);+ variableTargetEditor.chain().focus().insertVariableTag(variableName).run();};const defaultBreadcrumbs: BreadcrumbProps['links'] = [diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsxindex 3d23436322e..7babe4cf133 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsx@@ -1,9 +1,11 @@import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';import { type AdvancedTextEditorProfile } from '@/advanced-text-editor/types/AdvancedTextEditorProfile';import { buildFullRichTextWithVariableTagExtensions } from '@/advanced-text-editor/utils/buildFullRichTextExtensions';+import { FullScreenModal } from '@/ui/layout/fullscreen/components/FullScreenModal';+import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';import { type Meta, type StoryObj } from '@storybook/react-vite';import { HttpResponse, graphql } from 'msw';-import { expect, fn, userEvent, within } from 'storybook/test';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';import { TIPTAP_DOCUMENT_SCHEMA_VERSION } from 'twenty-shared/utils';import { ComponentDecorator } from 'twenty-ui/testing';import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';@@ -247,6 +249,57 @@ export const WithoutVariablePicker: Story = {},};+export const WorkflowVariablesInFullScreen: Story = {+ args: {+ ...DEFAULT_PROPS,+ VariablePicker: WorkflowVariablePicker,+ enableFullScreen: false,+ },+ render: (args) => (+ <FullScreenModal links={[{ children: 'Text Editor' }]} onClose={fn()}>+ <FormAdvancedTextFieldInput {...args} />+ </FullScreenModal>+ ),+ play: async ({ canvasElement, args }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const editor = await canvas.findByRole('textbox');++ await userEvent.click(editor);+ await userEvent.type(editor, 'Hello ');+ await userEvent.click(+ canvas.getByRole('button', { name: 'Insert variable' }),+ );+ const search = await body.findByRole('searchbox');+ await userEvent.type(search, 'name');+ await userEvent.keyboard('{Enter}');++ await waitFor(() =>+ expect(body.queryByRole('searchbox')).not.toBeInTheDocument(),+ );+ await waitFor(() => expect(editor).toHaveFocus());+ await waitFor(() => expect(within(editor).getByText('name')).toBeVisible());+ await userEvent.keyboard('!');++ await waitFor(() =>+ expect(args.onChange).toHaveBeenLastCalledWith(+ expect.stringContaining('"text":"!"'),+ ),+ );+ await userEvent.click(+ canvas.getByRole('button', { name: 'Insert variable' }),+ );+ await body.findByRole('searchbox');+ await userEvent.keyboard('{Escape}');+ await waitFor(() =>+ expect(+ canvas.getByRole('button', { name: 'Insert variable' }),+ ).toHaveFocus(),+ );+ await expect(editor).toBeVisible();+ },+};+export const WithLongContent: Story = {args: {...DEFAULT_PROPS,diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFilesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFilesFieldInput.tsxindex 8effb8a7f97..dc49131e2d5 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFilesFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFilesFieldInput.tsx@@ -65,7 +65,7 @@ export const FormFilesFieldInput = ({);}- editor.commands.insertVariableTag(variableName);+ editor.chain().focus().insertVariableTag(variableName).run();};if (!isDefined(editor)) {diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput.tsxindex 4bc1694ca62..f7479e5e546 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput.tsx@@ -48,7 +48,7 @@ export const FormMultiTextFieldInput = ({);}- editor.commands.insertVariableTag(variableName);+ editor.chain().focus().insertVariableTag(variableName).run();};if (!isDefined(editor)) {diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRawJsonFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRawJsonFieldInput.tsxindex 3369bc2d9c3..d03fba71348 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRawJsonFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormRawJsonFieldInput.tsx@@ -60,7 +60,7 @@ export const FormRawJsonFieldInput = ({);}- editor.commands.insertVariableTag(variableName);+ editor.chain().focus().insertVariableTag(variableName).run();};if (!isDefined(editor)) {diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsxindex 6cca71275d9..44d2d65f34b 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormTextFieldInput.tsx@@ -59,7 +59,7 @@ export const FormTextFieldInput = ({);}- editor.commands.insertVariableTag(variableName);+ editor.chain().focus().insertVariableTag(variableName).run();};if (!isDefined(editor)) {diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.tsindex 35988a7cd23..f2bb4ee3a21 100644--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts@@ -6,6 +6,7 @@ import { useBatchCreateManyRecords } from '@/object-record/hooks/useBatchCreateMimport { useBuildSpreadsheetImportFields } from '@/object-record/spreadsheet-import/hooks/useBuildSpreadSheetImportFields';import { buildRecordFromImportedStructuredRow } from '@/object-record/spreadsheet-import/utils/buildRecordFromImportedStructuredRow';import { spreadsheetImportFilterAvailableFieldMetadataItems } from '@/object-record/spreadsheet-import/utils/spreadsheetImportFilterAvailableFieldMetadataItems';+import { spreadsheetImportFilterImportableFieldMetadataItems } from '@/object-record/spreadsheet-import/utils/spreadsheetImportFilterImportableFieldMetadataItems';import { spreadsheetImportGetUnicityTableHook } from '@/object-record/spreadsheet-import/utils/spreadsheetImportGetUnicityTableHook';import { SPREADSHEET_IMPORT_CREATE_RECORDS_BATCH_SIZE } from '@/spreadsheet-import/constants/SpreadsheetImportCreateRecordsBatchSize';import { useOpenSpreadsheetImportDialog } from '@/spreadsheet-import/hooks/useOpenSpreadsheetImportDialog';@@ -91,7 +92,11 @@ export const useOpenObjectRecordsSpreadsheetImportDialog = (}},spreadsheetImportFields,- availableFieldMetadataItems: availableFieldMetadataItemsToImport,+ availableFieldMetadataItems:+ spreadsheetImportFilterImportableFieldMetadataItems({+ fieldMetadataItems: availableFieldMetadataItemsToImport,+ spreadsheetImportFields,+ }),onAbortSubmit: () => {abortController.abort();},diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/spreadsheetImportFilterImportableFieldMetadataItems.test.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/spreadsheetImportFilterImportableFieldMetadataItems.test.tsnew file mode 100644index 00000000000..5f321cb0243--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/__tests__/spreadsheetImportFilterImportableFieldMetadataItems.test.ts@@ -0,0 +1,89 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { spreadsheetImportFilterImportableFieldMetadataItems } from '@/object-record/spreadsheet-import/utils/spreadsheetImportFilterImportableFieldMetadataItems';+import { type SpreadsheetImportField } from '@/spreadsheet-import/types';+import { FieldMetadataType } from '~/generated-metadata/graphql';++const buildFieldMetadataItem = ({+ id,+ name,+ type,+}: Pick<FieldMetadataItem, 'id' | 'name' | 'type'>): FieldMetadataItem => ({+ id,+ universalIdentifier: id,+ name,+ label: name,+ type,+ isNullable: true,+ isActive: true,+ isSystem: false,+ createdAt: '2023-01-01',+ updatedAt: '2023-01-01',+ icon: 'IconCheck',+ description: null,+});++const buildSpreadsheetImportField = ({+ key,+ fieldMetadataItemId,+}: Pick<+ SpreadsheetImportField,+ 'key' | 'fieldMetadataItemId'+>): SpreadsheetImportField => ({+ Icon: null,+ key,+ label: key,+ fieldMetadataItemId,+ fieldMetadataType: FieldMetadataType.TEXT,+ fieldType: { type: 'input' },+ isNestedField: false,+});++describe('spreadsheetImportFilterImportableFieldMetadataItems', () => {+ const nameField = buildFieldMetadataItem({+ id: 'name-id',+ name: 'name',+ type: FieldMetadataType.TEXT,+ });+ const addressField = buildFieldMetadataItem({+ id: 'address-id',+ name: 'address',+ type: FieldMetadataType.ADDRESS,+ });+ const filesField = buildFieldMetadataItem({+ id: 'files-id',+ name: 'files',+ type: FieldMetadataType.FILES,+ });++ it('should keep only fields that have at least one spreadsheet import field', () => {+ const importableFieldMetadataItems =+ spreadsheetImportFilterImportableFieldMetadataItems({+ fieldMetadataItems: [nameField, addressField, filesField],+ spreadsheetImportFields: [+ buildSpreadsheetImportField({+ key: 'name',+ fieldMetadataItemId: nameField.id,+ }),+ buildSpreadsheetImportField({+ key: 'address.addressCity',+ fieldMetadataItemId: addressField.id,+ }),+ buildSpreadsheetImportField({+ key: 'address.addressStreet1',+ fieldMetadataItemId: addressField.id,+ }),+ ],+ });++ expect(importableFieldMetadataItems).toEqual([nameField, addressField]);+ });++ it('should return no fields when nothing can be imported', () => {+ expect(+ spreadsheetImportFilterImportableFieldMetadataItems({+ fieldMetadataItems: [filesField],+ spreadsheetImportFields: [],+ }),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/spreadsheetImportFilterImportableFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/spreadsheetImportFilterImportableFieldMetadataItems.tsnew file mode 100644index 00000000000..f7bc1ac688c--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/spreadsheetImportFilterImportableFieldMetadataItems.ts@@ -0,0 +1,20 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { type SpreadsheetImportFields } from '@/spreadsheet-import/types';++export const spreadsheetImportFilterImportableFieldMetadataItems = ({+ fieldMetadataItems,+ spreadsheetImportFields,+}: {+ fieldMetadataItems: FieldMetadataItem[];+ spreadsheetImportFields: SpreadsheetImportFields;+}) => {+ const importableFieldMetadataItemIds = new Set(+ spreadsheetImportFields.map(+ (spreadsheetImportField) => spreadsheetImportField.fieldMetadataItemId,+ ),+ );++ return fieldMetadataItems.filter((fieldMetadataItem) =>+ importableFieldMetadataItemIds.has(fieldMetadataItem.id),+ );+};diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsxindex a80fe8c2bf8..42e019163bb 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent.tsx@@ -4,166 +4,134 @@ import { DO_NOT_IMPORT_OPTION_KEY } from '@/spreadsheet-import/constants/DoNotImimport { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { isNonEmptyString } from '@sniptt/guards';-import { useMemo, useState } from 'react';-import { IconForbid, IconX, useIcons } from 'twenty-ui/icon';+import { useState } from 'react';+import { isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown, useDropdownPage } from 'twenty-ui/components';+import { IconForbid, useIcons } from 'twenty-ui/icon';import { type SelectOption } from 'twenty-ui/primitives/input';-import { ListItem } from 'twenty-ui/primitives/navigation';import { type ReadonlyDeep } from 'type-fest';import { normalizeSearchText } from '~/utils/normalizeSearchText';const StyledContainer = styled.div`max-height: 360px;+ overflow-y: auto;`;+type MatchColumnSelectFieldSelectDropdownContentProps = {+ selectedValue: SelectOption | undefined;+ onSelectFieldMetadataItem: (fieldMetadataItem: FieldMetadataItem) => void;+ onSelectSuggestedOption: (suggestedOption: SelectOption) => void;+ onDoNotImportSelect: () => void;+ suggestedOptions: readonly ReadonlyDeep<+ SelectOption & { fieldMetadataTypeLabel?: string }+ >[];+};+export const MatchColumnSelectFieldSelectDropdownContent = ({selectedValue,onSelectFieldMetadataItem,onSelectSuggestedOption,- onCancelSelect,onDoNotImportSelect,suggestedOptions,-}: {- selectedValue: SelectOption | undefined;- onSelectFieldMetadataItem: (- selectedFieldMetadataItem: FieldMetadataItem,- ) => void;- onSelectSuggestedOption: (selectedSuggestedOption: SelectOption) => void;- onCancelSelect: () => void;- onDoNotImportSelect: () => void;- suggestedOptions: readonly ReadonlyDeep<- SelectOption & { fieldMetadataTypeLabel?: string }- >[];-}) => {+}: MatchColumnSelectFieldSelectDropdownContentProps) => {const [searchFilter, setSearchFilter] = useState('');-- const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {- const value = event.currentTarget.value;-- setSearchFilter(value);- };-const { availableFieldMetadataItems } = useSpreadsheetImportInternal();+ const { goToPage } = useDropdownPage();+ const { getIcon } = useIcons();+ const { t } = useLingui();- const filteredAvailableFieldMetadataItems = useMemo(() => {- const searchTerm = normalizeSearchText(searchFilter);- return availableFieldMetadataItems.filter((field) => {- return (+ const searchTerm = normalizeSearchText(searchFilter);+ const filteredAvailableFieldMetadataItems =+ availableFieldMetadataItems.filter(+ (field) =>normalizeSearchText(field.label).includes(searchTerm) ||- normalizeSearchText(field.name).includes(searchTerm)- );- });- }, [availableFieldMetadataItems, searchFilter]);-- const { getIcon } = useIcons();+ normalizeSearchText(field.name).includes(searchTerm),+ );+ const filteredSuggestedOptions = suggestedOptions.filter((option) =>+ normalizeSearchText(option.label).includes(searchTerm),+ );+ const shouldShowDoNotImport = normalizeSearchText(t`Do not import`).includes(+ searchTerm,+ );+ const hasSuggestedOptions = isNonEmptyArray(filteredSuggestedOptions);+ const hasAvailableFields = isNonEmptyArray(+ filteredAvailableFieldMetadataItems,+ );- const handleFieldClick = (fieldMetadataItem: FieldMetadataItem) => {+ const handleFieldSelect = (fieldMetadataItem: FieldMetadataItem) => {onSelectFieldMetadataItem(fieldMetadataItem);- };- const handleSuggestedOptionClick = (suggestedOption: SelectOption) => {- onSelectSuggestedOption(suggestedOption);+ if (hasNestedFields(fieldMetadataItem)) {+ goToPage('sub-field');+ }};- const handleCancelClick = () => {- onCancelSelect();- };-- const { t } = useLingui();-return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={handleCancelClick}- Icon={IconX}- />- }- >- {t`Select matching field`}- </DropdownMenuHeader>- <DropdownMenuSearchInput+ <>+ <Dropdown.Header>+ <Dropdown.Title>{t`Select matching field`}</Dropdown.Title>+ <Dropdown.Close aria-label={t`Cancel field selection`} />+ </Dropdown.Header>+ <Dropdown.Searchvalue={searchFilter}- onChange={handleFilterChange}- autoFocus+ onValueChange={setSearchFilter}placeholder={t`Search fields`}+ aria-label={t`Search fields`}/>- <DropdownMenuSeparator />+ <Dropdown.Separator /><StyledContainer>- <ScrollWrapper componentInstanceId="match-column-select-field-select-dropdown-content">- {!isNonEmptyString(searchFilter) && (- <>- <DropdownMenuItemsContainer scrollable={false}>- <ListItem- onClick={onDoNotImportSelect}- role="option"- aria-selected={- selectedValue?.value === DO_NOT_IMPORT_OPTION_KEY- }- selected={selectedValue?.value === DO_NOT_IMPORT_OPTION_KEY}- indicator="check"- startIcon={<SelectOptionIcon Icon={IconForbid} />}- >{t`Do not import`}</ListItem>- </DropdownMenuItemsContainer>- {suggestedOptions.length > 0 && (- <>- <DropdownMenuSeparator />- <DropdownMenuSectionLabel label={t`Suggested`} />- <DropdownMenuItemsContainer scrollable={false}>- {suggestedOptions.map((option) => (- <ListItem- key={option.value}- onClick={() => handleSuggestedOptionClick(option)}- role="option"- aria-selected={selectedValue?.value === option.value}- selected={selectedValue?.value === option.value}- indicator="check"- description={option.fieldMetadataTypeLabel}- startIcon={<SelectOptionIcon Icon={option.Icon} />}- >- {option.label}- </ListItem>- ))}- </DropdownMenuItemsContainer>- </>- )}- <DropdownMenuSeparator />- <DropdownMenuSectionLabel label={t`All fields`} />- </>- )}- <DropdownMenuItemsContainer scrollable={false}>+ {shouldShowDoNotImport && (+ <Dropdown.Section>+ <Dropdown.OptionItem+ onSelect={onDoNotImportSelect}+ selected={selectedValue?.value === DO_NOT_IMPORT_OPTION_KEY}+ startIcon={<SelectOptionIcon Icon={IconForbid} />}+ >{t`Do not import`}</Dropdown.OptionItem>+ </Dropdown.Section>+ )}+ {shouldShowDoNotImport && hasSuggestedOptions && <Dropdown.Separator />}+ {hasSuggestedOptions && (+ <Dropdown.Section label={t`Suggested`}>+ {filteredSuggestedOptions.map((option) => (+ <Dropdown.OptionItem+ key={option.value}+ onSelect={() => onSelectSuggestedOption(option)}+ selected={selectedValue?.value === option.value}+ description={option.fieldMetadataTypeLabel}+ startIcon={<SelectOptionIcon Icon={option.Icon} />}+ >+ {option.label}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.Section>+ )}+ {(shouldShowDoNotImport || hasSuggestedOptions) &&+ hasAvailableFields && <Dropdown.Separator />}+ {hasAvailableFields && (+ <Dropdown.Section label={t`All fields`}>{filteredAvailableFieldMetadataItems.map((field) => (- <ListItem+ <Dropdown.OptionItemkey={field.id}- onClick={() => handleFieldClick(field)}- role="option"- aria-selected={selectedValue?.value === field.name}+ onSelect={() => handleFieldSelect(field)}selected={selectedValue?.value === field.name}- indicator="check"+ closeOnSelect={!hasNestedFields(field)}hasSubmenu={hasNestedFields(field)}description={getFieldMetadataTypeLabel(field.type)}startIcon={<SelectOptionIcon Icon={getIcon(field.icon)} />}>{field.label}- </ListItem>+ </Dropdown.OptionItem>))}- </DropdownMenuItemsContainer>- </ScrollWrapper>+ </Dropdown.Section>+ )}+ {!shouldShowDoNotImport &&+ !hasSuggestedOptions &&+ !hasAvailableFields && (+ <Dropdown.Empty>{t`No fields found`}</Dropdown.Empty>+ )}</StyledContainer>- </LegacyDropdownContent>+ </>);};diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsxindex c38b6efb0c1..c68ab16a54f 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent.tsx@@ -1,52 +1,28 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { type SpreadsheetImportFieldOption } from '@/spreadsheet-import/types/SpreadsheetImportFieldOption';import { getSubFieldOptions } from '@/spreadsheet-import/utils/spreadsheetImportGetSubFieldOptions';-import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useLingui } from '@lingui/react/macro';import { useState } from 'react';-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';-import { IconChevronLeft } from 'twenty-ui/icon';-import { ListItem } from 'twenty-ui/primitives/navigation';+import { isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';+import { type SelectOption } from 'twenty-ui/primitives/input';++type MatchColumnSelectSubFieldSelectDropdownContentProps = {+ fieldMetadataItem: FieldMetadataItem;+ selectedValue: SelectOption | undefined;+ onSubFieldSelect: (subFieldName: string) => void;+ options: readonly Readonly<SpreadsheetImportFieldOption>[];+};export const MatchColumnSelectSubFieldSelectDropdownContent = ({fieldMetadataItem,+ selectedValue,onSubFieldSelect,options,- onBack,-}: {- fieldMetadataItem: FieldMetadataItem;- onSubFieldSelect: (subFieldNameSelected: string) => void;- options: readonly Readonly<SpreadsheetImportFieldOption>[];- onBack: () => void;-}) => {+}: MatchColumnSelectSubFieldSelectDropdownContentProps) => {const [searchFilter, setSearchFilter] = useState('');-- const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {- const value = event.currentTarget.value;-- setSearchFilter(value);- };-- const handleSubFieldSelect = (subFieldName: string) => {- onSubFieldSelect(subFieldName);- };-- const handleSubMenuBack = () => {- setSearchFilter('');- onBack();- };-- if (!hasNestedFields(fieldMetadataItem)) {- return <></>;- }-+ const { t } = useLingui();const subFieldOptions = getSubFieldOptions(fieldMetadataItem,options,@@ -54,39 +30,35 @@ export const MatchColumnSelectSubFieldSelectDropdownContent = ({);return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={handleSubMenuBack}- Icon={IconChevronLeft}- />- }- >- <OverflowingTextWithTooltip text={fieldMetadataItem.label} />- </DropdownMenuHeader>- <DropdownMenuSearchInput+ <>+ <Dropdown.Back aria-label={t`${fieldMetadataItem.label}, back to fields`}>+ {fieldMetadataItem.label}+ </Dropdown.Back>+ <Dropdown.Searchvalue={searchFilter}- onChange={handleFilterChange}- autoFocus+ onValueChange={setSearchFilter}+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>+ <Dropdown.Separator />+ <Dropdown.Section scrollable>{subFieldOptions.map(({ value, shortLabelForNestedField, Icon, disabled }) => (- <ListItem+ <Dropdown.OptionItemkey={value}- onClick={() => handleSubFieldSelect(value)}+ onSelect={() => onSubFieldSelect(value)}+ selected={selectedValue?.value === value}startIcon={<SelectOptionIcon Icon={Icon} />}disabled={disabled}>{shortLabelForNestedField}- </ListItem>+ </Dropdown.OptionItem>),)}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ </Dropdown.Section>+ {!isNonEmptyArray(subFieldOptions) && (+ <Dropdown.Empty>{t`No fields found`}</Dropdown.Empty>+ )}+ </>);};diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsxindex f2ed5c973a5..dc18ea9c9a8 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/MatchColumnToFieldSelect.tsx@@ -1,30 +1,31 @@-import React, { useState } from 'react';+import { useState } from 'react';import { type ReadonlyDeep } from 'type-fest';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';import { MatchColumnSelectFieldSelectDropdownContent } from '@/spreadsheet-import/components/MatchColumnSelectFieldSelectDropdownContent';import { MatchColumnSelectSubFieldSelectDropdownContent } from '@/spreadsheet-import/components/MatchColumnSelectSubFieldSelectDropdownContent';import { DO_NOT_IMPORT_OPTION_KEY } from '@/spreadsheet-import/constants/DoNotImportOptionKey';import { type SpreadsheetImportFieldOption } from '@/spreadsheet-import/types/SpreadsheetImportFieldOption';import { hasNestedFields } from '@/spreadsheet-import/utils/spreadsheetImportHasNestedFields';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';-import { MenuItem } from 'twenty-ui/components';+import { Dropdown, MenuItem } from 'twenty-ui/components';import { IconChevronDown } from 'twenty-ui/icon';import { type SelectOption } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-interface MatchColumnToFieldSelectProps {+type MatchColumnToFieldSelectProps = {columnIndex: string;- onChange: (value: ReadonlyDeep<SelectOption> | null) => void;+ onChange: (value: ReadonlyDeep<SelectOption>) => void;value?: ReadonlyDeep<SelectOption>;options: readonly Readonly<SpreadsheetImportFieldOption>[];suggestedOptions: readonly ReadonlyDeep<SelectOption>[];placeholder?: string;-}+};const StyledMenuItemContainer = styled.div`> div {@@ -34,12 +35,6 @@ const StyledMenuItemContainer = styled.div`}`;-const StyledMenuItem = (props: React.ComponentProps<typeof MenuItem>) => (- <StyledMenuItemContainer>- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}- <MenuItem {...props} />- </StyledMenuItemContainer>-);export const MatchColumnToFieldSelect = ({onChange,value,@@ -48,8 +43,8 @@ export const MatchColumnToFieldSelect = ({placeholder,columnIndex,}: MatchColumnToFieldSelectProps) => {+ const { t } = useLingui();const dropdownId = `match-column-select-dropdown-${columnIndex}`;- const { closeDropdown } = useCloseDropdown();const [selectedFieldMetadataItem, setSelectedFieldMetadataItem] =useState<FieldMetadataItem | null>(null);@@ -58,103 +53,82 @@ export const MatchColumnToFieldSelect = ({);const handleFieldMetadataItemSelect = (- selectedFieldMetadataItem: FieldMetadataItem,+ fieldMetadataItem: FieldMetadataItem,) => {- setSelectedFieldMetadataItem(selectedFieldMetadataItem);-- if (!isCompositeFieldType(selectedFieldMetadataItem.type)) {- const correspondingOption = options.find(- (option) => option.value === selectedFieldMetadataItem.name,- );-- if (isDefined(correspondingOption)) {- setSelectedFieldMetadataItem(null);- onChange(correspondingOption);- closeDropdown(dropdownId);- }- }- };-- const handleSubFieldSelect = (subFieldNameSelected: string) => {- if (!isDefined(selectedFieldMetadataItem)) {+ if (hasNestedFields(fieldMetadataItem)) {+ setSelectedFieldMetadataItem(fieldMetadataItem);return;}- const correspondingOption = options.find((option) => {- return option.value === subFieldNameSelected;- });+ const correspondingOption = options.find(+ (option) => option.value === fieldMetadataItem.name,+ );if (isDefined(correspondingOption)) {- setSelectedFieldMetadataItem(null);onChange(correspondingOption);- closeDropdown(dropdownId);}};- const handleSelectSuggestedOption = (- selectedSuggestedOption: SelectOption,- ) => {- onChange(selectedSuggestedOption);- closeDropdown(dropdownId);- };+ const handleSubFieldSelect = (subFieldName: string) => {+ const correspondingOption = options.find(+ (option) => option.value === subFieldName,+ );- const handleDoNotImportSelect = () => {- if (isDefined(doNotImportOption)) {- onChange(doNotImportOption);- closeDropdown(dropdownId);+ if (isDefined(correspondingOption)) {+ onChange(correspondingOption);}};- const handleClickOutside = () => {- setSelectedFieldMetadataItem(null);- };-- const handleSubFieldBack = () => {- setSelectedFieldMetadataItem(null);- };-- const handleCancelSelectClick = () => {- setSelectedFieldMetadataItem(null);- closeDropdown(dropdownId);- };-- const shouldShowNestedField =- isDefined(selectedFieldMetadataItem) &&- hasNestedFields(selectedFieldMetadataItem);-return (- <Dropdown+ <DropdownRootdropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <StyledMenuItem+ type="picker"+ onOpenChange={(open) => {+ if (!open) {+ setSelectedFieldMetadataItem(null);+ }+ }}+ >+ <Dropdown.Trigger+ render={<StyledMenuItemContainer />}+ nativeButton={false}+ >+ <MenuItemLeftIcon={value?.Icon}text={value?.label ?? placeholder ?? ''}- accent={value?.label ? 'default' : 'placeholder'}+ accent={isDefined(value) ? 'default' : 'placeholder'}RightIcon={IconChevronDown}/>- }- dropdownComponents={- shouldShowNestedField ? (- <MatchColumnSelectSubFieldSelectDropdownContent- fieldMetadataItem={selectedFieldMetadataItem}- onSubFieldSelect={handleSubFieldSelect}- options={options}- onBack={handleSubFieldBack}- />- ) : (+ </Dropdown.Trigger>+ <DropdownContent+ align="start"+ width={GenericDropdownContentWidth.ExtraLarge}+ aria-label={t`Select matching field`}+ >+ <Dropdown.Page id="root"><MatchColumnSelectFieldSelectDropdownContentselectedValue={value}onSelectFieldMetadataItem={handleFieldMetadataItemSelect}- onSelectSuggestedOption={handleSelectSuggestedOption}- onCancelSelect={handleCancelSelectClick}- onDoNotImportSelect={handleDoNotImportSelect}+ onSelectSuggestedOption={onChange}+ onDoNotImportSelect={() => {+ if (isDefined(doNotImportOption)) {+ onChange(doNotImportOption);+ }+ }}suggestedOptions={suggestedOptions}/>- )- }- onClickOutside={handleClickOutside}- isDropdownInModal- />+ </Dropdown.Page>+ <Dropdown.Page id="sub-field">+ {isDefined(selectedFieldMetadataItem) && (+ <MatchColumnSelectSubFieldSelectDropdownContent+ fieldMetadataItem={selectedFieldMetadataItem}+ selectedValue={value}+ onSubFieldSelect={handleSubFieldSelect}+ options={options}+ />+ )}+ </Dropdown.Page>+ </DropdownContent>+ </DropdownRoot>);};diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsxindex f312c7d19ac..4c279b27989 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectDropdownButton.tsx@@ -11,13 +11,12 @@ import { styled } from '@linaria/react';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { Tag, type TagColor } from 'twenty-ui/primitives/data-display';import { IconChevronDown } from 'twenty-ui/icon';-import { type SelectOption } from 'twenty-ui/primitives/input';const StyledIconChevronDownContainer = styled.div`color: ${themeCssVariables.font.color.tertiary};display: flex;`;-export type SubMatchingSelectDropdownButtonProps = {+type SubMatchingSelectDropdownButtonProps = {option: SpreadsheetMatchedOptions | Partial<SpreadsheetMatchedOptions>;column:| SpreadsheetMatchedSelectColumn@@ -32,10 +31,12 @@ export const SubMatchingSelectDropdownButton = ({}: SubMatchingSelectDropdownButtonProps) => {const theme = useTheme();const { spreadsheetImportFields: fields } = useSpreadsheetImportInternal();- const options = getFieldOptions(fields, column.value) as SelectOption[];- const value = options.find((opt) => opt.value === option.value);+ const options = getFieldOptions(fields, column.value);+ const value = options.find(+ (fieldOption) => fieldOption.value === option.value,+ );return (- <SubMatchingSelectControlContainer cursor="pointer" id="control">+ <SubMatchingSelectControlContainer cursor="pointer"><Tag color={value?.color as TagColor}>{value?.label ?? placeholder}</Tag><StyledIconChevronDownContainer><IconChevronDown size={theme.icon.size.md} />diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsxindex 7ea98d8ca6a..58b879fe0bb 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectInput.tsx@@ -1,84 +1,70 @@-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { createElement, useMemo, useRef, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { useLingui } from '@lingui/react/macro';+import { createElement, useState } from 'react';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';import { type TagColor, Tag } from 'twenty-ui/primitives/data-display';import { type SelectOption } from 'twenty-ui/primitives/input';-import { ListItem } from 'twenty-ui/primitives/navigation';import { normalizeSearchText } from '~/utils/normalizeSearchText';-interface SubMatchingSelectInputProps {+type SubMatchingSelectInputProps = {onOptionSelected: (selectedOption: SelectOption) => void;- options: SelectOption[];- defaultOption?: SelectOption;-}+ options: readonly SelectOption[];+ selectedOption?: SelectOption;+};export const SubMatchingSelectInput = ({onOptionSelected,options,- defaultOption,+ selectedOption,}: SubMatchingSelectInputProps) => {- const containerRef = useRef<HTMLDivElement>(null);-const [searchFilter, setSearchFilter] = useState('');- const [selectedOption, setSelectedOption] = useState<- SelectOption | undefined- >(defaultOption);-- const optionsToSelect = useMemo(() => {- const searchTerm = normalizeSearchText(searchFilter);- return options.filter((option) => {- return (- option.value !== selectedOption?.value &&- normalizeSearchText(option.label).includes(searchTerm)- );- });- }, [options, searchFilter, selectedOption?.value]);-- const optionsInDropDown = useMemo(- () =>- selectedOption ? [selectedOption, ...optionsToSelect] : optionsToSelect,- [optionsToSelect, selectedOption],+ const { t } = useLingui();+ const searchTerm = normalizeSearchText(searchFilter);+ const matchingOptions = options.filter((option) =>+ normalizeSearchText(option.label).includes(searchTerm),);-- const handleOptionChange = (option: SelectOption) => {- setSelectedOption(option);- onOptionSelected(option);- };+ const optionsInDropdown = [+ ...matchingOptions.filter(+ (option) => option.value === selectedOption?.value,+ ),+ ...matchingOptions.filter(+ (option) => option.value !== selectedOption?.value,+ ),+ ];return (- <LegacyDropdownContent ref={containerRef}>- <DropdownMenuSearchInput+ <>+ <Dropdown.Searchvalue={searchFilter}- onChange={(e) => setSearchFilter(e.target.value)}- autoFocus+ onValueChange={setSearchFilter}+ placeholder={t`Search`}+ aria-label={t`Search`}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>- {optionsInDropDown.map((option) => (- <ListItem+ <Dropdown.Separator />+ <Dropdown.Section scrollable>+ {optionsInDropdown.map((option) => (+ <Dropdown.OptionItemkey={option.value}- onClick={() => handleOptionChange(option)}- role="option"- aria-selected={selectedOption?.value === option.value}+ onSelect={() => onOptionSelected(option)}selected={selectedOption?.value === option.value}- indicator="check"+ disabled={option.disabled}><Tagcolor={(option.color as TagColor) ?? 'transparent'}borderStyle="dashed"- variant={'soft'}+ variant="soft"startIcon={isDefined(option.Icon) ? createElement(option.Icon) : undefined}>{option.label}</Tag>- </ListItem>+ </Dropdown.OptionItem>))}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ </Dropdown.Section>+ {!isNonEmptyArray(optionsInDropdown) && (+ <Dropdown.Empty>{t`No options found`}</Dropdown.Empty>+ )}+ </>);};diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectRowRightDropdown.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectRowRightDropdown.tsxindex b612ef087ba..a750bc31fe6 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectRowRightDropdown.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/SubMatchingSelectRowRightDropdown.tsx@@ -9,8 +9,10 @@ import {type SpreadsheetMatchedSelectOptionsColumn,} from '@/spreadsheet-import/types/SpreadsheetColumn';import { type SpreadsheetMatchedOptions } from '@/spreadsheet-import/types/SpreadsheetMatchedOptions';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { useLingui } from '@lingui/react/macro';+import { Dropdown } from 'twenty-ui/components';import { styled } from '@linaria/react';import { type SelectOption } from 'twenty-ui/primitives/input';@@ -18,7 +20,7 @@ const StyledDropdownContainer = styled.div`width: 100%;`;-interface SubMatchingSelectRowRightDropdownProps {+type SubMatchingSelectRowRightDropdownProps = {option: SpreadsheetMatchedOptions | Partial<SpreadsheetMatchedOptions>;column:| SpreadsheetMatchedSelectColumn@@ -28,7 +30,7 @@ interface SubMatchingSelectRowRightDropdownProps {selectedOption?:| SpreadsheetMatchedOptions| Partial<SpreadsheetMatchedOptions>;-}+};export const SubMatchingSelectRowRightDropdown = ({option,@@ -36,40 +38,39 @@ export const SubMatchingSelectRowRightDropdown = ({onSubChange,placeholder,}: SubMatchingSelectRowRightDropdownProps) => {- const dropdownId = `sub-matching-select-dropdown-${option.entry}`;+ const entry = option.entry ?? '';+ const dropdownId = `sub-matching-select-dropdown-${column.index}-${entry}`;- const { closeDropdown } = useCloseDropdown();+ const { t } = useLingui();const { spreadsheetImportFields: fields } = useSpreadsheetImportInternal();- const options = getFieldOptions(fields, column.value) as SelectOption[];- const value = options.find((opt) => opt.value === option.value);+ const options = getFieldOptions(fields, column.value);+ const value = options.find(+ (fieldOption) => fieldOption.value === option.value,+ );const handleSelect = (selectedOption: SelectOption) => {- onSubChange(selectedOption.value, column.index, option.entry ?? '');- closeDropdown(dropdownId);+ onSubChange(selectedOption.value, column.index, entry);};return (<StyledDropdownContainer>- <Dropdown- dropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponent={+ <DropdownRoot dropdownId={dropdownId} type="picker">+ <Dropdown.Trigger render={<div />} nativeButton={false}><SubMatchingSelectDropdownButtoncolumn={column}option={option}placeholder={placeholder}/>- }- dropdownComponents={+ </Dropdown.Trigger>+ <DropdownContent align="start" aria-label={t`Match ${entry}`}><SubMatchingSelectInput- defaultOption={value}+ selectedOption={value}options={options}onOptionSelected={handleSelect}/>- }- isDropdownInModal- />+ </DropdownContent>+ </DropdownRoot></StyledDropdownContainer>);};diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsxindex 82a5dd73e4b..dd87b432201 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/components/TemplateColumn.tsx@@ -75,7 +75,7 @@ export const TemplateColumn = ({<MatchColumnToFieldSelectplaceholder={t`Select column...`}value={isIgnored ? ignoreValue : selectValue}- onChange={(value) => onChange(value?.value as string, column.index)}+ onChange={(value) => onChange(value.value, column.index)}options={selectOptions}suggestedOptions={suggestedFieldOptions}columnIndex={column.index.toString()}diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/MatchColumns.stories.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/MatchColumns.stories.tsxindex d5f59338695..07c78381dc8 100644--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/MatchColumns.stories.tsx+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/MatchColumns.stories.tsx@@ -1,85 +1,318 @@-import { type Meta } from '@storybook/react-vite';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import { FieldMetadataType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { Button } from 'twenty-ui/primitives/input';import { mockRsiValues } from '@/spreadsheet-import/__mocks__/mockRsiValues';import { ReactSpreadsheetImportContextProvider } from '@/spreadsheet-import/components/ReactSpreadsheetImportContextProvider';import { SpreadSheetImportModalWrapper } from '@/spreadsheet-import/components/SpreadSheetImportModalWrapper';import { MatchColumnsStep } from '@/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep';+import { matchColumnsState } from '@/spreadsheet-import/steps/components/MatchColumnsStep/components/states/initialComputedColumnsState';+import { suggestedFieldsByColumnHeaderState } from '@/spreadsheet-import/steps/components/MatchColumnsStep/components/states/suggestedFieldsByColumnHeaderState';import { type SpreadsheetImportStep } from '@/spreadsheet-import/steps/types/SpreadsheetImportStep';+import { type SpreadsheetImportField } from '@/spreadsheet-import/types/SpreadsheetImportField';+import { SpreadsheetColumnType } from '@/spreadsheet-import/types/SpreadsheetColumnType';import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';import { ToastDecorator } from '~/testing/decorators/ToastDecorator';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';-const meta: Meta<typeof MatchColumnsStep> = {+const DIALOG_ID = 'match-columns-step';+const company = getMockObjectMetadataItemOrThrow('company');+const nameField = company.fields.find((field) => field.name === 'name');+const addressField = company.fields.find((field) => field.name === 'address');++if (!isDefined(nameField) || !isDefined(addressField)) {+ throw new Error(+ 'The matching story requires company name and address fields',+ );+}++const teamField = {+ ...nameField,+ id: 'matching-team-field',+ name: 'team',+ label: 'Team',+ type: FieldMetadataType.SELECT,+};++const fields: SpreadsheetImportField[] = [+ {+ Icon: null,+ key: 'name',+ label: 'Name',+ fieldMetadataItemId: nameField.id,+ fieldMetadataType: FieldMetadataType.TEXT,+ fieldType: { type: 'input' },+ isNestedField: false,+ },+ ...[+ { key: 'addressStreet1', label: 'Street 1' },+ { key: 'addressCity', label: 'City' },+ ].map(+ ({ key, label }): SpreadsheetImportField => ({+ Icon: null,+ key: `address.${key}`,+ label: `Address / ${label}`,+ fieldMetadataItemId: addressField.id,+ fieldMetadataType: FieldMetadataType.ADDRESS,+ fieldType: { type: 'input' },+ isNestedField: true,+ }),+ ),+ {+ Icon: null,+ key: 'team',+ label: 'Team',+ fieldMetadataItemId: teamField.id,+ fieldMetadataType: FieldMetadataType.SELECT,+ fieldType: {+ type: 'select',+ options: [+ { value: 'one', label: 'Team One', color: 'blue' },+ { value: 'two', label: 'Team Two', color: 'green' },+ ],+ },+ isNestedField: false,+ },+];++const storyValues = {+ ...mockRsiValues,+ spreadsheetImportFields: fields,+ availableFieldMetadataItems: [nameField, addressField, teamField],+};++const MatchColumnsExample = ({ onClose }: { onClose: () => void }) => {+ const { openDialog } = useDialog();++ return (+ <DialogComponentInstanceContext.Provider+ value={{ instanceId: 'dialog-manager' }}+ >+ <ReactSpreadsheetImportContextProvider values={storyValues}>+ <Button onClick={() => openDialog(DIALOG_ID)}>Open import</Button>+ <SpreadSheetImportModalWrapper+ modalInstanceId={DIALOG_ID}+ onClose={onClose}+ >+ <MatchColumnsStep+ headerValues={['company', 'street', 'team']}+ data={[+ ['Acme', 'Paris', 'Red'],+ ['Twenty', 'London', 'Blue'],+ ]}+ onBack={() => undefined}+ setCurrentStepState={() => undefined}+ setPreviousStepState={() => undefined}+ currentStepState={{} as SpreadsheetImportStep}+ nextStep={() => undefined}+ onError={() => undefined}+ />+ </SpreadSheetImportModalWrapper>+ </ReactSpreadsheetImportContextProvider>+ </DialogComponentInstanceContext.Provider>+ );+};++const meta: Meta<typeof MatchColumnsExample> = {title: 'Modules/SpreadsheetImport/MatchColumnsStep',- component: MatchColumnsStep,- parameters: {- layout: 'fullscreen',+ component: MatchColumnsExample,+ parameters: { layout: 'fullscreen' },+ decorators: [ToastDecorator, IconsProviderDecorator],+ args: { onClose: fn() },+ beforeEach: () => {+ jotaiStore.set(matchColumnsState.atom, []);+ jotaiStore.set(suggestedFieldsByColumnHeaderState.atom, {+ company: [fields[0]],+ });++ return () => {+ jotaiStore.set(matchColumnsState.atom, []);+ jotaiStore.set(suggestedFieldsByColumnHeaderState.atom, {});+ };},- decorators: [ToastDecorator],};export default meta;+type Story = StoryObj<typeof MatchColumnsExample>;-const mockData = [- ['id', 'first_name', 'last_name', 'email', 'gender', 'ip_address'],- ['2', 'Geno', 'Gencke', '[email protected]', 'Female', '17.204.180.40'],- [- '3',- 'Bertram',- 'Twyford',- '[email protected]',- 'Genderqueer',- '188.98.2.13',- ],- [- '4',- 'Tersina',- 'Isacke',- '[email protected]',- 'Non-binary',- '237.69.180.31',- ],- [- '5',- 'Yoko',- 'Guilliland',- '[email protected]',- 'Male',- '179.123.237.119',- ],- ['6', 'Freida', 'Fearns', '[email protected]', 'Male', '184.48.15.1'],- ['7', 'Mildrid', 'Mount', '[email protected]', 'Male', '26.97.160.103'],- [- '8',- 'Jolene',- 'Darlington',- '[email protected]',- 'Agender',- '172.14.232.84',- ],- ['9', 'Craig', 'Dickie', '[email protected]', 'Male', '143.248.220.47'],- ['10', 'Jere', 'Shier', '[email protected]', 'Agender', '10.143.62.161'],-];+export const Default: Story = {+ play: async ({ canvasElement }) => {+ await userEvent.click(+ within(canvasElement).getByRole('button', { name: 'Open import' }),+ );+ await within(canvasElement.ownerDocument.body).findByRole('dialog', {+ name: 'Import data',+ });+ },+};-export const Default = () => (- <DialogComponentInstanceContext.Provider- value={{ instanceId: 'dialog-manager' }}- >- <ReactSpreadsheetImportContextProvider values={mockRsiValues}>- <SpreadSheetImportModalWrapper- modalInstanceId="match-columns-step"- onClose={() => null}- >- <MatchColumnsStep- headerValues={mockData[0] as string[]}- data={mockData.slice(1)}- onBack={() => null}- setCurrentStepState={() => null}- setPreviousStepState={() => null}- currentStepState={{} as SpreadsheetImportStep}- nextStep={() => null}- onError={() => null}- />- </SpreadSheetImportModalWrapper>- </ReactSpreadsheetImportContextProvider>- </DialogComponentInstanceContext.Provider>-);+export const CompositeFieldAndBack: Story = {+ play: async ({ canvasElement, args }) => {+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(+ within(canvasElement).getByRole('button', { name: 'Open import' }),+ );+ const dialog = await body.findByRole('dialog', { name: 'Import data' });+ const trigger = within(dialog).getAllByRole('button', {+ name: 'Select column...',+ })[1];+ await userEvent.click(trigger);+ const popup = await body.findByRole('dialog', {+ name: 'Select matching field',+ });+ const search = within(popup).getByRole('searchbox', {+ name: 'Search fields',+ });+ await waitFor(() => expect(search).toHaveFocus());+ await userEvent.type(search, 'address');+ await userEvent.keyboard('{Enter}');+ await within(popup).findByRole('button', { name: 'Street 1' });+ await userEvent.click(+ within(popup).getByRole('button', { name: 'Address, back to fields' }),+ );+ await userEvent.click(+ await within(popup).findByRole('button', { name: 'Address Address' }),+ );+ const subFieldSearch = within(popup).getByRole('searchbox', {+ name: 'Search fields',+ });+ await userEvent.type(subFieldSearch, 'City');+ await userEvent.keyboard('{Enter}');+ await waitFor(() => expect(popup).not.toBeInTheDocument());+ expect(trigger).toHaveTextContent('Address / City');+ expect(dialog).toBeVisible();+ expect(args.onClose).not.toHaveBeenCalled();+ await waitFor(() => expect(trigger).toHaveFocus());++ await userEvent.click(trigger);+ const reopenedPopup = await body.findByRole('dialog', {+ name: 'Select matching field',+ });+ expect(within(reopenedPopup).getByRole('searchbox')).toHaveValue('');+ expect(+ within(reopenedPopup).getByRole('button', { name: 'Do not import' }),+ ).toBeVisible();+ await userEvent.keyboard('{Escape}');+ await waitFor(() => expect(reopenedPopup).not.toBeInTheDocument());+ expect(args.onClose).not.toHaveBeenCalled();+ },+};++export const SuggestionsIgnoreAndCancel: Story = {+ play: async ({ canvasElement, args }) => {+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(+ within(canvasElement).getByRole('button', { name: 'Open import' }),+ );+ const dialog = await body.findByRole('dialog', { name: 'Import data' });+ const trigger = within(dialog).getAllByRole('button', {+ name: 'Select column...',+ })[0];+ await userEvent.click(trigger);+ const popup = await body.findByRole('dialog', {+ name: 'Select matching field',+ });+ const suggestedSection = within(popup).getByText('Suggested').parentElement;++ if (!isDefined(suggestedSection)) {+ throw new Error('The suggested field section is missing');+ }++ await userEvent.click(+ within(suggestedSection).getByRole('button', { name: 'Name Text' }),+ );+ await waitFor(() => expect(popup).not.toBeInTheDocument());+ expect(trigger).toHaveTextContent('Name');++ await userEvent.click(trigger);+ const reopenedPopup = await body.findByRole('dialog', {+ name: 'Select matching field',+ });+ const reopenedSuggestedSection =+ within(reopenedPopup).getByText('Suggested').parentElement;++ if (!isDefined(reopenedSuggestedSection)) {+ throw new Error('The suggested field section is missing');+ }++ expect(+ within(reopenedSuggestedSection).getByRole('button', {+ name: 'Name Text',+ }),+ ).toBeEnabled();+ await userEvent.click(+ within(reopenedPopup).getByRole('button', {+ name: 'Cancel field selection',+ }),+ );+ await waitFor(() =>+ expect(+ body.queryByRole('dialog', { name: 'Select matching field' }),+ ).not.toBeInTheDocument(),+ );+ expect(trigger).toHaveTextContent('Name');++ await userEvent.click(trigger);+ const ignoredPopup = await body.findByRole('dialog', {+ name: 'Select matching field',+ });+ await userEvent.type(+ within(ignoredPopup).getByRole('searchbox', { name: 'Search fields' }),+ 'do not import',+ );+ await userEvent.keyboard('{Enter}');+ await waitFor(() => expect(ignoredPopup).not.toBeInTheDocument());+ expect(trigger).toHaveTextContent('Do not import');+ expect(dialog).toBeVisible();+ expect(args.onClose).not.toHaveBeenCalled();+ },+};++export const SubMatchingSearchSkipsUnmatchedSelection: Story = {+ beforeEach: () => {+ jotaiStore.set(matchColumnsState.atom, [+ { header: 'company', index: 0, type: SpreadsheetColumnType.empty },+ { header: 'street', index: 1, type: SpreadsheetColumnType.empty },+ {+ header: 'team',+ index: 2,+ type: SpreadsheetColumnType.matchedSelect,+ value: 'team',+ matchedOptions: [{ entry: 'Red', value: 'two' }],+ },+ ]);+ },+ play: async ({ canvasElement, args }) => {+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(+ within(canvasElement).getByRole('button', { name: 'Open import' }),+ );+ const dialog = await body.findByRole('dialog', { name: 'Import data' });+ await userEvent.click(within(dialog).getByText('Match Team (0 Unmatched)'));+ const trigger = await within(dialog).findByRole('button', {+ name: 'Team Two',+ });+ await userEvent.click(trigger);+ const popup = await body.findByRole('dialog', { name: 'Match Red' });+ const options = within(popup).getAllByRole('button');+ expect(options[0]).toHaveTextContent('Team Two');+ await userEvent.type(+ within(popup).getByRole('searchbox', { name: 'Search' }),+ 'Team One',+ );+ expect(+ within(popup).queryByRole('button', { name: 'Team Two' }),+ ).not.toBeInTheDocument();+ await userEvent.keyboard('{Enter}');+ await waitFor(() => expect(popup).not.toBeInTheDocument());+ expect(trigger).toHaveTextContent('Team One');+ expect(dialog).toBeVisible();+ expect(args.onClose).not.toHaveBeenCalled();+ await waitFor(() => expect(trigger).toHaveFocus());+ },+};diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsxindex 4d7c9b23fc9..36314fe0334 100644--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx@@ -160,7 +160,15 @@ export const Select = <TValue extends SelectValue>({variant={variant}/>) : (- <DropdownRoot dropdownId={dropdownId} type="picker">+ <DropdownRoot+ dropdownId={dropdownId}+ type="picker"+ onOpenChange={(open) => {+ if (open) {+ setSearchInputValue('');+ }+ }}+ ><Dropdown.Trigger render={<div />} nativeButton={false}><SelectControlrenderAsTag={renderAsTag}diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsxindex d11b237d01c..47a823f8515 100644--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx@@ -161,6 +161,12 @@ export const SearchWithPinnedDisabledAndAction: Story = {expect(args.onChange).toHaveBeenCalledWith('a');await waitFor(() => expect(popup).not.toBeInTheDocument());await waitFor(() => expect(trigger).toHaveFocus());++ await userEvent.click(trigger);+ const reopenedPopup = await body.findByRole('dialog');+ expect(+ within(reopenedPopup).getByRole('searchbox', { name: 'Search' }),+ ).toHaveValue('');},};diff --git a/packages/twenty-front/src/modules/workflow/hooks/useWorkflowObjectSelectOptions.ts b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowObjectSelectOptions.tsnew file mode 100644index 00000000000..48036c94ac6--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/hooks/useWorkflowObjectSelectOptions.ts@@ -0,0 +1,35 @@+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';+import { type SelectOption } from 'twenty-ui/primitives/input';++type UseWorkflowObjectSelectOptionsProps = {+ selectedObjectNameSingular?: string;+};++export const useWorkflowObjectSelectOptions = ({+ selectedObjectNameSingular,+}: UseWorkflowObjectSelectOptionsProps = {}): SelectOption<string>[] => {+ const { objectMetadataItems } = useFilteredObjectMetadataItems();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();++ const selectableObjectMetadataItems = objectMetadataItems.filter(+ (objectMetadataItem) =>+ objectMetadataItem.isActive ||+ objectMetadataItem.nameSingular === selectedObjectNameSingular,+ );++ return [+ ...selectableObjectMetadataItems.filter(+ (objectMetadataItem) => !objectMetadataItem.isSystem,+ ),+ ...selectableObjectMetadataItems.filter(+ (objectMetadataItem) => objectMetadataItem.isSystem,+ ),+ ].map((objectMetadataItem) => ({+ label: objectMetadataItem.labelPlural,+ value: objectMetadataItem.nameSingular,+ searchKeywords: `${objectMetadataItem.nameSingular} ${objectMetadataItem.labelSingular}`,+ ...getSelectIconPropsFromObjectMetadataItem(objectMetadataItem),+ }));+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsxindex d754dcac43b..12ec55ca3fe 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx@@ -1,13 +1,6 @@import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { useUpdateStepFilterFromVariable } from '@/workflow/workflow-steps/filters/hooks/useUpdateStepFilterFromVariable';import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';import { useVariableDropdown } from '@/workflow/workflow-variables/hooks/useVariableDropdown';@@ -20,17 +13,16 @@ import { getStepItemIcon } from '@/workflow/workflow-variables/utils/getStepItemimport { getVariableTemplateFromPath } from '@/workflow/workflow-variables/utils/getVariableTemplateFromPath';import { getWorkflowVariableRecordObjectDisplay } from '@/workflow/workflow-variables/utils/getWorkflowVariableRecordObjectDisplay';import { useLingui } from '@lingui/react/macro';+import { isNonEmptyString } from '@sniptt/guards';import { type StepFilter } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { ListItem } from 'twenty-ui/primitives/navigation';+import { Dropdown, LightIconButton } from 'twenty-ui/components';type WorkflowDropdownStepOutputItemsProps = {stepFilter: StepFilter;step: StepOutputSchemaV2;initialPath?: string[];- onSelect: () => void;onBack: () => void;};@@ -38,7 +30,6 @@ export const WorkflowDropdownStepOutputItems = ({stepFilter,step,initialPath,- onSelect,onBack,}: WorkflowDropdownStepOutputItemsProps) => {const { t } = useLingui();@@ -58,7 +49,6 @@ export const WorkflowDropdownStepOutputItems = ({isFullRecord,stepType: step.type,});- onSelect();};const {@@ -105,7 +95,6 @@ export const WorkflowDropdownStepOutputItems = ({isFullRecord: true,stepType: step.type,});- onSelect();};const displayedSubStepObject = getDisplayedSubStepObject();@@ -129,28 +118,23 @@ export const WorkflowDropdownStepOutputItems = ({subStepObjectDisplay?.isSelectable === true;return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={goBack}- Icon={IconChevronLeft}- />- }- >- <OverflowingTextWithTooltip- text={getStepHeaderLabel(step, currentPath)}- />- </DropdownMenuHeader>- <DropdownMenuSearchInput+ <>+ <Dropdown.Header>+ <LightIconButton size="sm" aria-label={t`Back`} onClick={goBack}>+ <IconChevronLeft />+ </LightIconButton>+ <Dropdown.Title>{getStepHeaderLabel(step, currentPath)}</Dropdown.Title>+ <Dropdown.Close aria-label={t`Close`} />+ </Dropdown.Header>+ <Dropdown.Search+ key={JSON.stringify(currentPath)}autoFocus+ aria-label={t`Search fields`}value={searchInputValue}- onChange={(event) => setSearchInputValue(event.target.value)}+ onValueChange={setSearchInputValue}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>+ <Dropdown.Separator />+ <Dropdown.Section scrollable>{isSearching ? (<WorkflowVariableSearchResultItemssearchResults={searchResults}@@ -159,13 +143,8 @@ export const WorkflowDropdownStepOutputItems = ({) : (<>{shouldDisplaySubStepObject && (- <ListItem- focused={false}- onClick={handleSelectObject}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ <Dropdown.OptionItem+ onSelect={handleSelectObject}hasSubmenu={false}description={t`Pick a ${subStepObjectDisplay?.label} record`}startIcon={@@ -180,10 +159,10 @@ export const WorkflowDropdownStepOutputItems = ({}>{subStepObjectDisplay?.label ?? ''}- </ListItem>+ </Dropdown.OptionItem>)}- {options.length > 0 && shouldDisplaySubStepObject && (- <DropdownMenuSeparator />+ {isNonEmptyArray(options) && shouldDisplaySubStepObject && (+ <Dropdown.Separator />)}{options.map(([key, subStep]) => {if (!isDefined(subStep)) {@@ -191,22 +170,18 @@ export const WorkflowDropdownStepOutputItems = ({}return (- <ListItem+ <Dropdown.OptionItemkey={key}- focused={false}- onClick={() => handleSelectField(key)}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ onSelect={() => handleSelectField(key)}hasSubmenu={!subStep.isLeaf}+ closeOnSelect={subStep.isLeaf}description={subStep.isLeaf ? subStep.value?.toString() : undefined}startIcon={<SelectOptionIconIcon={- subStep.icon+ isNonEmptyString(subStep.icon)? getIcon(subStep.icon): getIcon(getStepItemIcon({@@ -218,12 +193,12 @@ export const WorkflowDropdownStepOutputItems = ({}>{subStep.label || key}- </ListItem>+ </Dropdown.OptionItem>);})}</>)}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsxindex 63eb9172563..590cedd6aed 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx@@ -1,8 +1,9 @@import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { SelectControl } from '@/ui/input/components/SelectControl';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { WorkflowDropdownStepOutputItems } from '@/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems';import { useUpdateStepFilterFromVariable } from '@/workflow/workflow-steps/filters/hooks/useUpdateStepFilterFromVariable';import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';@@ -20,7 +21,8 @@ import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { useContext, useState } from 'react';import { type StepFilter } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';import {TRIGGER_STEP_ID,extractRawVariableNamePart,@@ -45,7 +47,6 @@ export const WorkflowStepFilterFieldSelect = ({WorkflowStepFilterContext,);const { t } = useLingui();- const { closeDropdown } = useCloseDropdown();const { updateStepFilterFromVariable } = useUpdateStepFilterFromVariable({stepFilter,});@@ -58,7 +59,9 @@ export const WorkflowStepFilterFieldSelect = ({shouldDisplayRecordObjects: true,fieldTypesToExclude: NON_SELECTABLE_FIELD_TYPES,});- const noAvailableVariables = availableVariablesInWorkflowStep.length === 0;+ const noAvailableVariables = !isNonEmptyArray(+ availableVariablesInWorkflowStep,+ );const initialStep =availableVariablesInWorkflowStep.length === 1@@ -98,12 +101,6 @@ export const WorkflowStepFilterFieldSelect = ({);};- const handleSubItemSelect = () => {- setSelectedStep(initialStep);- setSelectedPath([]);- closeDropdown(dropdownId);- };-const handleBack = () => {setSelectedStep(undefined);};@@ -126,7 +123,6 @@ export const WorkflowStepFilterFieldSelect = ({stepType: step.type,isFullRecord,});- handleSubItemSelect();};const isSelectedFieldNotFound = !isDefined(variableLabel);@@ -168,21 +164,15 @@ export const WorkflowStepFilterFieldSelect = ({return (<>- <Dropdown- dropdownId={dropdownId}- clickableComponent={- <SelectControl- selectedOption={{- value: stepFilter.stepOutputKey,- label: disabledLabel,- fullLabel: variablePathLabel,- Icon: icon,- iconThemeColor,- }}- isDisabled={true}- />- }- dropdownComponents={[]}+ <SelectControl+ selectedOption={{+ value: stepFilter.stepOutputKey,+ label: disabledLabel,+ fullLabel: variablePathLabel,+ Icon: icon,+ iconThemeColor,+ }}+ isDisabled={true}/>{brokenFieldReferenceHint}</>@@ -191,9 +181,19 @@ export const WorkflowStepFilterFieldSelect = ({return (<>- <Dropdown+ <DropdownRootdropdownId={dropdownId}- clickableComponent={+ type="picker"+ onOpenChange={(open) => {+ if (!open) {+ return;+ }++ setSelectedStep(initialStep);+ setSelectedPath([]);+ }}+ >+ <Dropdown.Trigger nativeButton={false} render={<div />}><SelectControlselectedOption={{label,@@ -203,13 +203,16 @@ export const WorkflowStepFilterFieldSelect = ({iconThemeColor,}}textAccent={isSelectedFieldNotFound ? 'placeholder' : 'default'}- isDisabled={readonly}/>- }- dropdownComponents={- !isDefined(selectedStep) ? (+ </Dropdown.Trigger>+ <DropdownContent+ align="end"+ sideOffset={4}+ alignOffset={-2}+ width={GenericDropdownContentWidth.ExtraLarge}+ >+ {!isDefined(selectedStep) ? (<WorkflowVariablesDropdownSteps- dropdownId={dropdownId}steps={availableVariablesInWorkflowStep}onSelect={handleStepSelect}onVariableSelect={handleVariableSelect}@@ -221,17 +224,11 @@ export const WorkflowStepFilterFieldSelect = ({stepFilter={stepFilter}step={selectedStep}initialPath={selectedPath}- onSelect={handleSubItemSelect}onBack={handleBack}/>- )- }- dropdownPlacement="bottom-end"- dropdownOffset={{- x: 2,- y: 4,- }}- />+ )}+ </DropdownContent>+ </DropdownRoot>{brokenFieldReferenceHint}</>);diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsxindex 128ed63bcf8..f0cea03b5e2 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx@@ -1,3 +1,5 @@+import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';import { WorkflowStepFilterFieldSelect } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect';import { WorkflowStepFilterDecorator } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/decorators/WorkflowStepFilterDecorator';import { type Meta, type StoryObj } from '@storybook/react-vite';@@ -8,6 +10,8 @@ import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecoratoimport { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';import { graphqlMocks } from '~/testing/graphqlMocks';+const onFilterSettingsUpdate = fn();+const DEFAULT_STEP_FILTER: StepFilter = {id: 'filter-1',stepFilterGroupId: 'filter-group-1',@@ -28,6 +32,17 @@ const meta: Meta<typeof WorkflowStepFilterFieldSelect> = {stepFilter: DEFAULT_STEP_FILTER,},decorators: [+ (Story, context) => (+ <WorkflowStepFilterContext.Provider+ value={{+ stepId: 'step-id',+ readonly: context.parameters.readonly,+ onFilterSettingsUpdate,+ }}+ >+ <Story />+ </WorkflowStepFilterContext.Provider>+ ),WorkflowStepActionDrawerDecorator,WorkflowStepDecorator,ComponentDecorator,@@ -39,4 +54,63 @@ const meta: Meta<typeof WorkflowStepFilterFieldSelect> = {export default meta;type Story = StoryObj<typeof WorkflowStepFilterFieldSelect>;-export const Default: Story = {};+export const Default: Story = {+ play: async ({ canvasElement }) => {+ onFilterSettingsUpdate.mockClear();+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', {+ name: 'Select a field from a previous step',+ });++ await userEvent.click(trigger);+ const search = await body.findByRole('searchbox');+ await userEvent.type(search, 'name');+ await userEvent.keyboard('{Enter}');++ await waitFor(() =>+ expect(onFilterSettingsUpdate).toHaveBeenCalledWith(+ expect.objectContaining({+ stepFilters: expect.arrayContaining([+ expect.objectContaining({+ id: 'filter-1',+ stepOutputKey: expect.stringContaining('{{trigger.'),+ }),+ ]),+ }),+ ),+ );+ await waitFor(() =>+ expect(body.queryByRole('searchbox')).not.toBeInTheDocument(),+ );+ await waitFor(() => expect(trigger).toHaveFocus());+ },+};++export const Readonly: Story = {+ parameters: { readonly: true },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ await expect(+ await canvas.findByText('Select a field from a previous step'),+ ).toBeVisible();+ await expect(+ canvas.queryByRole('button', {+ name: 'Select a field from a previous step',+ }),+ ).not.toBeInTheDocument();+ },+};++export const BrokenReference: Story = {+ args: {+ stepFilter: { ...DEFAULT_STEP_FILTER, stepOutputKey: 'trigger.name' },+ },+ play: async ({ canvasElement }) => {+ await expect(+ await within(canvasElement).findByText(+ 'Broken field reference. Select the field again to fix this condition.',+ ),+ ).toBeVisible();+ },+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsxindex a84a6b65e9f..c132a43adc1 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx@@ -1,4 +1,3 @@-import { ListItem } from 'twenty-ui/primitives/navigation';import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';import { buildConnectedAccountSenderOptions } from '@/accounts/utils/buildConnectedAccountSenderOptions';import { getMissingDraftEmailScopes } from '@/accounts/utils/hasMissingDraftEmailScopes';@@ -11,11 +10,9 @@ import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedimport { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { WORKFLOW_STEP_CONNECTED_ACCOUNT_HANDLE } from '@/workflow/graphql/queries/workflowStepConnectedAccountHandle';import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';@@ -42,7 +39,7 @@ import {isDefined,} from 'twenty-shared/utils';import { isStandaloneVariableString } from 'twenty-shared/workflow';-import { Callout } from 'twenty-ui/components';+import { Callout, Dropdown } from 'twenty-ui/components';import { IconPlus } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';import { PermissionFlagType } from '~/generated-metadata/graphql';@@ -101,8 +98,6 @@ export const WorkflowEditActionEmailBase = ({};});- const { closeDropdown } = useCloseDropdown();-const advancedOptionsDropdownId = `${action.id}-email-advanced-options`;const hasAvailableAdvancedOptions =@@ -330,57 +325,48 @@ export const WorkflowEditActionEmailBase = ({/>)}{!actionOptions.readonly && hasAvailableAdvancedOptions && (- <Dropdown- dropdownId={advancedOptionsDropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <Button- size="sm"- variant="outline"- >{t`Advanced options`}</Button>- }- dropdownComponents={- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.Medium}- >- <DropdownMenuItemsContainer>- {!visibleAdvancedFields.cc && (- <ListItem- onClick={() => {- setVisibleAdvancedFields((prev) => ({- ...prev,- cc: true,- }));- closeDropdown(advancedOptionsDropdownId);- }}- >{t`Add CC`}</ListItem>- )}- {!visibleAdvancedFields.bcc && (- <ListItem- onClick={() => {- setVisibleAdvancedFields((prev) => ({- ...prev,- bcc: true,- }));- closeDropdown(advancedOptionsDropdownId);- }}- >{t`Add BCC`}</ListItem>- )}- {!visibleAdvancedFields.inReplyTo && (- <ListItem- onClick={() => {- setVisibleAdvancedFields((prev) => ({- ...prev,- inReplyTo: true,- }));- closeDropdown(advancedOptionsDropdownId);- }}- >{t`Add In-Reply-To`}</ListItem>- )}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- }- />+ <DropdownRoot dropdownId={advancedOptionsDropdownId} type="menu">+ <Dropdown.Trigger render={<Button size="sm" variant="outline" />}>+ {t`Advanced options`}+ </Dropdown.Trigger>+ <DropdownContent+ width={GenericDropdownContentWidth.Medium}+ align="start"+ >+ <Dropdown.Section>+ {!visibleAdvancedFields.cc && (+ <Dropdown.ActionItem+ onClick={() => {+ setVisibleAdvancedFields((previousFields) => ({+ ...previousFields,+ cc: true,+ }));+ }}+ >{t`Add CC`}</Dropdown.ActionItem>+ )}+ {!visibleAdvancedFields.bcc && (+ <Dropdown.ActionItem+ onClick={() => {+ setVisibleAdvancedFields((previousFields) => ({+ ...previousFields,+ bcc: true,+ }));+ }}+ >{t`Add BCC`}</Dropdown.ActionItem>+ )}+ {!visibleAdvancedFields.inReplyTo && (+ <Dropdown.ActionItem+ onClick={() => {+ setVisibleAdvancedFields((previousFields) => ({+ ...previousFields,+ inReplyTo: true,+ }));+ }}+ >{t`Add In-Reply-To`}</Dropdown.ActionItem>+ )}+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>)}<FormTextFieldInputlabel={t`Subject`}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsxindex 86d55ba9959..88054f36af8 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionEmailBase.stories.tsx@@ -5,7 +5,7 @@ import {import { WorkflowEditActionEmailBase } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase';import { type Meta, type StoryObj } from '@storybook/react-vite';import { HttpResponse, graphql } from 'msw';-import { expect, fn, userEvent, within } from 'storybook/test';+import { expect, fn, screen, userEvent, waitFor, within } from 'storybook/test';import { ComponentDecorator } from 'twenty-ui/testing';import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';import { ToastDecorator } from '~/testing/decorators/ToastDecorator';@@ -264,7 +264,25 @@ export const Default: Story = {expect(await canvas.findByText('To')).toBeVisible();expect(await canvas.findByText('Subject')).toBeVisible();expect(await canvas.findByText('Body')).toBeVisible();- expect(await canvas.findByText('Advanced options')).toBeVisible();+ for (const field of ['CC', 'BCC', 'In-Reply-To']) {+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Advanced options' }),+ );+ await userEvent.click(+ await screen.findByRole('menuitem', { name: `Add ${field}` }),+ );++ expect(await canvas.findByText(field)).toBeVisible();+ await waitFor(() => {+ expect(+ screen.queryByRole('menu', { name: 'Advanced options' }),+ ).not.toBeInTheDocument();+ });+ }++ expect(+ canvas.queryByRole('button', { name: 'Advanced options' }),+ ).not.toBeInTheDocument();},};@@ -428,3 +446,18 @@ export const VariableSenderSendEmail: Story = {).toBeVisible();},};++export const ReadOnly: Story = {+ args: {+ action: CONFIGURED_SEND_EMAIL_ACTION,+ actionOptions: { readonly: true },+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(await canvas.findByText('Subject')).toBeVisible();+ expect(+ canvas.queryByRole('button', { name: 'Advanced options' }),+ ).not.toBeInTheDocument();+ },+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionFindRecords.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionFindRecords.stories.tsxindex 30ba9ebb4a1..37d91b319a4 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionFindRecords.stories.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionFindRecords.stories.tsx@@ -64,6 +64,51 @@ export const Default: Story = {onActionUpdate: fn(),},},+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ await userEvent.click(+ await canvas.findByRole('button', { name: 'People' }),+ );++ const dropdown = within(+ await screen.findByRole('dialog', { name: 'Object' }),+ );+ const options = dropdown.getAllByRole('button');++ expect(+ options.indexOf(dropdown.getByRole('button', { name: 'People' })),+ ).toBeLessThan(+ options.indexOf(+ dropdown.getByRole('button', { name: 'Calendar events' }),+ ),+ );++ await userEvent.type(dropdown.getByRole('searchbox'), 'Person');+ expect(dropdown.getByRole('button', { name: 'People' })).toBeVisible();+ expect(+ dropdown.queryByRole('button', { name: 'Companies' }),+ ).not.toBeInTheDocument();++ await userEvent.keyboard('{Enter}');++ await waitFor(() => {+ expect(+ screen.queryByRole('dialog', { name: 'Object' }),+ ).not.toBeInTheDocument();+ });++ await userEvent.click(canvas.getByRole('button', { name: 'People' }));++ expect(+ await screen.findByRole('searchbox', { name: 'Search' }),+ ).toHaveValue('');+ expect(+ await screen.findByRole('button', { name: 'Companies' }),+ ).toBeVisible();++ await userEvent.keyboard('{Escape}');+ },};const onActionUpdateMock = fn();@@ -78,6 +123,8 @@ export const KeepsLimitAndOffsetWhenObjectChanges: Story = {objectName: 'person',limit: 100,offset: 20,+ filter: { recordFilters: [], recordFilterGroups: [] },+ orderBy: { recordSorts: [] },},},},@@ -97,7 +144,13 @@ export const KeepsLimitAndOffsetWhenObjectChanges: Story = {'Companies',);- await userEvent.click(await screen.findByText('Companies'));+ await userEvent.keyboard('{Enter}');++ await waitFor(() => {+ expect(+ screen.queryByRole('dialog', { name: 'Object' }),+ ).not.toBeInTheDocument();+ });await waitFor(() => {@@ -108,6 +161,8 @@ export const KeepsLimitAndOffsetWhenObjectChanges: Story = {objectName: 'company',limit: 100,offset: 20,+ filter: undefined,+ orderBy: undefined,}),}),}),@@ -133,7 +188,7 @@ export const DisabledWithEmptyValues: Story = {{const searchInputInSelectDropdown =- canvas.queryByPlaceholderText('Search');+ screen.queryByPlaceholderText('Search');expect(searchInputInSelectDropdown).not.toBeInTheDocument();}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsxindex 200f094a4b3..ea0f9f9a5f7 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx@@ -1,6 +1,3 @@-import { styled } from '@linaria/react';-import { i18n } from '@lingui/core';-import { msg } from '@lingui/core/macro';import { useLingui } from '@lingui/react/macro';import { isNumber } from '@sniptt/guards';import { useEffect, useState } from 'react';@@ -11,45 +8,27 @@ import { type JsonValue } from 'type-fest';import { useDebouncedCallback } from 'use-debounce';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext';-import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';import { useRecordIndexFieldMetadataDerivedStates } from '@/object-record/record-index/hooks/useRecordIndexFieldMetadataDerivedStates';import { type RecordSort } from '@/object-record/record-sort/types/RecordSort';-import { SelectControl } from '@/ui/input/components/SelectControl';+import { Select } from '@/ui/input/components/Select';import { InputLabel } from '@/ui/input/components/internal/InputLabel/InputLabel';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useWorkflowObjectSelectOptions } from '@/workflow/hooks/useWorkflowObjectSelectOptions';import { type WorkflowFindRecordsAction } from '@/workflow/types/Workflow';import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';import { WorkflowFindRecordsFilters } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters';import { WorkflowFindRecordsFiltersEffect } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect';import { WorkflowFindRecordsSorts } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts';-import { WorkflowObjectDropdownContent } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent';+import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter';import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';import { isStandaloneVariableString } from 'twenty-shared/workflow';-import { themeCssVariables } from 'twenty-ui/theme';--const StyledLabel = styled.span`- color: ${themeCssVariables.font.color.light};- display: block;- font-size: ${themeCssVariables.font.size.xs};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin-bottom: ${themeCssVariables.spacing[1]};-`;--const StyledRecordTypeSelectContainer = styled.div<{ fullWidth?: boolean }>`- width: ${({ fullWidth }) => (fullWidth ? '100%' : 'auto')};-`;--const defaultSelectedOptionMessage = msg`Select an option`;type WorkflowEditActionFindRecordsProps = {action: WorkflowFindRecordsAction;@@ -71,12 +50,7 @@ type FindRecordsFormData = {offset?: number | string;};-export type FindRecordsActionFilter = {- recordFilterGroups?: RecordFilterGroup[];- recordFilters?: RecordFilter[];-};--export type FindRecordsActionOrderBy = {+type FindRecordsActionOrderBy = {recordSorts?: RecordSort[];gqlOperationOrderBy?: JsonValue;};@@ -86,14 +60,10 @@ export const WorkflowEditActionFindRecords = ({actionOptions,}: WorkflowEditActionFindRecordsProps) => {const { t } = useLingui();- const { getSelectIconPropsFromObjectMetadataItem } =- useObjectMetadataSelectHelpers();const maxRecordsFormatted = QUERY_MAX_RECORDS.toLocaleString();const dropdownId = 'workflow-edit-action-record-find-records-object-name';- const { closeDropdown } = useCloseDropdown();-const { objectMetadataItems } = useFilteredObjectMetadataItems();const [formData, setFormData] = useState<FindRecordsFormData>(() => ({@@ -116,17 +86,13 @@ export const WorkflowEditActionFindRecords = ({const [offsetError, setOffsetError] = useState<string | undefined>(undefined);const isFormDisabled = actionOptions.readonly ?? false;const instanceId = `workflow-edit-action-record-find-records-${action.id}-${formData.objectNameSingular}`;+ const objectOptions = useWorkflowObjectSelectOptions({+ selectedObjectNameSingular: formData.objectNameSingular,+ });const selectedObjectMetadataItem = objectMetadataItems.find((item) => item.nameSingular === formData.objectNameSingular,);- const selectedOption = selectedObjectMetadataItem- ? {- label: selectedObjectMetadataItem.labelPlural,- value: selectedObjectMetadataItem.nameSingular,- ...getSelectIconPropsFromObjectMetadataItem(selectedObjectMetadataItem),- }- : { label: i18n._(defaultSelectedOptionMessage), value: '' };const { objectPermissionsByObjectMetadataId } = useObjectPermissions();@@ -192,34 +158,24 @@ export const WorkflowEditActionFindRecords = ({setFormData(newFormData);saveAction(newFormData);- closeDropdown(dropdownId);};return (<><WorkflowStepBody>- <StyledRecordTypeSelectContainer fullWidth>- <StyledLabel>{t`Object`}</StyledLabel>- <Dropdown- dropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <SelectControl- isDisabled={isFormDisabled}- selectedOption={selectedOption}- />- }- dropdownComponents={- !isFormDisabled && (- <WorkflowObjectDropdownContent- dropdownId={dropdownId}- onOptionClick={handleOptionClick}- />- )- }- dropdownOffset={{ y: 4 }}- />- </StyledRecordTypeSelectContainer>+ <Select+ dropdownId={dropdownId}+ label={t`Object`}+ fullWidth+ disabled={isFormDisabled}+ value={formData.objectNameSingular}+ emptyOption={{ label: t`Select an option`, value: '' }}+ options={objectOptions}+ onChange={handleOptionClick}+ withSearchInput+ dropdownSideOffset={4}+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}+ /><HorizontalSeparator noMargin />{isDefined(selectedObjectMetadataItem) && (diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsxindex ce10a1c9597..4f7d7ec1d47 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFilters.tsx@@ -5,7 +5,7 @@ import { currentRecordFilterGroupsComponentState } from '@/object-record/record-import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords';+import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter';import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';import { useStore } from 'jotai';diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsxindex a2b9ea6a7ca..1284b1a029e 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsFiltersEffect.tsx@@ -5,7 +5,7 @@ import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/usimport { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { hasInitializedCurrentRecordFilterGroupsComponentFamilyState } from '@/views/states/hasInitializedCurrentRecordFilterGroupsComponentFamilyState';import { hasInitializedCurrentRecordFiltersComponentFamilyState } from '@/views/states/hasInitializedCurrentRecordFiltersComponentFamilyState';-import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords';+import { type FindRecordsActionFilter } from '@/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter';import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsxdeleted file mode 100644index 899c9b838ef..00000000000--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx+++ /dev/null@@ -1,124 +0,0 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useState } from 'react';--type WorkflowObjectDropdownContentProps = {- dropdownId: string;- onOptionClick: (value: string) => void;-};--export const WorkflowObjectDropdownContent = ({- dropdownId,- onOptionClick,-}: WorkflowObjectDropdownContentProps) => {- const [searchInputValue, setSearchInputValue] = useState('');-- const { objectMetadataItems } = useFilteredObjectMetadataItems();- const nonSystemObjectMetadataItems = objectMetadataItems.filter(- (objectMetadataItem) =>- objectMetadataItem.isActive === true &&- objectMetadataItem.isSystem === false,- );- const systemObjectMetadataItems = objectMetadataItems.filter(- (objectMetadataItem) =>- objectMetadataItem.isActive === true &&- objectMetadataItem.isSystem === true,- );-- const matchesSearchFilter = (- objectMetadataItem: (typeof objectMetadataItems)[number],- searchInputLowerCase: string,- ) => {- return (- objectMetadataItem.nameSingular- .toLowerCase()- .includes(searchInputLowerCase) ||- objectMetadataItem.labelSingular- .toLowerCase()- .includes(searchInputLowerCase) ||- objectMetadataItem.labelPlural- .toLowerCase()- .includes(searchInputLowerCase)- );- };-- const searchInputLowerCase = searchInputValue.toLowerCase();-- const filteredNonSystemObjects = nonSystemObjectMetadataItems.filter(- (objectMetadataItem) =>- matchesSearchFilter(objectMetadataItem, searchInputLowerCase),- );-- const filteredSystemObjects = systemObjectMetadataItems.filter(- (objectMetadataItem) =>- matchesSearchFilter(objectMetadataItem, searchInputLowerCase),- );-- const filteredObjects = [- ...filteredNonSystemObjects,- ...filteredSystemObjects,- ];-- const selectableItemIdArray = filteredObjects.map(- (objectMetadataItem) => objectMetadataItem.nameSingular,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-- const handleSearchInputChange = (- event: React.ChangeEvent<HTMLInputElement>,- ) => {- setSearchInputValue(event.target.value);- };-- return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuSearchInput- autoFocus- value={searchInputValue}- onChange={handleSearchInputChange}- />- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={selectableItemIdArray}- >- {filteredObjects.map((objectMetadataItem) => (- <SelectableListItem- key={objectMetadataItem.nameSingular}- itemId={objectMetadataItem.nameSingular}- onEnter={() => onOptionClick(objectMetadataItem.nameSingular)}- >- <ListItem- focused={selectedItemId === objectMetadataItem.nameSingular}- startIcon={- <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />- }- onClick={() => onOptionClick(objectMetadataItem.nameSingular)}- >- {objectMetadataItem.labelPlural}- </ListItem>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- );-};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.tsnew file mode 100644index 00000000000..d6c907c6b9b--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/types/FindRecordsActionFilter.ts@@ -0,0 +1,7 @@+import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';++export type FindRecordsActionFilter = {+ recordFilterGroups?: RecordFilterGroup[];+ recordFilters?: RecordFilter[];+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsxindex 2c4ea68ef22..0d37dff45b8 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord.tsx@@ -10,26 +10,14 @@ import { HorizontalSeparator } from 'twenty-ui/primitives/layout';import { useDebouncedCallback } from 'use-debounce';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';import { FormMultiRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormMultiRecordPicker';import { Select } from '@/ui/input/components/Select';-import { SelectControl } from '@/ui/input/components/SelectControl';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useWorkflowObjectSelectOptions } from '@/workflow/hooks/useWorkflowObjectSelectOptions';import { type WorkflowPickRecordAction } from '@/workflow/types/Workflow';import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';-import { WorkflowObjectDropdownContent } from '@/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent';-import { themeCssVariables } from 'twenty-ui/theme';--const StyledLabel = styled.span`- color: ${themeCssVariables.font.color.light};- display: block;- font-size: ${themeCssVariables.font.size.xs};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin-bottom: ${themeCssVariables.spacing[1]};-`;const StyledObjectSelectContainer = styled.div`width: 100%;@@ -67,13 +55,9 @@ export const WorkflowEditActionPickRecord = ({actionOptions,}: WorkflowEditActionPickRecordProps) => {const { t } = useLingui();- const { getSelectIconPropsFromObjectMetadataItem } =- useObjectMetadataSelectHelpers();const dropdownId = `workflow-edit-action-pick-record-object-name-${action.id}`;- const { closeDropdown } = useCloseDropdown();-const { objectMetadataItems } = useFilteredObjectMetadataItems();const [formData, setFormData] = useState<PickRecordFormData>(() => ({@@ -84,6 +68,12 @@ export const WorkflowEditActionPickRecord = ({}));const isFormDisabled = actionOptions.readonly ?? false;+ const objectOptions = useWorkflowObjectSelectOptions({+ selectedObjectNameSingular: formData.objectNameSingular,+ });+ const loadBalanceObjectOptions = useWorkflowObjectSelectOptions({+ selectedObjectNameSingular: formData.loadBalance?.objectNameSingular,+ });const strategyOptions: SelectOption<PickRecordStrategy>[] = [{ label: t`Random`, value: 'RANDOM' },@@ -97,16 +87,6 @@ export const WorkflowEditActionPickRecord = ({(item) => item.nameSingular === formData.loadBalance?.objectNameSingular,);- const loadBalanceObjectOption = loadBalanceObjectMetadataItem- ? {- label: loadBalanceObjectMetadataItem.labelPlural,- value: loadBalanceObjectMetadataItem.nameSingular,- ...getSelectIconPropsFromObjectMetadataItem(- loadBalanceObjectMetadataItem,- ),- }- : { label: i18n._(defaultSelectedOptionMessage), value: '' };-const loadBalanceFieldOptions: SelectOption<string>[] = (loadBalanceObjectMetadataItem?.fields ?? [])@@ -127,14 +107,6 @@ export const WorkflowEditActionPickRecord = ({const loadBalancePoolObjectLabel =selectedObjectMetadataItem?.labelSingular ?? t`the selected object`;- const selectedOption = selectedObjectMetadataItem- ? {- label: selectedObjectMetadataItem.labelPlural,- value: selectedObjectMetadataItem.nameSingular,- ...getSelectIconPropsFromObjectMetadataItem(selectedObjectMetadataItem),- }- : { label: i18n._(defaultSelectedOptionMessage), value: '' };-const saveAction = useDebouncedCallback(async (updatedFormData: PickRecordFormData) => {if (actionOptions.readonly === true) {@@ -182,7 +154,6 @@ export const WorkflowEditActionPickRecord = ({setFormData(newFormData);saveAction(newFormData);- closeDropdown(dropdownId);};const handleStrategyChange = (strategy: PickRecordStrategy) => {@@ -225,7 +196,6 @@ export const WorkflowEditActionPickRecord = ({setFormData(newFormData);saveAction(newFormData);- closeDropdown(loadBalanceObjectDropdownId);};const handleLoadBalanceFieldChange = (fieldName: string) => {@@ -245,28 +215,22 @@ export const WorkflowEditActionPickRecord = ({return (<><WorkflowStepBody>- <StyledObjectSelectContainer>- <StyledLabel>{t`Object`}</StyledLabel>- <Dropdown- dropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <SelectControl- isDisabled={isFormDisabled}- selectedOption={selectedOption}- />- }- dropdownComponents={- !isFormDisabled && (- <WorkflowObjectDropdownContent- dropdownId={dropdownId}- onOptionClick={handleObjectChange}- />- )- }- dropdownOffset={{ y: 4 }}- />- </StyledObjectSelectContainer>+ <Select+ dropdownId={dropdownId}+ label={t`Object`}+ fullWidth+ disabled={isFormDisabled}+ value={formData.objectNameSingular}+ emptyOption={{+ label: i18n._(defaultSelectedOptionMessage),+ value: '',+ }}+ options={objectOptions}+ onChange={handleObjectChange}+ withSearchInput+ dropdownSideOffset={4}+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}+ /><SelectdropdownId={`workflow-edit-action-pick-record-strategy-${action.id}`}@@ -280,28 +244,22 @@ export const WorkflowEditActionPickRecord = ({{formData.strategy === 'LOAD_BALANCED' && (<>- <StyledObjectSelectContainer>- <StyledLabel>{t`Balance by`}</StyledLabel>- <Dropdown- dropdownId={loadBalanceObjectDropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <SelectControl- isDisabled={isFormDisabled}- selectedOption={loadBalanceObjectOption}- />- }- dropdownComponents={- !isFormDisabled && (- <WorkflowObjectDropdownContent- dropdownId={loadBalanceObjectDropdownId}- onOptionClick={handleLoadBalanceObjectChange}- />- )- }- dropdownOffset={{ y: 4 }}- />- </StyledObjectSelectContainer>+ <Select+ dropdownId={loadBalanceObjectDropdownId}+ label={t`Balance by`}+ fullWidth+ disabled={isFormDisabled}+ value={formData.loadBalance?.objectNameSingular ?? ''}+ emptyOption={{+ label: i18n._(defaultSelectedOptionMessage),+ value: '',+ }}+ options={loadBalanceObjectOptions}+ onChange={handleLoadBalanceObjectChange}+ withSearchInput+ dropdownSideOffset={4}+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}+ />{isDefined(loadBalanceObjectMetadataItem) && (<StyledObjectSelectContainer>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/__stories__/WorkflowEditActionPickRecord.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/__stories__/WorkflowEditActionPickRecord.stories.tsxnew file mode 100644index 00000000000..6669b70cfea--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/pick-record-action/components/__stories__/WorkflowEditActionPickRecord.stories.tsx@@ -0,0 +1,137 @@+import { type WorkflowPickRecordAction } from '@/workflow/types/Workflow';+import { WorkflowEditActionPickRecord } from '@/workflow/workflow-steps/workflow-actions/pick-record-action/components/WorkflowEditActionPickRecord';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, screen, userEvent, waitFor, within } from 'storybook/test';+import { isDefined } from 'twenty-shared/utils';+import { ComponentDecorator } from 'twenty-ui/testing';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';+import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/WorkflowStepActionDrawerDecorator';+import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';+import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';+import { graphqlMocks } from '~/testing/graphqlMocks';+import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';+import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';++const DEFAULT_ACTION: WorkflowPickRecordAction = {+ id: getWorkflowNodeIdMock(),+ name: 'Pick Record',+ type: 'PICK_RECORD',+ valid: true,+ settings: {+ input: {+ objectName: 'company',+ strategy: 'RANDOM',+ recordIds: [mockedCompanyRecords[0].id],+ loadBalance: { objectNameSingular: 'person', fieldName: 'company' },+ },+ outputSchema: {},+ errorHandlingOptions: {+ retryOnFailure: { value: 0 },+ continueOnFailure: { value: false },+ },+ },+};++const onActionUpdate = fn();++const meta: Meta<typeof WorkflowEditActionPickRecord> = {+ title: 'Modules/Workflow/Actions/PickRecord/EditAction',+ component: WorkflowEditActionPickRecord,+ parameters: { msw: graphqlMocks },+ args: {+ action: DEFAULT_ACTION,+ actionOptions: { onActionUpdate },+ },+ decorators: [+ WorkflowStepActionDrawerDecorator,+ WorkflowStepDecorator,+ ComponentDecorator,+ ObjectMetadataItemsDecorator,+ ToastDecorator,+ MemoryRouterDecorator,+ WorkspaceDecorator,+ ],+};++export default meta;++type Story = StoryObj<typeof WorkflowEditActionPickRecord>;++export const ObjectAndLoadBalanceSelection: Story = {+ play: async ({ canvasElement }) => {+ onActionUpdate.mockClear();+ const canvas = within(canvasElement);++ expect(await canvas.findByText('Strategy')).toBeVisible();+ expect(canvas.queryByText('Balance by')).not.toBeInTheDocument();++ await userEvent.click(canvas.getByRole('button', { name: 'Random' }));+ await userEvent.click(+ await screen.findByRole('button', { name: 'Load balanced' }),+ );++ expect(await canvas.findByText('Balance by')).toBeVisible();+ await userEvent.click(canvas.getByRole('button', { name: 'Companies' }));+ await userEvent.type(+ await screen.findByRole('searchbox', { name: 'Search' }),+ 'person',+ );+ await userEvent.keyboard('{Enter}');++ await waitFor(+ () => {+ expect(+ screen.queryByRole('dialog', { name: 'Object' }),+ ).not.toBeInTheDocument();+ expect(onActionUpdate).toHaveBeenLastCalledWith(+ expect.objectContaining({+ settings: expect.objectContaining({+ input: {+ objectName: 'person',+ strategy: 'LOAD_BALANCED',+ recordIds: [],+ loadBalance: { objectNameSingular: 'person', fieldName: '' },+ },+ }),+ }),+ );+ },+ { timeout: 3000 },+ );++ const balanceByField = canvas.getByText('Balance by').parentElement;++ if (!isDefined(balanceByField)) {+ throw new Error('The balance by field is missing');+ }++ await userEvent.click(+ within(balanceByField).getByRole('button', { name: 'People' }),+ );+ await userEvent.type(+ await screen.findByRole('searchbox', { name: 'Search' }),+ 'company',+ );+ await userEvent.keyboard('{ArrowDown}{Enter}');++ await waitFor(+ () => {+ expect(+ screen.queryByRole('dialog', { name: 'Balance by' }),+ ).not.toBeInTheDocument();+ expect(onActionUpdate).toHaveBeenLastCalledWith(+ expect.objectContaining({+ settings: expect.objectContaining({+ input: expect.objectContaining({+ loadBalance: { objectNameSingular: 'company', fieldName: '' },+ }),+ }),+ }),+ );+ },+ { timeout: 3000 },+ );+ },+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsxindex 212bb443ec9..b585c674425 100644--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx@@ -1,20 +1,8 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { type FieldMultiSelectValue } from '@/object-record/record-field/ui/types/FieldMetadata';-import { SelectControl } from '@/ui/input/components/SelectControl';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';+import { Select } from '@/ui/input/components/Select';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useWorkflowObjectSelectOptions } from '@/workflow/hooks/useWorkflowObjectSelectOptions';import { WorkflowFieldsMultiSelect } from '@/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect';import { type WorkflowDatabaseEventTrigger } from '@/workflow/types/Workflow';import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName';@@ -22,40 +10,9 @@ import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowSimport { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';import { WorkflowStepFilterBuilder } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterBuilder';import { type FilterSettings } from '@/workflow/workflow-steps/filters/types/FilterSettings';-import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';-import { type SelectOption } from 'twenty-ui/primitives/input';-import { themeCssVariables } from 'twenty-ui/theme';--const StyledLabel = styled.span`- color: ${themeCssVariables.font.color.light};- display: block;- font-size: ${themeCssVariables.font.size.xs};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin-bottom: ${themeCssVariables.spacing[1]};-`;--const StyledRecordTypeSelectContainer = styled.div<{ fullWidth?: boolean }>`- width: ${({ fullWidth }) => (fullWidth ? '100%' : 'auto')};-`;--const filterOptionsBySearch = <T extends { label: string; value: string }>(- options: T[],- searchValue: string,-): T[] => {- if (searchValue === '') return options;-- const searchValueLowerCase = searchValue.toLowerCase();-- return options.filter((option) =>- [option.label, option.value].some((searchableValue) =>- searchableValue.toLowerCase().includes(searchValueLowerCase),- ),- );-};type WorkflowEditTriggerDatabaseEventFormProps = {trigger: WorkflowDatabaseEventTrigger;@@ -75,14 +32,10 @@ export const WorkflowEditTriggerDatabaseEventForm = ({triggerOptions,}: WorkflowEditTriggerDatabaseEventFormProps) => {const { t } = useLingui();- const { getSelectIconPropsFromObjectMetadataItem } =- useObjectMetadataSelectHelpers();- const [searchInputValue, setSearchInputValue] = useState('');const dropdownId = 'workflow-edit-trigger-record-type';- const { closeDropdown } = useCloseDropdown();-const { objectMetadataItems } = useFilteredObjectMetadataItems();+ const objectOptions = useWorkflowObjectSelectOptions();const triggerEvent = splitWorkflowTriggerEventName(trigger.settings.eventName,@@ -91,66 +44,8 @@ export const WorkflowEditTriggerDatabaseEventForm = ({const isUpsertEvent = triggerEvent.event === 'upserted';const isFieldFilteringSupported = isUpdateEvent || isUpsertEvent;- const defaultSelectedOption = useMemo<SelectOption<string>>(- () => ({ label: t`Select an option`, value: '' }),- [t],- );-- const { regularObjects, systemObjects } = useMemo(() => {- return objectMetadataItems.reduce<{- regularObjects: SelectOption<string>[];- systemObjects: SelectOption<string>[];- }>(- (accumulator, item) => {- if (item.isActive === false) {- return accumulator;- }-- const option = {- label: item.labelPlural,- value: item.nameSingular,- ...getSelectIconPropsFromObjectMetadataItem(item),- };-- if (item.isSystem === true) {- accumulator.systemObjects.push(option);- } else {- accumulator.regularObjects.push(option);- }-- return accumulator;- },- { regularObjects: [], systemObjects: [] },- );- }, [getSelectIconPropsFromObjectMetadataItem, objectMetadataItems]);-- const selectableOptions = useMemo(- () => [...regularObjects, ...systemObjects],- [regularObjects, systemObjects],- );-- const selectedOption =- selectableOptions.find(- (option) => option.value === triggerEvent?.objectType,- ) || defaultSelectedOption;-const selectedObjectMetadataItem = objectMetadataItems.find(- (item) => item.nameSingular === selectedOption.value,- );-- const filteredObjects = useMemo(- () => [- ...filterOptionsBySearch(regularObjects, searchInputValue),- ...filterOptionsBySearch(systemObjects, searchInputValue),- ],- [regularObjects, searchInputValue, systemObjects],- );-- const selectableItemIdArray = filteredObjects.map((option) => option.value);-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,+ (item) => item.isActive && item.nameSingular === triggerEvent.objectType,);const handleOptionClick = (value: string) => {@@ -165,7 +60,6 @@ export const WorkflowEditTriggerDatabaseEventForm = ({eventName: `${value}.${triggerEvent.event}`,},});- closeDropdown(dropdownId);};const handleFieldsChange = (fields: FieldMultiSelectValue | string) => {@@ -206,63 +100,19 @@ export const WorkflowEditTriggerDatabaseEventForm = ({return (<><WorkflowStepBody>- <StyledRecordTypeSelectContainer fullWidth>- <StyledLabel>{t`Record Type`}</StyledLabel>- <Dropdown- dropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponent={- <SelectControl- isDisabled={triggerOptions.readonly}- selectedOption={selectedOption}- />- }- dropdownComponents={- <>- {!triggerOptions.readonly && (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuSearchInput- autoFocus- value={searchInputValue}- onChange={(event) =>- setSearchInputValue(event.target.value)- }- />- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>- <SelectableList- selectableListInstanceId={dropdownId}- focusId={dropdownId}- selectableItemIdArray={selectableItemIdArray}- >- {filteredObjects.map((option) => (- <SelectableListItem- key={option.value}- itemId={option.value}- onEnter={() => handleOptionClick(option.value)}- >- <ListItem- focused={selectedItemId === option.value}- startIcon={- <SelectOptionIcon Icon={option.Icon} />- }- onClick={() => handleOptionClick(option.value)}- >- {option.label}- </ListItem>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- )}- </>- }- dropdownOffset={{ y: 4 }}- />- </StyledRecordTypeSelectContainer>+ <Select+ dropdownId={dropdownId}+ label={t`Record Type`}+ fullWidth+ disabled={triggerOptions.readonly === true}+ value={triggerEvent.objectType}+ emptyOption={{ label: t`Select an option`, value: '' }}+ options={objectOptions}+ onChange={handleOptionClick}+ withSearchInput+ dropdownSideOffset={4}+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}+ />{isDefined(selectedObjectMetadataItem) && isFieldFilteringSupported && (<WorkflowFieldsMultiSelectlabel={t`Fields (Optional)`}diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/__stories__/WorkflowEditTriggerDatabaseEventForm.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/__stories__/WorkflowEditTriggerDatabaseEventForm.stories.tsxnew file mode 100644index 00000000000..8fdd901f591--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/__stories__/WorkflowEditTriggerDatabaseEventForm.stories.tsx@@ -0,0 +1,85 @@+import { type WorkflowDatabaseEventTrigger } from '@/workflow/types/Workflow';+import { WorkflowEditTriggerDatabaseEventForm } from '@/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, screen, userEvent, waitFor, within } from 'storybook/test';+import { ComponentDecorator } from 'twenty-ui/testing';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';+import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/WorkflowStepActionDrawerDecorator';+import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';+import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';+import { graphqlMocks } from '~/testing/graphqlMocks';++const DEFAULT_TRIGGER: WorkflowDatabaseEventTrigger = {+ name: 'Record is created',+ type: 'DATABASE_EVENT',+ settings: { eventName: 'person.created', outputSchema: {} },+};++const onTriggerUpdate = fn();++const meta: Meta<typeof WorkflowEditTriggerDatabaseEventForm> = {+ title: 'Modules/Workflow/Triggers/DatabaseEvent/EditTrigger',+ component: WorkflowEditTriggerDatabaseEventForm,+ parameters: { msw: graphqlMocks },+ args: {+ trigger: DEFAULT_TRIGGER,+ triggerOptions: { onTriggerUpdate },+ },+ decorators: [+ WorkflowStepActionDrawerDecorator,+ WorkflowStepDecorator,+ ComponentDecorator,+ ObjectMetadataItemsDecorator,+ ToastDecorator,+ MemoryRouterDecorator,+ WorkspaceDecorator,+ ],+};++export default meta;++type Story = StoryObj<typeof WorkflowEditTriggerDatabaseEventForm>;++export const SelectRecordTypeWithKeyboard: Story = {+ play: async ({ canvasElement }) => {+ onTriggerUpdate.mockClear();+ const canvas = within(canvasElement);++ await userEvent.click(+ await canvas.findByRole('button', { name: 'People' }),+ );+ await userEvent.type(+ await screen.findByRole('searchbox', { name: 'Search' }),+ 'Companies',+ );+ await userEvent.keyboard('{Enter}');++ await waitFor(() => {+ expect(+ screen.queryByRole('dialog', { name: 'Record Type' }),+ ).not.toBeInTheDocument();+ expect(onTriggerUpdate).toHaveBeenCalledWith({+ ...DEFAULT_TRIGGER,+ settings: { ...DEFAULT_TRIGGER.settings, eventName: 'company.created' },+ });+ });+ },+};++export const ReadOnly: Story = {+ args: { triggerOptions: { readonly: true } },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ await userEvent.click(await canvas.findByText('People'));++ expect(+ canvas.queryByRole('button', { name: 'People' }),+ ).not.toBeInTheDocument();+ expect(+ screen.queryByRole('dialog', { name: 'Record Type' }),+ ).not.toBeInTheDocument();+ },+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariableSearchResultItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariableSearchResultItems.tsxindex af5d09bddcf..4a732968c50 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariableSearchResultItems.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariableSearchResultItems.tsx@@ -1,7 +1,7 @@import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { type WorkflowVariableSearchResult } from '@/workflow/workflow-variables/types/WorkflowVariableSearchResult';import { useIcons } from 'twenty-ui/icon';-import { ListItem } from 'twenty-ui/primitives/navigation';+import { Dropdown } from 'twenty-ui/components';type WorkflowVariableSearchResultItemsProps = {searchResults: WorkflowVariableSearchResult[];@@ -15,20 +15,16 @@ export const WorkflowVariableSearchResultItems = ({const { getIcon } = useIcons();return searchResults.map((result) => (- <ListItem+ <Dropdown.OptionItemkey={JSON.stringify([result.stepId,result.path,result.isLeaf,result.isFullRecord,])}- focused={false}- onClick={() => onSelect(result)}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ onSelect={() => onSelect(result)}hasSubmenu={!result.isLeaf}+ closeOnSelect={result.isLeaf}description={result.breadcrumb}startIcon={<SelectOptionIcon@@ -38,6 +34,6 @@ export const WorkflowVariableSearchResultItems = ({}>{result.label}- </ListItem>+ </Dropdown.OptionItem>));};diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsxindex f08061f9b71..010f5e19ad1 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx@@ -1,5 +1,6 @@-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';import { WorkflowVariablesDropdownStepItems } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems';import { WorkflowVariablesDropdownSteps } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps';@@ -12,7 +13,8 @@ import { type WorkflowVariableStepSelection } from '@/workflow/workflow-variableimport { t } from '@lingui/core/macro';import { styled } from '@linaria/react';import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';import { IconVariablePlus } from 'twenty-ui/icon';import { Tooltip } from 'twenty-ui/primitives/surfaces';import { useTheme, themeCssVariables } from 'twenty-ui/theme';@@ -32,8 +34,17 @@ const StyledDropdownVariableButtonContainer = styled.div<{user-select: none;`;+type WorkflowVariablesDropdownProps = {+ disabled?: boolean;+ fieldTypesToExclude?: InputSchemaPropertyType[];+ instanceId: string;+ onVariableSelect: (variableName: string) => void;+ shouldDisplayRecordFields: boolean;+ shouldDisplayRecordObjects: boolean;+ objectNameSingularsToSelect?: string[];+};+export const WorkflowVariablesDropdown = ({- clickableComponent,disabled,fieldTypesToExclude,instanceId,@@ -41,26 +52,18 @@ export const WorkflowVariablesDropdown = ({shouldDisplayRecordFields,shouldDisplayRecordObjects,objectNameSingularsToSelect,-}: {- clickableComponent?: React.ReactNode;- disabled?: boolean;- fieldTypesToExclude?: InputSchemaPropertyType[];- instanceId: string;- onVariableSelect: (variableName: string) => void;- shouldDisplayRecordFields: boolean;- shouldDisplayRecordObjects: boolean;- objectNameSingularsToSelect?: string[];-}) => {+}: WorkflowVariablesDropdownProps) => {const theme = useTheme();const dropdownId = `${SEARCH_VARIABLES_DROPDOWN_ID}-${instanceId}`;- const { closeDropdown } = useCloseDropdown();const availableVariablesInWorkflowStep = useAvailableVariablesInWorkflowStep({shouldDisplayRecordFields,shouldDisplayRecordObjects,fieldTypesToExclude,});- const noAvailableVariables = availableVariablesInWorkflowStep.length === 0;+ const noAvailableVariables = !isNonEmptyArray(+ availableVariablesInWorkflowStep,+ );const initialStep =availableVariablesInWorkflowStep.length === 1@@ -82,13 +85,6 @@ export const WorkflowVariablesDropdown = ({);};- const handleSubItemSelect = (subItem: string) => {- onVariableSelect(subItem);- setSelectedStep(initialStep);- setSelectedPath([]);- closeDropdown(dropdownId);- };-const handleBack = () => {setSelectedStep(undefined);};@@ -115,24 +111,36 @@ export const WorkflowVariablesDropdown = ({}return (- <Dropdown+ <DropdownRootdropdownId={dropdownId}- isDropdownInModal={true}- clickableComponent={- clickableComponent ?? (- <StyledDropdownVariableButtonContainer>- <IconVariablePlus size={theme.icon.size.md} />- </StyledDropdownVariableButtonContainer>- )- }- dropdownComponents={- !isDefined(selectedStep) ? (+ type="picker"+ onOpenChange={(open) => {+ if (!open) {+ return;+ }++ setSelectedStep(initialStep);+ setSelectedPath([]);+ }}+ >+ <Dropdown.Trigger+ aria-label={t`Insert variable`}+ nativeButton={false}+ render={<StyledDropdownVariableButtonContainer />}+ >+ <IconVariablePlus size={theme.icon.size.md} />+ </Dropdown.Trigger>+ <DropdownContent+ align="end"+ sideOffset={4}+ width={GenericDropdownContentWidth.ExtraLarge}+ >+ {!isDefined(selectedStep) ? (<WorkflowVariablesDropdownSteps- dropdownId={dropdownId}steps={availableVariablesInWorkflowStep}onSelect={handleStepSelect}onVariableSelect={({ rawVariableName }) =>- handleSubItemSelect(rawVariableName)+ onVariableSelect(rawVariableName)}shouldDisplayRecordObjects={shouldDisplayRecordObjects}objectNameSingularsToSelect={objectNameSingularsToSelect}@@ -141,17 +149,13 @@ export const WorkflowVariablesDropdown = ({<WorkflowVariablesDropdownStepItemsstep={selectedStep}initialPath={selectedPath}- onSelect={handleSubItemSelect}+ onSelect={onVariableSelect}onBack={handleBack}shouldDisplayRecordObjects={shouldDisplayRecordObjects}objectNameSingularsToSelect={objectNameSingularsToSelect}/>- )- }- dropdownPlacement="bottom-end"- dropdownOffset={{- y: parseInt(theme.spacing[1], 10),- }}- />+ )}+ </DropdownContent>+ </DropdownRoot>);};diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsxindex edfe56da571..c568a86c0eb 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx@@ -1,13 +1,6 @@import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';import { useVariableDropdown } from '@/workflow/workflow-variables/hooks/useVariableDropdown';import { isRecordOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isRecordOutputSchemaV2';@@ -22,10 +15,10 @@ import {type WorkflowVariableSpecialItem,} from '@/workflow/workflow-variables/utils/getWorkflowVariableSpecialItems';import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';+import { isNonEmptyString } from '@sniptt/guards';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { ListItem } from 'twenty-ui/primitives/navigation';+import { Dropdown, LightIconButton } from 'twenty-ui/components';type WorkflowVariablesDropdownStepItemsProps = {step: StepOutputSchemaV2;@@ -129,28 +122,23 @@ export const WorkflowVariablesDropdownStepItems = ({displayedSubStepObjectDisplay?.isSelectable === true;return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={goBack}- Icon={IconChevronLeft}- />- }- >- <OverflowingTextWithTooltip- text={getStepHeaderLabel(step, currentPath)}- />- </DropdownMenuHeader>- <DropdownMenuSearchInput+ <>+ <Dropdown.Header>+ <LightIconButton size="sm" aria-label={t`Back`} onClick={goBack}>+ <IconChevronLeft />+ </LightIconButton>+ <Dropdown.Title>{getStepHeaderLabel(step, currentPath)}</Dropdown.Title>+ <Dropdown.Close aria-label={t`Close`} />+ </Dropdown.Header>+ <Dropdown.Search+ key={JSON.stringify(currentPath)}autoFocus+ aria-label={t`Search fields`}value={searchInputValue}- onChange={(event) => setSearchInputValue(event.target.value)}+ onValueChange={setSearchInputValue}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>+ <Dropdown.Separator />+ <Dropdown.Section scrollable>{isSearching ? (<WorkflowVariableSearchResultItemssearchResults={searchResults}@@ -159,14 +147,9 @@ export const WorkflowVariablesDropdownStepItems = ({) : (<>{specialItems.map((specialItem) => (- <ListItem+ <Dropdown.OptionItemkey={specialItem.id}- focused={false}- onClick={() => handleSelectSpecialItem(specialItem)}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ onSelect={() => handleSelectSpecialItem(specialItem)}hasSubmenu={false}description={specialItem.contextualText}startIcon={@@ -174,16 +157,11 @@ export const WorkflowVariablesDropdownStepItems = ({}>{specialItem.label}- </ListItem>+ </Dropdown.OptionItem>))}{shouldDisplaySubStepObject && (- <ListItem- focused={false}- onClick={handleSelectObject}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ <Dropdown.OptionItem+ onSelect={handleSelectObject}hasSubmenu={false}description={t`Pick a ${displayedSubStepObjectDisplay?.label} record`}startIcon={@@ -194,11 +172,11 @@ export const WorkflowVariablesDropdownStepItems = ({}>{displayedSubStepObjectDisplay?.label ?? ''}- </ListItem>+ </Dropdown.OptionItem>)}- {options.length > 0 &&- (shouldDisplaySubStepObject || specialItems.length > 0) && (- <DropdownMenuSeparator />+ {isNonEmptyArray(options) &&+ (shouldDisplaySubStepObject || isNonEmptyArray(specialItems)) && (+ <Dropdown.Separator />)}{options.map(([key, subStep]) => {if (!isDefined(subStep)) {@@ -206,22 +184,18 @@ export const WorkflowVariablesDropdownStepItems = ({}return (- <ListItem+ <Dropdown.OptionItemkey={key}- focused={false}- onClick={() => handleSelectField(key)}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ onSelect={() => handleSelectField(key)}hasSubmenu={!subStep.isLeaf}+ closeOnSelect={subStep.isLeaf}description={subStep.isLeaf ? subStep.value?.toString() : undefined}startIcon={<SelectOptionIconIcon={- subStep.icon+ isNonEmptyString(subStep.icon)? getIcon(subStep.icon): getIcon(getStepItemIcon({@@ -233,12 +207,12 @@ export const WorkflowVariablesDropdownStepItems = ({}>{subStep.label || key}- </ListItem>+ </Dropdown.OptionItem>);})}</>)}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsxindex 144fff41317..64b37a965ae 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps.tsx@@ -1,13 +1,5 @@import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { WorkflowVariableSearchResultItems } from '@/workflow/workflow-variables/components/WorkflowVariableSearchResultItems';import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';import { type WorkflowVariableSearchResult } from '@/workflow/workflow-variables/types/WorkflowVariableSearchResult';@@ -18,13 +10,13 @@ import {import { getWorkflowVariableSelectionFromSearchResult } from '@/workflow/workflow-variables/utils/getWorkflowVariableSelectionFromSearchResult';import { searchWorkflowVariables } from '@/workflow/workflow-variables/utils/searchWorkflowVariables';import { t } from '@lingui/core/macro';+import { isNonEmptyString } from '@sniptt/guards';import { useState } from 'react';-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';-import { IconX, useIcons } from 'twenty-ui/icon';-import { ListItem } from 'twenty-ui/primitives/navigation';+import { isNonEmptyArray } from 'twenty-shared/utils';+import { useIcons } from 'twenty-ui/icon';+import { Dropdown } from 'twenty-ui/components';type WorkflowVariablesDropdownStepsProps = {- dropdownId: string;steps: StepOutputSchemaV2[];onSelect: (selection: WorkflowVariableStepSelection) => void;onVariableSelect: (selection: WorkflowVariableSelection) => void;@@ -34,7 +26,6 @@ type WorkflowVariablesDropdownStepsProps = {};export const WorkflowVariablesDropdownSteps = ({- dropdownId,steps,onSelect,onVariableSelect,@@ -46,8 +37,6 @@ export const WorkflowVariablesDropdownSteps = ({const { objectMetadataItems } = useObjectMetadataItems();const [searchInputValue, setSearchInputValue] = useState('');- const { closeDropdown } = useCloseDropdown();-const search = searchInputValue.trim().toLowerCase();const availableSteps = steps.filter((step) =>step.name.toLowerCase().includes(search),@@ -71,57 +60,48 @@ export const WorkflowVariablesDropdownSteps = ({};return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={() => closeDropdown(dropdownId)}- Icon={IconX}- />- }- >- <OverflowingTextWithTooltip text={t`Select Step`} />- </DropdownMenuHeader>- <DropdownMenuSearchInput+ <>+ <Dropdown.Header>+ <Dropdown.Title>{t`Select Step`}</Dropdown.Title>+ <Dropdown.Close aria-label={t`Close`} />+ </Dropdown.Header>+ <Dropdown.SearchautoFocusplaceholder={t`Search steps and fields`}+ aria-label={t`Search steps and fields`}value={searchInputValue}- onChange={(event) => setSearchInputValue(event.target.value)}+ onValueChange={setSearchInputValue}/>- <DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>+ <Dropdown.Separator />+ <Dropdown.Section scrollable><WorkflowVariableSearchResultItemssearchResults={matchingVariables}onSelect={handleSearchResultSelect}/>- {matchingVariables.length > 0 && availableSteps.length > 0 && (- <DropdownMenuSeparator />- )}+ {isNonEmptyArray(matchingVariables) &&+ isNonEmptyArray(availableSteps) && <Dropdown.Separator />}{availableSteps.map((item) => (- <ListItem+ <Dropdown.OptionItemkey={`step-${item.id}`}- focused={false}- onClick={() => onSelect({ stepId: item.id })}- role="option"- aria-selected={false}- selected={false}- indicator="check"+ onSelect={() => onSelect({ stepId: item.id })}hasSubmenu+ closeOnSelect={false}startIcon={<SelectOptionIcon- Icon={item.icon ? getIcon(item.icon) : undefined}+ Icon={+ isNonEmptyString(item.icon) ? getIcon(item.icon) : undefined+ }/>}>{item.name}- </ListItem>+ </Dropdown.OptionItem>))}- {matchingVariables.length === 0 && availableSteps.length === 0 && (- <ListItem disabled>{t`No variables available`}</ListItem>- )}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ {!isNonEmptyArray(matchingVariables) &&+ !isNonEmptyArray(availableSteps) && (+ <Dropdown.Empty>{t`No variables available`}</Dropdown.Empty>+ )}+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdown.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdown.stories.tsxnew file mode 100644index 00000000000..7b5ad20391f--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdown.stories.tsx@@ -0,0 +1,264 @@+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { flowComponentState } from '@/workflow/states/flowComponentState';+import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';+import {+ type WorkflowCodeAction,+ type WorkflowEmptyAction,+} from '@/workflow/types/Workflow';+import { getStepOutputSchemaFamilyStateKey } from '@/workflow/utils/getStepOutputSchemaFamilyStateKey';+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';+import { workflowSelectedNodeComponentState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeComponentState';+import { WorkflowVariablesDropdown } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdown';+import { stepsOutputSchemaFamilyState } from '@/workflow/workflow-variables/states/stepsOutputSchemaFamilyState';+import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import { assertIsDefinedOrThrow } from 'twenty-shared/utils';+import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';+import { ComponentDecorator } from 'twenty-ui/testing';+import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';+import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';+import { graphqlMocks } from '~/testing/graphqlMocks';+import { mockedWorkflow } from '~/testing/mock-data/workflow';++const WORKFLOW_INSTANCE_ID = 'workflow-variables-story';+const WORKFLOW_VERSION_ID = '2eb13eb8-8fdb-4fb8-adb7-3ca86bd8f683';+const PREVIOUS_STEP_ID = 'bb3b3ff8-4e7f-47ee-af54-d12c9a725e70';+const CURRENT_STEP_ID = 'ff13b9a3-2801-4096-b6cb-df359bc04a26';++const OUTPUT_SCHEMA: StepOutputSchemaV2['outputSchema'] = {+ result: {+ isLeaf: false,+ label: 'Result',+ type: 'object',+ value: {+ companyName: {+ isLeaf: true,+ label: 'Company name',+ type: 'string',+ value: 'Acme',+ },+ },+ },+};++const STEP_SETTINGS = {+ input: {},+ outputSchema: {},+ errorHandlingOptions: {+ retryOnFailure: { value: 0 },+ continueOnFailure: { value: false },+ },+};++const CURRENT_STEP: WorkflowEmptyAction = {+ id: CURRENT_STEP_ID,+ name: 'Current step',+ type: 'EMPTY',+ valid: false,+ settings: STEP_SETTINGS,+};++const PREVIOUS_STEP: WorkflowCodeAction = {+ id: PREVIOUS_STEP_ID,+ name: 'Run code',+ type: 'CODE',+ valid: true,+ nextStepIds: [CURRENT_STEP_ID],+ settings: {+ ...STEP_SETTINGS,+ input: {+ logicFunctionId: 'd0eab6eb-8517-4db5-94e9-8bde5b95fb64',+ logicFunctionInput: {},+ },+ outputSchema: OUTPUT_SCHEMA,+ },+};++const initializeWorkflow = ({+ hasPreviousStep = false,+ hasAvailableVariables = true,+}: {+ hasPreviousStep?: boolean;+ hasAvailableVariables?: boolean;+} = {}) => {+ const triggerOutputSchema = hasAvailableVariables ? OUTPUT_SCHEMA : {};++ jotaiStore.set(+ flowComponentState.atomFamily({ instanceId: WORKFLOW_INSTANCE_ID }),+ {+ workflowVersionId: WORKFLOW_VERSION_ID,+ trigger: {+ type: 'MANUAL',+ name: 'Manual trigger',+ settings: { outputSchema: triggerOutputSchema },+ nextStepIds: [hasPreviousStep ? PREVIOUS_STEP_ID : CURRENT_STEP_ID],+ },+ steps: hasPreviousStep ? [PREVIOUS_STEP, CURRENT_STEP] : [CURRENT_STEP],+ },+ );+ jotaiStore.set(+ workflowSelectedNodeComponentState.atomFamily({+ instanceId: WORKFLOW_INSTANCE_ID,+ }),+ CURRENT_STEP_ID,+ );+ jotaiStore.set(+ workflowVisualizerWorkflowIdComponentState.atomFamily({+ instanceId: WORKFLOW_INSTANCE_ID,+ }),+ mockedWorkflow.id,+ );+ for (const step of [+ {+ id: TRIGGER_STEP_ID,+ name: 'Manual trigger',+ type: 'MANUAL',+ outputSchema: triggerOutputSchema,+ },+ {+ id: PREVIOUS_STEP_ID,+ name: PREVIOUS_STEP.name,+ type: PREVIOUS_STEP.type,+ outputSchema: OUTPUT_SCHEMA,+ },+ ] satisfies StepOutputSchemaV2[]) {+ jotaiStore.set(+ stepsOutputSchemaFamilyState.atomFamily(+ getStepOutputSchemaFamilyStateKey(WORKFLOW_VERSION_ID, step.id),+ ),+ step,+ );+ }+};++const meta = {+ title: 'Modules/Workflow/Variables/WorkflowVariablesDropdown',+ component: WorkflowVariablesDropdown,+ render: (args) => (+ <WorkflowVisualizerComponentInstanceContext.Provider+ value={{ instanceId: WORKFLOW_INSTANCE_ID }}+ >+ <WorkflowVariablesDropdown+ instanceId={args.instanceId}+ onVariableSelect={args.onVariableSelect}+ shouldDisplayRecordFields={args.shouldDisplayRecordFields}+ shouldDisplayRecordObjects={args.shouldDisplayRecordObjects}+ disabled={args.disabled}+ fieldTypesToExclude={args.fieldTypesToExclude}+ objectNameSingularsToSelect={args.objectNameSingularsToSelect}+ />+ </WorkflowVisualizerComponentInstanceContext.Provider>+ ),+ args: {+ instanceId: WORKFLOW_INSTANCE_ID,+ onVariableSelect: fn(),+ shouldDisplayRecordFields: true,+ shouldDisplayRecordObjects: false,+ },+ parameters: { msw: graphqlMocks },+ decorators: [WorkflowStepDecorator, ComponentDecorator, WorkspaceDecorator],+ beforeEach: () => initializeWorkflow(),+} satisfies Meta<typeof WorkflowVariablesDropdown>;++export default meta;+type Story = StoryObj<typeof meta>;++export const ResetAfterEscape: Story = {+ play: async ({ canvasElement }) => {+ const trigger = await within(canvasElement).findByRole('button', {+ name: 'Insert variable',+ });+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(trigger);+ await userEvent.click(await body.findByRole('button', { name: 'Result' }));+ await userEvent.type(body.getByRole('searchbox'), 'Company');+ await userEvent.keyboard('{Escape}');+ await waitFor(() =>+ expect(body.queryByRole('dialog')).not.toBeInTheDocument(),+ );+ await expect(trigger).toHaveFocus();+ await userEvent.click(trigger);++ await expect(+ await body.findByRole('dialog', { name: 'Manual trigger' }),+ ).toBeVisible();+ await expect(body.getByRole('searchbox')).toHaveValue('');+ await expect(body.getByRole('button', { name: 'Result' })).toBeVisible();+ await expect(+ body.queryByRole('button', { name: /Company name/ }),+ ).not.toBeInTheDocument();+ },+};++export const ResetMultipleSteps: Story = {+ beforeEach: () => initializeWorkflow({ hasPreviousStep: true }),+ play: async ({ canvasElement }) => {+ const trigger = await within(canvasElement).findByRole('button', {+ name: 'Insert variable',+ });+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(trigger);+ await userEvent.click(+ await body.findByRole('button', { name: 'Run code' }),+ );+ await userEvent.click(body.getByRole('button', { name: 'Result' }));+ await userEvent.click(body.getByRole('button', { name: 'Close' }));+ await waitFor(() =>+ expect(body.queryByRole('dialog')).not.toBeInTheDocument(),+ );+ await userEvent.click(trigger);++ await expect(+ await body.findByRole('dialog', { name: 'Select Step' }),+ ).toBeVisible();+ await expect(+ body.getByRole('button', { name: 'Manual trigger' }),+ ).toBeVisible();+ },+};++export const BackNavigation: Story = {+ play: async ({ canvasElement }) => {+ const trigger = await within(canvasElement).findByRole('button', {+ name: 'Insert variable',+ });+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(trigger);+ await userEvent.click(await body.findByRole('button', { name: 'Result' }));+ await expect(+ body.getByRole('button', { name: /Company name/ }),+ ).toBeVisible();+ await userEvent.click(body.getByRole('button', { name: 'Back' }));++ await expect(+ body.getByRole('dialog', { name: 'Manual trigger' }),+ ).toBeVisible();+ await expect(body.getByRole('searchbox')).toHaveFocus();+ await expect(body.getByRole('button', { name: 'Result' })).toBeVisible();+ },+};++export const NoAvailableVariables: Story = {+ beforeEach: () => initializeWorkflow({ hasAvailableVariables: false }),+ play: async ({ canvasElement }) => {+ const anchor = await waitFor(() => {+ const disabledAnchor = canvasElement.querySelector<HTMLElement>(+ '[data-variable-picker-disabled-anchor]',+ );+ assertIsDefinedOrThrow(disabledAnchor);+ return disabledAnchor;+ });++ await expect(+ within(canvasElement).queryByRole('button', { name: 'Insert variable' }),+ ).not.toBeInTheDocument();+ await userEvent.hover(anchor);+ await expect(+ await within(canvasElement.ownerDocument.body).findByRole('tooltip'),+ ).toHaveTextContent('No variables are available yet.');+ },+};diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownStepItems.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownStepItems.stories.tsxindex 0c9607dbddf..f4475df889e 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownStepItems.stories.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownStepItems.stories.tsx@@ -1,3 +1,7 @@+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { Dropdown } from 'twenty-ui/components';+import { Button } from 'twenty-ui/primitives/input';import { WorkflowVariablesDropdownStepItems } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems';import { type Meta, type StoryObj } from '@storybook/react-vite';import { expect, fn, userEvent, within } from 'storybook/test';@@ -10,6 +14,14 @@ const ASYNC_DECORATOR_WAIT_OPTIONS = { timeout: 5_000 };const meta = {title: 'Modules/Workflow/Variables/WorkflowVariablesDropdownStepItems',component: WorkflowVariablesDropdownStepItems,+ render: (args) => (+ <DropdownRoot dropdownId="workflow-variables-story" type="picker">+ <Dropdown.Trigger render={<Button title="Open variables" />} />+ <DropdownContent width={320}>+ <WorkflowVariablesDropdownStepItems {...args} />+ </DropdownContent>+ </DropdownRoot>+ ),args: {step: {id: 'code',@@ -43,10 +55,15 @@ type Story = StoryObj<typeof meta>;export const NestedFieldSearch: Story = {play: async ({ canvasElement, args }) => {- const canvas = within(canvasElement);+ await userEvent.click(+ await within(canvasElement).findByRole('button', {+ name: 'Open variables',+ }),+ );+ const canvas = within(canvasElement.ownerDocument.body);const searchInput = await canvas.findByRole(- 'textbox',+ 'searchbox',undefined,ASYNC_DECORATOR_WAIT_OPTIONS,);diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownSteps.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownSteps.stories.tsxindex 10229e45b7b..539827d7ac7 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownSteps.stories.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/__stories__/WorkflowVariablesDropdownSteps.stories.tsx@@ -1,3 +1,7 @@+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { Dropdown } from 'twenty-ui/components';+import { Button } from 'twenty-ui/primitives/input';import { WorkflowVariablesDropdownSteps } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdownSteps';import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';import { type Meta, type StoryObj } from '@storybook/react-vite';@@ -48,11 +52,18 @@ const ASYNC_DECORATOR_WAIT_OPTIONS = { timeout: 5_000 };const meta = {title: 'Modules/Workflow/Variables/WorkflowVariablesDropdownSteps',component: WorkflowVariablesDropdownSteps,+ render: (args) => (+ <DropdownRoot dropdownId="workflow-variables-story" type="picker">+ <Dropdown.Trigger render={<Button title="Open variables" />} />+ <DropdownContent width={320}>+ <WorkflowVariablesDropdownSteps {...args} />+ </DropdownContent>+ </DropdownRoot>+ ),parameters: {msw: graphqlMocks,},args: {- dropdownId: 'variables',steps: STEPS,onSelect: fn(),onVariableSelect: fn(),@@ -69,7 +80,12 @@ type Story = StoryObj<typeof meta>;export const Default: Story = {play: async ({ canvasElement, args }) => {- const canvas = within(canvasElement);+ await userEvent.click(+ await within(canvasElement).findByRole('button', {+ name: 'Open variables',+ }),+ );+ const canvas = within(canvasElement.ownerDocument.body);const runCodeItem = await canvas.findByText('Run code',@@ -85,7 +101,12 @@ export const Default: Story = {export const NestedFieldSearch: Story = {play: async ({ canvasElement, args }) => {- const canvas = within(canvasElement);+ await userEvent.click(+ await within(canvasElement).findByRole('button', {+ name: 'Open variables',+ }),+ );+ const canvas = within(canvasElement.ownerDocument.body);const searchInput = await canvas.findByPlaceholderText('Search steps and fields',@@ -110,7 +131,12 @@ export const NestedFieldSearch: Story = {export const NestedContainerSearch: Story = {play: async ({ canvasElement, args }) => {- const canvas = within(canvasElement);+ await userEvent.click(+ await within(canvasElement).findByRole('button', {+ name: 'Open variables',+ }),+ );+ const canvas = within(canvasElement.ownerDocument.body);const searchInput = await canvas.findByPlaceholderText('Search steps and fields',@@ -145,7 +171,12 @@ export const WholeRecordSearch: Story = {],},play: async ({ canvasElement, args }) => {- const canvas = within(canvasElement);+ await userEvent.click(+ await within(canvasElement).findByRole('button', {+ name: 'Open variables',+ }),+ );+ const canvas = within(canvasElement.ownerDocument.body);const searchInput = await canvas.findByPlaceholderText('Search steps and fields',@@ -165,7 +196,12 @@ export const WholeRecordSearch: Story = {export const StepSearchAndEmptyState: Story = {play: async ({ canvasElement }) => {- const canvas = within(canvasElement);+ await userEvent.click(+ await within(canvasElement).findByRole('button', {+ name: 'Open variables',+ }),+ );+ const canvas = within(canvasElement.ownerDocument.body);const searchInput = await canvas.findByPlaceholderText('Search steps and fields',undefined,diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.tsindex 2eb8f120454..afc846b37bf 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts@@ -14,8 +14,10 @@ import { type WorkflowVariableSearchResult } from '@/workflow/workflow-variablesimport { type WorkflowVariableSelection } from '@/workflow/workflow-variables/types/WorkflowVariableSelection';import { getVariableTemplateFromPath } from '@/workflow/workflow-variables/utils/getVariableTemplateFromPath';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { isNonEmptyString } from '@sniptt/guards';import {type BaseOutputSchemaV2,type InputSchemaPropertyType,@@ -74,6 +76,7 @@ export const useVariableDropdown = ({const [searchInputValue, setSearchInputValue] = useState('');const { openWorkflowEditStepInSidePanel } = useSidePanelWorkflowNavigation();+ const { closeDropdown } = useCloseDropdown();const workflowVisualizerWorkflowId = useAtomComponentStateValue(workflowVisualizerWorkflowIdComponentState,@@ -94,9 +97,13 @@ export const useVariableDropdown = ({if (isLinkOutputSchema(currentSubStep)) {return { link: currentSubStep.link };- } else if (isRecordOutputSchemaV2(currentSubStep)) {+ }++ if (isRecordOutputSchemaV2(currentSubStep)) {return currentSubStep.fields;- } else if (isBaseOutputSchemaV2(currentSubStep)) {+ }++ if (isBaseOutputSchemaV2(currentSubStep)) {return currentSubStep;}};@@ -112,16 +119,17 @@ export const useVariableDropdown = ({if (!baseOutputSchema[key]?.isLeaf) {setCurrentPath([...currentPath, key]);setSearchInputValue('');- } else {- onSelect({- rawVariableName: getVariableTemplateFromPath({- stepId: step.id,- path: [...currentPath, key],- }),- stepId: step.id,- isFullRecord: false,- });+ return;}++ onSelect({+ rawVariableName: getVariableTemplateFromPath({+ stepId: step.id,+ path: [...currentPath, key],+ }),+ stepId: step.id,+ isFullRecord: false,+ });};const handleSelectLinkOutputSchema = (@@ -161,30 +169,38 @@ export const useVariableDropdown = ({}: undefined,});+ closeDropdown();};if (isLinkOutputSchema(currentSubStep)) {handleSelectLinkOutputSchema(currentSubStep);- } else if (isRecordOutputSchemaV2(currentSubStep)) {+ }++ if (isRecordOutputSchemaV2(currentSubStep)) {handleSelectBaseOutputSchema(currentSubStep.fields);- } else if (isBaseOutputSchemaV2(currentSubStep)) {+ }++ if (isBaseOutputSchemaV2(currentSubStep)) {handleSelectBaseOutputSchema(currentSubStep);}};const goBack = () => {setSearchInputValue('');- if (currentPath.length === 0) {+ if (!isNonEmptyArray(currentPath)) {onBack();- } else {- setCurrentPath(currentPath.slice(0, -1));+ return;}++ setCurrentPath(currentPath.slice(0, -1));};const displayedFields = getDisplayedSubStepFields();- const options = displayedFields ? Object.entries(displayedFields) : [];+ const options = isDefined(displayedFields)+ ? Object.entries(displayedFields)+ : [];- const isSearching = searchInputValue.trim().length > 0;+ const isSearching = isNonEmptyString(searchInputValue.trim());const searchResults = searchWorkflowVariables({steps: [step],currentPath,