The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(front): create component instance ids once instead of rewriting them per surface (#25790)
Félix Malfaited653db19cb0
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldInput.tsx b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldInput.tsxindex 1e4ce1d54fe..4076767f63c 100644--- a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldInput.tsx+++ b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldInput.tsx@@ -53,7 +53,6 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTypimport { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';const SUGGESTIONS_SEARCH_DEBOUNCE_MS = 300;@@ -128,9 +127,7 @@ export const EmailRecipientsFieldInput = ({}: EmailRecipientsFieldInputProps) => {const instanceId = useId();const focusId = `email-recipients-field-${instanceId}`;- const suggestionsDropdownId = useWorkspaceSurfaceScopedComponentInstanceId(- `${focusId}-suggestions`,- );+ const suggestionsDropdownId = `${focusId}-suggestions`;const inputRef = useRef<HTMLInputElement>(null);diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsxindex a0598c77182..9c878cc3cb0 100644--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx@@ -15,7 +15,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useContext } from 'react';@@ -64,12 +63,9 @@ export const RecordIndexCommandMenuDropdown = () => {...(shouldShowMoreActions ? ['more-actions'] : []),];- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);return (diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewViewNoSelectionRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewViewNoSelectionRecordCommand.tsxindex dfa45335ff9..47390edd42d 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewViewNoSelectionRecordCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewViewNoSelectionRecordCommand.tsx@@ -3,7 +3,7 @@ import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-commandimport { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';+import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';import { isDefined } from 'twenty-shared/utils';@@ -35,7 +35,8 @@ export const CreateNewViewNoSelectionRecordCommand = () => {}setViewPickerMode('create-empty');openDropdown({- dropdownComponentInstanceIdFromProps: VIEW_PICKER_DROPDOWN_ID,+ dropdownComponentInstanceIdFromProps:+ getViewPickerDropdownId(recordIndexId),});};diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.tsindex 7a3859dae25..4ce9bd2adf2 100644--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCoreWorkflows.ts@@ -12,7 +12,6 @@ import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUsimport { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFieldByTableFamilyState';import { type TableSortValue } from '@/ui/layout/table/types/TableSortValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import {CoreWorkflowOrderByDirection,@@ -39,11 +38,10 @@ export const useCoreWorkflows = ({tableId?: string;} = {}) => {const apolloCoreClient = useApolloCoreClient();- const scopedTableId = useWorkspaceSurfaceScopedComponentInstanceId(tableId);const sortedFieldByTable = useAtomFamilyStateValue(sortedFieldByTableFamilyState,- { tableId: scopedTableId },+ { tableId: tableId },);const sortValue = sortedFieldByTable ?? CORE_WORKFLOWS_INITIAL_SORT;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 ffb86d0ecfd..2f231f094a6 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@@ -21,7 +21,6 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import { IconChevronLeft, useIcons } from 'twenty-ui/icon';@@ -80,14 +79,9 @@ export const AdvancedFilterCompositeSubFieldSelectMenu = ({const { advancedFilterFieldSelectDropdownId } =useAdvancedFilterFieldSelectDropdown(recordFilterId);- const scopedAdvancedFilterFieldSelectDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(- advancedFilterFieldSelectDropdownId,- );-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedAdvancedFilterFieldSelectDropdownId,+ advancedFilterFieldSelectDropdownId,);if (!isDefined(objectFilterDropdownSubMenuFieldType)) {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 f8b5e3d2734..8b97abd4c58 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@@ -18,7 +18,6 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectablimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useContext } from 'react';import { type ViewFilterOperand } from 'twenty-shared/types';@@ -57,12 +56,9 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({setRecordFilterUsedInAdvancedFilterDropdownRow(filter);};- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { userTimeZoneAbbreviation } =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 d92401c6965..3662c2b9743 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@@ -20,7 +20,6 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { CoreObjectNameSingular } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { IconChevronLeft, IconUserCircle, useIcons } from 'twenty-ui/icon';@@ -61,14 +60,9 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({const { advancedFilterFieldSelectDropdownId } =useAdvancedFilterFieldSelectDropdown(recordFilterId);- const scopedAdvancedFilterFieldSelectDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(- advancedFilterFieldSelectDropdownId,- );-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedAdvancedFilterFieldSelectDropdownId,+ advancedFilterFieldSelectDropdownId,);const { objectMetadataItem: workspaceMemberObjectMetadataItem } =diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsxindex 0d765feda0b..9151515c5e0 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx@@ -11,6 +11,8 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Dropimport { 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 { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { IconCheck } from 'twenty-ui/icon';const StyledBooleanSelectContainer = styled.div<{ selected?: boolean }>`@@ -33,6 +35,10 @@ const StyledIconCheckContainer = styled.div``;export const ObjectFilterDropdownBooleanSelect = () => {+ const objectFilterDropdownComponentInstanceId =+ useAvailableComponentInstanceIdOrThrow(+ ObjectFilterDropdownComponentInstanceContext,+ );const { theme } = useContext(ThemeContext);const options = [true, false];@@ -56,7 +62,7 @@ export const ObjectFilterDropdownBooleanSelect = () => {return (<DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}><SelectableList- selectableListInstanceId="boolean-select"+ selectableListInstanceId={`${objectFilterDropdownComponentInstanceId}-boolean-select`}selectableItemIdArray={options.map((option) => option.toString())}focusId="boolean-select">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.tsxindex e9658ecc842..d37f3b7baf2 100644--- 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.tsx@@ -1,5 +1,4 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { FILTER_FIELD_LIST_ID } from '@/object-record/object-filter-dropdown/constants/FilterFieldListId';import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';@@ -17,7 +16,7 @@ export const ObjectFilterDropdownFilterSelectMenuItem = ({fieldMetadataItemToSelect,onClick,}: ObjectFilterDropdownFilterSelectMenuItemProps) => {- const { resetSelectedItem } = useSelectableList(FILTER_FIELD_LIST_ID);+ const { resetSelectedItem } = useSelectableList();const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsxindex aa6683369f5..2e4a57221ae 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownInnerSelectOperandDropdown.tsx@@ -17,13 +17,17 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Geneimport { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';import { type SelectOption } from 'twenty-ui/input';-const OBJECT_FILTER_DROPDOWN_INNER_SELECT_OPERAND_DROPDOWN_ID =- 'object-filter-dropdown-inner-select-operand-dropdown';-export const ObjectFilterDropdownInnerSelectOperandDropdown = () => {+ const objectFilterDropdownComponentInstanceId =+ useAvailableComponentInstanceIdOrThrow(+ ObjectFilterDropdownComponentInstanceContext,+ );+ const dropdownId = `${objectFilterDropdownComponentInstanceId}-inner-select-operand`;const selectedOperandInDropdown = useAtomComponentStateValue(selectedOperandInDropdownComponentState,);@@ -114,7 +118,7 @@ export const ObjectFilterDropdownInnerSelectOperandDropdown = () => {return (<DropdownMenuInnerSelect- dropdownId={OBJECT_FILTER_DROPDOWN_INNER_SELECT_OPERAND_DROPDOWN_ID}+ dropdownId={dropdownId}selectedOption={selectedOption}onChange={handleOperandChange}options={options}diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsxindex 8a6d1a3e8df..e2e98a4337d 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx@@ -21,7 +21,6 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/comimport { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import { MAX_OPTIONS_TO_DISPLAY } from 'twenty-shared/constants';@@ -74,12 +73,9 @@ export const ObjectFilterDropdownOptionSelect = ({const { resetSelectedItem } = useSelectableList(componentInstanceId);- const scopedComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const { foundFieldMetadataItem: relationTargetFieldMetadataItem } =diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/FilterFieldListId.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/FilterFieldListId.tsdeleted file mode 100644index 834c68e4764..00000000000--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/FilterFieldListId.ts+++ /dev/null@@ -1 +0,0 @@-export const FILTER_FIELD_LIST_ID = 'filter-field-list';diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsxindex 6a76ad30d58..90dffefb1bd 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx@@ -1,7 +1,7 @@import { useDropdownContextCurrentContentId } from '@/dropdown-context-state-management/hooks/useDropdownContextCurrentContentId';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { ObjectOptionsDropdownContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownContent';-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';+import { getObjectOptionsDropdownId } from '@/object-record/object-options-dropdown/utils/getObjectOptionsDropdownId';import { ObjectOptionsDropdownContext } from '@/object-record/object-options-dropdown/states/contexts/ObjectOptionsDropdownContext';import { type ObjectOptionsContentId } from '@/object-record/object-options-dropdown/types/ObjectOptionsContentId';import { RecordGroupReorderConfirmationModal } from '@/object-record/record-group/components/RecordGroupReorderConfirmationModal';@@ -28,9 +28,11 @@ export const ObjectOptionsDropdown = ({const { currentContentId, handleContentChange, handleResetContent } =useDropdownContextCurrentContentId<ObjectOptionsContentId>();+ const dropdownId = getObjectOptionsDropdownId(recordIndexId);+const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,- OBJECT_OPTIONS_DROPDOWN_ID,+ dropdownId,);const {@@ -43,7 +45,7 @@ export const ObjectOptionsDropdown = ({return (<><Dropdown- dropdownId={OBJECT_OPTIONS_DROPDOWN_ID}+ dropdownId={dropdownId}dropdownOffset={{ y: DROPDOWN_OFFSET_Y }}clickableComponent={<StyledHeaderDropdownButton isUnfolded={isDropdownOpen}>@@ -60,7 +62,7 @@ export const ObjectOptionsDropdown = ({currentContentId,onContentChange: handleContentChange,resetContent: handleResetContent,- dropdownId: OBJECT_OPTIONS_DROPDOWN_ID,+ dropdownId,handleRecordGroupOrderChangeWithModal,}}>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsxindex a0373a9014c..4d91c394e04 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent.tsx@@ -16,12 +16,10 @@ import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';import { IconChevronLeft } from 'twenty-ui/icon';-export const ADD_RECORD_GROUP_PICKER_INSTANCE_ID =- 'object-options-add-record-group-picker';-export const ObjectOptionsDropdownAddRecordGroupContent = () => {const { t } = useLingui();- const { onContentChange } = useObjectOptionsDropdown();+ const { onContentChange, dropdownId } = useObjectOptionsDropdown();+ const addRecordGroupPickerInstanceId = `${dropdownId}-add-record-group-picker`;const { currentView } = useGetCurrentViewOnly();const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(@@ -32,7 +30,7 @@ export const ObjectOptionsDropdownAddRecordGroupContent = () => {const setSingleRecordPickerSearchFilter = useSetAtomComponentState(singleRecordPickerSearchFilterComponentState,- ADD_RECORD_GROUP_PICKER_INSTANCE_ID,+ addRecordGroupPickerInstanceId,);const targetObjectNameSingular =@@ -64,7 +62,7 @@ export const ObjectOptionsDropdownAddRecordGroupContent = () => {return (<SingleRecordPickerComponentInstanceContext.Provider- value={{ instanceId: ADD_RECORD_GROUP_PICKER_INSTANCE_ID }}+ value={{ instanceId: addRecordGroupPickerInstanceId }}><DropdownContent><DropdownMenuHeader@@ -78,7 +76,7 @@ export const ObjectOptionsDropdownAddRecordGroupContent = () => {{t`New group`}</DropdownMenuHeader><SingleRecordPickerMenuItemsWithSearch- focusId={ADD_RECORD_GROUP_PICKER_INSTANCE_ID}+ focusId={addRecordGroupPickerInstanceId}onCancel={handleBack}onMorphItemSelected={handleRecordSelected}objectNameSingulars={[targetObjectNameSingular]}diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsxindex 51119e98698..5a842867295 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx@@ -1,5 +1,4 @@import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -11,7 +10,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { Pill } from 'twenty-ui/data-display';import {@@ -27,7 +25,7 @@ import { ViewCalendarLayout } from '~/generated-metadata/graphql';const RECORD_CALENDAR_TIMELINE_VIEW_ID = 'record-calendar-timeline-view';export const ObjectOptionsDropdownCalendarViewContent = () => {- const { resetContent } = useObjectOptionsDropdown();+ const { resetContent, dropdownId } = useObjectOptionsDropdown();const recordIndexCalendarLayout = useAtomComponentStateValue(recordIndexCalendarLayoutComponentState,);@@ -36,12 +34,9 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {);const { updateCurrentView } = useUpdateCurrentView();- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);const { closeDropdown } = useObjectOptionsDropdown();@@ -80,8 +75,8 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {</DropdownMenuHeader><DropdownMenuItemsContainer><SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}><SelectableListItemdiff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsxindex 68813fd37fb..fa42168f5a6 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx@@ -1,5 +1,4 @@import { ObjectOptionsDropdownMenuViewName } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName';-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';@@ -25,7 +24,6 @@ import {import { useDestroyViewFromCurrentState } from '@/views/view-picker/hooks/useDestroyViewFromCurrentState';import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {@@ -48,8 +46,13 @@ export const ObjectOptionsDropdownCustomView = ({onBackToDefault,}: ObjectOptionsDropdownCustomViewProps) => {const { t } = useLingui();- const { recordIndexId, objectMetadataItem, onContentChange, closeDropdown } =- useObjectOptionsDropdown();+ const {+ recordIndexId,+ objectMetadataItem,+ onContentChange,+ closeDropdown,+ dropdownId,+ } = useObjectOptionsDropdown();const { currentView } = useGetCurrentViewOnly();@@ -121,12 +124,9 @@ export const ObjectOptionsDropdownCustomView = ({'Delete view',];- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);if (!customViewData) {@@ -138,8 +138,8 @@ export const ObjectOptionsDropdownCustomView = ({<ObjectOptionsDropdownMenuViewName currentView={customViewData} /><DropdownMenuSeparator /><SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}><DropdownMenuItemsContainer scrollable={false}>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsxindex 4dbe09e6de4..05fc2c09944 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx@@ -1,4 +1,3 @@-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -12,7 +11,6 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useOpenCreateViewDropdown } from '@/views/hooks/useOpenCreateViewDropown';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import {IconCopy,@@ -26,7 +24,8 @@ import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';export const ObjectOptionsDropdownDefaultView = () => {const { t } = useLingui();- const { recordIndexId, onContentChange } = useObjectOptionsDropdown();+ const { recordIndexId, onContentChange, dropdownId } =+ useObjectOptionsDropdown();const { currentView } = useGetCurrentViewOnly();@@ -43,19 +42,16 @@ export const ObjectOptionsDropdownDefaultView = () => {'Create custom view',];- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);const { openCreateViewDropdown } = useOpenCreateViewDropdown(recordIndexId);const { closeDropdown } = useCloseDropdown();const handleCreateCustomView = () => {- closeDropdown(OBJECT_OPTIONS_DROPDOWN_ID);+ closeDropdown(dropdownId);openCreateViewDropdown(currentView);};@@ -77,8 +73,8 @@ export const ObjectOptionsDropdownDefaultView = () => {</DropdownMenuItemsContainer><DropdownMenuSeparator /><SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}><DropdownMenuItemsContainer scrollable={false}>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsxindex 19f2b5d35a7..cb96fa4ef3c 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx@@ -1,4 +1,3 @@-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { useSetViewTypeFromLayoutOptionsMenu } from '@/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';@@ -23,7 +22,6 @@ import {} from '@/views/types/ViewType';import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -126,12 +124,9 @@ export const ObjectOptionsDropdownLayoutContent = () => {: []),];- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);return (@@ -149,8 +144,8 @@ export const ObjectOptionsDropdownLayoutContent = () => {{!!currentView && (<SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}><DropdownMenuItemsContainer scrollable={false}>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsxindex 7f1ac450582..6d7ce3c8fcf 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuViewName.tsx@@ -7,7 +7,7 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomCimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { type View } from '@/views/types/View';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';+import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState';import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/viewPickerIsDirtyComponentState';import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states/viewPickerIsPersistingComponentState';@@ -78,6 +78,7 @@ export const ObjectOptionsDropdownMenuViewName = ({const [viewName, setViewName] = useState(currentView?.name);const inputRef = useRef<HTMLInputElement>(null);+ const { dropdownId } = useObjectOptionsDropdown();useHotkeysOnFocusedElement({keys: [Key.Enter],@@ -88,7 +89,7 @@ export const ObjectOptionsDropdownMenuViewName = ({await updateViewFromCurrentState();},- focusId: VIEW_PICKER_DROPDOWN_ID,+ focusId: dropdownId,dependencies: [viewPickerIsPersisting, updateViewFromCurrentState],});diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsxindex 771d51c420e..fedf7c12508 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent.tsx@@ -1,7 +1,6 @@import { useEffect } from 'react';import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort';@@ -17,7 +16,6 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import {@@ -29,7 +27,8 @@ import {import { MenuItemSelect } from 'twenty-ui/navigation';export const ObjectOptionsDropdownRecordGroupSortContent = () => {- const { currentContentId, onContentChange } = useObjectOptionsDropdown();+ const { currentContentId, onContentChange, dropdownId } =+ useObjectOptionsDropdown();const hiddenRecordGroupIds = useAtomComponentSelectorValue(hiddenRecordGroupIdsComponentSelector,@@ -50,12 +49,9 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {setRecordIndexRecordGroupSort(sort);};- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);useEffect(() => {@@ -89,8 +85,8 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {</DropdownMenuHeader><DropdownMenuItemsContainer><SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}><SelectableListItemdiff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsxindex 68a0452c626..dccbcf468c5 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx@@ -1,7 +1,6 @@import { useEffect } from 'react';import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { RecordGroupsVisibilityDropdownSection } from '@/object-record/record-group/components/RecordGroupsVisibilityDropdownSection';import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/useRecordGroupVisibility';@@ -24,7 +23,6 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {@@ -49,6 +47,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {onContentChange,resetContent,handleRecordGroupOrderChangeWithModal,+ dropdownId,} = useObjectOptionsDropdown();const { currentView } = useGetCurrentViewOnly();@@ -104,12 +103,9 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {}}, [hiddenRecordGroupIds, currentContentId, onContentChange]);- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);const selectableItemIdArray = [@@ -117,7 +113,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {'HideEmptyGroups',];- const hiddenGroupsSelectableListId = `${OBJECT_OPTIONS_DROPDOWN_ID}-hidden-groups`;+ const hiddenGroupsSelectableListId = `${dropdownId}-hidden-groups`;return (<DropdownContent>@@ -133,8 +129,8 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {</DropdownMenuHeader><DropdownMenuItemsContainer><SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}>{currentView?.key !== 'INDEX' && (diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsxindex 4a214b91a80..bc9d86db0ed 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx@@ -1,4 +1,3 @@-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -14,7 +13,6 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChanges';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { createPortal } from 'react-dom';import { createPath, useLocation } from 'react-router-dom';@@ -35,19 +33,16 @@ import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';export const ObjectOptionsDropdownVisibilityContent = () => {const { t } = useLingui();const location = useLocation();- const { resetContent } = useObjectOptionsDropdown();+ const { resetContent, dropdownId } = useObjectOptionsDropdown();const { currentView } = useGetCurrentViewOnly();const { updateCurrentView } = useUpdateCurrentView();const { copyToClipboard } = useCopyToClipboard();const hasViewsPermission = useHasPermissionFlag(PermissionFlagType.VIEWS);const { canPersistChanges } = useCanPersistViewChanges();- const scopedObjectOptionsDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectOptionsDropdownId,+ dropdownId,);const selectableItemIdArray = [@@ -87,8 +82,8 @@ export const ObjectOptionsDropdownVisibilityContent = () => {</DropdownMenuHeader><DropdownMenuItemsContainer><SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}+ focusId={dropdownId}selectableItemIdArray={selectableItemIdArray}><SelectableListItemdiff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/utils/getObjectOptionsDropdownId.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/utils/getObjectOptionsDropdownId.tsnew file mode 100644index 00000000000..447e0157d89--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/utils/getObjectOptionsDropdownId.ts@@ -0,0 +1,4 @@+import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';++export const getObjectOptionsDropdownId = (recordIndexId: string) =>+ `${OBJECT_OPTIONS_DROPDOWN_ID}-${recordIndexId}`;diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsxindex cc266cab35a..25b3e383f30 100644--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx@@ -1,6 +1,6 @@import { availableFieldMetadataItemsForSortFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForSortFamilySelector';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';+import { getObjectSortDropdownId } from '@/object-record/object-sort-dropdown/utils/getObjectSortDropdownId';import { useCloseSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useCloseSortDropdown';import { useResetRecordSortDropdownSearchInput } from '@/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput';import { useResetSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useResetSortDropdown';@@ -30,7 +30,6 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomCimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { Trans, useLingui } from '@lingui/react/macro';import { findByProperty } from 'twenty-shared/utils';import { IconX, useIcons } from 'twenty-ui/icon';@@ -49,6 +48,7 @@ export const ObjectSortDropdownButton = () => {const { resetSortDropdown } = useResetSortDropdown();const { recordIndexId, objectMetadataItem } = useRecordIndexContextOrThrow();+ const dropdownId = getObjectSortDropdownId(recordIndexId);const objectSortDropdownSearchInput = useAtomComponentStateValue(objectSortDropdownSearchInputComponentState,@@ -143,7 +143,7 @@ export const ObjectSortDropdownButton = () => {const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,- OBJECT_SORT_DROPDOWN_ID,+ dropdownId,);const { t } = useLingui();@@ -153,17 +153,14 @@ export const ObjectSortDropdownButton = () => {...hiddenFieldMetadataItemsSorted.map((item) => item.id),];- const scopedObjectSortDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_SORT_DROPDOWN_ID);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedObjectSortDropdownId,+ dropdownId,);const setSelectedItemId = useSetAtomComponentState(selectedItemIdComponentState,- scopedObjectSortDropdownId,+ dropdownId,);const shouldShowHiddenFields = hiddenFieldMetadataItemsSorted.length > 0;@@ -171,7 +168,7 @@ export const ObjectSortDropdownButton = () => {return (<Dropdown- dropdownId={OBJECT_SORT_DROPDOWN_ID}+ dropdownId={dropdownId}dropdownOffset={{ y: 8 }}onOpen={handleDropdownOpen}clickableComponent={@@ -192,7 +189,7 @@ export const ObjectSortDropdownButton = () => {{t`Sort`}</DropdownMenuHeader><DropdownMenuInnerSelect- dropdownId="record-sort-direction-dropdown"+ dropdownId={`${dropdownId}-direction`}options={[ViewSortDirection.ASC, ViewSortDirection.DESC].map((sortDirection) => ({value: sortDirection,@@ -224,9 +221,9 @@ export const ObjectSortDropdownButton = () => {}/><SelectableList- selectableListInstanceId={OBJECT_SORT_DROPDOWN_ID}+ selectableListInstanceId={dropdownId}selectableItemIdArray={selectableItemIdArray}- focusId={OBJECT_SORT_DROPDOWN_ID}+ focusId={dropdownId}>{shouldShowVisibleFields && (<>diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ViewSortDropdownId.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ViewSortDropdownId.tsdeleted file mode 100644index 783ea772ec2..00000000000--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ViewSortDropdownId.ts+++ /dev/null@@ -1 +0,0 @@-export const VIEW_SORT_DROPDOWN_ID = 'view-sort';diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.tsindex 509b02f77e9..1d40e314527 100644--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.ts+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.ts@@ -1,4 +1,5 @@-import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getObjectSortDropdownId } from '@/object-record/object-sort-dropdown/utils/getObjectSortDropdownId';import { useResetSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useResetSortDropdown';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';@@ -6,9 +7,10 @@ export const useCloseSortDropdown = () => {const { resetSortDropdown } = useResetSortDropdown();const { closeDropdown } = useCloseDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();const closeSortDropdown = () => {- closeDropdown(OBJECT_SORT_DROPDOWN_ID);+ closeDropdown(getObjectSortDropdownId(recordIndexId));resetSortDropdown();};diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/getObjectSortDropdownId.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/getObjectSortDropdownId.tsnew file mode 100644index 00000000000..d7899f6cf00--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/getObjectSortDropdownId.ts@@ -0,0 +1,4 @@+import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';++export const getObjectSortDropdownId = (recordIndexId: string) =>+ `${OBJECT_SORT_DROPDOWN_ID}-${recordIndexId}`;diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardAddGroupColumn.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardAddGroupColumn.tsxindex 85f6cc53e2c..8980869543b 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardAddGroupColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardAddGroupColumn.tsx@@ -1,6 +1,7 @@import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';import { isRecordBoardViewSettingsReadOnlyComponentState } from '@/object-record/record-board/states/isRecordBoardViewSettingsReadOnlyComponentState';import { AddRecordGroupButton } from '@/object-record/record-group/components/AddRecordGroupButton';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { canAddRecordGroupForFieldMetadataItem } from '@/object-record/record-group/utils/canAddRecordGroupForFieldMetadataItem';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { styled } from '@linaria/react';@@ -16,6 +17,7 @@ const StyledColumn = styled.div``;export const RecordBoardAddGroupColumn = () => {+ const { recordIndexId } = useRecordIndexContextOrThrow();const { selectFieldMetadataItem } = useContext(RecordBoardContext);const isRecordBoardViewSettingsReadOnly = useAtomComponentStateValue(@@ -34,7 +36,7 @@ export const RecordBoardAddGroupColumn = () => {<StyledColumn><AddRecordGroupButtonfieldMetadataItem={selectFieldMetadataItem}- dropdownId={RECORD_BOARD_ADD_GROUP_DROPDOWN_ID}+ dropdownId={`${RECORD_BOARD_ADD_GROUP_DROPDOWN_ID}-${recordIndexId}`}dropdownOffset={{ x: 0, y: 10 }}/></StyledColumn>diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsxindex 6263d027d8a..87c28f2151e 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardContainer.tsx@@ -11,7 +11,8 @@ import { RecordBoardComponentInstanceContext } from '@/object-record/record-boarimport { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/components/RecordIndexRemoveSortingModal';-import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -55,9 +56,11 @@ export const RecordBoardContainer = ({...args,});+ const { recordIndexId } = useRecordIndexContextOrThrow();+const isModalOpened = useAtomComponentStateValue(isModalOpenedComponentState,- RECORD_INDEX_REMOVE_SORTING_MODAL_ID,+ getRecordIndexRemoveSortingModalId(recordIndexId),);if (!isDefined(recordIndexGroupFieldMetadataItem)) {diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.tsindex a26e41cfe4d..db9a4f2ab62 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/dnd/hooks/useRecordBoardColumnDndKit.ts@@ -1,7 +1,7 @@import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID } from '@/object-record/record-group/constants/RecordGroupReorderConfirmationModalId';+import { getRecordGroupReorderConfirmationModalId } from '@/object-record/record-group/utils/getRecordGroupReorderConfirmationModalId';import { useReorderRecordGroups } from '@/object-record/record-group/hooks/useReorderRecordGroups';import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort';@@ -127,7 +127,7 @@ export const useRecordBoardColumnDndKit = (): {fromIndex: sourceIndex,toIndex: destinationIndex,});- openModal(RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID);+ openModal(getRecordGroupReorderConfirmationModalId(recordIndexId));return;}diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.tsindex 981d7c1005c..2b90f3d3ccb 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts@@ -15,7 +15,8 @@ import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordimport { useProcessBoardCardDrop } from '@/object-record/record-drag/hooks/useProcessBoardCardDrop';import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';-import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';import { useModal } from '@/ui/layout/modal/hooks/useModal';import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';@@ -76,6 +77,7 @@ export const useRecordBoardDndKit = (): {);const { openModal } = useModal();+ const { recordIndexId } = useRecordIndexContextOrThrow();const [activeDropTargetIndex, setActiveDropTargetIndex] = useState<number | null@@ -165,7 +167,7 @@ export const useRecordBoardDndKit = (): {if (boardCardDropBehavior.shouldBlockDrop) {resetDragState();- openModal(RECORD_INDEX_REMOVE_SORTING_MODAL_ID);+ openModal(getRecordIndexRemoveSortingModalId(recordIndexId));return;}diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.tsindex 9e50eb65bf2..a5e5c7fc412 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts@@ -9,7 +9,7 @@ import { originalDragSelectionComponentState } from '@/object-record/record-dragimport { processGroupDrop } from '@/object-record/record-drag/utils/processGroupDrop';import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';-import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';@@ -95,7 +95,7 @@ export const useProcessTableWithGroupRecordDrop = () => {const existingRecordSorts = store.get(currentRecordSorts);if (existingRecordSorts.length > 0) {- openModal(RECORD_INDEX_REMOVE_SORTING_MODAL_ID);+ openModal(getRecordIndexRemoveSortingModalId(recordIndexId));return;}@@ -120,6 +120,7 @@ export const useProcessTableWithGroupRecordDrop = () => {},[currentRecordSorts,+ recordIndexId,store,objectNameSingular,objectMetadataItem.fields,diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.tsindex 8cb0a4eaf34..c87f9a13eef 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts@@ -6,7 +6,7 @@ import { originalDragSelectionComponentState } from '@/object-record/record-dragimport { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';import { processMultiDrag } from '@/object-record/record-drag/utils/processMultiDrag';import { processSingleDrag } from '@/object-record/record-drag/utils/processSingleDrag';-import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';import { allRecordIdsWithoutGroupsComponentSelector } from '@/object-record/record-index/states/selectors/allRecordIdsWithoutGroupsComponentSelector';import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';import { useStore } from 'jotai';@@ -57,7 +57,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {if (!tableRecordDropResult.destination) return;if (currentRecordSorts.length > 0) {- openModal(RECORD_INDEX_REMOVE_SORTING_MODAL_ID);+ openModal(getRecordIndexRemoveSortingModalId(recordIndexId));return;}@@ -157,6 +157,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {},[objectNameSingular,+ recordIndexId,selectedRowIds,store,updateOneRecord,diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsxindex 941b0936769..aed67685e00 100644--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupReorderConfirmationModal.tsx@@ -1,4 +1,5 @@-import { RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID } from '@/object-record/record-group/constants/RecordGroupReorderConfirmationModalId';+import { getRecordGroupReorderConfirmationModalId } from '@/object-record/record-group/utils/getRecordGroupReorderConfirmationModalId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -13,6 +14,7 @@ type RecordGroupReorderConfirmationModalProps = {export const RecordGroupReorderConfirmationModal = ({onConfirmClick,}: RecordGroupReorderConfirmationModalProps): ReactNode => {+ const { recordIndexId } = useRecordIndexContextOrThrow();const recordIndexRecordGroupSort = useAtomComponentStateValue(recordIndexRecordGroupSortComponentState,);@@ -21,7 +23,9 @@ export const RecordGroupReorderConfirmationModal = ({<>{createPortal(<ConfirmationModal- modalInstanceId={RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID}+ modalInstanceId={getRecordGroupReorderConfirmationModalId(+ recordIndexId,+ )}title={t`Group sorting`}subtitle={t`Would you like to remove ${recordIndexRecordGroupSort} group sorting?`}onConfirmClick={onConfirmClick}diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.tsindex 59f59e6daa7..0b5febcb92c 100644--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.ts+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupReorderConfirmationModal.ts@@ -1,4 +1,4 @@-import { RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID } from '@/object-record/record-group/constants/RecordGroupReorderConfirmationModalId';+import { getRecordGroupReorderConfirmationModalId } from '@/object-record/record-group/utils/getRecordGroupReorderConfirmationModalId';import { useReorderRecordGroups } from '@/object-record/record-group/hooks/useReorderRecordGroups';import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort';import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';@@ -60,7 +60,7 @@ export const useRecordGroupReorderConfirmationModal = ({const handleDragEndWithModal = (result: DraggableListDropResult) => {if (!isDragableSortRecordGroup) {closeAnyOpenDropdown();- openModal(RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID);+ openModal(getRecordGroupReorderConfirmationModalId(recordIndexId));setActiveDropdownFocusIdAndMemorizePrevious(null);setPendingDragEndHandlerParams(result);} else {diff --git a/packages/twenty-front/src/modules/object-record/record-group/utils/getRecordGroupReorderConfirmationModalId.ts b/packages/twenty-front/src/modules/object-record/record-group/utils/getRecordGroupReorderConfirmationModalId.tsnew file mode 100644index 00000000000..170532fbafa--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-group/utils/getRecordGroupReorderConfirmationModalId.ts@@ -0,0 +1,5 @@+import { RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID } from '@/object-record/record-group/constants/RecordGroupReorderConfirmationModalId';++export const getRecordGroupReorderConfirmationModalId = (+ recordIndexId: string,+) => `${RECORD_GROUP_REORDER_CONFIRMATION_MODAL_ID}-${recordIndexId}`;diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsxindex 53cb2c3c998..a0ce3747bc9 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexRemoveSortingModal.tsx@@ -1,4 +1,5 @@-import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';import { useRemoveRecordSort } from '@/object-record/record-sort/hooks/useRemoveRecordSort';import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';@@ -7,6 +8,7 @@ import { useLingui } from '@lingui/react/macro';export const RecordIndexRemoveSortingModal = () => {const { t } = useLingui();+ const { recordIndexId } = useRecordIndexContextOrThrow();const currentRecordSorts = useAtomComponentStateValue(currentRecordSortsComponentState,@@ -26,7 +28,7 @@ export const RecordIndexRemoveSortingModal = () => {return (<ConfirmationModal- modalInstanceId={RECORD_INDEX_REMOVE_SORTING_MODAL_ID}+ modalInstanceId={getRecordIndexRemoveSortingModalId(recordIndexId)}title={t`Remove sorting?`}subtitle={t`This is required to enable manual row reordering.`}onConfirmClick={handleRemoveClick}diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsxindex 8e73bc24a3c..22226a879f6 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainer.tsx@@ -1,7 +1,7 @@import { RecordIndexRemoveSortingModal } from '@/object-record/record-index/components/RecordIndexRemoveSortingModal';import { RecordIndexTableContainerEffect } from '@/object-record/record-index/components/RecordIndexTableContainerEffect';-import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getRecordIndexRemoveSortingModalId } from '@/object-record/record-index/utils/getRecordIndexRemoveSortingModalId';import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers';import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -13,12 +13,12 @@ type RecordIndexTableContainerProps = {export const RecordIndexTableContainer = ({recordTableId,}: RecordIndexTableContainerProps) => {- const { objectNameSingular, viewBarInstanceId } =+ const { objectNameSingular, viewBarInstanceId, recordIndexId } =useRecordIndexContextOrThrow();const isModalOpened = useAtomComponentStateValue(isModalOpenedComponentState,- RECORD_INDEX_REMOVE_SORTING_MODAL_ID,+ getRecordIndexRemoveSortingModalId(recordIndexId),);return (diff --git a/packages/twenty-front/src/modules/object-record/record-index/utils/getRecordIndexRemoveSortingModalId.ts b/packages/twenty-front/src/modules/object-record/record-index/utils/getRecordIndexRemoveSortingModalId.tsnew file mode 100644index 00000000000..d3a34ec86b1--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-index/utils/getRecordIndexRemoveSortingModalId.ts@@ -0,0 +1,4 @@+import { RECORD_INDEX_REMOVE_SORTING_MODAL_ID } from '@/object-record/record-index/constants/RecordIndexRemoveSortingModalId';++export const getRecordIndexRemoveSortingModalId = (recordIndexId: string) =>+ `${RECORD_INDEX_REMOVE_SORTING_MODAL_ID}-${recordIndexId}`;diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsxindex cf68ab0067d..30561c70f14 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerCreateTargetSelect.tsx@@ -4,7 +4,6 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';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';@@ -30,11 +29,9 @@ export const MultipleRecordPickerCreateTargetSelect = ({onBack,onSelect,}: MultipleRecordPickerCreateTargetSelectProps) => {- const scopedSelectableListInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(selectableListInstanceId);const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedSelectableListInstanceId,+ selectableListInstanceId,);const handleSelect = (objectMetadataItemId: string) => {diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsxindex 431e277c5ba..60371539d98 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/components/MultipleRecordPickerMenuItemContent.tsx@@ -17,7 +17,6 @@ import { Avatar } from 'twenty-ui/data-display';import { MenuItemMultiSelectAvatar } from 'twenty-ui/navigation';import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { type SearchRecord } from '~/generated/graphql';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';@@ -37,9 +36,7 @@ export const MultipleRecordPickerMenuItemContent = ({);const selectableListComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(- getMultipleRecordPickerSelectableListId(componentInstanceId),- );+ getMultipleRecordPickerSelectableListId(componentInstanceId);const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsxindex 5e0ef1f60de..21db14e8f41 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItem.tsx@@ -13,7 +13,6 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/comimport { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { capitalize, isDefined } from 'twenty-shared/utils';import { Avatar } from 'twenty-ui/data-display';import { MenuItemSelectAvatar } from 'twenty-ui/navigation';@@ -36,9 +35,7 @@ export const SingleRecordPickerMenuItem = ({);const selectableListComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(- getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId),- );+ getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId);const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsxindex ffb8f454d1d..01dac86619e 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx@@ -21,7 +21,6 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/comimport { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { type IconComponent } from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -48,9 +47,7 @@ export const SingleRecordPickerMenuItems = ({);const selectableListComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(- getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId),- );+ getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId);const { resetSelectedItem } = useSelectableList(selectableListComponentInstanceId,diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsxindex 385cadcc9cb..90f81ba67d0 100644--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsx@@ -4,7 +4,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { Avatar } from 'twenty-ui/data-display';import { MenuItemSelectAvatar } from 'twenty-ui/navigation';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';@@ -22,13 +21,10 @@ export const RecordTableWidgetRelationPickerMenuItem = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,relationRecord.id,- scopedDropdownId,+ dropdownId,);return (diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsxindex b947534bdc8..8d8e89ae90f 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderAddColumnButton.tsx@@ -95,7 +95,7 @@ export const RecordTableHeaderAddColumnButton = () => {!isFirstRowActiveOrFocused ||isRecordTableScrolledVertically;- const { visibleRecordFields } = useRecordTableContextOrThrow();+ const { visibleRecordFields, recordTableId } = useRecordTableContextOrThrow();return (<StyledPlusIconHeaderCell@@ -111,7 +111,7 @@ export const RecordTableHeaderAddColumnButton = () => {/><StyledDropdownContainer><Dropdown- dropdownId={HIDDEN_TABLE_COLUMN_DROPDOWN_ID}+ dropdownId={`${HIDDEN_TABLE_COLUMN_DROPDOWN_ID}-${recordTableId}`}clickableComponent={<StyledPlusIconContainer><IconPlus size={theme.icon.size.md} />diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupAddNewGroup.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupAddNewGroup.tsxindex c2453218696..0bb53722915 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupAddNewGroup.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupAddNewGroup.tsx@@ -1,5 +1,6 @@import { AddRecordGroupButton } from '@/object-record/record-group/components/AddRecordGroupButton';import { canAddRecordGroupForFieldMetadataItem } from '@/object-record/record-group/utils/canAddRecordGroupForFieldMetadataItem';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';import { isRecordTableCellsNonEditableComponentState } from '@/object-record/record-table/states/isRecordTableCellsNonEditableComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -14,6 +15,7 @@ const StyledContainer = styled.div``;export const RecordTableRecordGroupAddNewGroup = () => {+ const { recordIndexId } = useRecordIndexContextOrThrow();const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -36,7 +38,7 @@ export const RecordTableRecordGroupAddNewGroup = () => {<StyledContainer><AddRecordGroupButtonfieldMetadataItem={recordIndexGroupFieldMetadataItem}- dropdownId={RECORD_TABLE_ADD_GROUP_DROPDOWN_ID}+ dropdownId={`${RECORD_TABLE_ADD_GROUP_DROPDOWN_ID}-${recordIndexId}`}/></StyledContainer>);diff --git a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsxindex 3687de6099c..3368dab797f 100644--- a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx+++ b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx@@ -10,7 +10,6 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectabimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';import { t } from '@lingui/core/macro';import { Avatar } from 'twenty-ui/data-display';@@ -41,12 +40,9 @@ export const MultipleSelectDropdown = ({const { resetSelectedItem } = useSelectableList(selectableListId);- const scopedSelectableListId =- useWorkspaceSurfaceScopedComponentInstanceId(selectableListId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedSelectableListId,+ selectableListId,);const handleItemSelectChange = (diff --git a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsxindex c0cab0d618d..de950575fea 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx@@ -21,7 +21,6 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectablimport { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';@@ -102,8 +101,6 @@ export const SettingsMorphRelationMultiSelect = ({hasRightElement,error,}: SettingsMorphRelationMultiSelectProps) => {- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);const selectContainerRef = useRef<HTMLDivElement>(null);const [searchInputValue, setSearchInputValue] = useState('');@@ -165,10 +162,10 @@ export const SettingsMorphRelationMultiSelect = ({const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);- const { setSelectedItemId } = useSelectableList(scopedDropdownId);+ const { setSelectedItemId } = useSelectableList(dropdownId);const handleDropdownOpen = () => {if (selectedOptions.length > 0 && !searchInputValue) {diff --git a/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx b/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsxindex 587888d9245..1a468dbdb25 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsPageContainer.tsx@@ -1,5 +1,6 @@import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';+import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useScrollRestoration } from '@/ui/utilities/scroll/hooks/useScrollRestoration';import { styled } from '@linaria/react';@@ -63,7 +64,9 @@ export const SettingsPageContainer = ({const location = useLocation();const settingsPath = getMatchingSettingsPath(location.pathname);- const componentInstanceId = `scroll-wrapper-settings-page-container-${settingsPath}`;+ const componentInstanceId = useWorkspaceSurfaceScopedComponentInstanceId(+ `scroll-wrapper-settings-page-container-${settingsPath}`,+ );useScrollRestoration(componentInstanceId);diff --git a/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsx b/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsxindex 224dde42e05..1c0bd0e09f5 100644--- a/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsx+++ b/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsx@@ -109,11 +109,11 @@ const ScopedStateProbe = ({>{name} draft</button>- <button onClick={() => openModal(MODAL_ID)}>{name} modal</button>- <button onClick={() => toggleModal(MODAL_ID)}>{name} toggle modal</button>+ <button onClick={() => openModal(modalId)}>{name} modal</button>+ <button onClick={() => toggleModal(modalId)}>{name} toggle modal</button><buttononClick={() =>- openDropdown({ dropdownComponentInstanceIdFromProps: DROPDOWN_ID })+ openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId })}>{name} dropdowndiff --git a/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts b/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.tsindex af0943148ad..9649ec71ef4 100644--- a/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts+++ b/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts@@ -1,5 +1,4 @@import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useLocation } from 'react-router-dom';import { isDefined } from 'twenty-shared/utils';@@ -11,11 +10,9 @@ export const useSettingsActiveTabId = (componentInstanceId: string,tabIds: string[],): string | null => {- const scopedComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const { hash } = useLocation();diff --git a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsxindex b61fc84c89f..ac96945a143 100644--- a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx+++ b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx@@ -13,7 +13,6 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectablimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -49,12 +48,9 @@ export const WebhookEntitySelect = ({const { objectMetadataItems } = useObjectMetadataItems();const { closeDropdown } = useCloseDropdown();- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const metadataOptions: SelectOption<string>[] = [diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsxindex d2b7589534f..a0b554256a0 100644--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx@@ -187,13 +187,13 @@ export const SettingsRoleAssignment = ({entityType: entityType as 'member' | 'agent' | 'apiKey',});- openModal(ROLE_ASSIGNMENT_CONFIRMATION_MODAL_ID);+ openModal(modalInstanceId);};const handleRoleClick = (roleId: string) => {navigateSettings(SettingsPath.RoleDetail, { roleId });handleModalClose();- closeModal(ROLE_ASSIGNMENT_CONFIRMATION_MODAL_ID);+ closeModal(modalInstanceId);};if (!isDefined(settingsDraftRole)) {@@ -224,6 +224,7 @@ export const SettingsRoleAssignment = ({{selectedRoleTarget && (<SettingsRoleAssignmentConfirmationModal+ modalInstanceId={modalInstanceId}selectedRoleTarget={selectedRoleTarget}onClose={handleModalClose}onConfirm={handleConfirm}diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsxindex 3743b9dbbe4..415c7c23e47 100644--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx@@ -1,10 +1,10 @@import { SettingsRoleAssignmentConfirmationModalSubtitle } from '@/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModalSubtitle';-import { ROLE_ASSIGNMENT_CONFIRMATION_MODAL_ID } from '@/settings/roles/role-assignment/constants/RoleAssignmentConfirmationModalId';import { type SettingsRoleAssignmentConfirmationModalSelectedRoleTarget } from '@/settings/roles/role-assignment/types/SettingsRoleAssignmentConfirmationModalSelectedRoleTarget';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';import { t } from '@lingui/core/macro';type SettingsRoleAssignmentConfirmationModalProps = {+ modalInstanceId: string;selectedRoleTarget: SettingsRoleAssignmentConfirmationModalSelectedRoleTarget;onClose: () => void;onConfirm: () => void;@@ -13,6 +13,7 @@ type SettingsRoleAssignmentConfirmationModalProps = {};export const SettingsRoleAssignmentConfirmationModal = ({+ modalInstanceId,selectedRoleTarget,onClose,onConfirm,@@ -25,7 +26,7 @@ export const SettingsRoleAssignmentConfirmationModal = ({return (<ConfirmationModal- modalInstanceId={ROLE_ASSIGNMENT_CONFIRMATION_MODAL_ID}+ modalInstanceId={modalInstanceId}title={title}subtitle={selectedRoleTarget.role ? (diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsxindex ecd0e780024..0cd8a8f409d 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx@@ -112,9 +112,7 @@ export const SettingsRolePermissionsObjectLevelObjectFieldPermissionTable = ({<SortableTableHeaderfieldName="label"label={t`Name`}- tableId={- SETTINGS_ROLE_PERMISSION_OBJECT_LEVEL_FIELD_PERMISSION_TABLE_ID- }+ tableId={tableId}initialSort={{ fieldName: 'label', direction: 'asc' }}/><TableHeader>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 8d55b601f42..7dd9123de13 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@@ -30,7 +30,6 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';type SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSubFieldMenuProps ={@@ -90,14 +89,9 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectSconst { advancedFilterFieldSelectDropdownId } =useAdvancedFilterFieldSelectDropdown(recordFilterId);- const scopedAdvancedFilterFieldSelectDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(- advancedFilterFieldSelectDropdownId,- );-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedAdvancedFilterFieldSelectDropdownId,+ advancedFilterFieldSelectDropdownId,);if (!isDefined(objectFilterDropdownSubMenuFieldType)) {diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelDefaultSelectionEffect.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelDefaultSelectionEffect.tsxindex ad4ffaaa468..adcec7aa151 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelDefaultSelectionEffect.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelDefaultSelectionEffect.tsx@@ -2,7 +2,6 @@ import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSimport { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUserSelectedSidePanelListItemState';import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useEffect } from 'react';@@ -16,13 +15,10 @@ export const SidePanelDefaultSelectionEffect = ({const { setSelectedItemId } = useSelectableList(SIDE_PANEL_SELECTABLE_LIST_ID,);- const scopedSelectableListId = useWorkspaceSurfaceScopedComponentInstanceId(- SIDE_PANEL_SELECTABLE_LIST_ID,- );const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedSelectableListId,+ SIDE_PANEL_SELECTABLE_LIST_ID,);const hasUserSelectedSidePanelListItem = useAtomStateValue(diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsxindex eb9b42f3ebe..b3caf6e73f1 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx@@ -20,7 +20,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';const ALL_OBJECTS_ITEM_ID = 'all-objects';@@ -67,13 +66,10 @@ export const SidePanelObjectFilterDropdownContent = ({ALL_OBJECTS_ITEM_ID,...displayedObjects.map((item) => item.nameSingular),];- const scopedSelectableListId = useWorkspaceSurfaceScopedComponentInstanceId(- OBJECT_FILTER_DROPDOWN_ID,- );const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedSelectableListId,+ OBJECT_FILTER_DROPDOWN_ID,);return (diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsxindex 630fd93a222..6ffd514c4ac 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsFooter.tsx@@ -7,7 +7,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { useId } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -43,12 +42,9 @@ export const WidgetSettingsFooter = ({closeDropdown(dropdownId);};- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);return (diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsxindex a05e932403c..f1198ada5f4 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAggregateOperationSelectableListItem.tsx@@ -12,7 +12,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { isDefined } from 'twenty-shared/utils';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -41,12 +40,9 @@ export const ChartAggregateOperationSelectableListItem = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const configuration = widgetInEditMode?.configuration;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsxindex 3a8b1ebbfc8..f0090e1d02c 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartAxisNameSelectionDropdownContent.tsx@@ -11,7 +11,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { MenuItemSelect } from 'twenty-ui/navigation';import { AxisNameDisplay } from '~/generated-metadata/graphql';@@ -35,12 +34,9 @@ export const ChartAxisNameSelectionDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const axisOptions: AxisNameDisplay[] = [diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsxindex b2571780ca1..a7a3afa3713 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartColorSelectionDropdownContent.tsx@@ -14,7 +14,6 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectablimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useState } from 'react';import { capitalize, isDefined } from 'twenty-shared/utils';@@ -36,12 +35,9 @@ export const ChartColorSelectionDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { updateCurrentWidgetConfig } =diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsxindex 9f1fad85b85..4b7766010b2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx@@ -19,7 +19,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -42,12 +41,9 @@ export const ChartDataSourceDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const searchableObjects = useMemo(() => {diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsxindex 252c383864d..add1daf1e9e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDateGranularitySelectionDropdownContent.tsx@@ -13,7 +13,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { ObjectRecordGroupByDateGranularity } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -109,12 +108,9 @@ export const ChartDateGranularitySelectionDropdownContent = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const dateGranularityOptions: ObjectRecordGroupByDateGranularity[] = [diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsxindex 0a255eb0bed..b8160bacd5e 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartFieldSelectionForAggregateOperationDropdownContent.tsx@@ -14,7 +14,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useState } from 'react';import { useIcons } from 'twenty-ui/icon';@@ -61,12 +60,9 @@ export const ChartFieldSelectionForAggregateOperationDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const availableFieldMetadataItems = filterBySearchQuery({diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsxindex 8be502f4869..6eab2da1d27 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionCompositeFieldView.tsx@@ -12,7 +12,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { IconChevronLeft, useIcons } from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -35,12 +34,9 @@ export const ChartGroupByFieldSelectionCompositeFieldView = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const compositeFieldType = compositeField.type as CompositeFieldType;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsxindex 9f02c1b55c5..546b6a423b0 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionDropdownContentBase.tsx@@ -22,7 +22,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useMemo, useState } from 'react';import {@@ -81,12 +80,9 @@ export const ChartGroupByFieldSelectionDropdownContentBase = <DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const availableFieldMetadataItems = useMemo(diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsxindex 5bd8de15e78..fa8b9218043 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionMorphRelationFieldView.tsx@@ -11,7 +11,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -57,12 +56,9 @@ export const ChartGroupByFieldSelectionMorphRelationFieldView = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const availableTargets = useMemo<MorphRelationTarget[]>(() => {return (morphField.morphRelations ?? [])diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsxindex 869e64869bf..8b53a3e28c2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartGroupByFieldSelectionTargetObjectFieldsView.tsx@@ -14,7 +14,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -55,12 +54,9 @@ export const ChartGroupByFieldSelectionTargetObjectFieldsView = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { objectMetadataItems } = useObjectMetadataItems();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsxindex fd6b3fb97b2..2d94e7f1dcb 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartNumberFormatSelectionDropdownContent.tsx@@ -12,7 +12,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { MenuItemSelect } from 'twenty-ui/navigation';import { ChartNumberFormat } from '~/generated-metadata/graphql';@@ -42,12 +41,9 @@ export const ChartNumberFormatSelectionDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const numberFormatOptions: ChartNumberFormat[] = [diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsxindex 0354df35ded..7537dd31057 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioAggregateOperationSelectableListItem.tsx@@ -7,7 +7,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { isDefined } from 'twenty-shared/utils';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -25,12 +24,9 @@ export const ChartRatioAggregateOperationSelectableListItem = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const isCurrentlyRatio =diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsxindex 20df0311f6c..78665d79718 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionBooleanSelectableListItem.tsx@@ -8,7 +8,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { IconCheck, IconX } from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';import { AggregateOperations } from '~/generated-metadata/graphql';@@ -32,12 +31,9 @@ export const ChartRatioOptionBooleanSelectableListItem = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const currentRatioConfig = isWidgetConfigurationOfType(diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsxindex aea28b9a63f..2e1ce0480a5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartRatioOptionSelectSelectableListItem.tsx@@ -8,7 +8,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { MenuItemSelectTag } from 'twenty-ui/navigation';import { type ThemeColor } from 'twenty-ui/theme';import { AggregateOperations } from '~/generated-metadata/graphql';@@ -34,12 +33,9 @@ export const ChartRatioOptionSelectSelectableListItem = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const currentRatioConfig = isWidgetConfigurationOfType(diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsxindex a13af109e15..aea2ad8f0a7 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortByGroupByFieldDropdownContent.tsx@@ -19,7 +19,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { isDefined } from 'twenty-shared/utils';import { MenuItemSelect } from 'twenty-ui/navigation';import {@@ -54,12 +53,9 @@ export const ChartSortByGroupByFieldDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const objectMetadataItem = objectMetadataItems.find(diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsxindex f383ad7f9c4..3a2bd740b11 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartSortBySelectionDropdownContent.tsx@@ -19,7 +19,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { type CompositeFieldSubFieldName } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -42,12 +41,9 @@ export const ChartSortBySelectionDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const configuration = widgetInEditMode?.configuration;diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsxindex 110b6df5e2f..988d8e51f34 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx@@ -30,7 +30,6 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectabimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -94,12 +93,9 @@ export const FieldWidgetFieldDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { updateCurrentWidgetConfig } =diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsxindex 10f788e167d..5af073541a2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx@@ -30,7 +30,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {@@ -164,12 +163,9 @@ export const FieldWidgetLayoutDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { updateCurrentWidgetConfig } =diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsxindex bad7f3b0c43..739fd669876 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetNestedFieldDropdownContent.tsx@@ -12,7 +12,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { IconChevronLeft, useIcons } from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -40,12 +39,9 @@ export const FieldWidgetNestedFieldDropdownContent = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { getIcon } = useIcons();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsxindex f4d032680e9..2f1b9b9438f 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/WidgetVisibilityOptionsList.tsx@@ -7,7 +7,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { MenuItemSelect } from 'twenty-ui/navigation';type WidgetVisibilityOptionsListProps = {@@ -23,12 +22,9 @@ export const WidgetVisibilityOptionsList = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const visibilityLabels = useVisibilityLabels();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsxindex d380fa357ab..4045fed4c8b 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarFieldDropdownContent.tsx@@ -9,7 +9,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useIcons } from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';@@ -38,12 +37,9 @@ export const RecordTableCalendarFieldDropdownContent = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { closeDropdown } = useCloseDropdown();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsxindex 3474c3ddf87..b0b23a02684 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableCalendarLayoutDropdownContent.tsx@@ -7,7 +7,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import {IconCalendarEvent,@@ -32,12 +31,9 @@ export const RecordTableCalendarLayoutDropdownContent = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { closeDropdown } = useCloseDropdown();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsxindex 29e240f5568..440700affc9 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx@@ -18,7 +18,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -40,12 +39,9 @@ export const RecordTableDataSourceDropdownContent = () => {DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { updateCurrentWidgetConfig } =diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsxindex d7680978650..fa58f0ec284 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableGroupByDropdownContent.tsx@@ -11,7 +11,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -49,12 +48,9 @@ export const RecordTableGroupByDropdownContent = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { closeDropdown } = useCloseDropdown();diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsxindex 6738238db43..5b6c47a3303 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent.tsx@@ -14,7 +14,6 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';type RecordTableLayoutDropdownContentProps = {pageLayoutId: string;@@ -39,12 +38,9 @@ export const RecordTableLayoutDropdownContent = ({DropdownComponentInstanceContext,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { closeDropdown } = useCloseDropdown();diff --git a/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecordPreviewItem.ts b/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecordPreviewItem.tsindex c9891955e32..0cac675de42 100644--- a/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecordPreviewItem.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecordPreviewItem.ts@@ -1,7 +1,6 @@import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelSelectableListId';import { type SearchResultItem } from '@/side-panel/pages/search/hooks/useSidePanelSearchRecords';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';// Follows the selection immediately so the card never unmounts between@@ -9,12 +8,9 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useexport const useSidePanelSearchRecordPreviewItem = (searchResultItems: SearchResultItem[],): SearchResultItem | null => {- const scopedSelectableListId = useWorkspaceSurfaceScopedComponentInstanceId(- SIDE_PANEL_SELECTABLE_LIST_ID,- );const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedSelectableListId,+ SIDE_PANEL_SELECTABLE_LIST_ID,);return searchResultItems.find((item) => item.id === selectedItemId) ?? null;diff --git a/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts b/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.tsindex d958ea4007a..3201fb5f936 100644--- a/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/workflow/hooks/useSidePanelWorkflowNavigation.ts@@ -1,5 +1,4 @@import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { getWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { sidePanelWorkflowIdComponentState } from '@/side-panel/pages/workflow/states/sidePanelWorkflowIdComponentState';import { sidePanelWorkflowRunIdComponentState } from '@/side-panel/pages/workflow/states/sidePanelWorkflowRunIdComponentState';@@ -88,11 +87,7 @@ export const useSidePanelWorkflowNavigation = () => {if (isDefined(initialStepTab)) {store.set(activeTabIdComponentState.atomFamily({- instanceId: getWorkspaceSurfaceScopedComponentInstanceId({- componentInstanceId: initialStepTab.tabListComponentId,- surfaceType: 'side-panel',- surfaceInstanceId: pageId,- }),+ instanceId: initialStepTab.tabListComponentId,}),initialStepTab.tabId,);diff --git a/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsxindex 305e1170ffd..d041bb2cbfd 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/MultiSelectInput.tsx@@ -16,7 +16,6 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';import { type SelectOption } from 'twenty-ui/input';@@ -49,14 +48,9 @@ export const MultiSelectInput = ({selectableListComponentInstanceId,);- const scopedSelectableListComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(- selectableListComponentInstanceId,- );-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedSelectableListComponentInstanceId,+ selectableListComponentInstanceId,);const [searchFilter, setSearchFilter] = useState('');diff --git a/packages/twenty-front/src/modules/ui/field/input/components/__tests__/AddressInput.surfaceScope.test.tsx b/packages/twenty-front/src/modules/ui/field/input/components/__tests__/AddressInput.surfaceScope.test.tsxnew file mode 100644index 00000000000..cdbe1dc7a8a--- /dev/null+++ b/packages/twenty-front/src/modules/ui/field/input/components/__tests__/AddressInput.surfaceScope.test.tsx@@ -0,0 +1,84 @@+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { type ReactNode } from 'react';++import { AddressInput } from '@/ui/field/input/components/AddressInput';+import {+ WorkspaceSurfaceContext,+ type WorkspaceSurfaceContextValue,+} from '@/ui/layout/contexts/WorkspaceSurfaceContext';+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';++const SIDE_PANEL_SURFACE: WorkspaceSurfaceContextValue = {+ type: 'side-panel',+ instanceId: 'side-panel-page',+ ownsRouteLocation: true,+};++const EMPTY_ADDRESS = {+ addressStreet1: '',+ addressStreet2: null,+ addressCity: null,+ addressState: null,+ addressCountry: null,+ addressPostcode: null,+ addressLat: null,+ addressLng: null,+};++const renderAddressInput = (surface?: WorkspaceSurfaceContextValue) => {+ const onChange = jest.fn();+ const onClickOutside = jest.fn();+ const BaseWrapper = getJestMetadataAndApolloMocksWrapper({});++ const Wrapper = ({ children }: { children: ReactNode }) => (+ <I18nProvider i18n={i18n}>+ <BaseWrapper>+ {surface ? (+ <WorkspaceSurfaceContext.Provider value={surface}>+ {children}+ </WorkspaceSurfaceContext.Provider>+ ) : (+ children+ )}+ </BaseWrapper>+ </I18nProvider>+ );++ render(+ <AddressInput+ instanceId="address-input"+ value={EMPTY_ADDRESS}+ onTab={jest.fn()}+ onShiftTab={jest.fn()}+ onEnter={jest.fn()}+ onEscape={jest.fn()}+ onClickOutside={onClickOutside}+ onChange={onChange}+ />,+ { wrapper: Wrapper },+ );++ return { onChange, onClickOutside };+};++describe('AddressInput country picker on a side panel surface', () => {+ it.each([+ ['main', undefined],+ ['side-panel', SIDE_PANEL_SURFACE],+ ])('selects a country with a click on %s', async (_, surface) => {+ const user = userEvent.setup();+ const { onChange, onClickOutside } = renderAddressInput(surface);++ await user.click(screen.getByText('No country'));+ await user.type(screen.getByPlaceholderText('Search'), 'France');+ await user.click(await screen.findByText('France'));++ expect(onChange).toHaveBeenCalledWith(+ expect.objectContaining({ addressCountry: 'France' }),+ );+ expect(onClickOutside).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsxindex f4cb6b871ad..3f75d3fdbd8 100644--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx@@ -42,7 +42,6 @@ import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/conteximport { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { arrayToChunks } from '~/utils/array/arrayToChunks';export type IconPickerProps = {@@ -412,9 +411,7 @@ export const IconPicker = ({);const iconColorPickerDropdownId = `${dropdownId}-icon-color-picker`;-- const selectableListInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId('icon-list');+ const selectableListInstanceId = `${dropdownId}-icon-list`;const focusedIconKey =useAtomComponentStateValue(diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsxindex 8077921c45f..723526a1d78 100644--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx@@ -18,7 +18,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';import { type IconComponent } from 'twenty-ui/icon';@@ -162,12 +161,9 @@ export const Select = <Value extends SelectValue>({const selectableItemIdArray = filteredOptions.map((option) => option.label);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const { setSelectedItemId } = useSelectableList(dropdownId);diff --git a/packages/twenty-front/src/modules/ui/input/components/__tests__/Select.surfaceScope.test.tsx b/packages/twenty-front/src/modules/ui/input/components/__tests__/Select.surfaceScope.test.tsxnew file mode 100644index 00000000000..861ded0d6c7--- /dev/null+++ b/packages/twenty-front/src/modules/ui/input/components/__tests__/Select.surfaceScope.test.tsx@@ -0,0 +1,78 @@+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { createStore, Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';++import { Select } from '@/ui/input/components/Select';+import {+ WorkspaceSurfaceContext,+ type WorkspaceSurfaceContextValue,+} from '@/ui/layout/contexts/WorkspaceSurfaceContext';++const SIDE_PANEL_SURFACE: WorkspaceSurfaceContextValue = {+ type: 'side-panel',+ instanceId: 'side-panel-page',+ ownsRouteLocation: true,+};++const renderSelect = (surface?: WorkspaceSurfaceContextValue) => {+ const onChange = jest.fn();++ const Wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={createStore()}>+ {surface ? (+ <WorkspaceSurfaceContext.Provider value={surface}>+ {children}+ </WorkspaceSurfaceContext.Provider>+ ) : (+ children+ )}+ </JotaiProvider>+ );++ render(+ <Select+ dropdownId="select-dropdown"+ options={[+ { label: 'Option A', value: 'a' },+ { label: 'Option B', value: 'b' },+ ]}+ value="a"+ onChange={onChange}+ />,+ { wrapper: Wrapper },+ );++ return { onChange };+};++describe('Select on a side panel surface', () => {+ it.each([+ ['main', undefined],+ ['side-panel', SIDE_PANEL_SURFACE],+ ])('selects an option with the keyboard on %s', async (_, surface) => {+ const user = userEvent.setup();+ const { onChange } = renderSelect(surface);++ await user.click(screen.getByText('Option A'));+ expect(await screen.findByText('Option B')).toBeInTheDocument();++ await user.keyboard('{ArrowDown}');+ await user.keyboard('{Enter}');++ expect(onChange).toHaveBeenCalledWith('b');+ });++ it.each([+ ['main', undefined],+ ['side-panel', SIDE_PANEL_SURFACE],+ ])('selects an option with a click on %s', async (_, surface) => {+ const user = userEvent.setup();+ const { onChange } = renderSelect(surface);++ await user.click(screen.getByText('Option A'));+ await user.click(await screen.findByText('Option B'));++ expect(onChange).toHaveBeenCalledWith('b');+ });+});diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsxindex 8142fa96abe..57acd5856d9 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx@@ -12,7 +12,6 @@ import { dropdownMaxWidthComponentState } from '@/ui/layout/dropdown/states/inteimport { dropdownYPositionComponentState } from '@/ui/layout/dropdown/states/internal/dropdownYPositionComponentState';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { type DropdownOffset } from '@/ui/layout/dropdown/types/DropdownOffset';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { type GlobalHotkeysConfig } from '@/ui/utilities/hotkey/types/GlobalHotkeysConfig';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';@@ -87,12 +86,9 @@ export const Dropdown = ({disableClickForClickableComponent = false,middlewareBoundaryPadding = {},}: DropdownProps) => {- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,- scopedDropdownId,+ dropdownId,);const { toggleDropdown } = useToggleDropdown();@@ -111,17 +107,17 @@ export const Dropdown = ({const setDropdownMaxHeight = useSetAtomComponentState(dropdownMaxHeightComponentState,- scopedDropdownId,+ dropdownId,);const setDropdownMaxWidth = useSetAtomComponentState(dropdownMaxWidthComponentState,- scopedDropdownId,+ dropdownId,);const setDropdownYPosition = useSetAtomComponentState(dropdownYPositionComponentState,- scopedDropdownId,+ dropdownId,);const isMobile = useIsMobile();@@ -181,27 +177,27 @@ export const Dropdown = ({event.preventDefault();toggleDropdown({- dropdownComponentInstanceIdFromProps: scopedDropdownId,+ dropdownComponentInstanceIdFromProps: dropdownId,globalHotkeysConfig,});},[globalHotkeysConfig,toggleDropdown,- scopedDropdownId,+ dropdownId,disableClickForClickableComponent,],);return (<DropdownComponentInstanceContext.Provider- value={{ instanceId: scopedDropdownId }}+ value={{ instanceId: dropdownId }}>{isDefined(clickableComponent) ? (<StyledClickableComponentref={refs.setReference}onClick={handleClickableComponentClick}- aria-controls={`${scopedDropdownId}-options`}+ aria-controls={`${dropdownId}-options`}aria-expanded={isDropdownOpen}aria-haspopup={true}role="button"@@ -216,7 +212,7 @@ export const Dropdown = ({<DropdownInternalContainerfloatingStyles={floatingStyles}dropdownComponents={dropdownComponents}- dropdownId={scopedDropdownId}+ dropdownId={dropdownId}dropdownPlacement={placement}floatingUiRefs={refs}hotkey={hotkey}diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useCloseDropdown.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useCloseDropdown.tsindex 3e3f5bd8393..c37d5bf1b57 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useCloseDropdown.ts+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useCloseDropdown.ts@@ -5,7 +5,6 @@ import { useGoBackToPreviousDropdownFocusId } from '@/ui/layout/dropdown/hooks/uimport { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';-import { useWorkspaceSurfaceScopedComponentInstanceIdResolver } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';import { useStore } from 'jotai';import { isDefined } from 'twenty-shared/utils';@@ -18,26 +17,20 @@ export const useCloseDropdown = () => {useRemoveFocusItemFromFocusStackById();const store = useStore();- const resolveComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceIdResolver();const dropdownComponentInstanceIdFromContext =useAvailableComponentInstanceId(DropdownComponentInstanceContext);const closeDropdown = useCallback((dropdownComponentInstanceIdFromProps?: string) => {- const rawDropdownComponentInstanceId =+ const dropdownComponentInstanceId =dropdownComponentInstanceIdFromProps ??dropdownComponentInstanceIdFromContext;- if (!isDefined(rawDropdownComponentInstanceId)) {+ if (!isDefined(dropdownComponentInstanceId)) {throw new Error('Dropdown component instance ID is not defined');}- const dropdownComponentInstanceId = resolveComponentInstanceId(- rawDropdownComponentInstanceId,- );-const isDropdownOpen = store.get(isDropdownOpenComponentState.atomFamily({instanceId: dropdownComponentInstanceId,@@ -63,7 +56,6 @@ export const useCloseDropdown = () => {removeFocusItemFromFocusStackById,goBackToPreviousDropdownFocusId,dropdownComponentInstanceIdFromContext,- resolveComponentInstanceId,store,],);diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useOpenDropdown.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useOpenDropdown.tsindex 537a3ec4be1..6f56194baa3 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useOpenDropdown.ts+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useOpenDropdown.ts@@ -4,7 +4,6 @@ import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceIdResolver } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { type GlobalHotkeysConfig } from '@/ui/utilities/hotkey/types/GlobalHotkeysConfig';@@ -23,26 +22,20 @@ export const useOpenDropdown = () => {const { setActiveDropdownFocusIdAndMemorizePrevious } =useSetActiveDropdownFocusIdAndMemorizePrevious();const store = useStore();- const resolveComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceIdResolver();const dropdownComponentInstanceIdFromContext =useAvailableComponentInstanceId(DropdownComponentInstanceContext);const openDropdown = useCallback((args?: OpenDropdownArgs | null | undefined) => {- const rawDropdownComponentInstanceId =+ const dropdownComponentInstanceId =args?.dropdownComponentInstanceIdFromProps ??dropdownComponentInstanceIdFromContext;- if (!isDefined(rawDropdownComponentInstanceId)) {+ if (!isDefined(dropdownComponentInstanceId)) {throw new Error('Dropdown component instance ID is not defined');}- const dropdownComponentInstanceId = resolveComponentInstanceId(- rawDropdownComponentInstanceId,- );-store.set(isDropdownOpenComponentState.atomFamily({instanceId: dropdownComponentInstanceId,@@ -72,7 +65,6 @@ export const useOpenDropdown = () => {pushFocusItemToFocusStack,setActiveDropdownFocusIdAndMemorizePrevious,dropdownComponentInstanceIdFromContext,- resolveComponentInstanceId,store,],);diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useToggleDropdown.ts b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useToggleDropdown.tsindex abddbbb2aaa..ae1a9fd5b61 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useToggleDropdown.ts+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/hooks/useToggleDropdown.ts@@ -4,7 +4,6 @@ import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceIdResolver } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { type GlobalHotkeysConfig } from '@/ui/utilities/hotkey/types/GlobalHotkeysConfig';import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';import { useStore } from 'jotai';@@ -23,23 +22,17 @@ export const useToggleDropdown = () => {const { closeDropdown } = useCloseDropdown();const store = useStore();- const resolveComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceIdResolver();const toggleDropdown = useCallback((args?: ToggleDropdownArgs | null | undefined) => {- const rawDropdownComponentInstanceId =+ const dropdownComponentInstanceId =args?.dropdownComponentInstanceIdFromProps ??dropdownComponentInstanceIdFromContext;- if (!isDefined(rawDropdownComponentInstanceId)) {+ if (!isDefined(dropdownComponentInstanceId)) {throw new Error('Dropdown component instance ID is not defined');}- const dropdownComponentInstanceId = resolveComponentInstanceId(- rawDropdownComponentInstanceId,- );-const isDropdownOpen = store.get(isDropdownOpenComponentState.atomFamily({instanceId: dropdownComponentInstanceId,@@ -59,7 +52,6 @@ export const useToggleDropdown = () => {closeDropdown,openDropdown,dropdownComponentInstanceIdFromContext,- resolveComponentInstanceId,store,],);diff --git a/packages/twenty-front/src/modules/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId.ts b/packages/twenty-front/src/modules/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId.tsindex 1ff761188e6..3e105974d2b 100644--- a/packages/twenty-front/src/modules/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId.ts+++ b/packages/twenty-front/src/modules/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId.ts@@ -1,6 +1,5 @@import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';import { isNonEmptyString } from '@sniptt/guards';-import { useCallback } from 'react';export const getWorkspaceSurfaceScopedComponentInstanceId = ({componentInstanceId,@@ -24,6 +23,12 @@ export const getWorkspaceSurfaceScopedComponentInstanceId = ({return `${componentInstanceId}-${surfaceInstanceId}`;};+// Only for the place that creates an id for something the same page instance+// can mount once per workspace surface (a record index, a page layout, a+// settings tab bar). The id it returns is then passed around and used verbatim:+// Dropdown, Modal, SelectableList, TabList and ScrollWrapper never rewrite the+// id they are given, so a reader holding the same id always reads the same+// state.export const useWorkspaceSurfaceScopedComponentInstanceId = (componentInstanceId: string,) => {@@ -35,17 +40,3 @@ export const useWorkspaceSurfaceScopedComponentInstanceId = (surfaceInstanceId: workspaceSurface.instanceId,});};--export const useWorkspaceSurfaceScopedComponentInstanceIdResolver = () => {- const workspaceSurface = useWorkspaceSurface();-- return useCallback(- (componentInstanceId: string) =>- getWorkspaceSurfaceScopedComponentInstanceId({- componentInstanceId,- surfaceType: workspaceSurface.type,- surfaceInstanceId: workspaceSurface.instanceId,- }),- [workspaceSurface.instanceId, workspaceSurface.type],- );-};diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsxindex 475a44e1137..85243daa00b 100644--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ModalStatefulWrapper.tsx@@ -7,7 +7,6 @@ import { useModalContainer } from '@/ui/layout/modal/contexts/ModalContainerContimport { useModal } from '@/ui/layout/modal/hooks/useModal';import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';import { type ModalStatefulWrapperProps } from '@/ui/layout/modal/types/ModalStatefulWrapperProps';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -33,8 +32,6 @@ export const ModalStatefulWrapper = ({autoHeight,width,}: ModalStatefulWrapperProps) => {- const scopedModalInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(modalInstanceId);const isMobile = useIsMobile();const modalRef = useRef<HTMLDivElement>(null);const { container } = useModalContainer();@@ -44,7 +41,7 @@ export const ModalStatefulWrapper = ({const isModalOpened = useAtomComponentStateValue(isModalOpenedComponentState,- scopedModalInstanceId,+ modalInstanceId,);const { closeModal } = useModal();@@ -52,13 +49,13 @@ export const ModalStatefulWrapper = ({const handleClose = () => {onClose?.();if (shouldCloseModalOnClickOutsideOrEscape) {- closeModal(scopedModalInstanceId);+ closeModal(modalInstanceId);}};return (<ModalComponentInstanceContext.Provider- value={{ instanceId: scopedModalInstanceId }}+ value={{ instanceId: modalInstanceId }}><ClickOutsideListenerContext.Providervalue={{@@ -67,7 +64,7 @@ export const ModalStatefulWrapper = ({>{isModalOpened && (<ModalHotkeysAndClickOutsideEffect- modalInstanceId={scopedModalInstanceId}+ modalInstanceId={modalInstanceId}modalRef={modalRef}onEnter={onEnter}isClosable={isClosable}diff --git a/packages/twenty-front/src/modules/ui/layout/modal/hooks/useModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/hooks/useModal.tsxindex ad869c9bf4e..e5cb023e6e4 100644--- a/packages/twenty-front/src/modules/ui/layout/modal/hooks/useModal.tsx+++ b/packages/twenty-front/src/modules/ui/layout/modal/hooks/useModal.tsx@@ -2,7 +2,6 @@ import { useCallback } from 'react';import { useStore } from 'jotai';import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceIdResolver } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';@@ -13,15 +12,12 @@ export const useModal = () => {useRemoveFocusItemFromFocusStackById();const store = useStore();- const resolveComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceIdResolver();const closeModal = useCallback((modalInstanceId: string) => {- const scopedModalInstanceId = resolveComponentInstanceId(modalInstanceId);const isModalOpen = store.get(isModalOpenedComponentState.atomFamily({- instanceId: scopedModalInstanceId,+ instanceId: modalInstanceId,}),);@@ -30,25 +26,24 @@ export const useModal = () => {}removeFocusItemFromFocusStackById({- focusId: scopedModalInstanceId,+ focusId: modalInstanceId,});store.set(isModalOpenedComponentState.atomFamily({- instanceId: scopedModalInstanceId,+ instanceId: modalInstanceId,}),false,);},- [store, removeFocusItemFromFocusStackById, resolveComponentInstanceId],+ [store, removeFocusItemFromFocusStackById],);const openModal = useCallback((modalInstanceId: string) => {- const scopedModalInstanceId = resolveComponentInstanceId(modalInstanceId);const isModalOpened = store.get(isModalOpenedComponentState.atomFamily({- instanceId: scopedModalInstanceId,+ instanceId: modalInstanceId,}),);@@ -58,16 +53,16 @@ export const useModal = () => {store.set(isModalOpenedComponentState.atomFamily({- instanceId: scopedModalInstanceId,+ instanceId: modalInstanceId,}),true,);pushFocusItemToFocusStack({- focusId: scopedModalInstanceId,+ focusId: modalInstanceId,component: {type: FocusComponentType.MODAL,- instanceId: scopedModalInstanceId,+ instanceId: modalInstanceId,},globalHotkeysConfig: {enableGlobalHotkeysWithModifiers: false,@@ -75,15 +70,14 @@ export const useModal = () => {},});},- [store, pushFocusItemToFocusStack, resolveComponentInstanceId],+ [store, pushFocusItemToFocusStack],);const toggleModal = useCallback((modalInstanceId: string) => {- const scopedModalInstanceId = resolveComponentInstanceId(modalInstanceId);const isModalOpen = store.get(isModalOpenedComponentState.atomFamily({- instanceId: scopedModalInstanceId,+ instanceId: modalInstanceId,}),);@@ -93,7 +87,7 @@ export const useModal = () => {openModal(modalInstanceId);}},- [store, closeModal, openModal, resolveComponentInstanceId],+ [store, closeModal, openModal],);return {diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsxindex d8e5d3d6a35..27d0422632b 100644--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx@@ -6,7 +6,6 @@ import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-limport { SelectableListContextProvider } from '@/ui/layout/selectable-list/states/contexts/SelectableListContext';import { selectableItemIdsComponentState } from '@/ui/layout/selectable-list/states/selectableItemIdsComponentState';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useStore } from 'jotai';import { isDefined } from 'twenty-shared/utils';@@ -31,19 +30,17 @@ export const SelectableList = ({focusId,shouldPreselectFirstItem,}: SelectableListProps) => {- const scopedSelectableListInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(selectableListInstanceId);- useSelectableListHotKeys(scopedSelectableListInstanceId, focusId, onSelect);+ useSelectableListHotKeys(selectableListInstanceId, focusId, onSelect);const store = useStore();const { resetSelectedItem, setSelectedItemId } = useSelectableList(- scopedSelectableListInstanceId,+ selectableListInstanceId,);const setSelectableItemIds = useSetAtomComponentState(selectableItemIdsComponentState,- scopedSelectableListInstanceId,+ selectableListInstanceId,);useEffect(() => {@@ -76,7 +73,7 @@ export const SelectableList = ({const selectedItemId = store.get(selectedItemIdComponentState.atomFamily({- instanceId: scopedSelectableListInstanceId,+ instanceId: selectableListInstanceId,}),);@@ -86,7 +83,7 @@ export const SelectableList = ({}, [selectableItemIdArray,selectableItemIdMatrix,- scopedSelectableListInstanceId,+ selectableListInstanceId,setSelectableItemIds,shouldPreselectFirstItem,resetSelectedItem,@@ -97,7 +94,7 @@ export const SelectableList = ({return (<SelectableListComponentInstanceContext.Providervalue={{- instanceId: scopedSelectableListInstanceId,+ instanceId: selectableListInstanceId,}}><SelectableListContextProvider value={{ focusId }}>diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.surfaceScope.test.tsx b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.surfaceScope.test.tsxdeleted file mode 100644index 9d1de64b02e..00000000000--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.surfaceScope.test.tsx+++ /dev/null@@ -1,69 +0,0 @@-import { act, renderHook } from '@testing-library/react';-import { createStore, Provider as JotaiProvider } from 'jotai';-import { type ReactNode } from 'react';--import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';--const DROPDOWN_ID = 'sort-dropdown';-const SIDE_PANEL_INSTANCE_ID = 'side-panel-page';--const buildWrapper =- (store: ReturnType<typeof createStore>) =>- ({ children }: { children: ReactNode }) => (- <JotaiProvider store={store}>- <WorkspaceSurfaceContext.Provider- value={{- type: 'side-panel',- instanceId: SIDE_PANEL_INSTANCE_ID,- ownsRouteLocation: false,- }}- >- {children}- </WorkspaceSurfaceContext.Provider>- </JotaiProvider>- );--// useSelectableList scopes the id it is handed to the current surface before-// writing. A component that reads selectedItemIdComponentState directly with-// the raw id it passed in would look at a different atom inside a side panel,-// so such readers scope the id the same way first.-describe('useSelectableList surface scoping', () => {- it('writes under the surface-scoped id, which a scoped reader sees and a raw reader does not', () => {- const store = createStore();- const wrapper = buildWrapper(store);-- const { result: list } = renderHook(() => useSelectableList(DROPDOWN_ID), {- wrapper,- });-- act(() => {- list.current.setSelectedItemId('option-b');- });-- const { result: scopedRead } = renderHook(- () => {- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(DROPDOWN_ID);-- return useAtomComponentStateValue(- selectedItemIdComponentState,- scopedDropdownId,- );- },- { wrapper },- );-- const { result: rawRead } = renderHook(- () =>- useAtomComponentStateValue(selectedItemIdComponentState, DROPDOWN_ID),- { wrapper },- );-- expect(scopedRead.current).toBe('option-b');- expect(rawRead.current).toBeNull();- });-});diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.tsindex 92a9c064c74..84e4920613d 100644--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts@@ -4,18 +4,13 @@ import { useStore } from 'jotai';import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-list/states/contexts/SelectableListComponentInstanceContext';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { isDefined } from 'twenty-shared/utils';export const useSelectableList = (instanceId?: string) => {- const unscopedSelectableListInstanceId =- useAvailableComponentInstanceIdOrThrow(- SelectableListComponentInstanceContext,- instanceId,- );- const selectableListInstanceId = useWorkspaceSurfaceScopedComponentInstanceId(- unscopedSelectableListInstanceId,+ const selectableListInstanceId = useAvailableComponentInstanceIdOrThrow(+ SelectableListComponentInstanceContext,+ instanceId,);const store = useStore();diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsxindex b994d35cdb5..87954ec844b 100644--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx@@ -10,7 +10,6 @@ import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/conimport { type TabListProps } from '@/ui/layout/tab-list/types/TabListProps';import { NodeDimension } from '@/ui/utilities/dimensions/components/NodeDimension';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { styled } from '@linaria/react';@@ -90,12 +89,10 @@ export const TabList = ({const navigate = useNavigate();const workspaceSurface = useWorkspaceSurface();const isMobile = useIsMobile();- const scopedComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);const [activeTabId, setActiveTabId] = useAtomComponentState(activeTabIdComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const activeTabExists = visibleTabs.some((tab) => tab.id === activeTabId);@@ -125,7 +122,7 @@ export const TabList = ({isScrollable: shouldScrollTabs,});- const dropdownId = `tab-overflow-${scopedComponentInstanceId}`;+ const dropdownId = `tab-overflow-${componentInstanceId}`;const { closeDropdown } = useCloseDropdown();const isActiveTabHidden = useMemo(() => {@@ -178,7 +175,7 @@ export const TabList = ({return (<TabListComponentInstanceContext.Provider- value={{ instanceId: scopedComponentInstanceId }}+ value={{ instanceId: componentInstanceId }}><><TabListFromUrlOptionalEffect tabListIds={tabs.map((tab) => tab.id)} />diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsxindex 6df22cac964..9ea5f3ad5dd 100644--- a/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx+++ b/packages/twenty-front/src/modules/ui/layout/table/components/SortableTableHeader.tsx@@ -4,7 +4,6 @@ import { TableHeader } from '@/ui/layout/table/components/TableHeader';import { TableHeaderText } from '@/ui/layout/table/components/TableHeaderText';import { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFieldByTableFamilyState';import { type TableSortValue } from '@/ui/layout/table/types/TableSortValue';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';import { IconArrowDown, IconArrowUp, type IconComponent } from 'twenty-ui/icon';@@ -30,16 +29,15 @@ export const SortableTableHeader = ({initialSort?: TableSortValue;Icon?: IconComponent;}) => {- const scopedTableId = useWorkspaceSurfaceScopedComponentInstanceId(tableId);const sortedFieldByTable = useAtomFamilyStateValue(sortedFieldByTableFamilyState,{- tableId: scopedTableId,+ tableId: tableId,},);const setSortedFieldByTable = useSetAtomFamilyState(sortedFieldByTableFamilyState,- { tableId: scopedTableId },+ { tableId: tableId },);const sortValue = sortedFieldByTable ?? initialSort;diff --git a/packages/twenty-front/src/modules/ui/layout/table/hooks/useSortedArray.ts b/packages/twenty-front/src/modules/ui/layout/table/hooks/useSortedArray.tsindex 020f137dfed..844e74668b3 100644--- a/packages/twenty-front/src/modules/ui/layout/table/hooks/useSortedArray.ts+++ b/packages/twenty-front/src/modules/ui/layout/table/hooks/useSortedArray.ts@@ -1,6 +1,5 @@import { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFieldByTableFamilyState';import { type TableMetadata } from '@/ui/layout/table/types/TableMetadata';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { useMemo } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -9,13 +8,10 @@ export const useSortedArray = <T>(arrayToSort: T[],tableMetadata: TableMetadata<T>,): T[] => {- const scopedTableId = useWorkspaceSurfaceScopedComponentInstanceId(- tableMetadata.tableId,- );const sortedFieldByTable = useAtomFamilyStateValue(sortedFieldByTableFamilyState,{- tableId: scopedTableId,+ tableId: tableMetadata.tableId,},);diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsxindex 2523ec7d1aa..2d6e99ab445 100644--- a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx@@ -5,7 +5,6 @@ import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/staimport { scrollWrapperScrollBottomComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollBottomComponentState';import { scrollWrapperScrollLeftComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollLeftComponentState';import { scrollWrapperScrollTopComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollTopComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { getScrollBottomInPx } from '@/ui/utilities/scroll/utils/getScrollBottomInPx';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';@@ -39,22 +38,19 @@ export const ScrollWrapper = ({defaultEnableYScroll = true,autoHeight = false,}: ScrollWrapperProps) => {- const scopedComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);-const setScrollWrapperScrollTop = useSetAtomComponentState(scrollWrapperScrollTopComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const setScrollWrapperScrollLeft = useSetAtomComponentState(scrollWrapperScrollLeftComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const setScrollWrapperScrollBottom = useSetAtomComponentState(scrollWrapperScrollBottomComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const handleScroll = (event: React.UIEvent<HTMLDivElement>) => {@@ -66,14 +62,14 @@ export const ScrollWrapper = ({return (<ScrollWrapperComponentInstanceContext.Provider- value={{ instanceId: scopedComponentInstanceId }}+ value={{ instanceId: componentInstanceId }}><ScrollWrapperInitEffectdefaultEnableXScroll={defaultEnableXScroll}defaultEnableYScroll={defaultEnableYScroll}/><StyledScrollWrapper- id={`scroll-wrapper-${scopedComponentInstanceId}`}+ id={`scroll-wrapper-${componentInstanceId}`}className={className}autoHeight={autoHeight}onScroll={handleScroll}diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.tsindex 27b8d325b64..3ee9e88955c 100644--- a/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.ts+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/hooks/useScrollRestoration.ts@@ -1,6 +1,5 @@import { SCROLL_RESTORATION_TOP_THRESHOLD_PX } from '@/ui/utilities/scroll/constants/ScrollRestorationTopThreshold';import { scrollWrapperScrollTopComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollTopComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useCallback, useEffect, useState } from 'react';import { useLocation } from 'react-router-dom';@@ -8,14 +7,12 @@ import { isDefined } from 'twenty-shared/utils';export const useScrollRestoration = (componentInstanceId: string) => {const location = useLocation();- const scopedComponentInstanceId =- useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);- const storageKey = `scroll-${location.pathname}-${scopedComponentInstanceId}`;+ const storageKey = `scroll-${location.pathname}-${componentInstanceId}`;const [isRestoring, setIsRestoring] = useState(false);const scrollWrapperScrollTop = useAtomComponentStateValue(scrollWrapperScrollTopComponentState,- scopedComponentInstanceId,+ componentInstanceId,);const restoreScrollPosition = useCallback(@@ -59,7 +56,7 @@ export const useScrollRestoration = (componentInstanceId: string) => {useEffect(() => {const savedPosition = sessionStorage.getItem(storageKey);- const expectedElementId = `scroll-wrapper-${scopedComponentInstanceId}`;+ const expectedElementId = `scroll-wrapper-${componentInstanceId}`;if (!isDefined(savedPosition)) {return;@@ -76,7 +73,7 @@ export const useScrollRestoration = (componentInstanceId: string) => {}, [location.pathname,storageKey,- scopedComponentInstanceId,+ componentInstanceId,restoreScrollPosition,]);};diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow.tsindex 6e7ab1b01cd..64b6b165fe6 100644--- a/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow.ts+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow.ts@@ -2,12 +2,12 @@ import { useComponentInstanceStateContext } from '@/ui/utilities/state/componentimport { type ComponentInstanceStateContext } from '@/ui/utilities/state/component-state/types/ComponentInstanceStateContext';import { isNonEmptyString } from '@sniptt/guards';-// Returns the id exactly as provided. Surface isolation is opted into where an-// id is created (useWorkspaceSurfaceScopedComponentInstanceId at the provider),-// never here: this hook cannot tell state meant to be shared across surfaces-// (a side panel reading the main diagram's flow) from state that must be-// isolated, and ids also escape into DOM anchors that are looked up by the-// exact string a provider rendered.+// Returns the id exactly as provided. An id is made unique where it is created+// (from the record, page, view or step it belongs to), never rewritten here:+// this hook cannot tell state meant to be shared across surfaces (a side panel+// reading the main diagram's flow) from state that must be isolated, and ids+// also escape into DOM anchors that are looked up by the exact string a+// provider rendered.export const useAvailableComponentInstanceIdOrThrow = <T extends { instanceId: string },>(diff --git a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsxindex dd26d7e5569..63877d74580 100644--- a/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx+++ b/packages/twenty-front/src/modules/views/advanced-filter-chip/components/AdvancedFilterChip.tsx@@ -50,7 +50,7 @@ export const AdvancedFilterChip = () => {});const handleRemoveClick = () => {- closeDropdown(ViewBarFilterDropdownIds.ADVANCED);+ closeDropdown();const viewFilterGroupIds = currentRecordFilterGroups.map((recordFilterGroup) => recordFilterGroup.id,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 fbfa3df0c6f..b31ee851d0c 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@@ -5,7 +5,8 @@ import { useSetAdvancedFilterDropdownStates } from '@/object-record/advanced-filimport { rootLevelRecordFilterGroupComponentSelector } from '@/object-record/advanced-filter/states/rootLevelRecordFilterGroupComponentSelector';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { AdvancedFilterChip } from '@/views/advanced-filter-chip/components/AdvancedFilterChip';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getViewBarAdvancedFilterDropdownId } from '@/views/utils/getViewBarAdvancedFilterDropdownId';import { isDefined } from 'twenty-shared/utils';export const AdvancedFilterDropdownButton = () => {@@ -15,6 +16,7 @@ export const AdvancedFilterDropdownButton = () => {const { setAdvancedFilterDropdownStates } =useSetAdvancedFilterDropdownStates();+ const { recordIndexId } = useRecordIndexContextOrThrow();const handleOpenAdvancedFilterDropdown = () => {setAdvancedFilterDropdownStates();@@ -26,7 +28,7 @@ export const AdvancedFilterDropdownButton = () => {return (<Dropdown- dropdownId={ViewBarFilterDropdownIds.ADVANCED}+ dropdownId={getViewBarAdvancedFilterDropdownId(recordIndexId)}clickableComponent={<AdvancedFilterChip />}dropdownComponents={<AdvancedFilterRootRecordFilterGroup />}dropdownOffset={{ y: 8, x: 0 }}diff --git a/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownButton.tsx b/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownButton.tsxindex 4e4f450f52d..dfc41a9fedf 100644--- a/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownButton.tsx+++ b/packages/twenty-front/src/modules/views/components/AnyFieldSearchDropdownButton.tsx@@ -4,20 +4,23 @@ import { DROPDOWN_OFFSET_Y } from '@/ui/layout/dropdown/constants/DropdownOffsetimport { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { AnyFieldSearchChip } from '@/views/components/AnyFieldSearchChip';import { AnyFieldSearchDropdownContent } from '@/views/components/AnyFieldSearchDropdownContent';-import { ANY_FIELD_SEARCH_DROPDOWN_ID } from '@/views/constants/AnyFieldSearchDropdownId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getAnyFieldSearchDropdownId } from '@/views/utils/getAnyFieldSearchDropdownId';export const AnyFieldSearchDropdownButton = () => {const { openDropdown } = useOpenDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();+ const dropdownId = getAnyFieldSearchDropdownId(recordIndexId);const handleOpenAnyFieldSearchDropdown = () => {openDropdown({- dropdownComponentInstanceIdFromProps: ANY_FIELD_SEARCH_DROPDOWN_ID,+ dropdownComponentInstanceIdFromProps: dropdownId,});};return (<Dropdown- dropdownId={ANY_FIELD_SEARCH_DROPDOWN_ID}+ dropdownId={dropdownId}clickableComponent={<AnyFieldSearchChip />}dropdownComponents={<AnyFieldSearchDropdownContent />}dropdownOffset={{ y: DROPDOWN_OFFSET_Y, x: 0 }}diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsxindex 2fd7512b182..89ff3219a4d 100644--- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx+++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx@@ -8,6 +8,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { UPDATE_VIEW_BUTTON_DROPDOWN_ID } from '@/views/constants/UpdateViewButtonDropdownId';import { useHasFiltersInQueryParams } from '@/views/hooks/internal/useHasFiltersInQueryParams';import { useAreViewFilterGroupsDifferentFromRecordFilterGroups } from '@/views/hooks/useAreViewFilterGroupsDifferentFromRecordFilterGroups';@@ -17,7 +18,7 @@ import { useCanPersistViewChanges } from '@/views/hooks/useCanPersistViewChangesimport { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useIsViewAnyFieldFilterDifferentFromCurrentAnyFieldFilter } from '@/views/hooks/useIsViewAnyFieldFilterDifferentFromCurrentAnyFieldFilter';import { useSaveCurrentViewFiltersAndSorts } from '@/views/hooks/useSaveCurrentViewFiltersAndSorts';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';+import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';import { t } from '@lingui/core/macro';@@ -44,6 +45,8 @@ export const UpdateViewButtonGroup = () => {);const { closeDropdown: closeUpdateViewButtonDropdown } = useCloseDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();+ const updateViewButtonDropdownId = `${UPDATE_VIEW_BUTTON_DROPDOWN_ID}-${recordIndexId}`;const { openDropdown: openViewPickerDropdown } = useOpenDropdown();const { currentView } = useGetCurrentViewOnly();@@ -57,12 +60,13 @@ export const UpdateViewButtonGroup = () => {}openViewPickerDropdown({- dropdownComponentInstanceIdFromProps: VIEW_PICKER_DROPDOWN_ID,+ dropdownComponentInstanceIdFromProps:+ getViewPickerDropdownId(recordIndexId),});setViewPickerReferenceViewId(contextStoreCurrentViewId);setViewPickerMode('create-from-current');- closeUpdateViewButtonDropdown(UPDATE_VIEW_BUTTON_DROPDOWN_ID);+ closeUpdateViewButtonDropdown(updateViewButtonDropdownId);};const handleCreateViewClick = () => {@@ -113,7 +117,7 @@ export const UpdateViewButtonGroup = () => {disabled={!canPersistChanges}/><Dropdown- dropdownId={UPDATE_VIEW_BUTTON_DROPDOWN_ID}+ dropdownId={updateViewButtonDropdownId}clickableComponent={<IconButtonsize="small"diff --git a/packages/twenty-front/src/modules/views/components/ViewBar.tsx b/packages/twenty-front/src/modules/views/components/ViewBar.tsxindex 1d970fd5ead..bbf95453473 100644--- a/packages/twenty-front/src/modules/views/components/ViewBar.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBar.tsx@@ -9,7 +9,7 @@ import { ViewBarPageTitle } from '@/views/components/ViewBarPageTitle';import { ViewPickerDropdown } from '@/views/view-picker/components/ViewPickerDropdown';import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';-import { VIEW_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ViewSortDropdownId';+import { getObjectSortDropdownId } from '@/object-record/object-sort-dropdown/utils/getObjectSortDropdownId';import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';import { QueryParamsCleanupEffect } from '@/views/components/QueryParamsCleanupEffect';import { ViewBarAnyFieldFilterEffect } from '@/views/components/ViewBarAnyFieldFilterEffect';@@ -18,7 +18,7 @@ import { ViewBarRecordFieldEffect } from '@/views/components/ViewBarRecordFieldEimport { ViewBarRecordFilterEffect } from '@/views/components/ViewBarRecordFilterEffect';import { ViewBarRecordFilterGroupEffect } from '@/views/components/ViewBarRecordFilterGroupEffect';import { ViewBarRecordSortEffect } from '@/views/components/ViewBarRecordSortEffect';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { getViewBarFilterDropdownId } from '@/views/utils/getViewBarFilterDropdownId';import { UpdateViewButtonGroup } from './UpdateViewButtonGroup';import { ViewBarDetails } from './ViewBarDetails';@@ -35,7 +35,7 @@ export const ViewBar = ({optionsDropdownButton,isReadOnly = false,}: ViewBarProps) => {- const { objectNamePlural } = useRecordIndexContextOrThrow();+ const { objectNamePlural, recordIndexId } = useRecordIndexContextOrThrow();if (!objectNamePlural) {return;@@ -49,7 +49,7 @@ export const ViewBar = ({return (<ObjectSortDropdownComponentInstanceContext.Provider- value={{ instanceId: VIEW_SORT_DROPDOWN_ID }}+ value={{ instanceId: getObjectSortDropdownId(recordIndexId) }}><ViewBarRecordFilterGroupEffect /><ViewBarAnyFieldFilterEffect />@@ -66,7 +66,7 @@ export const ViewBar = ({rightComponent={<><ObjectFilterDropdownComponentInstanceContext.Provider- value={{ instanceId: ViewBarFilterDropdownIds.MAIN }}+ value={{ instanceId: getViewBarFilterDropdownId(recordIndexId) }}><ViewBarFilterDropdown /></ObjectFilterDropdownComponentInstanceContext.Provider>diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsxindex 4db3694a3eb..d92c4a14216 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx@@ -23,7 +23,8 @@ import { anyFieldFilterValueComponentState } from '@/object-record/record-filterimport { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { AnyFieldSearchDropdownButton } from '@/views/components/AnyFieldSearchDropdownButton';-import { ANY_FIELD_SEARCH_DROPDOWN_ID } from '@/views/constants/AnyFieldSearchDropdownId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getAnyFieldSearchDropdownId } from '@/views/utils/getAnyFieldSearchDropdownId';import { EditableFilterDropdownButton } from '@/views/editable-chip/components/EditableFilterDropdownButton';import { getEditableChipObjectFilterDropdownComponentInstanceId } from '@/views/editable-chip/utils/getEditableChipObjectFilterDropdownComponentInstanceId';import { useHasFiltersInQueryParams } from '@/views/hooks/internal/useHasFiltersInQueryParams';@@ -105,6 +106,8 @@ export const ViewBarDetails = ({viewBarId,objectNamePlural,}: ViewBarDetailsProps) => {+ const { recordIndexId } = useRecordIndexContextOrThrow();+const isViewBarExpanded = useAtomComponentStateValue(isViewBarExpandedComponentState,);@@ -190,7 +193,7 @@ export const ViewBarDetails = ({const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,- ANY_FIELD_SEARCH_DROPDOWN_ID,+ getAnyFieldSearchDropdownId(recordIndexId),);const canResetView =diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsxindex 67b69e36557..99ffef63cc9 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx@@ -1,4 +1,5 @@-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getViewBarFilterDropdownId } from '@/views/utils/getViewBarFilterDropdownId';import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';@@ -8,15 +9,15 @@ import { LightButton } from 'twenty-ui/input';export const ViewBarDetailsAddFilterButton = () => {const { toggleDropdown } = useToggleDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();+ const filterDropdownId = getViewBarFilterDropdownId(recordIndexId);- const { resetFilterDropdown } = useResetFilterDropdown(- ViewBarFilterDropdownIds.MAIN,- );+ const { resetFilterDropdown } = useResetFilterDropdown(filterDropdownId);const handleClick = () => {resetFilterDropdown();toggleDropdown({- dropdownComponentInstanceIdFromProps: ViewBarFilterDropdownIds.MAIN,+ dropdownComponentInstanceIdFromProps: filterDropdownId,});};diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterButton.tsxindex c130cd8ad72..380b85991d8 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterButton.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterButton.tsx@@ -1,13 +1,11 @@import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';import { Trans } from '@lingui/react/macro';export const ViewBarFilterButton = () => {const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,- ViewBarFilterDropdownIds.MAIN,);return (diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdown.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdown.tsxindex 9b02e787b5c..f6ec0bab5ea 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdown.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdown.tsx@@ -1,6 +1,7 @@import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';@@ -11,6 +12,9 @@ import { isDefined } from 'twenty-shared/utils';import { ViewBarFilterButton } from './ViewBarFilterButton';export const ViewBarFilterDropdown = () => {+ const dropdownId = useAvailableComponentInstanceIdOrThrow(+ ObjectFilterDropdownComponentInstanceContext,+ );const { resetFilterDropdown } = useResetFilterDropdown();const { removeRecordFilter } = useRemoveRecordFilter();@@ -40,7 +44,7 @@ export const ViewBarFilterDropdown = () => {return (<Dropdown- dropdownId={ViewBarFilterDropdownIds.MAIN}+ dropdownId={dropdownId}onClose={handleDropdownClose}onOpen={handleDropdownOpen}clickableComponent={<ViewBarFilterButton />}diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsxindex 36ad8e9cc9b..d9bd2d7957e 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx@@ -17,7 +17,8 @@ import { useCreateEmptyRecordFilterFromFieldMetadataItem } from '@/object-recordimport { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getViewBarAdvancedFilterDropdownId } from '@/views/utils/getViewBarAdvancedFilterDropdownId';import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';@@ -59,6 +60,7 @@ export const ViewBarFilterDropdownAdvancedFilterButton = () => {const { openDropdown: openAdvancedFilterDropdown } = useOpenDropdown();const { closeDropdown: closeObjectFilterDropdown } = useCloseDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();const { currentView } = useGetCurrentViewOnly();@@ -131,9 +133,10 @@ export const ViewBarFilterDropdownAdvancedFilterButton = () => {setRecordFilterUsedInAdvancedFilterDropdownRow(newRecordFilter);}- closeObjectFilterDropdown(ViewBarFilterDropdownIds.MAIN);+ closeObjectFilterDropdown();openAdvancedFilterDropdown({- dropdownComponentInstanceIdFromProps: ViewBarFilterDropdownIds.ADVANCED,+ dropdownComponentInstanceIdFromProps:+ getViewBarAdvancedFilterDropdownId(recordIndexId),});};diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownContent.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownContent.tsxindex 8efe5be6666..5555581570d 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownContent.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownContent.tsx@@ -5,12 +5,10 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { ViewBarFilterDropdownAnyFieldSearchInput } from '@/views/components/ViewBarFilterDropdownAnyFieldSearchInput';import { ViewBarFilterDropdownFieldSelectMenu } from '@/views/components/ViewBarFilterDropdownFieldSelectMenu';import { ViewBarFilterDropdownFilterInput } from '@/views/components/ViewBarFilterDropdownFilterInput';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';export const ViewBarFilterDropdownContent = () => {const [objectFilterDropdownFilterIsSelected] = useAtomComponentState(objectFilterDropdownFilterIsSelectedComponentState,- ViewBarFilterDropdownIds.MAIN,);const objectFilterDropdownAnyFieldSearchIsSelected =diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsxindex 54352738a44..4b083490611 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx@@ -6,7 +6,6 @@ import { objectFilterDropdownSearchInputComponentState } from '@/object-record/oimport { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { FILTER_FIELD_LIST_ID } from '@/object-record/object-filter-dropdown/constants/FilterFieldListId';import { useFilterDropdownSelectableFieldMetadataItems } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownSelectableFieldMetadataItems';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';@@ -21,7 +20,8 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Geneimport { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { VIEW_BAR_FILTER_BOTTOM_MENU_ITEM_IDS } from '@/views/constants/ViewBarFilterBottomMenuItemIds';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useLingui } from '@lingui/react/macro';import { IconX } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -62,6 +62,9 @@ export const ViewBarFilterDropdownFieldSelectMenu = () => {} = useFilterDropdownSelectableFieldMetadataItems();const { closeDropdown } = useCloseDropdown();+ const dropdownId = useAvailableComponentInstanceIdOrThrow(+ DropdownComponentInstanceContext,+ );const selectableFieldMetadataItemIds = [...selectableVisibleFieldMetadataItems.map(@@ -111,8 +114,8 @@ export const ViewBarFilterDropdownFieldSelectMenu = () => {/><SelectableListselectableItemIdArray={selectableFieldMetadataItemIds}- selectableListInstanceId={FILTER_FIELD_LIST_ID}- focusId={ViewBarFilterDropdownIds.MAIN}+ selectableListInstanceId={`${dropdownId}-field-list`}+ focusId={dropdownId}>{shouldShowVisibleFields && (<>diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsxindex bfc8bdf3081..8ba6b787dda 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenuItem.tsx@@ -1,5 +1,4 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { FILTER_FIELD_LIST_ID } from '@/object-record/object-filter-dropdown/constants/FilterFieldListId';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';@@ -15,7 +14,7 @@ export type ViewBarFilterDropdownFieldSelectMenuItemProps = {export const ViewBarFilterDropdownFieldSelectMenuItem = ({fieldMetadataItemToSelect,}: ViewBarFilterDropdownFieldSelectMenuItemProps) => {- const { resetSelectedItem } = useSelectableList(FILTER_FIELD_LIST_ID);+ const { resetSelectedItem } = useSelectableList();const isSelectedItemId = useAtomComponentFamilyStateValue(isSelectedItemIdComponentFamilyState,diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInput.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInput.tsxindex 1d2da884693..186b4bde1e0 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInput.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFilterInput.tsx@@ -1,7 +1,8 @@import { ObjectFilterDropdownContentWrapper } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownContentWrapper';import { ObjectFilterDropdownFilterInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput';import { ViewBarFilterDropdownFilterInputMenuHeader } from '@/views/components/ViewBarFilterDropdownFilterInputMenuHeader';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';type ViewBarFilterDropdownFilterInputProps = {recordFilterId?: string;@@ -10,11 +11,15 @@ type ViewBarFilterDropdownFilterInputProps = {export const ViewBarFilterDropdownFilterInput = ({recordFilterId,}: ViewBarFilterDropdownFilterInputProps) => {+ const filterDropdownId = useAvailableComponentInstanceIdOrThrow(+ ObjectFilterDropdownComponentInstanceContext,+ );+return (<ObjectFilterDropdownContentWrapper><ViewBarFilterDropdownFilterInputMenuHeader /><ObjectFilterDropdownFilterInput- filterDropdownId={ViewBarFilterDropdownIds.MAIN}+ filterDropdownId={filterDropdownId}recordFilterId={recordFilterId}/></ObjectFilterDropdownContentWrapper>diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsxindex 68b25590c17..1e1cacef89c 100644--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx@@ -21,7 +21,6 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTypimport { 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 { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';import { getFilterTypeFromFieldType } from 'twenty-shared/utils';import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';@@ -173,7 +172,7 @@ describe('useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown', () =expect(result.current.objectFilterDropdownFilterIsSelected).toBe(true);expect(result.current.selectedOperandInDropdown).toBe(defaultOperand);expect(mockPushFocusItemToFocusStack).toHaveBeenCalledWith({- focusId: ViewBarFilterDropdownIds.MAIN,+ focusId: 'test',component: {type: FocusComponentType.DROPDOWN,instanceId: personCompanyFieldMetadataItemMock.id,diff --git a/packages/twenty-front/src/modules/views/hooks/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.ts b/packages/twenty-front/src/modules/views/hooks/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.tsindex cd4d875c787..a515f45e8fb 100644--- a/packages/twenty-front/src/modules/views/hooks/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.ts+++ b/packages/twenty-front/src/modules/views/hooks/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.ts@@ -14,7 +14,8 @@ import { getRecordFilterOperands } from '@/object-record/record-filter/utils/getimport { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useStore } from 'jotai';import { useCallback } from 'react';@@ -55,6 +56,9 @@ export const useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown =useUpsertObjectFilterDropdownCurrentFilter();const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();+ const filterDropdownId = useAvailableComponentInstanceIdOrThrow(+ ObjectFilterDropdownComponentInstanceContext,+ );const { getInitialFilterValue } = useGetInitialFilterValue();const store = useStore();@@ -75,7 +79,7 @@ export const useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown =if (filterType === 'RELATION' || filterType === 'SELECT') {pushFocusItemToFocusStack({- focusId: ViewBarFilterDropdownIds.MAIN,+ focusId: filterDropdownId,component: {type: FocusComponentType.DROPDOWN,instanceId: fieldMetadataItem.id,@@ -144,6 +148,7 @@ export const useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown =},[store,+ filterDropdownId,fieldMetadataItemUsedInDropdownCallbackState,currentRecordFiltersCallbackState,objectFilterDropdownFilterIsSelectedCallbackState,diff --git a/packages/twenty-front/src/modules/views/hooks/useOpenCreateViewDropown.ts b/packages/twenty-front/src/modules/views/hooks/useOpenCreateViewDropown.tsindex b39bb8bad33..a034737879c 100644--- a/packages/twenty-front/src/modules/views/hooks/useOpenCreateViewDropown.ts+++ b/packages/twenty-front/src/modules/views/hooks/useOpenCreateViewDropown.ts@@ -1,7 +1,8 @@import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { type View } from '@/views/types/View';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';@@ -16,13 +17,16 @@ export const useOpenCreateViewDropdown = (viewBardId?: string) => {const { setViewPickerMode } = useViewPickerMode(viewBardId);const { openDropdown } = useOpenDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();const openCreateViewDropdown = (referenceView: View | undefined) => {if (isDefined(referenceView?.id)) {setViewPickerReferenceViewId(referenceView.id);setViewPickerMode('create-empty');openDropdown({- dropdownComponentInstanceIdFromProps: VIEW_PICKER_DROPDOWN_ID,+ dropdownComponentInstanceIdFromProps: getViewPickerDropdownId(+ viewBardId ?? recordIndexId,+ ),});}};diff --git a/packages/twenty-front/src/modules/views/utils/getAnyFieldSearchDropdownId.ts b/packages/twenty-front/src/modules/views/utils/getAnyFieldSearchDropdownId.tsnew file mode 100644index 00000000000..786d4e8e901--- /dev/null+++ b/packages/twenty-front/src/modules/views/utils/getAnyFieldSearchDropdownId.ts@@ -0,0 +1,4 @@+import { ANY_FIELD_SEARCH_DROPDOWN_ID } from '@/views/constants/AnyFieldSearchDropdownId';++export const getAnyFieldSearchDropdownId = (viewBarId: string) =>+ `${ANY_FIELD_SEARCH_DROPDOWN_ID}-${viewBarId}`;diff --git a/packages/twenty-front/src/modules/views/utils/getViewBarAdvancedFilterDropdownId.ts b/packages/twenty-front/src/modules/views/utils/getViewBarAdvancedFilterDropdownId.tsnew file mode 100644index 00000000000..4ef35004543--- /dev/null+++ b/packages/twenty-front/src/modules/views/utils/getViewBarAdvancedFilterDropdownId.ts@@ -0,0 +1,4 @@+import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';++export const getViewBarAdvancedFilterDropdownId = (viewBarId: string) =>+ `${ViewBarFilterDropdownIds.ADVANCED}-${viewBarId}`;diff --git a/packages/twenty-front/src/modules/views/utils/getViewBarFilterDropdownId.ts b/packages/twenty-front/src/modules/views/utils/getViewBarFilterDropdownId.tsnew file mode 100644index 00000000000..451ccddf0c0--- /dev/null+++ b/packages/twenty-front/src/modules/views/utils/getViewBarFilterDropdownId.ts@@ -0,0 +1,4 @@+import { ViewBarFilterDropdownIds } from '@/views/constants/ViewBarFilterDropdownIds';++export const getViewBarFilterDropdownId = (viewBarId: string) =>+ `${ViewBarFilterDropdownIds.MAIN}-${viewBarId}`;diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsxindex 8183484ab86..e6c3e957c19 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx@@ -10,7 +10,9 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuimport { 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 { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';@@ -20,11 +22,7 @@ import { ViewPickerCreateButton } from '@/views/view-picker/components/ViewPickeimport { ViewPickerIconAndNameContainer } from '@/views/view-picker/components/ViewPickerIconAndNameContainer';import { ViewPickerSaveButtonContainer } from '@/views/view-picker/components/ViewPickerSaveButtonContainer';import { ViewPickerSelectContainer } from '@/views/view-picker/components/ViewPickerSelectContainer';-import { VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerCalendarFieldDropdownId';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';-import { VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerKanbanFieldDropdownId';import { VIEW_PICKER_TYPE_SELECT_OPTIONS } from '@/views/view-picker/constants/ViewPickerTypeSelectOptions';-import { VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerViewTypeDropdownId';import { useCreateViewFromCurrentState } from '@/views/view-picker/hooks/useCreateViewFromCurrentState';import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';@@ -51,6 +49,9 @@ const StyledFieldAvailableContainer = styled.div`export const ViewPickerContentCreateMode = () => {const { t } = useLingui();+ const dropdownId = useAvailableComponentInstanceIdOrThrow(+ DropdownComponentInstanceContext,+ );const { viewPickerMode, setViewPickerMode } = useViewPickerMode();const [hasManuallySelectedIcon, setHasManuallySelectedIcon] = useState(false);@@ -112,7 +113,7 @@ export const ViewPickerContentCreateMode = () => {await createViewFromCurrentState();},- focusId: VIEW_PICKER_DROPDOWN_ID,+ focusId: dropdownId,dependencies: [viewPickerIsPersisting,createViewFromCurrentState,@@ -191,7 +192,7 @@ export const ViewPickerContentCreateMode = () => {...option,label: t(option.label),}))}- dropdownId={VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID}+ dropdownId={`${dropdownId}-view-type`}/></ViewPickerSelectContainer>{viewPickerType === ViewType.KANBAN && (@@ -213,7 +214,7 @@ export const ViewPickerContentCreateMode = () => {})): [{ value: '', label: t`No Select field` }]}- dropdownId={VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID}+ dropdownId={`${dropdownId}-kanban-field`}/></ViewPickerSelectContainer>{availableFieldsForGrouping.length === 0 && (@@ -244,7 +245,7 @@ export const ViewPickerContentCreateMode = () => {})): [{ value: '', label: t`No Date field` }]}- dropdownId={VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID}+ dropdownId={`${dropdownId}-calendar-field`}/></ViewPickerSelectContainer>{availableFieldsForCalendar.length === 0 && (diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsxindex 66401992f11..d93662302aa 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEditMode.tsx@@ -14,7 +14,8 @@ import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSeimport { ViewPickerEditButton } from '@/views/view-picker/components/ViewPickerEditButton';import { ViewPickerIconAndNameContainer } from '@/views/view-picker/components/ViewPickerIconAndNameContainer';import { ViewPickerSaveButtonContainer } from '@/views/view-picker/components/ViewPickerSaveButtonContainer';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';+import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';import { viewPickerInputNameComponentState } from '@/views/view-picker/states/viewPickerInputNameComponentState';@@ -25,6 +26,9 @@ import { t } from '@lingui/core/macro';import { IconChevronLeft } from 'twenty-ui/icon';export const ViewPickerContentEditMode = () => {+ const dropdownId = useAvailableComponentInstanceIdOrThrow(+ DropdownComponentInstanceContext,+ );const { setViewPickerMode } = useViewPickerMode();const [viewPickerInputName, setViewPickerInputName] = useAtomComponentState(@@ -51,7 +55,7 @@ export const ViewPickerContentEditMode = () => {await updateViewFromCurrentState();},- focusId: VIEW_PICKER_DROPDOWN_ID,+ focusId: dropdownId,dependencies: [viewPickerIsPersisting, updateViewFromCurrentState],});diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsxindex 518ac908eb9..f9a76a8c9fd 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx@@ -11,7 +11,8 @@ import { ViewPickerContentCreateMode } from '@/views/view-picker/components/Viewimport { ViewPickerContentEditMode } from '@/views/view-picker/components/ViewPickerContentEditMode';import { ViewPickerContentEffect } from '@/views/view-picker/components/ViewPickerContentEffect';import { ViewPickerListContent } from '@/views/view-picker/components/ViewPickerListContent';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';import { useUpdateViewFromCurrentState } from '@/views/view-picker/hooks/useUpdateViewFromCurrentState';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';import { isDefined } from 'twenty-shared/utils';@@ -61,9 +62,12 @@ export const ViewPickerDropdown = () => {const { formatNumber } = useNumberFormat();+ const { recordIndexId } = useRecordIndexContextOrThrow();+ const dropdownId = getViewPickerDropdownId(recordIndexId);+const isDropdownOpen = useAtomComponentStateValue(isDropdownOpenComponentState,- VIEW_PICKER_DROPDOWN_ID,+ dropdownId,);const { viewPickerMode, setViewPickerMode } = useViewPickerMode();@@ -80,7 +84,7 @@ export const ViewPickerDropdown = () => {return (<Dropdown- dropdownId={VIEW_PICKER_DROPDOWN_ID}+ dropdownId={dropdownId}dropdownOffset={{ x: 0, y: 8 }}dropdownPlacement="bottom-start"onClickOutside={handleClickOutside}diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsxindex e43949d42b6..c50d84a7e79 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx@@ -18,7 +18,6 @@ import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';import { useOpenCreateViewDropdown } from '@/views/hooks/useOpenCreateViewDropown';import { viewsFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/viewsFromObjectMetadataItemFamilySelector';import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPickerOptionDropdown';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';import { useLingui } from '@lingui/react/macro';@@ -70,7 +69,7 @@ export const ViewPickerListContent = () => {const handleViewSelect = (viewId: string) => {changeView(viewId);- closeDropdown(VIEW_PICKER_DROPDOWN_ID);+ closeDropdown();};const { openCreateViewDropdown } = useOpenCreateViewDropdown();diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerCalendarFieldDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerCalendarFieldDropdownId.tsdeleted file mode 100644index a909ffa995c..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerCalendarFieldDropdownId.ts+++ /dev/null@@ -1,2 +0,0 @@-export const VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID =- 'view-picker-calendar-field';diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerKanbanFieldDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerKanbanFieldDropdownId.tsdeleted file mode 100644index 4d8e5aaec39..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerKanbanFieldDropdownId.ts+++ /dev/null@@ -1 +0,0 @@-export const VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID = 'view-picker-kanban-field';diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerViewTypeDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerViewTypeDropdownId.tsdeleted file mode 100644index b5d83d47474..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerViewTypeDropdownId.ts+++ /dev/null@@ -1 +0,0 @@-export const VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID = 'view-picker-view-type';diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.tsindex 213217370db..db0c4996f59 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts@@ -2,10 +2,8 @@ import { useCallback } from 'react';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerCalendarFieldDropdownId';-import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';-import { VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerKanbanFieldDropdownId';-import { VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerViewTypeDropdownId';+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';+import { getViewPickerDropdownId } from '@/views/view-picker/utils/getViewPickerDropdownId';import { viewPickerIsPersistingComponentState } from '@/views/view-picker/states/viewPickerIsPersistingComponentState';import { viewPickerModeComponentState } from '@/views/view-picker/states/viewPickerModeComponentState';@@ -19,15 +17,23 @@ export const useCloseAndResetViewPicker = () => {);const { closeDropdown } = useCloseDropdown();+ const { recordIndexId } = useRecordIndexContextOrThrow();const closeAndResetViewPicker = useCallback(() => {+ const viewPickerDropdownId = getViewPickerDropdownId(recordIndexId);+setViewPickerIsPersisting(false);setViewPickerMode('list');- closeDropdown(VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID);- closeDropdown(VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID);- closeDropdown(VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID);- closeDropdown(VIEW_PICKER_DROPDOWN_ID);- }, [closeDropdown, setViewPickerIsPersisting, setViewPickerMode]);+ closeDropdown(`${viewPickerDropdownId}-calendar-field`);+ closeDropdown(`${viewPickerDropdownId}-kanban-field`);+ closeDropdown(`${viewPickerDropdownId}-view-type`);+ closeDropdown(viewPickerDropdownId);+ }, [+ closeDropdown,+ recordIndexId,+ setViewPickerIsPersisting,+ setViewPickerMode,+ ]);return { closeAndResetViewPicker };};diff --git a/packages/twenty-front/src/modules/views/view-picker/utils/getViewPickerDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/utils/getViewPickerDropdownId.tsnew file mode 100644index 00000000000..8af9812539d--- /dev/null+++ b/packages/twenty-front/src/modules/views/view-picker/utils/getViewPickerDropdownId.ts@@ -0,0 +1,4 @@+import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';++export const getViewPickerDropdownId = (viewBarId: string) =>+ `${VIEW_PICKER_DROPDOWN_ID}-${viewBarId}`;diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsxindex adddd8b6905..fd3f915182a 100644--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx@@ -6,7 +6,6 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID } from '@/workflow/workflow-diagram/constants/WorkflowDiagramStepNodeClickOutsideId';import { WorkflowStepOptionsMenuItems } from '@/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems';import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useId } from 'react';@@ -46,12 +45,9 @@ export const WorkflowDiagramStepNodeOptionsDropdown = ({WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode,];- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const closeDropdownThen = (action: () => void) => () => {diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsxindex d5ed515eaec..9354ac2be43 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx@@ -12,7 +12,6 @@ import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';import { useDuplicateStep } from '@/workflow/workflow-steps/hooks/useDuplicateStep';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { workflowAiAgentActionAgentState } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/states/workflowAiAgentActionAgentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useLingui } from '@lingui/react/macro';import { useId } from 'react';import { SettingsPath } from 'twenty-shared/types';@@ -108,12 +107,9 @@ export const WorkflowStepFooter = ({}};- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const OptionsDropdown = (diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsxindex 14e8cd23e0d..aa9bf6b358b 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx@@ -1,6 +1,5 @@import { TabList } from '@/ui/layout/tab-list/components/TabList';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';@@ -114,7 +113,7 @@ export const WorkflowEditActionAiAgent = ({const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,- useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId),+ componentInstanceId,);const currentTabId =(activeTabId as WorkflowAiAgentTabId) ?? WORKFLOW_AI_AGENT_TABS.PROMPT;diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsxindex d3a77b8945c..59e6d7e9bb1 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/code-action/components/WorkflowEditActionCode.tsx@@ -13,7 +13,6 @@ import { LogicFunctionLogs } from '@/logic-functions/components/LogicFunctionLogimport { InputLabel, CodeEditor } from 'twenty-ui/input';import { TabList } from '@/ui/layout/tab-list/components/TabList';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -94,9 +93,7 @@ export const WorkflowEditActionCode = ({const fullScreenFocusId = `code-editor-fullscreen-${logicFunctionId}`;const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,- useWorkspaceSurfaceScopedComponentInstanceId(- WORKFLOW_LOGIC_FUNCTION_TAB_LIST_COMPONENT_ID,- ),+ WORKFLOW_LOGIC_FUNCTION_TAB_LIST_COMPONENT_ID,);const { getUpdatableWorkflowVersion } =useGetUpdatableWorkflowVersionOrThrow();diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsxindex f6bb37e6404..44b46e61675 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx@@ -9,7 +9,6 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectablimport { 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 { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useState } from 'react';import { MenuItem } from 'twenty-ui/navigation';@@ -74,12 +73,9 @@ export const WorkflowObjectDropdownContent = ({(objectMetadataItem) => objectMetadataItem.nameSingular,);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const handleSearchInputChange = (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 12fda795c4d..06706ec7414 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@@ -8,7 +8,6 @@ import { WorkflowStepCmdEnterButton } from '@/workflow/workflow-steps/componentsimport { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { TabList } from '@/ui/layout/tab-list/components/TabList';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';import { getBodyTypeFromHeaders } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/getBodyTypeFromHeaders';@@ -92,9 +91,7 @@ export const WorkflowEditActionHttpRequest = ({const { theme } = useContext(ThemeContext);const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,- useWorkspaceSurfaceScopedComponentInstanceId(- WORKFLOW_HTTP_REQUEST_TAB_LIST_COMPONENT_ID,- ),+ WORKFLOW_HTTP_REQUEST_TAB_LIST_COMPONENT_ID,);const { formData, handleFieldChange, saveAction } = useHttpRequestForm({diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsxindex ef4207ef003..f345aa6ebbe 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/logic-function-action/components/WorkflowEditActionLogicFunction.tsx@@ -7,7 +7,6 @@ import { useGetOneLogicFunction } from '@/logic-functions/hooks/useGetOneLogicFuimport { InputLabel } from 'twenty-ui/input';import { TabList } from '@/ui/layout/tab-list/components/TabList';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { type WorkflowLogicFunctionAction } from '@/workflow/types/Workflow';import { WorkflowExpectedOutputBodyInput } from '@/workflow/workflow-steps/components/WorkflowExpectedOutputBodyInput';@@ -81,9 +80,7 @@ export const WorkflowEditActionLogicFunction = ({const activeTabId = useAtomComponentStateValue(activeTabIdComponentState,- useWorkspaceSurfaceScopedComponentInstanceId(- WORKFLOW_LOGIC_FUNCTION_ACTION_TAB_LIST_COMPONENT_ID,- ),+ WORKFLOW_LOGIC_FUNCTION_ACTION_TAB_LIST_COMPONENT_ID,);const functionInput = useMemo(() => {diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsxindex b591b125670..11029db6cb6 100644--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx@@ -20,7 +20,6 @@ import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowSimport { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';import { WorkflowStepFilterBuilder } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterBuilder';import { type FilterSettings } from '@/workflow/workflow-steps/filters/types/FilterSettings';-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useMemo, useState } from 'react';@@ -148,12 +147,9 @@ export const WorkflowEditTriggerDatabaseEventForm = ({const selectableItemIdArray = filteredObjects.map((option) => option.value);- const scopedDropdownId =- useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);-const selectedItemId = useAtomComponentStateValue(selectedItemIdComponentState,- scopedDropdownId,+ dropdownId,);const handleOptionClick = (value: string) => {