The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Migrate advanced filter row controls (#26961)
Raphaël Bosi061607ff1303
diff --git a/packages/twenty-docs/snippets/ui/generated/components/dropdown.mdx b/packages/twenty-docs/snippets/ui/generated/components/dropdown.mdxindex 3aef91befcf..b2343468cbc 100644--- a/packages/twenty-docs/snippets/ui/generated/components/dropdown.mdx+++ b/packages/twenty-docs/snippets/ui/generated/components/dropdown.mdx@@ -281,7 +281,7 @@</ParamField><ParamField body="OptionItem.indicator" type=""check" | "checkbox" | "none"">- Selection indicator: a check icon after the content, a checkbox before it, or none. Defaults to `checkbox` when `multiple` is set, otherwise `check`.+ Selection indicator: a check icon after the content, a checkbox before it, or none. Defaults to `checkbox` when `multiple` is set, otherwise `check`, and to `none` when `selected` is omitted.</ParamField><ParamField body="OptionItem.nativeButton" type="boolean" default="true when render is omitted; false otherwise">@@ -298,8 +298,8 @@Element rendered as the row instead of a native button. Custom components must forward the supplied props and ref.</ParamField>-<ParamField body="OptionItem.selected" type="boolean" required>- Whether the option is selected. Exposed as `aria-checked` in menus and `aria-pressed` in other dropdown types.+<ParamField body="OptionItem.selected" type="boolean">+ Whether the option is selected. Exposed as `aria-checked` in menus and `aria-pressed` in other dropdown types. Omit it for options that navigate or apply without a selection state.</ParamField><ParamField body="OptionItem.shortcut" type="ShortcutDefinition">diff --git a/packages/twenty-docs/ui/components/dropdown.mdx b/packages/twenty-docs/ui/components/dropdown.mdxindex 8d2202dcc9d..671f28b0b24 100644--- a/packages/twenty-docs/ui/components/dropdown.mdx+++ b/packages/twenty-docs/ui/components/dropdown.mdx@@ -24,7 +24,7 @@ Set `type` on `Dropdown.Root` to match the popup's contents.| `picker` | Search, selectable values, and optional commands | A dialog containing a search field and selectable toggle buttons. Arrow keys navigate result rows. || `panel` | Inputs, forms, and supporting actions | A dialog with native input behavior and Tab navigation. |-Pickers allow creation actions and selectable values in the same list, in any order. Options expose their selected state with `aria-pressed`; commands keep their button semantics. Give `Search` an accessible name.+Pickers allow creation actions and selectable values in the same list, in any order. Options expose their selected state with `aria-pressed`; commands keep their button semantics. Omit `selected` on an option that navigates or applies without a selection state, so it exposes no pressed state. Give `Search` an accessible name.`Content` takes its accessible name from `Trigger`, or from `SubmenuTrigger` in a submenu. Pass `aria-label` on `Content` when the trigger shows a value, such as the selected option, or when the root has no trigger. An explicit `aria-label` or `aria-labelledby`, and a `Title` inside a `Header`, take precedence over the trigger name.@@ -134,7 +134,7 @@ Actions and single selection close by default. Set `multiple` on the root to keeUse `Page` for navigation that replaces the contents of the same popup. Wrap the first page in `Page id="root"`, or choose another initial page with `defaultPage`. Set `page` on an action to navigate without closing. `Back` returns to the previous page and restores focus to its invoking row. Closing the dropdown resets its page history.-A page can override the root's `type`. For example, an action menu can open a searchable picker page or a form panel. Search receives focus when entering a searchable page.+A page can override the root's `type`. For example, an action menu can open a searchable picker page or a form panel. Search receives focus when entering a searchable page; other pages focus their first row after `Back`.<StoryEmbedstoryId="ui-components-dropdown--pages-documentation"diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsxindex 5eca951495c..e348cd570bb 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx@@ -1,4 +1,4 @@-import { ListItem } from 'twenty-ui/primitives/navigation';+import { NavigationButton } from '@/ui/input/components/NavigationButton';import { CommandMenuButton } from '@/command-menu/components/CommandMenuButton';import { useChildRecordFiltersAndRecordFilterGroups } from '@/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups';import { useGetDefaultFieldMetadataItemForFilter } from '@/object-record/advanced-filter/hooks/useGetDefaultFieldMetadataItemForFilter';@@ -11,10 +11,9 @@ import { type RecordFilterGroup } from '@/object-record/record-filter-group/typeimport { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter';import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';import { getDefaultSubFieldNameForCompositeFilterableFieldType } from '@/object-record/record-filter/utils/getDefaultSubFieldNameForCompositeFilterableFieldType';-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 { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { Dropdown } from 'twenty-ui/components';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { t } from '@lingui/core/macro';import { useContext } from 'react';@@ -46,8 +45,6 @@ export const AdvancedFilterAddFilterRuleSelect = ({const newPositionInRecordFilterGroup = lastChildPosition + 1;- const { closeDropdown } = useCloseDropdown();-const { getDefaultFieldMetadataItemForFilter } =useGetDefaultFieldMetadataItemForFilter();@@ -64,8 +61,6 @@ export const AdvancedFilterAddFilterRuleSelect = ({throw new Error('Missing default field metadata item for filter');}- closeDropdown(dropdownId);-const filterType = getFilterTypeFromFieldType(defaultFieldMetadataItemForFilter.type,);@@ -95,8 +90,6 @@ export const AdvancedFilterAddFilterRuleSelect = ({const { defaultFieldMetadataItemForFilter } =getDefaultFieldMetadataItemForFilter(objectMetadataItem);- closeDropdown(dropdownId);-if (!isDefined(defaultFieldMetadataItemForFilter)) {throw new Error('Missing default field metadata item for filter');}@@ -156,36 +149,35 @@ export const AdvancedFilterAddFilterRuleSelect = ({}return (- <Dropdown- dropdownId={dropdownId}- clickableComponent={- <CommandMenuButton- command={{- Icon: IconPlus,- label: t`Add filter rule`,- shortLabel: t`Add filter rule`,- key: 'add-filter-rule',- }}- />- }- dropdownComponents={- <LegacyDropdownContent>- <DropdownMenuItemsContainer>- <ListItem- startIcon={<IconPlus />}- onClick={handleAddFilter}- >{t`Add rule`}</ListItem>- {isFilterRuleGroupOptionVisible && (- <ListItem- startIcon={<IconLibraryPlus />}- onClick={handleAddFilterGroup}- >{t`Add rule group`}</ListItem>- )}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- }- dropdownOffset={{ y: 8, x: 0 }}- dropdownPlacement="bottom-start"- />+ <DropdownRoot dropdownId={dropdownId} type="menu">+ <Dropdown.Trigger+ render={+ <NavigationButton+ size="sm"+ variant="outline"+ color="neutral"+ startIcon={<IconPlus />}+ >+ {t`Add filter rule`}+ </NavigationButton>+ }+ />+ <DropdownContent sideOffset={8}>+ <Dropdown.Section>+ <Dropdown.ActionItem+ startIcon={<IconPlus />}+ onClick={handleAddFilter}+ >+ {t`Add rule`}+ </Dropdown.ActionItem>+ <Dropdown.ActionItem+ startIcon={<IconLibraryPlus />}+ onClick={handleAddFilterGroup}+ >+ {t`Add rule group`}+ </Dropdown.ActionItem>+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsxindex 1dc2512dc34..3fd4a98a085 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu.tsx@@ -1,211 +1,95 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';import { useApplyAdvancedFilterCompositeSubField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterCompositeSubField';-import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState';import { getCompositeSubFieldLabel } from '@/object-record/object-filter-dropdown/utils/getCompositeSubFieldLabel';+import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFilterableFieldType';import { ICON_NAME_BY_SUB_FIELD } from '@/object-record/record-filter/constants/IconNameBySubField';import { areCompositeTypeSubFieldsFilterable } from '@/object-record/record-filter/utils/areCompositeTypeSubFieldsFilterable';import { isCompositeTypeNonFilterableByAnySubField } from '@/object-record/record-filter/utils/isCompositeTypeNonFilterableByAnySubField';import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';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 { 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 { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';-import { isDefined } from 'twenty-shared/utils';+import { getFilterTypeFromFieldType } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';+import { useIcons } from 'twenty-ui/icon';import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';-import { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { ListItem } from 'twenty-ui/primitives/navigation';type AdvancedFilterCompositeSubFieldSelectMenuProps = {recordFilterId: string;+ fieldMetadataItem: FieldMetadataItem;};export const AdvancedFilterCompositeSubFieldSelectMenu = ({recordFilterId,+ fieldMetadataItem,}: AdvancedFilterCompositeSubFieldSelectMenuProps) => {const { getIcon } = useIcons();-- const fieldMetadataItemUsedInDropdown = useAtomComponentSelectorValue(- fieldMetadataItemUsedInDropdownComponentSelector,- );-- const [, setObjectFilterDropdownIsSelectingCompositeField] =- useAtomComponentState(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- );-- const [- objectFilterDropdownSubMenuFieldType,- setObjectFilterDropdownSubMenuFieldType,- ] = useAtomComponentState(objectFilterDropdownSubMenuFieldTypeComponentState);-- const { closeAdvancedFilterFieldSelectDropdown } =- useAdvancedFilterFieldSelectDropdown(recordFilterId);-const { applyAdvancedFilterCompositeSubField } =useApplyAdvancedFilterCompositeSubField();- const handleSelectFilter = ({- fieldMetadataItem,- subFieldName,- }: {- fieldMetadataItem: FieldMetadataItem;- subFieldName?: CompositeFieldSubFieldName | null;- }) => {+ const filterType = getFilterTypeFromFieldType(fieldMetadataItem.type);++ if (!isCompositeFilterableFieldType(filterType)) {+ return null;+ }++ const handleSelectFilter = (+ subFieldName: CompositeFieldSubFieldName | null,+ ) => {applyAdvancedFilterCompositeSubField({sourceFieldMetadataItem: fieldMetadataItem,- subFieldName: subFieldName ?? null,+ subFieldName,recordFilterId,});-- closeAdvancedFilterFieldSelectDropdown();- };-- const handleSubMenuBack = () => {- setObjectFilterDropdownSubMenuFieldType(null);- setObjectFilterDropdownIsSelectingCompositeField(false);};- const { advancedFilterFieldSelectDropdownId } =- useAdvancedFilterFieldSelectDropdown(recordFilterId);-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- advancedFilterFieldSelectDropdownId,- );-- if (!isDefined(objectFilterDropdownSubMenuFieldType)) {- return null;- }-const subFieldNames = SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS[- objectFilterDropdownSubMenuFieldType+ filterType].subFields.filter((subField) => subField.isFilterable === true).map((subField) => subField.subFieldName);-- const subFieldsAreFilterable =- isDefined(fieldMetadataItemUsedInDropdown) &&- areCompositeTypeSubFieldsFilterable(fieldMetadataItemUsedInDropdown.type);-+ const subFieldsAreFilterable = areCompositeTypeSubFieldsFilterable(+ fieldMetadataItem.type,+ );const compositeFieldTypeIsFilterableByAnySubField =- isDefined(fieldMetadataItemUsedInDropdown) &&- !isCompositeTypeNonFilterableByAnySubField(- fieldMetadataItemUsedInDropdown.type,- );-- const selectableItemIdArray = [- '-1',- ...subFieldNames.map((subFieldName) => subFieldName),- ];-- const fieldLabel = fieldMetadataItemUsedInDropdown?.label;+ !isCompositeTypeNonFilterableByAnySubField(fieldMetadataItem.type);return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={handleSubMenuBack}- Icon={IconChevronLeft}- />- }- >- {fieldMetadataItemUsedInDropdown?.label}- </DropdownMenuHeader>- <DropdownMenuItemsContainer>- <SelectableList- focusId={advancedFilterFieldSelectDropdownId}- selectableItemIdArray={selectableItemIdArray}- selectableListInstanceId={advancedFilterFieldSelectDropdownId}- >- {compositeFieldTypeIsFilterableByAnySubField &&- isDefined(fieldMetadataItemUsedInDropdown) && (- <SelectableListItem- itemId="-1"- key={`select-filter-${-1}`}- onEnter={() => {- handleSelectFilter({- fieldMetadataItem: fieldMetadataItemUsedInDropdown,- });- }}- >- <ListItem- key={`select-filter-${-1}`}- data-testid={`select-filter-${-1}`}- focused={selectedItemId === '-1'}- onClick={() => {- handleSelectFilter({- fieldMetadataItem: fieldMetadataItemUsedInDropdown,- });- }}- startIcon={- <SelectOptionIcon- Icon={getIcon(fieldMetadataItemUsedInDropdown.icon)}- />- }- >- <OverflowingTextWithTooltip- text={t`Any ${fieldLabel ?? ''} field`}- />- </ListItem>- </SelectableListItem>- )}- {subFieldsAreFilterable &&- isDefined(fieldMetadataItemUsedInDropdown) &&- subFieldNames.map((subFieldName, index) => (- <SelectableListItem- itemId={subFieldName}- key={`select-filter-${index}`}- onEnter={() => {- handleSelectFilter({- fieldMetadataItem: fieldMetadataItemUsedInDropdown,- subFieldName,- });- }}- >- <ListItem- focused={selectedItemId === subFieldName}- key={`select-filter-${index}`}- data-testid={`select-filter-${index}`}- onClick={() => {- handleSelectFilter({- fieldMetadataItem: fieldMetadataItemUsedInDropdown,- subFieldName,- });- }}- startIcon={- <SelectOptionIcon- Icon={getIcon(- ICON_NAME_BY_SUB_FIELD[subFieldName] ??- fieldMetadataItemUsedInDropdown.icon,- )}- />- }- >- {getCompositeSubFieldLabel(- objectFilterDropdownSubMenuFieldType,- subFieldName,+ <>+ <Dropdown.Back aria-label={t`${fieldMetadataItem.label}, back to fields`}>+ {fieldMetadataItem.label}+ </Dropdown.Back>+ <Dropdown.Section>+ {compositeFieldTypeIsFilterableByAnySubField && (+ <Dropdown.ActionItem+ onClick={() => handleSelectFilter(null)}+ startIcon={+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ }+ >+ <OverflowingTextWithTooltip+ text={t`Any ${fieldMetadataItem.label} field`}+ />+ </Dropdown.ActionItem>+ )}+ {subFieldsAreFilterable &&+ subFieldNames.map((subFieldName) => (+ <Dropdown.ActionItem+ key={subFieldName}+ onClick={() => handleSelectFilter(subFieldName)}+ startIcon={+ <SelectOptionIcon+ Icon={getIcon(+ ICON_NAME_BY_SUB_FIELD[subFieldName] ??+ fieldMetadataItem.icon,)}- </ListItem>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ />+ }+ >+ {getCompositeSubFieldLabel(filterType, subFieldName)}+ </Dropdown.ActionItem>+ ))}+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownButton.tsxindex 8add14c1cb8..3e04940f3f6 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownButton.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownButton.tsx@@ -1,10 +1,13 @@import { AdvancedFilterFieldSelectDropdownButtonClickableSelect } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownButtonClickableSelect';import { AdvancedFilterFieldSelectDropdownContent } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownContent';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';--import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+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 { t } from '@lingui/core/macro';+import { Dropdown } from 'twenty-ui/components';const StyledContainer = styled.div`flex: 2;@@ -22,21 +25,26 @@ export const AdvancedFilterFieldSelectDropdownButton = ({return (<StyledContainer>- <Dropdown+ <DropdownRootdropdownId={advancedFilterFieldSelectDropdownId}- clickableComponent={+ type="picker"+ >+ <Dropdown.Trigger render={<div />} nativeButton={false}><AdvancedFilterFieldSelectDropdownButtonClickableSelectrecordFilterId={recordFilterId}/>- }- dropdownComponents={+ </Dropdown.Trigger>+ <DropdownContent+ aria-label={t`Select field`}+ width={GenericDropdownContentWidth.ExtraLarge}+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}+ align="start"+ ><AdvancedFilterFieldSelectDropdownContentrecordFilterId={recordFilterId}/>- }- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}- dropdownPlacement="bottom-start"- />+ </DropdownContent>+ </DropdownRoot></StyledContainer>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownContent.tsxindex c798d238199..b2644fccf54 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownContent.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownContent.tsx@@ -1,9 +1,10 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { AdvancedFilterCompositeSubFieldSelectMenu } from '@/object-record/advanced-filter/components/AdvancedFilterCompositeSubFieldSelectMenu';import { AdvancedFilterFieldSelectMenu } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu';import { AdvancedFilterRelationTargetFieldSelectMenu } from '@/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { objectFilterDropdownIsSelectingRelationTargetFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useState } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';type AdvancedFilterFieldSelectDropdownContentProps = {recordFilterId: string;@@ -12,31 +13,36 @@ type AdvancedFilterFieldSelectDropdownContentProps = {export const AdvancedFilterFieldSelectDropdownContent = ({recordFilterId,}: AdvancedFilterFieldSelectDropdownContentProps) => {- const objectFilterDropdownIsSelectingCompositeField =- useAtomComponentStateValue(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- );+ const [searchInput, setSearchInput] = useState('');+ const [subPageFieldMetadataItem, setSubPageFieldMetadataItem] =+ useState<FieldMetadataItem | null>(null);- const objectFilterDropdownIsSelectingRelationTargetField =- useAtomComponentStateValue(- objectFilterDropdownIsSelectingRelationTargetFieldComponentState,- );-- if (objectFilterDropdownIsSelectingRelationTargetField) {- return (- <AdvancedFilterRelationTargetFieldSelectMenu- recordFilterId={recordFilterId}- />- );- }-- if (objectFilterDropdownIsSelectingCompositeField) {- return (- <AdvancedFilterCompositeSubFieldSelectMenu- recordFilterId={recordFilterId}- />- );- }-- return <AdvancedFilterFieldSelectMenu recordFilterId={recordFilterId} />;+ return (+ <>+ <Dropdown.Page id="root">+ <AdvancedFilterFieldSelectMenu+ recordFilterId={recordFilterId}+ searchInput={searchInput}+ onSearchInputChange={setSearchInput}+ onSubPageFieldMetadataItemSelect={setSubPageFieldMetadataItem}+ />+ </Dropdown.Page>+ <Dropdown.Page id="composite">+ {isDefined(subPageFieldMetadataItem) && (+ <AdvancedFilterCompositeSubFieldSelectMenu+ recordFilterId={recordFilterId}+ fieldMetadataItem={subPageFieldMetadataItem}+ />+ )}+ </Dropdown.Page>+ <Dropdown.Page id="relation-target">+ {isDefined(subPageFieldMetadataItem) && (+ <AdvancedFilterRelationTargetFieldSelectMenu+ recordFilterId={recordFilterId}+ sourceFieldMetadataItem={subPageFieldMetadataItem}+ />+ )}+ </Dropdown.Page>+ </>+ );};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsxindex b44fa1bf83c..1844e62c371 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx@@ -1,243 +1,145 @@-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';--import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';--import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { AdvancedFilterFieldSelectSearchInput } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput';import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';import { useApplyAdvancedFilterSourceField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterSourceField';+import { usePushFocusForLeafFieldValuePicker } from '@/object-record/advanced-filter/hooks/usePushFocusForLeafFieldValuePicker';import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';-import { ObjectFilterDropdownFilterSelectMenuItem } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem';-import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { objectFilterDropdownIsSelectingRelationTargetFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState';-import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState';-import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFilterableFieldType';-import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';+import { getAdvancedFilterFieldSubPage } from '@/object-record/advanced-filter/utils/getAdvancedFilterFieldSubPage';import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';import { useFilterableFieldMetadataItems } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItems';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';-import { usePushFocusForLeafFieldValuePicker } from '@/object-record/advanced-filter/hooks/usePushFocusForLeafFieldValuePicker';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';+import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useLingui } from '@lingui/react/macro';-import { useContext } from 'react';-import { getFilterTypeFromFieldType } from 'twenty-shared/utils';+import { Fragment, useContext } from 'react';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown, useDropdownPage } from 'twenty-ui/components';+import { useIcons } from 'twenty-ui/icon';type AdvancedFilterFieldSelectMenuProps = {recordFilterId: string;+ searchInput: string;+ onSearchInputChange: (searchInput: string) => void;+ onSubPageFieldMetadataItemSelect: (+ fieldMetadataItem: FieldMetadataItem,+ ) => void;};export const AdvancedFilterFieldSelectMenu = ({recordFilterId,+ searchInput,+ onSearchInputChange,+ onSubPageFieldMetadataItemSelect,}: AdvancedFilterFieldSelectMenuProps) => {- const {- closeAdvancedFilterFieldSelectDropdown,- advancedFilterFieldSelectDropdownId,- } = useAdvancedFilterFieldSelectDropdown(recordFilterId);-- const [objectFilterDropdownSearchInput] = useAtomComponentState(- objectFilterDropdownSearchInputComponentState,- );-+ const { closeAdvancedFilterFieldSelectDropdown } =+ useAdvancedFilterFieldSelectDropdown(recordFilterId);+ const { goToPage } = useDropdownPage();+ const { getIcon } = useIcons();+ const { t } = useLingui();const { objectMetadataItem } = useContext(AdvancedFilterContext);-- const { filterableFieldMetadataItems: filterableFieldMetadataItems } =- useFilterableFieldMetadataItems(objectMetadataItem.id);-+ const { filterableFieldMetadataItems } = useFilterableFieldMetadataItems(+ objectMetadataItem.id,+ );const visibleRecordFields = useAtomComponentSelectorValue(visibleRecordFieldsComponentSelector,);-const visibleFieldMetadataItemIds = visibleRecordFields.map((recordField) => recordField.fieldMetadataItemId,);-const filteredSearchInputFieldMetadataItems =filterableFieldMetadataItems.filter((fieldMetadataItem) =>fieldMetadataItem.label.toLocaleLowerCase()- .includes(objectFilterDropdownSearchInput.toLocaleLowerCase()),+ .includes(searchInput.toLocaleLowerCase()),);-const visibleFieldMetadataItems = filteredSearchInputFieldMetadataItems- .toSorted((a, b) => {- return (- visibleFieldMetadataItemIds.indexOf(a.id) -- visibleFieldMetadataItemIds.indexOf(b.id)- );- }).filter((fieldMetadataItem) =>visibleFieldMetadataItemIds.includes(fieldMetadataItem.id),+ )+ .toSorted(+ (firstField, secondField) =>+ visibleFieldMetadataItemIds.indexOf(firstField.id) -+ visibleFieldMetadataItemIds.indexOf(secondField.id),);-- const hiddenColumnsFieldMetadataItems = filteredSearchInputFieldMetadataItems- .sort((a, b) => a.label.localeCompare(b.label))+ const hiddenFieldMetadataItems = filteredSearchInputFieldMetadataItems.filter((fieldMetadataItem) =>!visibleFieldMetadataItemIds.includes(fieldMetadataItem.id),+ )+ .toSorted((firstField, secondField) =>+ firstField.label.localeCompare(secondField.label),);-- const { resetSelectedItem } = useSelectableList(- advancedFilterFieldSelectDropdownId,- );-const { applyAdvancedFilterSourceField } =useApplyAdvancedFilterSourceField();-- const [, setObjectFilterDropdownSubMenuFieldType] = useAtomComponentState(- objectFilterDropdownSubMenuFieldTypeComponentState,- );-- const [, setObjectFilterDropdownIsSelectingCompositeField] =- useAtomComponentState(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- );-- const [, setObjectFilterDropdownIsSelectingRelationTargetField] =- useAtomComponentState(- objectFilterDropdownIsSelectingRelationTargetFieldComponentState,- );-- const setFieldMetadataItemIdUsedInDropdown = useSetAtomComponentState(- fieldMetadataItemIdUsedInDropdownComponentState,- );-const { pushFocusForLeafFieldValuePicker } =usePushFocusForLeafFieldValuePicker();const handleFieldMetadataItemSelect = (- selectedFieldMetadataItem: FieldMetadataItem,+ fieldMetadataItem: FieldMetadataItem,) => {- resetSelectedItem();-- const filterType = getFilterTypeFromFieldType(- selectedFieldMetadataItem.type,- );-- const isRelationTraversalField = isManyToOneRelationField(- selectedFieldMetadataItem,- );-- const compositeSubMenuFieldType =- !isRelationTraversalField && isCompositeFilterableFieldType(filterType)- ? filterType- : null;-- // For sub-menu paths (composite or relation traversal) we only stage- // the source field in the dropdown state and open the sub-menu —- // upsertRecordFilter happens in the sub-menu's hook once the user- // makes the final choice. Otherwise navigating back from the sub-menu- // would leave an orphan partial filter in the chip list.- if (isRelationTraversalField) {- setFieldMetadataItemIdUsedInDropdown(selectedFieldMetadataItem.id);- setObjectFilterDropdownIsSelectingRelationTargetField(true);- return;- }+ const subPage = getAdvancedFilterFieldSubPage(fieldMetadataItem);- if (compositeSubMenuFieldType !== null) {- setFieldMetadataItemIdUsedInDropdown(selectedFieldMetadataItem.id);- setObjectFilterDropdownSubMenuFieldType(compositeSubMenuFieldType);- setObjectFilterDropdownIsSelectingCompositeField(true);+ if (isDefined(subPage)) {+ onSubPageFieldMetadataItemSelect(fieldMetadataItem);+ goToPage(subPage);return;}applyAdvancedFilterSourceField({- sourceFieldMetadataItem: selectedFieldMetadataItem,+ sourceFieldMetadataItem: fieldMetadataItem,recordFilterId,});-- pushFocusForLeafFieldValuePicker(selectedFieldMetadataItem);-+ pushFocusForLeafFieldValuePicker(fieldMetadataItem);closeAdvancedFilterFieldSelectDropdown();};- const shouldShowVisibleFields = visibleFieldMetadataItems.length > 0;- const shouldShowHiddenFields = hiddenColumnsFieldMetadataItems.length > 0;-- const shouldShowSeparator =- visibleFieldMetadataItems.length > 0 &&- hiddenColumnsFieldMetadataItems.length > 0;-- const selectableItemIdArray = [- ...visibleFieldMetadataItems.map(- (fieldMetadataItem) => fieldMetadataItem.id,- ),- ...hiddenColumnsFieldMetadataItems.map(- (fieldMetadataItem) => fieldMetadataItem.id,- ),- ];-- const { t } = useLingui();+ const hasVisibleFields = isNonEmptyArray(visibleFieldMetadataItems);+ const sections = [+ {+ id: 'visible',+ label: t`Visible fields`,+ fields: visibleFieldMetadataItems,+ },+ {+ id: 'hidden',+ label: hasVisibleFields ? t`Hidden fields` : undefined,+ fields: hiddenFieldMetadataItems,+ },+ ].filter((section) => isNonEmptyArray(section.fields));return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <AdvancedFilterFieldSelectSearchInput />- <SelectableList- focusId={advancedFilterFieldSelectDropdownId}- selectableItemIdArray={selectableItemIdArray}- selectableListInstanceId={advancedFilterFieldSelectDropdownId}- >- {shouldShowVisibleFields && (- <>- <DropdownMenuSectionLabel label={t`Visible fields`} />- <DropdownMenuItemsContainer>- {visibleFieldMetadataItems.map(- (visibleFieldMetadataItem, index) => (- <SelectableListItem- itemId={visibleFieldMetadataItem.id}- key={`visible-select-filter-${index}`}- onEnter={() => {- handleFieldMetadataItemSelect(visibleFieldMetadataItem);- }}- >- <ObjectFilterDropdownFilterSelectMenuItem- fieldMetadataItemToSelect={visibleFieldMetadataItem}- onClick={handleFieldMetadataItemSelect}- />- </SelectableListItem>- ),- )}- </DropdownMenuItemsContainer>- </>- )}- {shouldShowSeparator && <DropdownMenuSeparator />}- {shouldShowHiddenFields && (- <>- {visibleFieldMetadataItems.length > 0 && (- <DropdownMenuSectionLabel label={t`Hidden fields`} />- )}- <DropdownMenuItemsContainer>- {hiddenColumnsFieldMetadataItems.map(- (hiddenFieldMetadataItem, index) => (- <SelectableListItem- itemId={hiddenFieldMetadataItem.id}- key={`hidden-select-filter-${index}`}- onEnter={() => {- handleFieldMetadataItemSelect(hiddenFieldMetadataItem);- }}- >- <ObjectFilterDropdownFilterSelectMenuItem- fieldMetadataItemToSelect={hiddenFieldMetadataItem}- onClick={handleFieldMetadataItemSelect}- />- </SelectableListItem>- ),- )}- </DropdownMenuItemsContainer>- </>- )}- </SelectableList>- </LegacyDropdownContent>+ <>+ <Dropdown.Search+ value={searchInput}+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}+ onValueChange={onSearchInputChange}+ />+ {sections.map((section, index) => (+ <Fragment key={section.id}>+ {index > 0 && <Dropdown.Separator />}+ <Dropdown.Section label={section.label}>+ {section.fields.map((fieldMetadataItem) => (+ <Dropdown.OptionItem+ key={fieldMetadataItem.id}+ closeOnSelect={false}+ onSelect={() =>+ handleFieldMetadataItemSelect(fieldMetadataItem)+ }+ startIcon={+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ }+ hasSubmenu={isDefined(+ getAdvancedFilterFieldSubPage(fieldMetadataItem),+ )}+ >+ {fieldMetadataItem.label}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.Section>+ </Fragment>+ ))}+ {!isNonEmptyArray(sections) && (+ <Dropdown.Empty>{t`No fields found`}</Dropdown.Empty>+ )}+ </>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsxdeleted file mode 100644index 6a5c2eb8de3..00000000000--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput.tsx+++ /dev/null@@ -1,47 +0,0 @@-import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';-import { themeCssVariables } from 'twenty-ui/theme';--export const StyledInput = styled.input`- background: transparent;- border: none;- border-bottom: 1px solid ${themeCssVariables.border.color.light};- border-radius: 0;- border-top: none;- border-top-left-radius: ${themeCssVariables.border.radius.md};- border-top-right-radius: ${themeCssVariables.border.radius.md};- color: ${themeCssVariables.font.color.primary};- font-family: inherit;- font-size: ${themeCssVariables.font.size.sm};- font-weight: inherit;- margin: 0;- max-width: 100%;- min-height: 19px;-- outline: none;- overflow: hidden;- padding: ${themeCssVariables.spacing[2]};- text-decoration: none;-- &::placeholder {- color: ${themeCssVariables.font.color.light};- }-`;--export const AdvancedFilterFieldSelectSearchInput = () => {- const [objectFilterDropdownSearchInput, setObjectFilterDropdownSearchInput] =- useAtomComponentState(objectFilterDropdownSearchInputComponentState);-- return (- <StyledInput- value={objectFilterDropdownSearchInput}- autoFocus- placeholder={t`Search fields`}- onChange={(event: React.ChangeEvent<HTMLInputElement>) =>- setObjectFilterDropdownSearchInput(event.target.value)- }- />- );-};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsxindex 0915e96e44d..3641114fc5f 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx@@ -1,5 +1,5 @@import { ADVANCED_FILTER_LOGICAL_OPERATOR_OPTIONS } from '@/object-record/advanced-filter/constants/AdvancedFilterLogicalOperatorOptions';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useUpsertRecordFilterGroup } from '@/object-record/record-filter-group/hooks/useUpsertRecordFilterGroup';import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';import { Select } from '@/ui/input/components/Select';@@ -32,7 +32,7 @@ export const AdvancedFilterLogicalOperatorDropdown = ({value={recordFilterGroup.logicalOperator}onChange={handleChange}options={ADVANCED_FILTER_LOGICAL_OPERATOR_OPTIONS}- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}+ dropdownSideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}/>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsxindex c8c63827692..158b16a7f67 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterGroupOptionsDropdown.tsx@@ -1,16 +1,14 @@-import { ListItem } from 'twenty-ui/primitives/navigation';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useChildRecordFiltersAndRecordFilterGroups } from '@/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups';import { useRemoveRecordFilterGroup } from '@/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup';import { useRemoveRootRecordFilterGroupIfEmpty } from '@/object-record/record-filter-group/hooks/useRemoveRootRecordFilterGroupIfEmpty';import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';-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 { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { Dropdown, IconButton } from 'twenty-ui/components';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { t } from '@lingui/core/macro';import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';-import { IconButton } from 'twenty-ui/components';type AdvancedFilterRecordFilterGroupOptionsDropdownProps = {recordFilterGroupId: string;@@ -21,8 +19,6 @@ export const AdvancedFilterRecordFilterGroupOptionsDropdown = ({}: AdvancedFilterRecordFilterGroupOptionsDropdownProps) => {const dropdownId = `advanced-filter-record-filter-group-options-${recordFilterGroupId}`;- const { closeDropdown } = useCloseDropdown();-const { removeRecordFilter } = useRemoveRecordFilter();const { removeRecordFilterGroup } = useRemoveRecordFilterGroup();const { removeRootRecordFilterGroupIfEmpty } =@@ -40,31 +36,30 @@ export const AdvancedFilterRecordFilterGroupOptionsDropdown = ({removeRecordFilterGroup(recordFilterGroupId);removeRootRecordFilterGroupIfEmpty();-- closeDropdown(dropdownId);};return (- <Dropdown- dropdownId={dropdownId}- clickableComponent={- <IconButton aria-label={t`Filter group rule options`} variant="ghost">- <IconDotsVertical />- </IconButton>- }- dropdownComponents={- <LegacyDropdownContent>- <DropdownMenuItemsContainer>- <ListItem- onClick={handleRemove}- startIcon={<IconTrash />}- color="danger"- >{t`Remove rule group`}</ListItem>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- }- dropdownOffset={{ y: 2, x: 0 }}- dropdownPlacement="bottom-start"- />+ <DropdownRoot dropdownId={dropdownId} type="menu">+ <Dropdown.Trigger+ render={+ <IconButton aria-label={t`Filter group rule options`} variant="ghost">+ <IconDotsVertical />+ </IconButton>+ }+ />+ <DropdownContent+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}+ >+ <Dropdown.Section>+ <Dropdown.ActionItem+ onClick={handleRemove}+ startIcon={<IconTrash />}+ color="danger"+ >+ {t`Remove rule group`}+ </Dropdown.ActionItem>+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsxindex cc12636f349..4a790639a81 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOperandSelectContent.tsx@@ -1,5 +1,4 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useSetRecordFilterUsedInAdvancedFilterDropdownRow } from '@/object-record/advanced-filter/hooks/useSetRecordFilterUsedInAdvancedFilterDropdownRow';import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';import { useApplyObjectFilterDropdownOperand } from '@/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownOperand';@@ -10,17 +9,12 @@ import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilimport { type RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';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 { 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 { Dropdown } from 'twenty-ui/components';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { t } from '@lingui/core/macro';import { useContext } from 'react';+import { isDefined } from 'twenty-shared/utils';import { type ViewFilterOperand } from 'twenty-shared/types';type AdvancedFilterRecordFilterOperandSelectContentProps = {@@ -38,8 +32,6 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({const { isWorkflowFindRecords } = useContext(AdvancedFilterContext);- const { closeDropdown } = useCloseDropdown();-const { applyObjectFilterDropdownOperand } =useApplyObjectFilterDropdownOperand();@@ -47,8 +39,6 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({useSetRecordFilterUsedInAdvancedFilterDropdownRow();const handleOperandChange = (operand: ViewFilterOperand) => {- closeDropdown(dropdownId);-applyObjectFilterDropdownOperand(operand);};@@ -56,11 +46,6 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({setRecordFilterUsedInAdvancedFilterDropdownRow(filter);};- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- dropdownId,- );-const { userTimeZoneAbbreviation } =useTimeZoneAbbreviationForNowInUserTimeZone();@@ -74,55 +59,42 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({: null;return (- <Dropdown+ <DropdownRootdropdownId={dropdownId}- clickableComponent={+ type="picker"+ onOpenChange={(open) => {+ if (open) {+ handleDropdownOpen();+ }+ }}+ >+ <Dropdown.Trigger nativeButton={false} render={<div />}><SelectControlselectedOption={{- label: filter?.operand+ label: isDefined(filter.operand)? getOperandLabel(filter.operand, timeZoneAbbreviation): t`Select operand`,value: null,}}/>- }- dropdownComponents={- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.Narrow}- >- <DropdownMenuItemsContainer>- <SelectableList- focusId={dropdownId}- selectableItemIdArray={operandsForFilterType.map(- (operand) => operand,- )}- selectableListInstanceId={dropdownId}+ </Dropdown.Trigger>+ <DropdownContent+ width={160}+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}+ aria-label={t`Select operand`}+ >+ <Dropdown.Section>+ {operandsForFilterType.map((filterOperand) => (+ <Dropdown.OptionItem+ key={filterOperand}+ selected={filter.operand === filterOperand}+ onSelect={() => handleOperandChange(filterOperand)}>- {operandsForFilterType.map((filterOperand, index) => (- <SelectableListItem- itemId={filterOperand}- key={`select-filter-operand-${index}`}- onEnter={() => {- handleOperandChange(filterOperand);- }}- >- <ListItem- focused={selectedItemId === filterOperand}- onClick={() => {- handleOperandChange(filterOperand);- }}- >- {getOperandLabel(filterOperand, timeZoneAbbreviation)}- </ListItem>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- }- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}- dropdownPlacement="bottom-start"- onOpen={handleDropdownOpen}- />+ {getOperandLabel(filterOperand, timeZoneAbbreviation)}+ </Dropdown.OptionItem>+ ))}+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsxindex 6189229a1dc..80d2a54129d 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRecordFilterOptionsDropdown.tsx@@ -1,4 +1,3 @@-import { ListItem } from 'twenty-ui/primitives/navigation';import { useChildRecordFiltersAndRecordFilterGroups } from '@/object-record/advanced-filter/hooks/useChildRecordFiltersAndRecordFilterGroups';import { useRemoveRecordFilterGroup } from '@/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup';import { useRemoveRootRecordFilterGroupIfEmpty } from '@/object-record/record-filter-group/hooks/useRemoveRootRecordFilterGroupIfEmpty';@@ -6,16 +5,14 @@ import { useRemoveRootRecordFilterGroupIfEmpty } from '@/object-record/record-fiimport { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';-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 { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';+import { Dropdown, IconButton } from 'twenty-ui/components';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import { IconDotsVertical, IconTrash } from 'twenty-ui/icon';-import { IconButton } from 'twenty-ui/components';type AdvancedFilterRecordFilterOptionsDropdownProps = {recordFilterId: string;@@ -26,8 +23,6 @@ export const AdvancedFilterRecordFilterOptionsDropdown = ({}: AdvancedFilterRecordFilterOptionsDropdownProps) => {const dropdownId = `advanced-filter-record-filter-options-${recordFilterId}`;- const { closeDropdown } = useCloseDropdown();-const { removeRecordFilter } = useRemoveRecordFilter();const { removeRecordFilterGroup } = useRemoveRecordFilterGroup();@@ -47,16 +42,15 @@ export const AdvancedFilterRecordFilterOptionsDropdown = ({const { removeRootRecordFilterGroupIfEmpty } =useRemoveRootRecordFilterGroupIfEmpty();- const handleRemove = async () => {- closeDropdown(dropdownId);-- if (isDefined(currentRecordFilter?.recordFilterGroupId)) {- const isOnlyViewFilterInGroup =- childRecordFiltersAndRecordFilterGroups?.length === 1;+ const handleRemove = () => {+ const isOnlyViewFilterInGroup =+ childRecordFiltersAndRecordFilterGroups?.length === 1;- if (isOnlyViewFilterInGroup) {- removeRecordFilterGroup(currentRecordFilter.recordFilterGroupId);- }+ if (+ isDefined(currentRecordFilter?.recordFilterGroupId) &&+ isOnlyViewFilterInGroup+ ) {+ removeRecordFilterGroup(currentRecordFilter.recordFilterGroupId);}removeRecordFilter({ recordFilterId: recordFilterId });@@ -65,26 +59,30 @@ export const AdvancedFilterRecordFilterOptionsDropdown = ({};return (- <Dropdown- dropdownId={dropdownId}- clickableComponent={- <IconButton aria-label={t`Record filter rule options`} variant="ghost">- <IconDotsVertical />- </IconButton>- }- dropdownComponents={- <LegacyDropdownContent>- <DropdownMenuItemsContainer>- <ListItem- onClick={handleRemove}- startIcon={<IconTrash />}- color="danger"- >{t`Remove rule`}</ListItem>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>- }- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}- dropdownPlacement="bottom-start"- />+ <DropdownRoot dropdownId={dropdownId} type="menu">+ <Dropdown.Trigger+ render={+ <IconButton+ aria-label={t`Record filter rule options`}+ variant="ghost"+ >+ <IconDotsVertical />+ </IconButton>+ }+ />+ <DropdownContent+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}+ >+ <Dropdown.Section>+ <Dropdown.ActionItem+ onClick={handleRemove}+ startIcon={<IconTrash />}+ color="danger"+ >+ {t`Remove rule`}+ </Dropdown.ActionItem>+ </Dropdown.Section>+ </DropdownContent>+ </DropdownRoot>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsxindex 030d6081734..93d808a56f6 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu.tsx@@ -1,89 +1,45 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';-import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';import { useApplyAdvancedFilterRelationTargetField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterRelationTargetField';import { useApplyAdvancedFilterSourceField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterSourceField';import { usePushFocusForLeafFieldValuePicker } from '@/object-record/advanced-filter/hooks/usePushFocusForLeafFieldValuePicker';-import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';-import { objectFilterDropdownIsSelectingRelationTargetFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState';import { useFilterableFieldMetadataItems } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItems';-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 { 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 { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';+import { t } from '@lingui/core/macro';import { CoreObjectNameSingular } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft, IconUserCircle, useIcons } from 'twenty-ui/icon';--const RELATION_RECORD_SELECTABLE_ITEM_ID = 'relation-record-select';+import { Dropdown } from 'twenty-ui/components';+import { IconUserCircle, useIcons } from 'twenty-ui/icon';type AdvancedFilterRelationTargetFieldSelectMenuProps = {recordFilterId: string;+ sourceFieldMetadataItem: FieldMetadataItem;};export const AdvancedFilterRelationTargetFieldSelectMenu = ({recordFilterId,+ sourceFieldMetadataItem,}: AdvancedFilterRelationTargetFieldSelectMenuProps) => {const { getIcon } = useIcons();-- const sourceFieldMetadataItem = useAtomComponentSelectorValue(- fieldMetadataItemUsedInDropdownComponentSelector,- );-- const setObjectFilterDropdownIsSelectingRelationTargetField =- useSetAtomComponentState(- objectFilterDropdownIsSelectingRelationTargetFieldComponentState,- );-- const { closeAdvancedFilterFieldSelectDropdown } =- useAdvancedFilterFieldSelectDropdown(recordFilterId);-const { applyAdvancedFilterRelationTargetField } =useApplyAdvancedFilterRelationTargetField();-const { applyAdvancedFilterSourceField } =useApplyAdvancedFilterSourceField();-const { pushFocusForLeafFieldValuePicker } =usePushFocusForLeafFieldValuePicker();-- const { advancedFilterFieldSelectDropdownId } =- useAdvancedFilterFieldSelectDropdown(recordFilterId);-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- advancedFilterFieldSelectDropdownId,- );-const { objectMetadataItem: workspaceMemberObjectMetadataItem } =useObjectMetadataItem({objectNameSingular: CoreObjectNameSingular.WorkspaceMember,});-- const targetObjectMetadataId =- isDefined(sourceFieldMetadataItem) &&- isManyToOneRelationField(sourceFieldMetadataItem)- ? sourceFieldMetadataItem.relation.targetObjectMetadata.id- : null;-+ const targetObjectMetadataId = isManyToOneRelationField(+ sourceFieldMetadataItem,+ )+ ? sourceFieldMetadataItem.relation.targetObjectMetadata.id+ : null;const { filterableFieldMetadataItems: relationTargetFields } =useFilterableFieldMetadataItems(targetObjectMetadataId ?? '');- if (- !isDefined(sourceFieldMetadataItem) ||- !isManyToOneRelationField(sourceFieldMetadataItem)- ) {+ if (!isManyToOneRelationField(sourceFieldMetadataItem)) {return null;}@@ -91,10 +47,6 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({sourceFieldMetadataItem.relation.targetObjectMetadata.nameSingular ===CoreObjectNameSingular.WorkspaceMember;- const handleSubMenuBack = () => {- setObjectFilterDropdownIsSelectingRelationTargetField(false);- };-const handleSelectTargetField = (relationTargetFieldMetadataItem: FieldMetadataItem,) => {@@ -103,11 +55,7 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({relationTargetFieldMetadataItem,recordFilterId,});-pushFocusForLeafFieldValuePicker(relationTargetFieldMetadataItem);-- setObjectFilterDropdownIsSelectingRelationTargetField(false);- closeAdvancedFilterFieldSelectDropdown();};const handleSelectRelationRecord = () => {@@ -115,81 +63,37 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({sourceFieldMetadataItem,recordFilterId,});-- setObjectFilterDropdownIsSelectingRelationTargetField(false);- closeAdvancedFilterFieldSelectDropdown();};- const selectableItemIdArray = [- ...(isWorkspaceMemberTarget ? [RELATION_RECORD_SELECTABLE_ITEM_ID] : []),- ...relationTargetFields.map((field) => field.id),- ];-return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={handleSubMenuBack}- Icon={IconChevronLeft}- />- }+ <>+ <Dropdown.Back+ aria-label={t`${sourceFieldMetadataItem.label}, back to fields`}>{sourceFieldMetadataItem.label}- </DropdownMenuHeader>- <DropdownMenuItemsContainer>- <SelectableList- focusId={advancedFilterFieldSelectDropdownId}- selectableItemIdArray={selectableItemIdArray}- selectableListInstanceId={advancedFilterFieldSelectDropdownId}- >- {isWorkspaceMemberTarget && (- <>- <SelectableListItem- itemId={RELATION_RECORD_SELECTABLE_ITEM_ID}- onEnter={handleSelectRelationRecord}- >- <ListItem- focused={- selectedItemId === RELATION_RECORD_SELECTABLE_ITEM_ID- }- data-testid={'select-filter-relation-record'}- onClick={handleSelectRelationRecord}- startIcon={<IconUserCircle />}- >- {workspaceMemberObjectMetadataItem.labelSingular}- </ListItem>- </SelectableListItem>- <DropdownMenuSeparator />- </>- )}- {relationTargetFields.map((targetField, index) => (- <SelectableListItem- itemId={targetField.id}- key={`select-filter-relation-${index}`}- onEnter={() => {- handleSelectTargetField(targetField);- }}+ </Dropdown.Back>+ <Dropdown.Section>+ {isWorkspaceMemberTarget && (+ <>+ <Dropdown.ActionItem+ onClick={handleSelectRelationRecord}+ startIcon={<IconUserCircle />}>- <ListItem- focused={selectedItemId === targetField.id}- key={`select-filter-relation-${index}`}- data-testid={`select-filter-relation-${index}`}- onClick={() => {- handleSelectTargetField(targetField);- }}- startIcon={- <SelectOptionIcon Icon={getIcon(targetField.icon)} />- }- >- {targetField.label}- </ListItem>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ {workspaceMemberObjectMetadataItem.labelSingular}+ </Dropdown.ActionItem>+ <Dropdown.Separator />+ </>+ )}+ {relationTargetFields.map((targetField) => (+ <Dropdown.ActionItem+ key={targetField.id}+ onClick={() => handleSelectTargetField(targetField)}+ startIcon={<SelectOptionIcon Icon={getIcon(targetField.icon)} />}+ >+ {targetField.label}+ </Dropdown.ActionItem>+ ))}+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsxindex ea91f1feb84..5322407bf8b 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterValueInput.tsx@@ -1,7 +1,7 @@import { AdvancedFilterDropdownFilterInput } from '@/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput';import { AdvancedFilterDropdownTextInput } from '@/object-record/advanced-filter/components/AdvancedFilterDropdownTextInput';import { AdvancedFilterValueInputDropdownButtonClickableSelect } from '@/object-record/advanced-filter/components/AdvancedFilterValueInputDropdownButtonClickableSelect';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useSetRecordFilterUsedInAdvancedFilterDropdownRow } from '@/object-record/advanced-filter/hooks/useSetRecordFilterUsedInAdvancedFilterDropdownRow';import { getAdvancedFilterObjectFilterDropdownComponentInstanceId } from '@/object-record/advanced-filter/utils/getAdvancedFilterObjectFilterDropdownComponentInstanceId';import { shouldShowFilterTextInput } from '@/object-record/advanced-filter/utils/shouldShowFilterTextInput';@@ -76,7 +76,7 @@ export const AdvancedFilterValueInput = ({const dropdownContentOffset =filterType === 'DATE' || filterType === 'DATE_TIME'? ({ y: -33, x: 0 } satisfies DropdownOffset)- : DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET;+ : { y: DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET };const showFilterTextInputInsteadOfDropdown = shouldShowFilterTextInput({recordFilter,diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/__stories__/AdvancedFilterRecordFilterRow.stories.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/__stories__/AdvancedFilterRecordFilterRow.stories.tsxnew file mode 100644index 00000000000..b14abb33f94--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/__stories__/AdvancedFilterRecordFilterRow.stories.tsx@@ -0,0 +1,214 @@+import { AdvancedFilterRecordFilterRow } from '@/object-record/advanced-filter/components/AdvancedFilterRecordFilterRow';+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, userEvent, waitFor, within } from 'storybook/test';+import { type ComponentProps } from 'react';+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';+import { type PageDecoratorArgs } from '~/testing/decorators/PageDecorator';+import { ADVANCED_FILTER_STORY_DATA } from '~/testing/mock-data/advanced-filter-story-data';+import { AdvancedFilterViewDecorator } from '~/testing/decorators/AdvancedFilterViewDecorator';+import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';++const { instanceId, objectMetadataItem, recordFilterGroup, recordFilter } =+ ADVANCED_FILTER_STORY_DATA;++type AdvancedFilterRecordFilterRowStoryArgs = ComponentProps<+ typeof AdvancedFilterRecordFilterRow+> &+ PageDecoratorArgs;++const meta: Meta<AdvancedFilterRecordFilterRowStoryArgs> = {+ title: 'Modules/ObjectRecord/AdvancedFilter/RecordFilterRow',+ component: AdvancedFilterRecordFilterRow,+ decorators: [+ AdvancedFilterViewDecorator,+ ObjectMetadataItemsDecorator,+ ToastDecorator,+ ComponentWithRouterDecorator,+ IconsProviderDecorator,+ ],+ args: {+ routePath: '/objects/:objectNamePlural',+ routeParams: { ':objectNamePlural': objectMetadataItem.namePlural },+ recordFilterGroup,+ recordFilter,+ recordFilterIndex: 0,+ },+ parameters: {+ container: { width: 900 },+ },+};++export default meta;+type Story = StoryObj<AdvancedFilterRecordFilterRowStoryArgs>;++export const SearchAndSelectWithEnter: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByRole('button', { name: 'Name' }));+ const popup = await body.findByRole('dialog', { name: 'Select field' });+ const search = within(popup).getByRole('searchbox', {+ name: 'Search fields',+ });+ await waitFor(() => expect(search).toHaveFocus());+ expect(within(popup).getByText('Visible fields')).toBeVisible();+ expect(within(popup).getByText('Hidden fields')).toBeVisible();+ await userEvent.type(search, 'Stage');+ await userEvent.keyboard('{Enter}');++ await waitFor(() => expect(popup).not.toBeInTheDocument());+ const stageTrigger = await canvas.findByRole('button', { name: 'Stage' });+ await expect(stageTrigger).toHaveFocus();+ const stageField = objectMetadataItem.fields.find(+ (field) => field.name === 'stage',+ );+ expect(jotaiStore.get(focusStackState.atom)).toContainEqual(+ expect.objectContaining({ focusId: stageField?.id }),+ );++ await userEvent.click(stageTrigger);+ expect(await body.findByPlaceholderText('Search fields')).toHaveValue('');+ await userEvent.keyboard('{Escape}');+ await userEvent.click(await canvas.findByText('Select Stage'));+ const valueSearch = await body.findByPlaceholderText('Stage');+ await waitFor(() => expect(valueSearch).toHaveFocus());+ await userEvent.type(valueSearch, 'Screening');+ await userEvent.click(+ await body.findByRole('option', { name: 'Screening' }),+ );+ await userEvent.keyboard('{Escape}');+ await expect(await canvas.findByText('Screening')).toBeVisible();+ },+};++export const CompositePageAndBack: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByRole('button', { name: 'Name' }));+ const popup = await body.findByRole('dialog', { name: 'Select field' });+ await userEvent.click(+ within(popup).getByRole('button', { name: 'Amount' }),+ );+ await expect(+ await within(popup).findByRole('button', { name: 'Currency' }),+ ).toBeVisible();+ await userEvent.click(+ within(popup).getByRole('button', { name: 'Amount, back to fields' }),+ );+ await expect(+ await within(popup).findByPlaceholderText('Search fields'),+ ).toBeVisible();+ expect(+ jotaiStore.get(+ currentRecordFiltersComponentState.atomFamily({ instanceId }),+ ),+ ).toEqual([recordFilter]);++ await userEvent.click(+ within(popup).getByRole('button', { name: 'Amount' }),+ );+ await userEvent.click(+ await within(popup).findByRole('button', { name: 'Currency' }),+ );+ await waitFor(() => expect(popup).not.toBeInTheDocument());+ const fieldTrigger = await canvas.findByRole('button', {+ name: 'Amount / Currency',+ });+ await userEvent.click(fieldTrigger);+ expect(await body.findByPlaceholderText('Search fields')).toBeVisible();+ await userEvent.keyboard('{Escape}');+ },+};++export const RelationTargetPageAndBack: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByRole('button', { name: 'Name' }));+ const popup = await body.findByRole('dialog', { name: 'Select field' });+ await userEvent.click(+ within(popup).getByRole('button', { name: 'Company' }),+ );+ await within(popup).findByRole('button', { name: 'Employees' });+ expect(+ within(popup).queryByRole('button', { name: 'Workspace Member' }),+ ).not.toBeInTheDocument();+ await userEvent.click(+ within(popup).getByRole('button', { name: 'Company, back to fields' }),+ );+ await within(popup).findByPlaceholderText('Search fields');+ expect(+ jotaiStore.get(+ currentRecordFiltersComponentState.atomFamily({ instanceId }),+ ),+ ).toEqual([recordFilter]);++ await userEvent.click(+ within(popup).getByRole('button', { name: 'Company' }),+ );+ await userEvent.click(+ await within(popup).findByRole('button', { name: 'Employees' }),+ );+ await waitFor(() => expect(popup).not.toBeInTheDocument());+ await expect(+ await canvas.findByRole('button', { name: 'Company → Employees' }),+ ).toBeVisible();+ },+};++export const RelationTargetPageWithKeyboard: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByRole('button', { name: 'Name' }));+ const popup = await body.findByRole('dialog', { name: 'Select field' });+ const search = within(popup).getByRole('searchbox', {+ name: 'Search fields',+ });+ await waitFor(() => expect(search).toHaveFocus());+ await userEvent.type(search, 'Company');+ await userEvent.keyboard('{Enter}');+ await within(popup).findByRole('button', {+ name: 'Company, back to fields',+ });+ await userEvent.keyboard('{Enter}');++ await waitFor(() => expect(popup).not.toBeInTheDocument());+ await expect(+ await canvas.findByRole('button', { name: /^Company → / }),+ ).toBeVisible();+ },+};++export const WorkspaceMemberRecord: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByRole('button', { name: 'Name' }));+ const popup = await body.findByRole('dialog', { name: 'Select field' });+ await userEvent.click(within(popup).getByRole('button', { name: 'Owner' }));+ await userEvent.click(+ await within(popup).findByRole('button', { name: 'Workspace Member' }),+ );+ await waitFor(() => expect(popup).not.toBeInTheDocument());+ await expect(+ await canvas.findByRole('button', { name: 'Owner' }),+ ).toBeVisible();+ expect(+ jotaiStore.get(+ currentRecordFiltersComponentState.atomFamily({ instanceId }),+ ),+ ).toEqual([+ expect.objectContaining({+ type: 'RELATION',+ relationTargetFieldMetadataId: null,+ }),+ ]);+ },+};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/__tests__/AdvancedFilterRelationTargetFieldSelectMenu.test.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/__tests__/AdvancedFilterRelationTargetFieldSelectMenu.test.tsxdeleted file mode 100644index b9927c96c9a..00000000000--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/__tests__/AdvancedFilterRelationTargetFieldSelectMenu.test.tsx+++ /dev/null@@ -1,135 +0,0 @@-import { fireEvent, render, waitFor } from '@testing-library/react';-import { useEffect, useState } from 'react';--import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';-import { AdvancedFilterRelationTargetFieldSelectMenu } from '@/object-record/advanced-filter/components/AdvancedFilterRelationTargetFieldSelectMenu';-import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';-import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState';-import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';-import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';-import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';--const INSTANCE_ID = 'advanced-filter-relation-target-test';-const FILTER_ID = 'relation-target-filter';--const opportunity = getMockObjectMetadataItemOrThrow('opportunity');--const workspaceMemberRelationField = opportunity.fields.find(- (field) =>- isManyToOneRelationField(field) &&- field.relation.targetObjectMetadata.nameSingular === 'workspaceMember',-);--const nonWorkspaceMemberRelationField = opportunity.fields.find(- (field) =>- isManyToOneRelationField(field) &&- field.relation.targetObjectMetadata.nameSingular !== 'workspaceMember',-);--if (!workspaceMemberRelationField || !nonWorkspaceMemberRelationField) {- throw new Error('Missing expected relation fields in opportunity mock');-}--const BaseWrapper = getJestMetadataAndApolloMocksWrapper({ apolloMocks: [] });--const CurrentRecordFiltersObserver = () => {- const currentRecordFilters = useAtomComponentStateValue(- currentRecordFiltersComponentState,- );-- return (- <div data-testid="current-record-filters">- {JSON.stringify(currentRecordFilters)}- </div>- );-};--const Seed = ({- sourceFieldMetadataId,- children,-}: {- sourceFieldMetadataId: string;- children: React.ReactNode;-}) => {- const setFieldMetadataItemIdUsedInDropdown = useSetAtomComponentState(- fieldMetadataItemIdUsedInDropdownComponentState,- );-- const [isSeeded, setIsSeeded] = useState(false);-- useEffect(() => {- setFieldMetadataItemIdUsedInDropdown(sourceFieldMetadataId);- setIsSeeded(true);- }, [sourceFieldMetadataId, setFieldMetadataItemIdUsedInDropdown]);-- return isSeeded ? <>{children}</> : null;-};--const renderSubMenu = (sourceFieldMetadataId: string) => {- return render(- <BaseWrapper>- <RecordFiltersComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- <ObjectFilterDropdownComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- <Seed sourceFieldMetadataId={sourceFieldMetadataId}>- <AdvancedFilterRelationTargetFieldSelectMenu- recordFilterId={FILTER_ID}- />- </Seed>- <CurrentRecordFiltersObserver />- </ObjectFilterDropdownComponentInstanceContext.Provider>- </RecordFiltersComponentInstanceContext.Provider>- </BaseWrapper>,- );-};--describe('AdvancedFilterRelationTargetFieldSelectMenu', () => {- it('shows a "filter by record" entry when the relation target is workspaceMember', async () => {- const { getByTestId } = renderSubMenu(workspaceMemberRelationField.id);-- await waitFor(() => {- expect(getByTestId('select-filter-relation-record')).toBeInTheDocument();- });- });-- it('does not show the "filter by record" entry for a non-workspaceMember relation', async () => {- const { findByText, queryByTestId } = renderSubMenu(- nonWorkspaceMemberRelationField.id,- );-- await findByText(nonWorkspaceMemberRelationField.label);-- expect(- queryByTestId('select-filter-relation-record'),- ).not.toBeInTheDocument();- });-- it('creates a direct RELATION filter (relationTargetFieldMetadataId null) when the record entry is selected', async () => {- const { getByTestId } = renderSubMenu(workspaceMemberRelationField.id);-- const recordEntry = await waitFor(() =>- getByTestId('select-filter-relation-record'),- );-- fireEvent.click(recordEntry);-- await waitFor(() => {- const currentRecordFilters = JSON.parse(- getByTestId('current-record-filters').textContent || '[]',- );-- expect(currentRecordFilters).toHaveLength(1);- expect(currentRecordFilters[0]).toMatchObject({- fieldMetadataId: workspaceMemberRelationField.id,- type: 'RELATION',- relationTargetFieldMetadataId: null,- });- });- });-});diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset.tsdeleted file mode 100644index 3bdaa1c1362..00000000000--- a/packages/twenty-front/src/modules/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset.ts+++ /dev/null@@ -1,6 +0,0 @@-import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';--export const DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET: DropdownOffset = {- y: 2,- x: 0,-};diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset.tsnew file mode 100644index 00000000000..7fb3aaed0af--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset.ts@@ -0,0 +1 @@+export const DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET = 2;diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelLogicalOperatorCell.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelLogicalOperatorCell.tsxindex f9e62a1cc68..0780aeb86ae 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelLogicalOperatorCell.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelLogicalOperatorCell.tsx@@ -1,6 +1,6 @@import { AdvancedFilterLogicalOperatorDropdown } from '@/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown';import { ADVANCED_FILTER_LOGICAL_OPERATOR_OPTIONS } from '@/object-record/advanced-filter/constants/AdvancedFilterLogicalOperatorOptions';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';import { Select } from '@/ui/input/components/Select';@@ -48,7 +48,7 @@ export const AdvancedFilterSidePanelLogicalOperatorCell = ({dropdownId={`advanced-filter-logical-operator-${recordFilterGroup.id}`}value={recordFilterGroup.logicalOperator}options={ADVANCED_FILTER_LOGICAL_OPERATOR_OPTIONS}- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}+ dropdownSideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}disabled/>) : (diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/utils/getAdvancedFilterFieldSubPage.ts b/packages/twenty-front/src/modules/object-record/advanced-filter/utils/getAdvancedFilterFieldSubPage.tsnew file mode 100644index 00000000000..3b97076f234--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/utils/getAdvancedFilterFieldSubPage.ts@@ -0,0 +1,22 @@+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';+import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFilterableFieldType';+import { getFilterTypeFromFieldType } from 'twenty-shared/utils';++export const getAdvancedFilterFieldSubPage = (+ fieldMetadataItem: FieldMetadataItem,+): 'relation-target' | 'composite' | null => {+ if (isManyToOneRelationField(fieldMetadataItem)) {+ return 'relation-target';+ }++ if (+ isCompositeFilterableFieldType(+ getFilterTypeFromFieldType(fieldMetadataItem.type),+ )+ ) {+ return 'composite';+ }++ return null;+};diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsxdeleted file mode 100644index 0aca08cb7d1..00000000000--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx+++ /dev/null@@ -1,51 +0,0 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';-import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';-import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useIcons } from 'twenty-ui/icon';--export type ObjectFilterDropdownFilterSelectMenuItemProps = {- fieldMetadataItemToSelect: FieldMetadataItem;- onClick: (selectedFieldMetadataItem: FieldMetadataItem) => void;-};--export const ObjectFilterDropdownFilterSelectMenuItem = ({- fieldMetadataItemToSelect,- onClick,-}: ObjectFilterDropdownFilterSelectMenuItemProps) => {- const { resetSelectedItem } = useSelectableList();-- const isSelectedItemId = useAtomComponentFamilyStateValue(- isSelectedItemIdComponentFamilyState,- fieldMetadataItemToSelect.id,- );-- const { getIcon } = useIcons();-- const Icon = getIcon(fieldMetadataItemToSelect.icon);-- const shouldShowSubMenu =- isCompositeFieldType(fieldMetadataItemToSelect.type) ||- isManyToOneRelationField(fieldMetadataItemToSelect);-- const handleClick = () => {- resetSelectedItem();-- onClick(fieldMetadataItemToSelect);- };-- return (- <ListItem- focused={isSelectedItemId}- onClick={handleClick}- startIcon={<SelectOptionIcon Icon={Icon} />}- hasSubmenu={shouldShowSubMenu}- >- {fieldMetadataItemToSelect.label}- </ListItem>- );-};diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.tsindex f9115bee2e4..923bfc06d3e 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts@@ -4,8 +4,6 @@ import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-recordimport { objectFilterDropdownAnyFieldSearchIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownAnyFieldSearchIsSelectedComponentState';import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { objectFilterDropdownIsSelectingRelationTargetFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState';import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';@@ -40,18 +38,6 @@ export const useResetFilterDropdown = (componentInstanceId?: string) => {componentInstanceId,);- const objectFilterDropdownIsSelectingCompositeField =- useAtomComponentStateCallbackState(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- componentInstanceId,- );-- const objectFilterDropdownIsSelectingRelationTargetField =- useAtomComponentStateCallbackState(- objectFilterDropdownIsSelectingRelationTargetFieldComponentState,- componentInstanceId,- );-const objectFilterDropdownCurrentRecordFilter =useAtomComponentStateCallbackState(objectFilterDropdownCurrentRecordFilterComponentState,@@ -62,8 +48,6 @@ export const useResetFilterDropdown = (componentInstanceId?: string) => {store.set(objectFilterDropdownSearchInput, '');store.set(selectedOperandInDropdown, null);store.set(objectFilterDropdownFilterIsSelected, false);- store.set(objectFilterDropdownIsSelectingCompositeField, false);- store.set(objectFilterDropdownIsSelectingRelationTargetField, false);store.set(fieldMetadataItemIdUsedInDropdown, null);store.set(objectFilterDropdownCurrentRecordFilter, null);store.set(objectFilterDropdownAnyFieldSearchIsSelected, false);@@ -71,8 +55,6 @@ export const useResetFilterDropdown = (componentInstanceId?: string) => {objectFilterDropdownSearchInput,selectedOperandInDropdown,objectFilterDropdownFilterIsSelected,- objectFilterDropdownIsSelectingCompositeField,- objectFilterDropdownIsSelectingRelationTargetField,fieldMetadataItemIdUsedInDropdown,objectFilterDropdownCurrentRecordFilter,objectFilterDropdownAnyFieldSearchIsSelected,diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.tsdeleted file mode 100644index cb840f3914e..00000000000--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const objectFilterDropdownIsSelectingCompositeFieldComponentState =- createAtomComponentState<boolean>({- key: 'objectFilterDropdownIsSelectingCompositeFieldComponentState',- defaultValue: false,- componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState.tsdeleted file mode 100644index 29664c96beb..00000000000--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingRelationTargetFieldComponentState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const objectFilterDropdownIsSelectingRelationTargetFieldComponentState =- createAtomComponentState<boolean>({- key: 'objectFilterDropdownIsSelectingRelationTargetFieldComponentState',- defaultValue: false,- componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.tsdeleted file mode 100644index b4fa5e195c5..00000000000--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts+++ /dev/null@@ -1,10 +0,0 @@-import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';-import { type ObjectFilterDropdownSubMenuFieldType } from '@/object-record/record-filter/types/ObjectFilterDropdownSubMenuFieldType';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const objectFilterDropdownSubMenuFieldTypeComponentState =- createAtomComponentState<ObjectFilterDropdownSubMenuFieldType | null>({- key: 'objectFilterDropdownSubMenuFieldTypeComponentState',- defaultValue: null,- componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsxindex 0b9f6e938d3..680f76437d1 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormBooleanFieldInput.tsx@@ -134,9 +134,7 @@ export const FormBooleanFieldInput = ({hasRightElement={isDefined(VariablePicker) && !readonly}disabled={readonly}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}- dropdownOffset={{- y: parseInt(theme.spacing[1], 10),- }}+ dropdownSideOffset={parseInt(theme.spacing[1], 10)}/>) : (<FormFieldInputInnerContainerdiff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsxindex 3d80467cfe8..a1ebc47876d 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx@@ -152,9 +152,7 @@ export const FormSelectFieldInput = ({withSearchInputdisabled={readonly}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}- dropdownOffset={{- y: parseInt(theme.spacing[1], 10),- }}+ dropdownSideOffset={parseInt(theme.spacing[1], 10)}/>) : (<FormFieldInputInnerContainerdiff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsxindex 4f24fad19c8..f7b342d2682 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput.tsx@@ -1,9 +1,9 @@import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { type ChangeEvent, useCallback, useId, useMemo, useState } from 'react';+import { useCallback, useId, useMemo, useState } from 'react';import { CoreObjectNameSingular } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { IconChevronDown, IconUserCircle } from 'twenty-ui/icon';+import { IconChevronDown } from 'twenty-ui/icon';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { type JsonValue } from 'type-fest';@@ -23,7 +23,10 @@ import {import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect';import { type SelectableItem } from '@/object-record/select/types/SelectableItem';import { Field } from 'twenty-ui/primitives/input';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { Dropdown } from 'twenty-ui/components';+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 { isStandaloneVariableString } from 'twenty-shared/workflow';const StyledFormSelectContainerWrapper = styled.div<{ readonly?: boolean }>`@@ -38,7 +41,7 @@ const StyledIconButton = styled.div`padding-right: ${themeCssVariables.spacing[2]};`;-export type FormWorkspaceMemberFilterValueInputProps = {+type FormWorkspaceMemberFilterValueInputProps = {label?: string;defaultValue?: string | null;onChange: (value: JsonValue) => void;@@ -59,7 +62,6 @@ export const FormWorkspaceMemberFilterValueInput = ({const componentId = useId();const dropdownId = `form-workspace-member-filter-picker-${componentId}`;- const selectableListId = `${dropdownId}-selectable-list`;const variablesDropdownId = `${dropdownId}-variables`;const [searchFilter, setSearchFilter] = useState('');@@ -102,26 +104,14 @@ export const FormWorkspaceMemberFilterValueInput = ({[onChange, onClear],);- const meSelectableItem: SelectableItem = useMemo(- () => ({- id: CURRENT_WORKSPACE_MEMBER_SELECTABLE_ITEM_ID,- name: t`Me`,- isSelected: isCurrentWorkspaceMemberSelected,- AvatarIcon: IconUserCircle,- }),- [isCurrentWorkspaceMemberSelected],- );-- const filteredPinnedSelectableItems = useMemo(- () =>- [meSelectableItem].filter((item) =>- item.name.toLowerCase().includes(searchFilter.toLowerCase()),- ),- [meSelectableItem, searchFilter],- );-const handleSelectChange = useCallback(- (itemToSelect: SelectableItem, isNewSelectedValue: boolean) => {+ ({+ itemToSelect,+ isNewSelectedValue,+ }: {+ itemToSelect: Pick<SelectableItem, 'id'>;+ isNewSelectedValue: boolean;+ }) => {if (loading) {return;}@@ -163,17 +153,6 @@ export const FormWorkspaceMemberFilterValueInput = ({onChange('');}, [onChange, onClear]);- const handleSearchChange = useCallback(- (event: ChangeEvent<HTMLInputElement>) => {- setSearchFilter(event.target.value);- },- [],- );-- const handleDropdownClose = useCallback(() => {- setSearchFilter('');- }, []);-const triggerDisplayText = useMemo(() => {const selectedRecordNames = [...recordsToSelect,@@ -187,12 +166,12 @@ export const FormWorkspaceMemberFilterValueInput = ({.filter((record) => selectedRecordIds.includes(record.id)).map((record) => record.name);- const selectedPinnedItemNames = isCurrentWorkspaceMemberSelected+ const selectedCurrentMemberNames = isCurrentWorkspaceMemberSelected? [t`Me`]: [];const selectedItemNames = [- ...selectedPinnedItemNames,+ ...selectedCurrentMemberNames,...selectedRecordNames,];@@ -238,47 +217,55 @@ export const FormWorkspaceMemberFilterValueInput = ({</FormFieldInputInnerContainer></StyledFormSelectContainerWrapper>) : (- <Dropdown+ <DropdownRootdropdownId={dropdownId}- dropdownPlacement="bottom-start"- clickableComponentWidth="100%"- onClose={handleDropdownClose}- dropdownOffset={{- y: parseInt(theme.spacing[1], 10),+ type="picker"+ multiple+ onOpenChange={(open) => {+ if (!open) {+ setSearchFilter('');+ }}}- clickableComponent={- <StyledFormSelectContainerWrapper>- <FormFieldInputInnerContainer- formFieldInputInstanceId={componentId}- hasRightElement={isDefined(VariablePicker)}- hoverable- preventFocusStackUpdate- >- {triggerContent}- <StyledIconButton>- <IconChevronDown- size={theme.icon.size.md}- color={theme.font.color.light}- />- </StyledIconButton>- </FormFieldInputInnerContainer>- </StyledFormSelectContainerWrapper>- }- dropdownComponents={+ >+ <Dropdown.Trigger+ render={<StyledFormSelectContainerWrapper />}+ nativeButton={false}+ >+ <FormFieldInputInnerContainer+ formFieldInputInstanceId={componentId}+ hasRightElement={isDefined(VariablePicker)}+ hoverable+ preventFocusStackUpdate+ >+ {triggerContent}+ <StyledIconButton>+ <IconChevronDown+ size={theme.icon.size.md}+ color={theme.font.color.light}+ />+ </StyledIconButton>+ </FormFieldInputInnerContainer>+ </Dropdown.Trigger>+ <DropdownContent+ aria-label={t`Select workspace members`}+ side="bottom"+ align="start"+ sideOffset={parseInt(theme.spacing[1], 10)}+ width={GenericDropdownContentWidth.ExtraLarge}+ ><FormWorkspaceMemberFilterValueInputDropdownContent- dropdownId={dropdownId}- selectableListId={selectableListId}searchFilter={searchFilter}- onSearchChange={handleSearchChange}- pinnedSelectableItems={filteredPinnedSelectableItems}+ onSearchChange={setSearchFilter}+ isCurrentWorkspaceMemberSelected={+ isCurrentWorkspaceMemberSelected+ }recordsToSelect={recordsToSelect}filteredSelectedRecords={filteredSelectedRecords}- selectedRecords={selectedRecords}loading={loading}onSelectChange={handleSelectChange}/>- }- />+ </DropdownContent>+ </DropdownRoot>)}{isDefined(VariablePicker) && !readonly && (<VariablePickerdiff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsxindex 4a754b3c46e..98c151e6ce0 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInputDropdownContent.tsx@@ -1,64 +1,104 @@-import { type ChangeEvent } from 'react';+import { t } from '@lingui/core/macro';+import { isNonEmptyArray } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';+import { IconUserCircle } from 'twenty-ui/icon';+import { Avatar } from 'twenty-ui/primitives/data-display';+import { Field } from 'twenty-ui/primitives/input';-import { ObjectFilterDropdownRecordPinnedItems } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems';-import { MultipleSelectDropdown } from '@/object-record/select/components/MultipleSelectDropdown';+import { CURRENT_WORKSPACE_MEMBER_SELECTABLE_ITEM_ID } from '@/object-record/object-filter-dropdown/constants/CurrentWorkspaceMemberSelectableItemId';import { type SelectableItem } from '@/object-record/select/types/SelectableItem';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-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 { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';+import { normalizeSearchText } from '~/utils/normalizeSearchText';type FormWorkspaceMemberFilterValueInputDropdownContentProps = {- dropdownId: string;- selectableListId: string;searchFilter: string;- onSearchChange: (event: ChangeEvent<HTMLInputElement>) => void;- pinnedSelectableItems: SelectableItem[];+ onSearchChange: (value: string) => void;+ isCurrentWorkspaceMemberSelected: boolean;recordsToSelect: SelectableItem[];filteredSelectedRecords: SelectableItem[];- selectedRecords: SelectableItem[];loading: boolean;- onSelectChange: (item: SelectableItem, isNewSelectedValue: boolean) => void;+ onSelectChange: (selection: {+ itemToSelect: Pick<SelectableItem, 'id'>;+ isNewSelectedValue: boolean;+ }) => void;};export const FormWorkspaceMemberFilterValueInputDropdownContent = ({- dropdownId,- selectableListId,searchFilter,onSearchChange,- pinnedSelectableItems,+ isCurrentWorkspaceMemberSelected,recordsToSelect,filteredSelectedRecords,- selectedRecords,loading,onSelectChange,-}: FormWorkspaceMemberFilterValueInputDropdownContentProps) => (- <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>- <DropdownMenuSearchInput- autoFocus- type="text"- value={searchFilter}- onChange={onSearchChange}- />- <DropdownMenuSeparator />- {pinnedSelectableItems.length > 0 && (- <>- <ObjectFilterDropdownRecordPinnedItems- selectableItems={pinnedSelectableItems}- onChange={onSelectChange}+}: FormWorkspaceMemberFilterValueInputDropdownContentProps) => {+ const isMeVisible = normalizeSearchText(t`Me`).includes(+ normalizeSearchText(searchFilter),+ );+ const items = [...filteredSelectedRecords, ...recordsToSelect];+ const hasNoResults = !loading && !isMeVisible && !isNonEmptyArray(items);++ return (+ <>+ <Field.Root>+ <Dropdown.Search+ value={searchFilter}+ onValueChange={onSearchChange}+ placeholder={t`Search`}+ aria-label={t`Search workspace members`}/>- <DropdownMenuSeparator />- </>- )}- <MultipleSelectDropdown- selectableListId={selectableListId}- focusId={dropdownId}- itemsToSelect={recordsToSelect}- filteredSelectedItems={filteredSelectedRecords}- selectedItems={selectedRecords}- onChange={onSelectChange}- searchFilter={searchFilter}- loadingItems={loading}- />- </LegacyDropdownContent>-);+ </Field.Root>+ {isMeVisible && (+ <Dropdown.Section>+ <Dropdown.OptionItem+ selected={isCurrentWorkspaceMemberSelected}+ disabled={loading}+ indicator="checkbox"+ startIcon={<SelectOptionIcon Icon={IconUserCircle} />}+ onSelect={() =>+ onSelectChange({+ itemToSelect: {+ id: CURRENT_WORKSPACE_MEMBER_SELECTABLE_ITEM_ID,+ },+ isNewSelectedValue: !isCurrentWorkspaceMemberSelected,+ })+ }+ >+ {t`Me`}+ </Dropdown.OptionItem>+ </Dropdown.Section>+ )}+ {isMeVisible && <Dropdown.Separator />}+ <Dropdown.Section scrollable>+ {items.map((item) => (+ <Dropdown.OptionItem+ key={item.id}+ selected={item.isSelected}+ indicator="checkbox"+ disabled={loading}+ onSelect={() =>+ onSelectChange({+ itemToSelect: item,+ isNewSelectedValue: !item.isSelected,+ })+ }+ startIcon={+ <Avatar+ src={getAbsoluteImageUrl(item.avatarUrl)}+ colorSeed={item.id}+ name={item.name}+ size="md"+ shape={item.avatarShape}+ />+ }+ >+ {item.name}+ </Dropdown.OptionItem>+ ))}+ {hasNoResults && <Dropdown.Empty>{t`No results`}</Dropdown.Empty>}+ {loading && <Dropdown.Loading>{t`Loading...`}</Dropdown.Loading>}+ </Dropdown.Section>+ </>+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormWorkspaceMemberFilterValueInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormWorkspaceMemberFilterValueInput.stories.tsxnew file mode 100644index 00000000000..f194666d415--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormWorkspaceMemberFilterValueInput.stories.tsx@@ -0,0 +1,158 @@+import { FormWorkspaceMemberFilterValueInput } from '@/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput';+import { styled } from '@linaria/react';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { useState } from 'react';+import { delay, graphql, HttpResponse } from 'msw';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import { isString } from '@sniptt/guards';+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 { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';+import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';+import { graphqlMocks } from '~/testing/graphqlMocks';+import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';++const StyledContainer = styled.div`+ width: 400px;+`;++const meta = {+ title: 'UI/Data/Field/Form/Input/FormWorkspaceMemberFilterValueInput',+ component: FormWorkspaceMemberFilterValueInput,+ decorators: [+ ObjectMetadataItemsDecorator,+ ComponentDecorator,+ WorkspaceDecorator,+ ToastDecorator,+ MemoryRouterDecorator,+ ],+ parameters: { msw: graphqlMocks },+ args: { label: 'Workspace members', onChange: fn(), defaultValue: '' },+ render: function Render(args) {+ const [value, setValue] = useState(args.defaultValue);++ return (+ <StyledContainer>+ <FormWorkspaceMemberFilterValueInput+ {...args}+ defaultValue={value}+ onChange={(nextValue) => {+ args.onChange(nextValue);+ setValue(isString(nextValue) ? nextValue : '');+ }}+ />+ </StyledContainer>+ );+ },+} satisfies Meta<typeof FormWorkspaceMemberFilterValueInput>;++export default meta;+type Story = StoryObj<typeof meta>;++export const SelectMeAndResetSearch: Story = {+ play: async ({ canvasElement, args }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Select' }),+ );+ const dialog = await body.findByRole('dialog', {+ name: 'Select workspace members',+ });+ const dropdown = within(dialog);+ const me = await dropdown.findByRole('button', { name: 'Me' });+ await waitFor(() =>+ expect(me).not.toHaveAttribute('aria-disabled', 'true'),+ );+ await userEvent.click(me);+ await waitFor(() => expect(me).toHaveAttribute('aria-pressed', 'true'));+ expect(args.onChange).toHaveBeenCalledWith(+ JSON.stringify({+ isCurrentWorkspaceMemberSelected: true,+ selectedRecordIds: [],+ }),+ );+ expect(dialog).toBeVisible();+ expect(dialog.getBoundingClientRect().width).toBe(320);+ const search = dropdown.getByRole('searchbox', {+ name: 'Search workspace members',+ });+ await userEvent.type(search, 'missing-member');+ await userEvent.keyboard('{Escape}');+ await waitFor(() => expect(dialog).not.toBeInTheDocument());+ await userEvent.click(canvas.getByRole('button', { name: 'Me' }));+ const reopened = within(+ await body.findByRole('dialog', { name: 'Select workspace members' }),+ );+ expect(+ reopened.getByRole('searchbox', { name: 'Search workspace members' }),+ ).toHaveValue('');+ await userEvent.keyboard('{Escape}');+ },+};++export const Variable: Story = {+ decorators: [WorkflowStepDecorator],+ args: { defaultValue: `{{${MOCKED_STEP_ID}.createdAt}}` },+ play: async ({ canvasElement }) => {+ expect(+ await within(canvasElement).findByText('Creation date'),+ ).toBeVisible();+ },+};++export const Readonly: Story = {+ args: {+ readonly: true,+ defaultValue: JSON.stringify({+ isCurrentWorkspaceMemberSelected: true,+ selectedRecordIds: [],+ }),+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ expect(await canvas.findByText('Me')).toBeVisible();+ expect(+ canvas.queryByRole('button', { name: 'Me' }),+ ).not.toBeInTheDocument();+ },+};++export const LoadingPreventsSelection: Story = {+ parameters: {+ msw: {+ handlers: [+ graphql.query('FindManyWorkspaceMembers', async () => {+ await delay('infinite');++ return HttpResponse.json({+ data: { workspaceMembers: { edges: [] } },+ });+ }),+ ...graphqlMocks.handlers,+ ],+ },+ },+ play: async ({ canvasElement, args }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Select' }),+ );+ const dropdown = within(+ await body.findByRole('dialog', { name: 'Select workspace members' }),+ );+ await userEvent.type(+ dropdown.getByRole('searchbox', { name: 'Search workspace members' }),+ 'm',+ );+ expect(await dropdown.findByText('Loading...')).toBeVisible();+ const me = dropdown.getByRole('button', { name: 'Me' });+ expect(me).toHaveAttribute('aria-disabled', 'true');+ await userEvent.click(me);+ expect(args.onChange).not.toHaveBeenCalled();+ await userEvent.keyboard('{Escape}');+ },+};diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectFilterDropdownSubMenuFieldType.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectFilterDropdownSubMenuFieldType.tsdeleted file mode 100644index c4deab78ec3..00000000000--- a/packages/twenty-front/src/modules/object-record/record-filter/types/ObjectFilterDropdownSubMenuFieldType.ts+++ /dev/null@@ -1,3 +0,0 @@-import { type CompositeFilterableFieldType } from '@/object-record/record-filter/types/CompositeFilterableFieldType';--export type ObjectFilterDropdownSubMenuFieldType = CompositeFilterableFieldType;diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsxindex 3455e3ce65d..ba8f58348e3 100644--- a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx@@ -105,7 +105,7 @@ export const SettingsLogicFunctionHttpTriggerSection = ({value={value.httpMethod as HTTPMethod}options={HTTP_METHOD_OPTIONS}onChange={(newMethod) => updateField('httpMethod', newMethod)}- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/><SettingsTextInputdiff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelect.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelect.tsxindex 53cee79d60a..7657d18a64b 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelect.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelect.tsx@@ -1,15 +1,16 @@/* @license Enterprise */import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import { Dropdown } from 'twenty-ui/components';import { AdvancedFilterFieldSelectDropdownButtonClickableSelect } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectDropdownButtonClickableSelect';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu';-import { SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';+import { SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';const StyledContainer = styled.div`flex: 2;@@ -27,34 +28,29 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectconst { advancedFilterFieldSelectDropdownId } =useAdvancedFilterFieldSelectDropdown(recordFilterId);- const [objectFilterDropdownIsSelectingCompositeField] =- useAtomComponentState(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- );-return (<StyledContainer>- <Dropdown+ <DropdownRootdropdownId={advancedFilterFieldSelectDropdownId}- clickableComponent={+ type="picker"+ >+ <Dropdown.Trigger render={<div />} nativeButton={false}><AdvancedFilterFieldSelectDropdownButtonClickableSelectrecordFilterId={recordFilterId}/>- }- dropdownComponents={- objectFilterDropdownIsSelectingCompositeField ? (- <SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu- recordFilterId={recordFilterId}- />- ) : (- <SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu- recordFilterId={recordFilterId}- />- )- }- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}- dropdownPlacement="bottom-start"- />+ </Dropdown.Trigger>+ <DropdownContent+ aria-label={t`Select a filter field`}+ side="bottom"+ align="start"+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}+ width={GenericDropdownContentWidth.ExtraLarge}+ >+ <SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent+ recordFilterId={recordFilterId}+ />+ </DropdownContent>+ </DropdownRoot></StyledContainer>);};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent.tsxnew file mode 100644index 00000000000..7b3cf25307d--- /dev/null+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent.tsx@@ -0,0 +1,44 @@+/* @license Enterprise */++import { useState } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';++import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu';+import { SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu';++type SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContentProps =+ {+ recordFilterId: string;+ };++export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContent =+ ({+ recordFilterId,+ }: SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectDropdownContentProps) => {+ const [searchInput, setSearchInput] = useState('');+ const [subPageFieldMetadataItem, setSubPageFieldMetadataItem] =+ useState<FieldMetadataItem | null>(null);++ return (+ <>+ <Dropdown.Page id="root">+ <SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu+ recordFilterId={recordFilterId}+ searchInput={searchInput}+ onSearchInputChange={setSearchInput}+ onSubPageFieldMetadataItemSelect={setSubPageFieldMetadataItem}+ />+ </Dropdown.Page>+ <Dropdown.Page id="composite">+ {isDefined(subPageFieldMetadataItem) && (+ <SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu+ recordFilterId={recordFilterId}+ fieldMetadataItem={subPageFieldMetadataItem}+ />+ )}+ </Dropdown.Page>+ </>+ );+ };diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsxindex 37f7b5e9118..aef287a02eb 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu.tsx@@ -1,55 +1,50 @@/* @license Enterprise */import { useLingui } from '@lingui/react/macro';-import { getFilterTypeFromFieldType } from 'twenty-shared/utils';+import {+ getFilterTypeFromFieldType,+ isNonEmptyArray,+} from 'twenty-shared/utils';+import { Dropdown, useDropdownPage } from 'twenty-ui/components';+import { useIcons } from 'twenty-ui/icon';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { CoreObjectNameSingular, FieldMetadataType } from 'twenty-shared/types';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { AdvancedFilterFieldSelectSearchInput } from '@/object-record/advanced-filter/components/AdvancedFilterFieldSelectSearchInput';import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';import { useApplyAdvancedFilterSourceField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterSourceField';import { usePushFocusForLeafFieldValuePicker } from '@/object-record/advanced-filter/hooks/usePushFocusForLeafFieldValuePicker';import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';-import { ObjectFilterDropdownFilterSelectMenuItem } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem';-import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';-import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState';import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFilterableFieldType';import { useFilterableFieldMetadataItems } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItems';import { RECORD_LEVEL_PERMISSION_PREDICATE_FIELD_TYPES } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/constants/RecordLevelPermissionPredicateFieldTypes';import { getComparableWorkspaceMemberRelationFields } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/utils/getComparableWorkspaceMemberRelationFields';-import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';-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 { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useContext } from 'react';type SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenuProps ={recordFilterId: string;+ searchInput: string;+ onSearchInputChange: (searchInput: string) => void;+ onSubPageFieldMetadataItemSelect: (+ fieldMetadataItem: FieldMetadataItem,+ ) => void;};export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenu =({recordFilterId,+ searchInput,+ onSearchInputChange,+ onSubPageFieldMetadataItemSelect,}: SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFieldMenuProps) => {const { t } = useLingui();+ const { getIcon } = useIcons();+ const { goToPage } = useDropdownPage();- const {- closeAdvancedFilterFieldSelectDropdown,- advancedFilterFieldSelectDropdownId,- } = useAdvancedFilterFieldSelectDropdown(recordFilterId);-- const [objectFilterDropdownSearchInput] = useAtomComponentState(- objectFilterDropdownSearchInputComponentState,- );+ const { closeAdvancedFilterFieldSelectDropdown } =+ useAdvancedFilterFieldSelectDropdown(recordFilterId);const { objectMetadataItem } = useContext(AdvancedFilterContext);@@ -84,13 +79,13 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFreturn true;}- return (+ return isNonEmptyArray(getComparableWorkspaceMemberRelationFields({workspaceMemberFieldMetadataItems:workspaceMemberObjectMetadataItem?.fields ?? [],targetObjectMetadataId:fieldMetadataItem.relation?.targetObjectMetadata.id,- }).length > 0+ }),);};@@ -99,47 +94,27 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectF(fieldMetadataItem) =>fieldMetadataItem.label.toLocaleLowerCase()- .includes(objectFilterDropdownSearchInput.toLocaleLowerCase()) &&+ .includes(searchInput.toLocaleLowerCase()) &&isPredicateFieldMetadataItem(fieldMetadataItem),).sort((a, b) => a.label.localeCompare(b.label));- const { resetSelectedItem } = useSelectableList(- advancedFilterFieldSelectDropdownId,- );-const { applyAdvancedFilterSourceField } =useApplyAdvancedFilterSourceField();- const [, setObjectFilterDropdownSubMenuFieldType] = useAtomComponentState(- objectFilterDropdownSubMenuFieldTypeComponentState,- );-- const [, setObjectFilterDropdownIsSelectingCompositeField] =- useAtomComponentState(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- );-- const setFieldMetadataItemIdUsedInDropdown = useSetAtomComponentState(- fieldMetadataItemIdUsedInDropdownComponentState,- );-const { pushFocusForLeafFieldValuePicker } =usePushFocusForLeafFieldValuePicker();const handleFieldSelect = (selectedFieldMetadataItem: FieldMetadataItem,) => {- resetSelectedItem();-const filterType = getFilterTypeFromFieldType(selectedFieldMetadataItem.type,);if (isCompositeFilterableFieldType(filterType)) {- setObjectFilterDropdownSubMenuFieldType(filterType);- setFieldMetadataItemIdUsedInDropdown(selectedFieldMetadataItem.id);- setObjectFilterDropdownIsSelectingCompositeField(true);+ onSubPageFieldMetadataItemSelect(selectedFieldMetadataItem);+ goToPage('composite');return;}@@ -153,38 +128,34 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectFcloseAdvancedFilterFieldSelectDropdown();};- const selectableItemIdArray = filteredFieldMetadataItems.map(- (fieldMetadataItem) => fieldMetadataItem.id,- );-return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <AdvancedFilterFieldSelectSearchInput />- <SelectableList- focusId={advancedFilterFieldSelectDropdownId}- selectableItemIdArray={selectableItemIdArray}- selectableListInstanceId={advancedFilterFieldSelectDropdownId}- >- <DropdownMenuSectionLabel label={t`Fields`} />- <DropdownMenuItemsContainer>- {filteredFieldMetadataItems.map((fieldMetadataItem) => (- <SelectableListItem- itemId={fieldMetadataItem.id}- key={fieldMetadataItem.id}- onEnter={() => {- handleFieldSelect(fieldMetadataItem);- }}- >- <ObjectFilterDropdownFilterSelectMenuItem- fieldMetadataItemToSelect={fieldMetadataItem}- onClick={handleFieldSelect}- />- </SelectableListItem>- ))}- </DropdownMenuItemsContainer>- </SelectableList>- </LegacyDropdownContent>+ <>+ <Dropdown.Search+ value={searchInput}+ onValueChange={onSearchInputChange}+ placeholder={t`Search fields`}+ aria-label={t`Search fields`}+ />+ <Dropdown.Section label={t`Fields`}>+ {filteredFieldMetadataItems.map((fieldMetadataItem) => (+ <Dropdown.OptionItem+ key={fieldMetadataItem.id}+ closeOnSelect={false}+ hasSubmenu={isCompositeFilterableFieldType(+ getFilterTypeFromFieldType(fieldMetadataItem.type),+ )}+ startIcon={+ <SelectOptionIcon Icon={getIcon(fieldMetadataItem.icon)} />+ }+ onSelect={() => handleFieldSelect(fieldMetadataItem)}+ >+ {fieldMetadataItem.label}+ </Dropdown.OptionItem>+ ))}+ {!isNonEmptyArray(filteredFieldMetadataItems) && (+ <Dropdown.Empty>{t`No compatible fields`}</Dropdown.Empty>+ )}+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsxindex 2d841d8872e..976cd286579 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu.tsx@@ -1,194 +1,91 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';/* @license Enterprise */+import { t } from '@lingui/core/macro';import {FieldMetadataType,compositeTypeDefinitions,} from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft, useIcons } from 'twenty-ui/icon';+import { getFilterTypeFromFieldType } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';+import { useIcons } from 'twenty-ui/icon';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { useAdvancedFilterFieldSelectDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterFieldSelectDropdown';import { useApplyAdvancedFilterCompositeSubField } from '@/object-record/advanced-filter/hooks/useApplyAdvancedFilterCompositeSubField';-import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';-import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState';import { getCompositeSubFieldLabel } from '@/object-record/object-filter-dropdown/utils/getCompositeSubFieldLabel';+import { isCompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFilterableFieldType';import { ICON_NAME_BY_SUB_FIELD } from '@/object-record/record-filter/constants/IconNameBySubField';-import { areCompositeTypeSubFieldsFilterable } from '@/object-record/record-filter/utils/areCompositeTypeSubFieldsFilterable';import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';-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 { 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 { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';type SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenuProps ={recordFilterId: string;+ fieldMetadataItem: FieldMetadataItem;};export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenu =({recordFilterId,+ fieldMetadataItem,}: SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenuProps) => {const { getIcon } = useIcons();-- const fieldMetadataItemUsedInDropdown = useAtomComponentSelectorValue(- fieldMetadataItemUsedInDropdownComponentSelector,- );-- const [, setObjectFilterDropdownIsSelectingCompositeField] =- useAtomComponentState(- objectFilterDropdownIsSelectingCompositeFieldComponentState,- );-- const [- objectFilterDropdownSubMenuFieldType,- setObjectFilterDropdownSubMenuFieldType,- ] = useAtomComponentState(- objectFilterDropdownSubMenuFieldTypeComponentState,- );-- const { closeAdvancedFilterFieldSelectDropdown } =- useAdvancedFilterFieldSelectDropdown(recordFilterId);-const { applyAdvancedFilterCompositeSubField } =useApplyAdvancedFilterCompositeSubField();- const handleSelectFilter = (- selectedFieldMetadataItem: FieldMetadataItem | null | undefined,- subFieldName?: CompositeFieldSubFieldName | null | undefined,- ) => {- if (!isDefined(selectedFieldMetadataItem)) {- return;- }-- applyAdvancedFilterCompositeSubField({- sourceFieldMetadataItem: selectedFieldMetadataItem,- subFieldName: subFieldName ?? null,- recordFilterId,- });-- closeAdvancedFilterFieldSelectDropdown();- };-- const handleSubMenuBack = () => {- setObjectFilterDropdownSubMenuFieldType(null);- setObjectFilterDropdownIsSelectingCompositeField(false);- };-- const { advancedFilterFieldSelectDropdownId } =- useAdvancedFilterFieldSelectDropdown(recordFilterId);-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- advancedFilterFieldSelectDropdownId,- );+ const filterType = getFilterTypeFromFieldType(fieldMetadataItem.type);- if (!isDefined(objectFilterDropdownSubMenuFieldType)) {+ if (!isCompositeFilterableFieldType(filterType)) {return null;}- const compositeType = compositeTypeDefinitions.get(- objectFilterDropdownSubMenuFieldType as FieldMetadataType,- );-- const subFieldNames = SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS[- objectFilterDropdownSubMenuFieldType- ].subFields- .filter((subField) => {- if (!subField.isFilterable) {- return false;- }-- const subFieldProperty = compositeType?.properties.find(- (property) => property.name === subField.subFieldName,- );-- return subFieldProperty?.type !== FieldMetadataType.RAW_JSON;- })- .map((subField) => subField.subFieldName);+ const compositeType = compositeTypeDefinitions.get(fieldMetadataItem.type);+ const subFields = SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS[+ filterType+ ].subFields.filter((subField) => {+ const subFieldProperty = compositeType?.properties.find(+ (property) => property.name === subField.subFieldName,+ );- const subFieldsAreFilterable =- isDefined(fieldMetadataItemUsedInDropdown) &&- areCompositeTypeSubFieldsFilterable(fieldMetadataItemUsedInDropdown.type);+ return (+ subField.isFilterable &&+ subFieldProperty?.type !== FieldMetadataType.RAW_JSON+ );+ });- const selectableItemIdArray = subFieldNames.map(- (subFieldName) => subFieldName,- );+ const handleSelectFilter = (subFieldName: CompositeFieldSubFieldName) => {+ applyAdvancedFilterCompositeSubField({+ sourceFieldMetadataItem: fieldMetadataItem,+ subFieldName,+ recordFilterId,+ });+ };return (- <LegacyDropdownContent- widthInPixels={GenericDropdownContentWidth.ExtraLarge}- >- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={handleSubMenuBack}- Icon={IconChevronLeft}- />- }+ <>+ <Dropdown.Back+ aria-label={t`${fieldMetadataItem.label}, back to fields`}>- {fieldMetadataItemUsedInDropdown?.label}- </DropdownMenuHeader>- <DropdownMenuItemsContainer>- <SelectableList- focusId={advancedFilterFieldSelectDropdownId}- selectableItemIdArray={selectableItemIdArray}- selectableListInstanceId={advancedFilterFieldSelectDropdownId}- >- {subFieldsAreFilterable &&- subFieldNames.map((subFieldName, index) => (- <SelectableListItem- itemId={subFieldName}- key={`select-filter-${index}`}- onEnter={() => {- handleSelectFilter(- fieldMetadataItemUsedInDropdown,- subFieldName,- );- }}- >- <ListItem- focused={selectedItemId === subFieldName}- key={`select-filter-${index}`}- data-testid={`select-filter-${index}`}- onClick={() => {- if (isDefined(fieldMetadataItemUsedInDropdown)) {- handleSelectFilter(- fieldMetadataItemUsedInDropdown,- subFieldName,- );- }- }}- startIcon={- <SelectOptionIcon- Icon={getIcon(- ICON_NAME_BY_SUB_FIELD[subFieldName] ??- fieldMetadataItemUsedInDropdown?.icon,- )}- />- }- >- {getCompositeSubFieldLabel(- objectFilterDropdownSubMenuFieldType,- subFieldName,- )}- </ListItem>- </SelectableListItem>- ))}- </SelectableList>- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ {fieldMetadataItem.label}+ </Dropdown.Back>+ <Dropdown.Section>+ {subFields.map(({ subFieldName }) => (+ <Dropdown.ActionItem+ key={subFieldName}+ onClick={() => handleSelectFilter(subFieldName)}+ startIcon={+ <SelectOptionIcon+ Icon={getIcon(+ ICON_NAME_BY_SUB_FIELD[subFieldName] ??+ fieldMetadataItem.icon,+ )}+ />+ }+ >+ {getCompositeSubFieldLabel(filterType, subFieldName)}+ </Dropdown.ActionItem>+ ))}+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionLogicalOperatorCell.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionLogicalOperatorCell.tsxindex 54be10f7f90..64b4787b92b 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionLogicalOperatorCell.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionLogicalOperatorCell.tsx@@ -7,7 +7,7 @@ import { capitalize } from 'twenty-shared/utils';import { AdvancedFilterLogicalOperatorDropdown } from '@/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown';import { ADVANCED_FILTER_LOGICAL_OPERATOR_OPTIONS } from '@/object-record/advanced-filter/constants/AdvancedFilterLogicalOperatorOptions';-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';import { Select } from '@/ui/input/components/Select';@@ -53,7 +53,7 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionLogicalOperadropdownId={`advanced-filter-logical-operator-${recordFilterGroup.id}`}value={recordFilterGroup.logicalOperator}options={ADVANCED_FILTER_LOGICAL_OPERATOR_OPTIONS}- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}+ dropdownSideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}disabled/>) : (diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsxindex 9b8185bb09c..d45cce2396f 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect.tsx@@ -1,18 +1,19 @@-import { ListItem } from 'twenty-ui/primitives/navigation';-import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';/* @license Enterprise */-import { styled } from '@linaria/react';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';+import { t } from '@lingui/core/macro';+import { isNonEmptyString } from '@sniptt/guards';import { useState } from 'react';+import { Dropdown } from 'twenty-ui/components';+import { IconUserCircle, useIcons } from 'twenty-ui/icon';+import { Field } from 'twenty-ui/primitives/input';import {CoreObjectNameSingular,FieldMetadataType,compositeTypeDefinitions,} from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconUserCircle, IconX, useIcons } from 'twenty-ui/icon';-import { themeCssVariables } from 'twenty-ui/theme';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';@@ -21,48 +22,18 @@ import { getCompositeSubFieldType } from '@/object-record/object-filter-dropdownimport { getFieldMetadataTypeLabel } from '@/object-record/object-filter-dropdown/utils/getFieldMetadataTypeLabel';import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { type RLSDynamicValue } from '@/object-record/record-filter/types/RecordFilter';import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';import { type CompositeFieldType } from '@/settings/data-model/types/CompositeFieldType';import { RECORD_LEVEL_PERMISSION_PREDICATE_FIELD_TYPES } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/constants/RecordLevelPermissionPredicateFieldTypes';import { getComparableWorkspaceMemberRelationFields } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/utils/getComparableWorkspaceMemberRelationFields';-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 { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-const StyledSearchInput = styled.input`- background: transparent;- border: none;- border-bottom: 1px solid ${themeCssVariables.border.color.light};- border-radius: 0;- color: ${themeCssVariables.font.color.primary};- font-family: inherit;- font-size: ${themeCssVariables.font.size.sm};- font-weight: inherit;- margin: 0;- max-width: 100%;- min-height: 19px;- outline: none;- overflow: hidden;- padding: ${themeCssVariables.spacing[2]};- text-decoration: none;-- &::placeholder {- color: ${themeCssVariables.font.color.light};- }-`;-type SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelectProps ={- onSelect: (- workspaceMemberFieldMetadataId: string,- workspaceMemberSubFieldName?: string | null,- ) => void;+ onSelect: (selection: RLSDynamicValue) => void;recordFilterId: string;};@@ -72,7 +43,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelecrecordFilterId,}: SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelectProps) => {const { getIcon } = useIcons();- const { closeDropdown } = useCloseDropdown();const [searchInput, setSearchInput] = useState('');const { objectMetadataItem: workspaceMemberMetadataItem } =@@ -173,14 +143,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelecconst compatibleWorkspaceMemberFields =getCompatibleWorkspaceMemberFields();- const handleSelectField = (- fieldMetadataId: string,- subFieldName?: string | null,- ) => {- onSelect(fieldMetadataId, subFieldName);- closeDropdown();- };-const menuItems: Array<{id: string;label: string;@@ -283,45 +245,46 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelec: t`Search 1 field`;return (- <LegacyDropdownContent widthInPixels={GenericDropdownContentWidth.Medium}>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={() => closeDropdown()}- Icon={IconX}- />- }- >- {headerText}- </DropdownMenuHeader>- <StyledSearchInput- value={searchInput}- autoFocus- placeholder={placeholderText}- onChange={(event: React.ChangeEvent<HTMLInputElement>) =>- setSearchInput(event.target.value)- }- />- <DropdownMenuItemsContainer>+ <>+ <Dropdown.Header>+ <Dropdown.Title>{headerText}</Dropdown.Title>+ <Dropdown.Close aria-label={t`Close`} />+ </Dropdown.Header>+ <Field.Root>+ <Dropdown.Search+ value={searchInput}+ placeholder={placeholderText}+ aria-label={placeholderText}+ onValueChange={setSearchInput}+ />+ </Field.Root>+ <Dropdown.Section>{filteredMenuItems.map((item) => (- <ListItem+ <Dropdown.OptionItemkey={item.id}startIcon={<SelectOptionIcon- Icon={item.icon ? getIcon(item.icon) : IconUserCircle}+ Icon={+ isNonEmptyString(item.icon)+ ? getIcon(item.icon)+ : IconUserCircle+ }/>}- onClick={() =>- handleSelectField(item.fieldMetadataId, item.subFieldName)+ onSelect={() =>+ onSelect({+ workspaceMemberFieldMetadataId: item.fieldMetadataId,+ workspaceMemberSubFieldName: item.subFieldName,+ })}>{item.label}- </ListItem>+ </Dropdown.OptionItem>))}- {filteredMenuItems.length === 0 && (- <ListItem disabled>{t`No compatible fields`}</ListItem>+ {!isNonEmptyArray(filteredMenuItems) && (+ <Dropdown.Empty>{t`No compatible fields`}</Dropdown.Empty>)}- </DropdownMenuItemsContainer>- </LegacyDropdownContent>+ </Dropdown.Section>+ </>);};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsxindex b70716915bd..e82f13fb3f9 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx@@ -22,8 +22,10 @@ import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utiimport { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';import { FormMultiSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput';import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';-import { type CompositeFieldType } from '@/settings/data-model/types/CompositeFieldType';-import { createRecordLevelPermissionVariablePicker } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker';+import { type RLSDynamicValue } from '@/object-record/record-filter/types/RecordFilter';+import { isValidSubFieldName } from '@/settings/data-model/utils/isValidSubFieldName';+import { SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker';+import { RecordLevelPermissionVariablePickerContext } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/contexts/RecordLevelPermissionVariablePickerContext';import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useTheme, themeCssVariables } from 'twenty-ui/theme';@@ -150,11 +152,12 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput =if (isDefined(dynamicValue.workspaceMemberSubFieldName) &&+ isValidSubFieldName(dynamicValue.workspaceMemberSubFieldName) &&isCompositeFieldType(workspaceMemberField.type)) {const subFieldLabel = getCompositeSubFieldLabel(- workspaceMemberField.type as CompositeFieldType,- dynamicValue.workspaceMemberSubFieldName as any,+ workspaceMemberField.type,+ dynamicValue.workspaceMemberSubFieldName,);return subFieldLabel ? `${baseLabel} / ${subFieldLabel}` : baseLabel;@@ -169,10 +172,10 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput =);}, [dynamicValue, workspaceMemberMetadataItem?.fields]);- const handleSelectDynamicValue = (- workspaceMemberFieldMetadataId: string,- workspaceMemberSubFieldName?: string | null,- ) => {+ const handleSelectDynamicValue = ({+ workspaceMemberFieldMetadataId,+ workspaceMemberSubFieldName,+ }: RLSDynamicValue) => {if (!recordFilter) {return;}@@ -253,12 +256,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput =applyObjectFilterDropdownFilterValue(valueToUpsert);};- const RecordLevelPermissionPicker =- createRecordLevelPermissionVariablePicker(- recordFilterId,- handleSelectDynamicValue,- );-let fieldDefinition = formatFieldMetadataItemAsFieldDefinition({field: {...fieldMetadataItem,@@ -303,30 +300,42 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput =return (<StyledContainer>- <StyledFormFieldInputWrapper>- <FormMultiSelectFieldInput- label=""- defaultValue={formattedValue}- onChange={handleChange}- options={fieldMetadataItem?.options ?? []}- VariablePicker={RecordLevelPermissionPicker}- dropdownWidth={200}- />- </StyledFormFieldInputWrapper>+ <RecordLevelPermissionVariablePickerContext.Provider+ value={{ recordFilterId, onSelect: handleSelectDynamicValue }}+ >+ <StyledFormFieldInputWrapper>+ <FormMultiSelectFieldInput+ label=""+ defaultValue={formattedValue}+ onChange={handleChange}+ options={fieldMetadataItem?.options ?? []}+ VariablePicker={+ SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker+ }+ dropdownWidth={200}+ />+ </StyledFormFieldInputWrapper>+ </RecordLevelPermissionVariablePickerContext.Provider></StyledContainer>);}return (<StyledContainer>- <StyledFormFieldInputWrapper>- <FormFieldInput- field={fieldDefinition}- defaultValue={recordFilter.value}- onChange={handleChange}- VariablePicker={RecordLevelPermissionPicker}- />- </StyledFormFieldInputWrapper>+ <RecordLevelPermissionVariablePickerContext.Provider+ value={{ recordFilterId, onSelect: handleSelectDynamicValue }}+ >+ <StyledFormFieldInputWrapper>+ <FormFieldInput+ field={fieldDefinition}+ defaultValue={recordFilter.value}+ onChange={handleChange}+ VariablePicker={+ SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker+ }+ />+ </StyledFormFieldInputWrapper>+ </RecordLevelPermissionVariablePickerContext.Provider></StyledContainer>);};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsxindex 262267cfb76..a7e4ba7aa93 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker.tsx@@ -1,12 +1,19 @@/* @license Enterprise */import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import { useContext } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { Dropdown } from 'twenty-ui/components';import { IconVariablePlus } from 'twenty-ui/icon';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';import { SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { RecordLevelPermissionVariablePickerContext } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/contexts/RecordLevelPermissionVariablePickerContext';+import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';const StyledRecordLevelPermissionPickerContainer = styled.div<{multiline?: boolean;@@ -51,41 +58,47 @@ const StyledRecordLevelPermissionPickerContainer = styled.div<{}`;-export const createRecordLevelPermissionVariablePicker = (- recordFilterId: string,- onMeSelect: (- workspaceMemberFieldMetadataId: string,- workspaceMemberSubFieldName?: string | null,- ) => void,-): VariablePickerComponent => {- const RecordLevelPermissionVariablePicker: VariablePickerComponent = ({- instanceId,- disabled,- multiline,- }) => {+export const SettingsRolePermissionsObjectLevelRecordLevelPermissionVariablePicker: VariablePickerComponent =+ ({ instanceId, disabled, multiline }) => {const theme = useTheme();+ const pickerContext = useContext(+ RecordLevelPermissionVariablePickerContext,+ );++ if (!isDefined(pickerContext)) {+ return null;+ }++ const { recordFilterId, onSelect } = pickerContext;return (- <Dropdown+ <DropdownRootdropdownId={`record-level-permission-me-picker-${instanceId}-${recordFilterId}`}- clickableComponent={- <StyledRecordLevelPermissionPickerContainer- multiline={multiline}- readonly={disabled}- >- <IconVariablePlus size={theme.icon.size.sm} />- </StyledRecordLevelPermissionPickerContainer>- }- dropdownComponents={+ type="picker"+ >+ <Dropdown.Trigger+ render={+ <StyledRecordLevelPermissionPickerContainer+ multiline={multiline}+ readonly={disabled}+ />+ }+ nativeButton={false}+ disabled={disabled}+ aria-label={t`Select a current user field`}+ >+ <IconVariablePlus size={theme.icon.size.sm} />+ </Dropdown.Trigger>+ <DropdownContent+ side="bottom"+ align="end"+ width={GenericDropdownContentWidth.Medium}+ ><SettingsRolePermissionsObjectLevelRecordLevelPermissionMeValueSelect- onSelect={onMeSelect}+ onSelect={onSelect}recordFilterId={recordFilterId}/>- }- dropdownPlacement="bottom-end"- />+ </DropdownContent>+ </DropdownRoot>);};-- return RecordLevelPermissionVariablePicker;-};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/__stories__/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterRow.stories.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/__stories__/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterRow.stories.tsxnew file mode 100644index 00000000000..0192df9e09a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/__stories__/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterRow.stories.tsx@@ -0,0 +1,209 @@+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';+import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';+import { getAdvancedFilterObjectFilterDropdownComponentInstanceId } from '@/object-record/advanced-filter/utils/getAdvancedFilterObjectFilterDropdownComponentInstanceId';+import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState';+import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';+import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext';+import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';+import { SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterRow } from '@/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterRow';+import { styled } from '@linaria/react';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { useAtomValue, useStore } from 'jotai';+import { useEffect } from 'react';+import { expect, userEvent, waitFor, within } from 'storybook/test';+import {+ RecordFilterGroupLogicalOperator,+ ViewFilterOperand,+} from 'twenty-shared/types';+import { getFilterTypeFromFieldType, 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 { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';+import { graphqlMocks } from '~/testing/graphqlMocks';++const INSTANCE_ID = 'record-permission-filter-story';+const FILTER_ID = 'record-permission-filter';+const ROW_INSTANCE_ID =+ getAdvancedFilterObjectFilterDropdownComponentInstanceId(FILTER_ID);+const FILTER_GROUP = {+ id: 'record-permission-filter-group',+ logicalOperator: RecordFilterGroupLogicalOperator.AND,+};+const filtersState = currentRecordFiltersComponentState.atomFamily({+ instanceId: INSTANCE_ID,+});++const StyledContainer = styled.div`+ width: 720px;+`;++const PermissionFilterStory = () => {+ const store = useStore();+ const { objectMetadataItem } = useObjectMetadataItem({+ objectNameSingular: 'company',+ });+ const field = objectMetadataItem.fields.find(+ (candidate) => candidate.name === 'name',+ );+ const filters = useAtomValue(filtersState);++ useEffect(() => {+ if (!isDefined(field)) {+ return;+ }++ const filter: RecordFilter = {+ id: FILTER_ID,+ fieldMetadataId: field.id,+ type: getFilterTypeFromFieldType(field.type),+ label: field.label,+ operand: ViewFilterOperand.IS,+ value: '',+ displayValue: '',+ recordFilterGroupId: FILTER_GROUP.id,+ positionInRecordFilterGroup: 0,+ };+ store.set(filtersState, [filter]);+ store.set(+ currentRecordFilterGroupsComponentState.atomFamily({+ instanceId: INSTANCE_ID,+ }),+ [FILTER_GROUP],+ );+ store.set(+ fieldMetadataItemIdUsedInDropdownComponentState.atomFamily({+ instanceId: ROW_INSTANCE_ID,+ }),+ field.id,+ );+ store.set(+ objectFilterDropdownCurrentRecordFilterComponentState.atomFamily({+ instanceId: ROW_INSTANCE_ID,+ }),+ filter,+ );++ return () => store.set(filtersState, []);+ }, [field, store]);++ const filter = filters[0];++ if (!isDefined(filter)) {+ return null;+ }++ return (+ <RecordFiltersComponentInstanceContext.Provider+ value={{ instanceId: INSTANCE_ID }}+ >+ <RecordFilterGroupsComponentInstanceContext.Provider+ value={{ instanceId: INSTANCE_ID }}+ >+ <AdvancedFilterContext.Provider value={{ objectMetadataItem }}>+ <StyledContainer+ onKeyDownCapture={(event) => {+ if (event.key === 'F2') {+ event.preventDefault();+ store.set(filtersState, [+ { ...filter, value: 'Updated while open' },+ ]);+ }+ }}+ >+ <SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterRow+ recordFilter={filter}+ recordFilterGroup={FILTER_GROUP}+ index={0}+ />+ </StyledContainer>+ </AdvancedFilterContext.Provider>+ </RecordFilterGroupsComponentInstanceContext.Provider>+ </RecordFiltersComponentInstanceContext.Provider>+ );+};++const meta = {+ title: 'Settings/Roles/RecordLevelPermissionFilterRow',+ component: PermissionFilterStory,+ decorators: [+ ObjectMetadataItemsDecorator,+ ComponentDecorator,+ WorkspaceDecorator,+ ToastDecorator,+ MemoryRouterDecorator,+ ],+ parameters: { msw: graphqlMocks },+} satisfies Meta<typeof PermissionFilterStory>;++export default meta;+type Story = StoryObj<typeof meta>;++export const CompositeFieldPage: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByRole('button', { name: 'Name' }));+ const dialog = await body.findByRole('dialog', {+ name: 'Select a filter field',+ });+ const dropdown = within(dialog);+ expect(+ dropdown.queryByRole('button', { name: 'ID' }),+ ).not.toBeInTheDocument();+ await userEvent.click(dropdown.getByRole('button', { name: 'Address' }));+ expect(await dropdown.findByRole('button', { name: 'City' })).toBeVisible();+ await userEvent.click(+ dropdown.getByRole('button', { name: 'Address, back to fields' }),+ );+ expect(+ await dropdown.findByRole('searchbox', { name: 'Search fields' }),+ ).toHaveFocus();+ await userEvent.click(dropdown.getByRole('button', { name: 'Address' }));+ await userEvent.click(+ await dropdown.findByRole('button', { name: 'City' }),+ );+ await waitFor(() => expect(dialog).not.toBeInTheDocument());+ expect(await canvas.findByText('Address / City')).toBeVisible();+ },+};++export const MePickerSurvivesRerender: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = await canvas.findByRole('button', {+ name: 'Select a current user field',+ });+ await userEvent.click(trigger);+ const dialog = await body.findByRole('dialog', {+ name: 'Select 1 text field',+ });+ const dropdown = within(dialog);+ const search = dropdown.getByRole('searchbox');+ await userEvent.type(search, 'Name');+ await userEvent.keyboard('{F2}');+ expect(search).toBeInTheDocument();+ expect(search).toHaveValue('Name');+ expect(search).toHaveFocus();+ await userEvent.clear(search);+ await userEvent.type(search, 'no-compatible-field');+ expect(await dropdown.findByText('No compatible fields')).toBeVisible();+ await userEvent.click(dropdown.getByRole('button', { name: 'Close' }));+ await waitFor(() => expect(dialog).not.toBeInTheDocument());+ await userEvent.click(trigger);+ const reopened = within(+ await body.findByRole('dialog', { name: 'Select 1 text field' }),+ );+ expect(reopened.getByRole('searchbox')).toHaveValue('');+ await userEvent.click(+ reopened.getByRole('button', { name: 'Name / First Name' }),+ );+ expect(await canvas.findByText('Me')).toBeVisible();+ expect(await canvas.findByText('/ Name / First Name')).toBeVisible();+ },+};diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/contexts/RecordLevelPermissionVariablePickerContext.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/contexts/RecordLevelPermissionVariablePickerContext.tsnew file mode 100644index 00000000000..c889893b13a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/contexts/RecordLevelPermissionVariablePickerContext.ts@@ -0,0 +1,8 @@+import { createContext } from 'react';++import { type RLSDynamicValue } from '@/object-record/record-filter/types/RecordFilter';++export const RecordLevelPermissionVariablePickerContext = createContext<{+ recordFilterId: string;+ onSelect: (selection: RLSDynamicValue) => void;+} | null>(null);diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsxindex 1a21fe420f0..4d7c9b23fc9 100644--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx@@ -55,7 +55,7 @@ export const Select = <TValue extends SelectValue>({needIconCheck,pinnedOption,callToActionButton,- dropdownOffset,+ dropdownSideOffset = 0,hasRightElement,showContextualTextInControl = true,showIconInControl = true,@@ -181,8 +181,7 @@ export const Select = <TValue extends SelectValue>({}width={dropdownWidthAuto ? 'var(--anchor-width)' : dropdownWidth}align="start"- sideOffset={dropdownOffset?.y ?? 0}- alignOffset={dropdownOffset?.x ?? 0}+ sideOffset={dropdownSideOffset}aria-label={isNonEmptyString(label) ? label : undefined}>{withSearchInput === true && (diff --git a/packages/twenty-front/src/modules/ui/input/types/SelectProps.ts b/packages/twenty-front/src/modules/ui/input/types/SelectProps.tsindex 3c9d0dafc6c..d5bab39f2d8 100644--- a/packages/twenty-front/src/modules/ui/input/types/SelectProps.ts+++ b/packages/twenty-front/src/modules/ui/input/types/SelectProps.ts@@ -2,7 +2,6 @@ import { type SelectValue } from '@/ui/input/components/internal/select/types';import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';import { type SelectCallToActionButton } from '@/ui/input/types/SelectCallToActionButton';import { type SelectSizeVariant } from '@/ui/input/types/SelectSizeVariant';-import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';import { type SelectOption } from 'twenty-ui/primitives/input';export type SelectProps<TValue extends SelectValue> = {className?: string;@@ -24,7 +23,7 @@ export type SelectProps<TValue extends SelectValue> = {needIconCheck?: boolean;pinnedOption?: SelectOption<TValue>;callToActionButton?: SelectCallToActionButton;- dropdownOffset?: DropdownOffset;+ dropdownSideOffset?: number;hasRightElement?: boolean;showContextualTextInControl?: boolean;showIconInControl?: boolean;diff --git a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterDropdownButton.tsx b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterDropdownButton.tsxindex b31ee851d0c..5e6924071c1 100644--- a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterDropdownButton.tsx+++ b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterDropdownButton.tsx@@ -1,4 +1,5 @@import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownCleanupEffect } from '@/ui/layout/dropdown/components/DropdownCleanupEffect';import { AdvancedFilterRootRecordFilterGroup } from '@/object-record/advanced-filter/components/AdvancedFilterRootRecordFilterGroup';import { useSetAdvancedFilterDropdownStates } from '@/object-record/advanced-filter/hooks/useSetAdvancedFilterDropdownAllRowsStates';@@ -17,6 +18,7 @@ export const AdvancedFilterDropdownButton = () => {const { setAdvancedFilterDropdownStates } =useSetAdvancedFilterDropdownStates();const { recordIndexId } = useRecordIndexContextOrThrow();+ const dropdownId = getViewBarAdvancedFilterDropdownId(recordIndexId);const handleOpenAdvancedFilterDropdown = () => {setAdvancedFilterDropdownStates();@@ -27,13 +29,16 @@ export const AdvancedFilterDropdownButton = () => {}return (- <Dropdown- dropdownId={getViewBarAdvancedFilterDropdownId(recordIndexId)}- clickableComponent={<AdvancedFilterChip />}- dropdownComponents={<AdvancedFilterRootRecordFilterGroup />}- dropdownOffset={{ y: 8, x: 0 }}- dropdownPlacement="bottom-start"- onOpen={handleOpenAdvancedFilterDropdown}- />+ <>+ <DropdownCleanupEffect dropdownId={dropdownId} />+ <Dropdown+ dropdownId={dropdownId}+ clickableComponent={<AdvancedFilterChip />}+ dropdownComponents={<AdvancedFilterRootRecordFilterGroup />}+ dropdownOffset={{ y: 8, x: 0 }}+ dropdownPlacement="bottom-start"+ onOpen={handleOpenAdvancedFilterDropdown}+ />+ </>);};diff --git a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/__stories__/AdvancedFilterDropdownButton.stories.tsx b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/__stories__/AdvancedFilterDropdownButton.stories.tsxnew file mode 100644index 00000000000..8d9800f5df4--- /dev/null+++ b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/__stories__/AdvancedFilterDropdownButton.stories.tsx@@ -0,0 +1,200 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, userEvent, waitFor, within } from 'storybook/test';+import { Button } from 'twenty-ui/primitives/input';+import { ComponentDecorator } from 'twenty-ui/testing';++import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { AdvancedFilterDropdownButton } from '@/views/advanced-filter-chip/components/AdvancedFilterDropdownButton';+import { ADVANCED_FILTER_STORY_DATA } from '~/testing/mock-data/advanced-filter-story-data';+import { AdvancedFilterViewDecorator } from '~/testing/decorators/AdvancedFilterViewDecorator';+import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';++const { instanceId } = ADVANCED_FILTER_STORY_DATA;++const meta: Meta<typeof AdvancedFilterDropdownButton> = {+ title: 'Modules/Views/AdvancedFilterDropdownButton',+ component: AdvancedFilterDropdownButton,+ decorators: [+ AdvancedFilterViewDecorator,+ ObjectMetadataItemsDecorator,+ ToastDecorator,+ ComponentDecorator,+ IconsProviderDecorator,+ ],+ render: () => (+ <div+ style={{+ display: 'flex',+ justifyContent: 'space-between',+ width: 900,+ }}+ >+ <AdvancedFilterDropdownButton />+ <Button>Outside filter</Button>+ </div>+ ),+};++export default meta;+type Story = StoryObj<typeof AdvancedFilterDropdownButton>;++export const NestedPickerDismissal: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement.ownerDocument.body);++ await userEvent.click(await canvas.findByText('1 advanced rule'));+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Contains' }),+ );+ await expect(+ await canvas.findByRole('dialog', { name: 'Select operand' }),+ ).toBeVisible();++ await userEvent.keyboard('{Escape}');++ await waitFor(() => {+ expect(+ canvas.queryByRole('dialog', { name: 'Select operand' }),+ ).toBeNull();+ });+ await expect(canvas.getByRole('listbox')).toBeVisible();+ await expect(+ canvas.getByRole('button', { name: 'Contains' }),+ ).toHaveFocus();++ await userEvent.click(canvas.getByRole('button', { name: 'Contains' }));+ await canvas.findByRole('dialog', { name: 'Select operand' });+ await userEvent.click(+ canvas.getByRole('button', { name: 'Outside filter' }),+ );++ await waitFor(() => {+ expect(+ canvas.queryByRole('dialog', { name: 'Select operand' }),+ ).toBeNull();+ });+ await expect(canvas.getByRole('listbox')).toBeVisible();++ await userEvent.click(+ canvas.getByRole('button', { name: 'Outside filter' }),+ );++ await waitFor(() => {+ expect(canvas.queryByRole('listbox')).toBeNull();+ expect(jotaiStore.get(focusStackState.atom)).toEqual([]);+ });+ },+};++export const AddRulesAndRemoveGroup: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement.ownerDocument.body);++ await userEvent.click(await canvas.findByText('1 advanced rule'));+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Add filter rule' }),+ );+ await userEvent.click(+ await canvas.findByRole('menuitem', { name: 'Add rule' }),+ );+ await expect(await canvas.findByText('2 advanced rules')).toBeVisible();++ await userEvent.click(+ canvas.getByRole('button', { name: 'Add filter rule' }),+ );+ await userEvent.click(+ await canvas.findByRole('menuitem', { name: 'Add rule group' }),+ );+ await expect(await canvas.findByText('3 advanced rules')).toBeVisible();++ await userEvent.click(canvas.getByRole('button', { name: 'Add rule' }));++ await waitFor(() => {+ const filters = jotaiStore.get(+ currentRecordFiltersComponentState.atomFamily({ instanceId }),+ );+ const groups = jotaiStore.get(+ currentRecordFilterGroupsComponentState.atomFamily({ instanceId }),+ );++ expect(filters).toHaveLength(4);+ expect(groups).toHaveLength(2);+ expect(+ filters.map((filter) => filter.positionInRecordFilterGroup),+ ).toEqual([0, 1, 1, 2]);+ expect(groups[1].positionInRecordFilterGroup).toBe(2);+ });++ await userEvent.click(+ canvas.getByRole('button', { name: 'Filter group rule options' }),+ );+ await userEvent.click(+ await canvas.findByRole('menuitem', { name: 'Remove rule group' }),+ );++ await expect(await canvas.findByText('2 advanced rules')).toBeVisible();+ await expect(canvas.getByRole('listbox')).toBeVisible();+ await expect(+ jotaiStore.get(+ currentRecordFiltersComponentState.atomFamily({ instanceId }),+ ),+ ).toHaveLength(2);+ await expect(+ jotaiStore.get(+ currentRecordFilterGroupsComponentState.atomFamily({ instanceId }),+ ),+ ).toHaveLength(1);+ },+};++export const RemoveLastRule: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement.ownerDocument.body);++ await userEvent.click(await canvas.findByText('1 advanced rule'));+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Record filter rule options' }),+ );+ await userEvent.click(+ await canvas.findByRole('menuitem', { name: 'Remove rule' }),+ );++ await waitFor(() => {+ expect(canvas.queryByText('1 advanced rule')).toBeNull();+ expect(canvas.queryByRole('listbox')).toBeNull();+ expect(jotaiStore.get(focusStackState.atom)).toEqual([]);+ });+ },+};++export const SelectOperandWithKeyboard: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement.ownerDocument.body);++ await userEvent.click(await canvas.findByText('1 advanced rule'));+ await userEvent.click(+ await canvas.findByRole('button', { name: 'Contains' }),+ );+ const popup = await canvas.findByRole('dialog', {+ name: 'Select operand',+ });++ await waitFor(() => {+ expect(+ within(popup).getByRole('button', { name: 'Contains' }),+ ).toHaveFocus();+ });+ await userEvent.keyboard('{ArrowDown}{Enter}');++ await waitFor(() => expect(popup).not.toBeInTheDocument());+ await expect(+ canvas.getByRole('button', { name: "Doesn't contain" }),+ ).toHaveFocus();+ await expect(canvas.getByRole('listbox')).toBeVisible();+ },+};diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsxindex 650b74d6470..3fe27a640f4 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx@@ -23,6 +23,7 @@ import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { getViewBarAdvancedFilterDropdownId } from '@/views/utils/getViewBarAdvancedFilterDropdownId';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';+import { flushSync } from 'react-dom';import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { IconFilter } from 'twenty-ui/icon';@@ -103,14 +104,6 @@ export const ViewBarFilterDropdownAdvancedFilterButton = () => {const alreadyHasAdvancedFilterGroup = currentRecordFilterGroups.length > 0;if (!alreadyHasAdvancedFilterGroup) {- const newRecordFilterGroup = {- id: v4(),- viewId: currentView.id,- logicalOperator: RecordFilterGroupLogicalOperator.AND,- };-- upsertRecordFilterGroup(newRecordFilterGroup);-const defaultFieldMetadataItem =availableFieldMetadataItemsForFilter.find((fieldMetadataItem) =>@@ -122,15 +115,26 @@ export const ViewBarFilterDropdownAdvancedFilterButton = () => {throw new Error('Missing default filter definition');}- const { newRecordFilter } = createEmptyRecordFilterFromFieldMetadataItem(- defaultFieldMetadataItem,- );+ flushSync(() => {+ const newRecordFilterGroup = {+ id: v4(),+ viewId: currentView.id,+ logicalOperator: RecordFilterGroupLogicalOperator.AND,+ };++ upsertRecordFilterGroup(newRecordFilterGroup);++ const { newRecordFilter } =+ createEmptyRecordFilterFromFieldMetadataItem(+ defaultFieldMetadataItem,+ );- newRecordFilter.recordFilterGroupId = newRecordFilterGroup.id;+ newRecordFilter.recordFilterGroupId = newRecordFilterGroup.id;- upsertRecordFilter(newRecordFilter);+ upsertRecordFilter(newRecordFilter);- setRecordFilterUsedInAdvancedFilterDropdownRow(newRecordFilter);+ setRecordFilterUsedInAdvancedFilterDropdownRow(newRecordFilter);+ });}closeObjectFilterDropdown();diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsxindex c97a7160810..6f81a92f52c 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterGroupOptionsDropdown.tsx@@ -1,4 +1,4 @@-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useRemoveStepFilterGroup } from '@/workflow/workflow-steps/filters/hooks/useRemoveStepFilterGroup';import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';import { useContext } from 'react';@@ -38,7 +38,7 @@ export const WorkflowStepFilterGroupOptionsDropdown = ({/><DropdownContentalign="end"- sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET.y}+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}><Dropdown.Section><Dropdown.ActionItemdiff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterLogicalOperatorCell.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterLogicalOperatorCell.tsxindex ee87f953ced..4890b1b1285 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterLogicalOperatorCell.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterLogicalOperatorCell.tsx@@ -1,4 +1,4 @@-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { Select } from '@/ui/input/components/Select';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { useUpsertStepFilterSettings } from '@/workflow/workflow-steps/filters/hooks/useUpsertStepFilterSettings';@@ -88,7 +88,7 @@ export const WorkflowStepFilterLogicalOperatorCell = ({dropdownId={`advanced-filter-logical-operator-${stepFilterGroup.id}`}value={stepFilterGroup.logicalOperator}options={stepFilterLogicalOperatorOptions}- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}+ dropdownSideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}disabled/>) : (@@ -98,7 +98,7 @@ export const WorkflowStepFilterLogicalOperatorCell = ({value={stepFilterGroup.logicalOperator}onChange={handleChange}options={stepFilterLogicalOperatorOptions}- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}+ dropdownSideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}/>)) : (diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOperandSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOperandSelect.tsxindex b171ed28d56..ad40b62821e 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOperandSelect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOperandSelect.tsx@@ -1,4 +1,4 @@-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { getOperandLabel } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';import { useGetRelativeDateFilterWithUserTimezone } from '@/object-record/record-filter/hooks/useGetRelativeDateFilterWithUserTimezone';import { Select } from '@/ui/input/components/Select';@@ -69,7 +69,7 @@ export const WorkflowStepFilterOperandSelect = ({options={options}onChange={handleChange}disabled={readonly}- dropdownOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET}+ dropdownSideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}/>);};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsxindex 586bd35fc74..ae8ec25d3c4 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterOptionsDropdown.tsx@@ -1,4 +1,4 @@-import { DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownOffset';+import { DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET } from '@/object-record/advanced-filter/constants/DefaultAdvancedFilterDropdownSideOffset';import { useRemoveStepFilter } from '@/workflow/workflow-steps/filters/hooks/useRemoveStepFilter';import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';import { useContext } from 'react';@@ -38,7 +38,7 @@ export const WorkflowStepFilterOptionsDropdown = ({/><DropdownContentalign="start"- sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_OFFSET.y}+ sideOffset={DEFAULT_ADVANCED_FILTER_DROPDOWN_SIDE_OFFSET}><Dropdown.Section><Dropdown.ActionItemdiff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsxindex ae2ce5f19cf..a697640bff0 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx@@ -213,7 +213,7 @@ export const WorkflowEditActionCreateRecord = ({saveAction(newFormData);}}withSearchInput- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsxindex 353092f5a16..fd0160b7004 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx@@ -133,7 +133,7 @@ export const WorkflowEditActionDeleteRecord = ({saveAction(newFormData);}}withSearchInput- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsxindex 43605d1f28d..5c8616bfbaf 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx@@ -175,7 +175,7 @@ export const WorkflowEditActionUpdateRecord = ({saveAction(newFormData);}}withSearchInput- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsxindex a928b7f123c..f64c0f24fb7 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx@@ -230,7 +230,7 @@ export const WorkflowEditActionUpsertRecord = ({saveAction(newFormData);}}withSearchInput- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsxindex f338d88ec79..a579332e537 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx@@ -65,7 +65,7 @@ export const WorkflowFormFieldSettingsRecordPicker = ({});}}withSearchInput- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/></FormFieldInputContainer>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsxindex 4a3f8b80c89..e28175da103 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx@@ -159,9 +159,7 @@ export const WorkflowEditActionHttpRequest = ({value={formData.method}onChange={(value) => handleFieldChange('method', value)}disabled={actionOptions.readonly}- dropdownOffset={{- y: parseInt(theme.spacing[1], 10),- }}+ dropdownSideOffset={parseInt(theme.spacing[1], 10)}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsxindex cb8bf9db66a..36aae53e5c1 100644--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx@@ -109,7 +109,7 @@ export const WorkflowEditTriggerManual = ({}),});}}- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>@@ -144,7 +144,7 @@ export const WorkflowEditTriggerManual = ({},});}}- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}withSearchInput/>@@ -215,7 +215,7 @@ export const WorkflowEditTriggerManual = ({},});}}- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/></WorkflowStepBody>diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsxindex 718f8cc1f1d..b621c9d264e 100644--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerWebhookForm.tsx@@ -110,7 +110,7 @@ export const WorkflowEditTriggerWebhookForm = ({{ computeOutputSchema: false },);}}- dropdownOffset={{ y: 4 }}+ dropdownSideOffset={4}dropdownWidth={GenericDropdownContentWidth.ExtraLarge}/>{trigger.settings.httpMethod === 'POST' && (diff --git a/packages/twenty-front/src/testing/decorators/AdvancedFilterViewDecorator.tsx b/packages/twenty-front/src/testing/decorators/AdvancedFilterViewDecorator.tsxnew file mode 100644index 00000000000..77c6748dbc7--- /dev/null+++ b/packages/twenty-front/src/testing/decorators/AdvancedFilterViewDecorator.tsx@@ -0,0 +1,135 @@+import { type Decorator } from '@storybook/react-vite';+import { useStore } from 'jotai';+import { useEffect, useState } from 'react';++import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';+import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';+import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';+import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';+import { AdvancedFilterContext } from '@/object-record/advanced-filter/states/context/AdvancedFilterContext';+import { getAdvancedFilterObjectFilterDropdownComponentInstanceId } from '@/object-record/advanced-filter/utils/getAdvancedFilterObjectFilterDropdownComponentInstanceId';+import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';+import { fieldMetadataItemIdUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemIdUsedInDropdownComponentState';+import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';+import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';+import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';+import { useRecordIndexFieldMetadataDerivedStates } from '@/object-record/record-index/hooks/useRecordIndexFieldMetadataDerivedStates';+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';+import { viewObjectMetadataIdComponentState } from '@/views/states/viewObjectMetadataIdComponentState';+import { isDefined } from 'twenty-shared/utils';+import { ADVANCED_FILTER_STORY_DATA } from '~/testing/mock-data/advanced-filter-story-data';+import { mockedViews } from '~/testing/mock-data/generated/metadata/views/mock-views-data';+import { setTestViewsInMetadataStore } from '~/testing/utils/setTestViewsInMetadataStore';++const { instanceId, objectMetadataItem, recordFilterGroup, recordFilter } =+ ADVANCED_FILTER_STORY_DATA;++export const AdvancedFilterViewDecorator: Decorator = (Story) => {+ const store = useStore();+ const [isLoaded, setIsLoaded] = useState(false);+ const derivedStates = useRecordIndexFieldMetadataDerivedStates(+ objectMetadataItem,+ instanceId,+ );++ useEffect(() => {+ const opportunityView = mockedViews.find(+ (view) => view.name === 'All Opportunities',+ );++ if (!isDefined(opportunityView)) {+ throw new Error('The advanced filter story requires an opportunity view');+ }++ const view = {+ ...opportunityView,+ key: null,+ viewFilters: [],+ viewFilterGroups: [],+ };++ setTestViewsInMetadataStore(store, [view]);+ store.set(+ contextStoreCurrentViewIdComponentState.atomFamily({+ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,+ }),+ view.id,+ );+ store.set(+ contextStoreCurrentObjectMetadataItemIdComponentState.atomFamily({+ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,+ }),+ objectMetadataItem.id,+ );+ store.set(+ viewObjectMetadataIdComponentState.atomFamily({ instanceId }),+ objectMetadataItem.id,+ );+ store.set(+ currentRecordFieldsComponentState.atomFamily({ instanceId }),+ objectMetadataItem.fields.map((field, position) => ({+ id: field.id,+ fieldMetadataItemId: field.id,+ isVisible: field.name === 'name' || field.name === 'stage',+ position,+ size: 100,+ })),+ );+ store.set(+ currentRecordFilterGroupsComponentState.atomFamily({ instanceId }),+ [recordFilterGroup],+ );+ store.set(currentRecordFiltersComponentState.atomFamily({ instanceId }), [+ recordFilter,+ ]);++ const dropdownInstanceId =+ getAdvancedFilterObjectFilterDropdownComponentInstanceId(recordFilter.id);++ store.set(+ objectFilterDropdownCurrentRecordFilterComponentState.atomFamily({+ instanceId: dropdownInstanceId,+ }),+ recordFilter,+ );+ store.set(+ fieldMetadataItemIdUsedInDropdownComponentState.atomFamily({+ instanceId: dropdownInstanceId,+ }),+ recordFilter.fieldMetadataId,+ );+ setIsLoaded(true);+ }, [store]);++ return (+ <ContextStoreComponentInstanceContext.Provider+ value={{ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID }}+ >+ <RecordIndexContextProvider+ value={{+ ...derivedStates,+ objectPermissionsByObjectMetadataId: {},+ indexIdentifierUrl: () => '',+ onIndexRecordsLoaded: () => {},+ objectNamePlural: objectMetadataItem.namePlural,+ objectNameSingular: objectMetadataItem.nameSingular,+ objectMetadataItem,+ recordIndexId: instanceId,+ viewBarInstanceId: instanceId,+ }}+ >+ <RecordComponentInstanceContextsWrapper+ componentInstanceId={instanceId}+ >+ <ViewComponentInstanceContext.Provider value={{ instanceId }}>+ <AdvancedFilterContext.Provider value={{ objectMetadataItem }}>+ {isLoaded && <Story />}+ </AdvancedFilterContext.Provider>+ </ViewComponentInstanceContext.Provider>+ </RecordComponentInstanceContextsWrapper>+ </RecordIndexContextProvider>+ </ContextStoreComponentInstanceContext.Provider>+ );+};diff --git a/packages/twenty-front/src/testing/mock-data/advanced-filter-story-data.ts b/packages/twenty-front/src/testing/mock-data/advanced-filter-story-data.tsnew file mode 100644index 00000000000..132c34bf30d--- /dev/null+++ b/packages/twenty-front/src/testing/mock-data/advanced-filter-story-data.ts@@ -0,0 +1,44 @@+import { type RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup';+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';+import {+ RecordFilterGroupLogicalOperator,+ ViewFilterOperand,+} from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++const objectMetadataItem = getMockObjectMetadataItemOrThrow('opportunity');+const nameField = objectMetadataItem.fields.find(+ (field) => field.name === 'name',+);++if (!isDefined(nameField)) {+ throw new Error(+ 'The advanced filter story requires an opportunity name field',+ );+}++const recordFilterGroup: RecordFilterGroup = {+ id: 'advanced-filter-story-root-group',+ logicalOperator: RecordFilterGroupLogicalOperator.AND,+ positionInRecordFilterGroup: 0,+};++const recordFilter: RecordFilter = {+ id: 'advanced-filter-story-name-rule',+ fieldMetadataId: nameField.id,+ label: nameField.label,+ type: 'TEXT',+ operand: ViewFilterOperand.CONTAINS,+ value: 'Acme',+ displayValue: 'Acme',+ recordFilterGroupId: recordFilterGroup.id,+ positionInRecordFilterGroup: 0,+};++export const ADVANCED_FILTER_STORY_DATA = {+ instanceId: 'advanced-filter-view-story',+ objectMetadataItem,+ recordFilterGroup,+ recordFilter,+};diff --git a/packages/twenty-ui/docs/dropdownPartPropDescriptions.ts b/packages/twenty-ui/docs/dropdownPartPropDescriptions.tsindex d0e6719bac8..0766d3101d8 100644--- a/packages/twenty-ui/docs/dropdownPartPropDescriptions.ts+++ b/packages/twenty-ui/docs/dropdownPartPropDescriptions.ts@@ -49,13 +49,13 @@ export const DROPDOWN_PART_PROP_DESCRIPTIONS = {OptionItem: {...DROPDOWN_ITEM_PROP_DESCRIPTIONS,selected:- 'Whether the option is selected. Exposed as `aria-checked` in menus and `aria-pressed` in other dropdown types.',+ 'Whether the option is selected. Exposed as `aria-checked` in menus and `aria-pressed` in other dropdown types. Omit it for options that navigate or apply without a selection state.',onSelect:'Called when the option is activated. The application owns the selected value.',closeOnSelect:'Closes the dropdown after selection. Defaults to `true`, or `false` when `multiple` is set.',indicator:- 'Selection indicator: a check icon after the content, a checkbox before it, or none. Defaults to `checkbox` when `multiple` is set, otherwise `check`.',+ 'Selection indicator: a check icon after the content, a checkbox before it, or none. Defaults to `checkbox` when `multiple` is set, otherwise `check`, and to `none` when `selected` is omitted.',} satisfies Partial<Record<keyof DropdownOptionItemProps, string>>,Search: {onValueChange:diff --git a/packages/twenty-ui/generated/components.docs.json b/packages/twenty-ui/generated/components.docs.jsonindex 4d9d6af5082..9d57863adc4 100644--- a/packages/twenty-ui/generated/components.docs.json+++ b/packages/twenty-ui/generated/components.docs.json@@ -7233,7 +7233,7 @@"type": "\"check\" | \"checkbox\" | \"none\"","required": false,"defaultValue": null,- "description": "Selection indicator: a check icon after the content, a checkbox before it, or none. Defaults to `checkbox` when `multiple` is set, otherwise `check`."+ "description": "Selection indicator: a check icon after the content, a checkbox before it, or none. Defaults to `checkbox` when `multiple` is set, otherwise `check`, and to `none` when `selected` is omitted."},{"name": "nativeButton",@@ -7259,9 +7259,9 @@{"name": "selected","type": "boolean",- "required": true,+ "required": false,"defaultValue": null,- "description": "Whether the option is selected. Exposed as `aria-checked` in menus and `aria-pressed` in other dropdown types."+ "description": "Whether the option is selected. Exposed as `aria-checked` in menus and `aria-pressed` in other dropdown types. Omit it for options that navigate or apply without a selection state."},{"name": "shortcut",diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.menu.stories.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.menu.stories.tsxindex c5063b6560f..1bb5cb30614 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.menu.stories.tsx+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.menu.stories.tsx@@ -210,6 +210,26 @@ export const DisabledCommand: Story = {},};+export const OptionWithoutSelectionState: Story = {+ render: () => (+ <RecordActionsMenu>+ <Dropdown.OptionItem onSelect={onDuplicate}>+ Duplicate+ </Dropdown.OptionItem>+ </RecordActionsMenu>+ ),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await openRecordActions(canvasElement);+ const option = body.getByRole('menuitem', { name: 'Duplicate' });++ expect(option).not.toHaveAttribute('aria-checked');+ await userEvent.click(option);+ expect(onDuplicate).toHaveBeenCalledOnce();+ },+};+export const TypeaheadAndHomeEnd: Story = {render: () => (<RecordActionsMenu>diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.pages.stories.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.pages.stories.tsxindex 4d1b647c072..8a518557090 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.pages.stories.tsx+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.pages.stories.tsx@@ -243,6 +243,35 @@ export const SelectionReturnsToPreviousPage: Story = {},};+export const PageWithoutSearchFocusesFirstOption: Story = {+ render: () => (+ <Dropdown.Root type="picker">+ <Dropdown.Trigger>Filters</Dropdown.Trigger>+ <Dropdown.Content aria-label="Filters">+ <Dropdown.Page id="root">+ <Dropdown.ActionItem page="status">Status</Dropdown.ActionItem>+ </Dropdown.Page>+ <Dropdown.Page id="status">+ <Dropdown.Back>Back to filters</Dropdown.Back>+ <StatusOptions />+ </Dropdown.Page>+ </Dropdown.Content>+ </Dropdown.Root>+ ),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await openFilters(canvasElement);+ await userEvent.click(await body.findByRole('button', { name: 'Status' }));+ await waitFor(() =>+ expect(body.getByRole('button', { name: 'Active' })).toHaveFocus(),+ );+ await userEvent.keyboard('{Enter}');++ expect(onStatusChange).toHaveBeenCalledWith('Active');+ },+};+export const ProgrammaticNavigation: Story = {render: () => (<Dropdown.Root type="menu">diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.picker.stories.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.picker.stories.tsxindex ddba4476b77..43a29354724 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.picker.stories.tsx+++ b/packages/twenty-ui/src/components/navigation/Dropdown/__stories__/Dropdown.picker.stories.tsx@@ -375,6 +375,38 @@ export const SelectionOverrides: Story = {},};+export const OptionsWithoutSelectionState: Story = {+ render: () => (+ <Dropdown.Root type="picker">+ <Dropdown.Trigger>Fields</Dropdown.Trigger>+ <Dropdown.Content aria-label="Choose a field">+ <Dropdown.Search+ aria-label="Search fields"+ value="Stage"+ onValueChange={onSearchChange}+ />+ <Dropdown.OptionItem onSelect={() => onSelectOption('Stage')}>+ Stage+ </Dropdown.OptionItem>+ </Dropdown.Content>+ </Dropdown.Root>+ ),+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await openFields(canvasElement);+ expect(body.getByRole('button', { name: 'Stage' })).not.toHaveAttribute(+ 'aria-pressed',+ );+ await userEvent.keyboard('{Enter}');++ expect(onSelectOption).toHaveBeenCalledWith('Stage');+ await waitFor(() =>+ expect(body.queryByRole('dialog')).not.toBeInTheDocument(),+ );+ },+};+export const LoadingStatus: Story = {render: () => (<Dropdown.Root type="picker">diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownOptionItem.tsx b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownOptionItem.tsxindex a0e0387728f..5dd10c59d70 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownOptionItem.tsx+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/DropdownOptionItem.tsx@@ -32,7 +32,14 @@ export const DropdownOptionItem = ({}: DropdownOptionItemProps) => {const { type, multiple, closeTree, searchTargetId } = useDropdownContext();const isMenu = type === 'menu';- const menuOptionRole = multiple ? 'menuitemcheckbox' : 'menuitemradio';+ const hasSelectionState = isDefined(selected);+ const selectableMenuOptionRole = multiple+ ? 'menuitemcheckbox'+ : 'menuitemradio';+ const menuOptionRole = hasSelectionState+ ? selectableMenuOptionRole+ : 'menuitem';+ const selectionIndicator = multiple ? 'checkbox' : 'check';const generatedId = useId();const itemId = id ?? generatedId;const itemFocus = useDropdownItemFocus({ id: itemId });@@ -44,8 +51,8 @@ export const DropdownOptionItem = ({disabled={disabled}nativeButton={nativeButton}role={isMenu ? menuOptionRole : undefined}- aria-checked={isMenu ? selected : undefined}- aria-pressed={isMenu ? undefined : selected}+ aria-checked={isMenu && hasSelectionState ? selected : undefined}+ aria-pressed={!isMenu && hasSelectionState ? selected : undefined}tabIndex={itemFocus.tabIndex}onFocus={(event) => {itemFocus.activate();@@ -73,7 +80,9 @@ export const DropdownOptionItem = ({disabled={disabled}selected={selected}focused={searchTargetId === itemId}- indicator={indicator ?? (multiple ? 'checkbox' : 'check')}+ indicator={+ indicator ?? (hasSelectionState ? selectionIndicator : 'none')+ }color={color}startIcon={startIcon}endIcon={endIcon}diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownFocusTarget.ts b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownFocusTarget.tsindex a962304d938..803c75aec37 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownFocusTarget.ts+++ b/packages/twenty-ui/src/components/navigation/Dropdown/internal/getDropdownFocusTarget.ts@@ -80,8 +80,13 @@ export const getDropdownFocusTarget = ({return search;}+ if (edge === 'last') {+ return items[items.length - 1] ?? firstFormControl ?? content;+ }+return (- (edge === 'last' ? items[items.length - 1] : items[0]) ??+ items.find((item) => !item.hasAttribute('data-dropdown-back')) ??+ items[0] ??firstFormControl ??content);diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/types/DropdownOptionItemProps.ts b/packages/twenty-ui/src/components/navigation/Dropdown/types/DropdownOptionItemProps.tsindex f552eeab148..4da91be9099 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/types/DropdownOptionItemProps.ts+++ b/packages/twenty-ui/src/components/navigation/Dropdown/types/DropdownOptionItemProps.ts@@ -4,7 +4,7 @@ export type DropdownOptionItemProps = Omit<DropdownActionItemProps,'page' | 'closeOnClick' | 'onSelect'> & {- selected: boolean;+ selected?: boolean;indicator?: 'check' | 'checkbox' | 'none';onSelect?: () => void;closeOnSelect?: boolean;