Skip to content

The open alternative to Salesforce, designed for AI.

Scope component instance ids at the provider, not in the resolving primitive (#25225)

Félix Malfait90d243cef129
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.tsx
index 4076767f63c..1e4ce1d54fe 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,6 +53,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
import { 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;
@@ -127,7 +128,9 @@ export const EmailRecipientsFieldInput = ({
}: EmailRecipientsFieldInputProps) => {
const instanceId = useId();
const focusId = `email-recipients-field-${instanceId}`;
- const suggestionsDropdownId = `${focusId}-suggestions`;
+ const suggestionsDropdownId = useWorkspaceSurfaceScopedComponentInstanceId(
+ `${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.tsx
index 115ab1d67e5..9d46a4bab10 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,6 +15,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -63,9 +64,12 @@ export const RecordIndexCommandMenuDropdown = () => {
...(shouldShowMoreActions ? ['more-actions'] : []),
];
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
return (
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.tsx
index 2f231f094a6..ffb86d0ecfd 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,6 +21,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { 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';
@@ -79,9 +80,14 @@ export const AdvancedFilterCompositeSubFieldSelectMenu = ({
const { advancedFilterFieldSelectDropdownId } =
useAdvancedFilterFieldSelectDropdown(recordFilterId);
+ const scopedAdvancedFilterFieldSelectDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ advancedFilterFieldSelectDropdownId,
+ );
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- advancedFilterFieldSelectDropdownId,
+ scopedAdvancedFilterFieldSelectDropdownId,
);
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.tsx
index 8b97abd4c58..f8b5e3d2734 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,6 +18,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { type ViewFilterOperand } from 'twenty-shared/types';
@@ -56,9 +57,12 @@ export const AdvancedFilterRecordFilterOperandSelectContent = ({
setRecordFilterUsedInAdvancedFilterDropdownRow(filter);
};
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 3662c2b9743..d92401c6965 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,6 +20,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
+import { 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';
@@ -60,9 +61,14 @@ export const AdvancedFilterRelationTargetFieldSelectMenu = ({
const { advancedFilterFieldSelectDropdownId } =
useAdvancedFilterFieldSelectDropdown(recordFilterId);
+ const scopedAdvancedFilterFieldSelectDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ advancedFilterFieldSelectDropdownId,
+ );
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- advancedFilterFieldSelectDropdownId,
+ scopedAdvancedFilterFieldSelectDropdownId,
);
const { objectMetadataItem: workspaceMemberObjectMetadataItem } =
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.tsx
index e2e98a4337d..8a6d1a3e8df 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,6 +21,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { 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';
@@ -73,9 +74,12 @@ export const ObjectFilterDropdownOptionSelect = ({
const { resetSelectedItem } = useSelectableList(componentInstanceId);
+ const scopedComponentInstanceId =
+ useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- componentInstanceId,
+ scopedComponentInstanceId,
);
const { foundFieldMetadataItem: relationTargetFieldMetadataItem } =
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.tsx
index dc081377cdf..51119e98698 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
@@ -11,6 +11,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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 {
@@ -35,9 +36,12 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {
);
const { updateCurrentView } = useUpdateCurrentView();
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
const { closeDropdown } = useObjectOptionsDropdown();
diff --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.tsx
index 03135f33801..97cbee3b178 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
@@ -25,6 +25,7 @@ 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 {
@@ -120,9 +121,12 @@ export const ObjectOptionsDropdownCustomView = ({
'Delete view',
];
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
if (!customViewData) {
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.tsx
index 0e4a76f9481..c41a1042614 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
@@ -12,6 +12,7 @@ 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,
@@ -42,9 +43,12 @@ export const ObjectOptionsDropdownDefaultView = () => {
'Create custom view',
];
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
const { openCreateViewDropdown } = useOpenCreateViewDropdown(recordIndexId);
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.tsx
index 27248082003..38b08f61447 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
@@ -23,6 +23,7 @@ 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';
@@ -125,9 +126,12 @@ export const ObjectOptionsDropdownLayoutContent = () => {
: []),
];
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
return (
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.tsx
index 82b0f437a4e..771d51c420e 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
@@ -17,6 +17,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import {
@@ -49,9 +50,12 @@ export const ObjectOptionsDropdownRecordGroupSortContent = () => {
setRecordIndexRecordGroupSort(sort);
};
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
useEffect(() => {
diff --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.tsx
index 213ea0dfee5..38acbadec0f 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
@@ -24,6 +24,7 @@ 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 {
@@ -103,9 +104,12 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {
}
}, [hiddenRecordGroupIds, currentContentId, onContentChange]);
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
const selectableItemIdArray = [
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.tsx
index c2f646331e6..6b8b6aafcf2 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
@@ -14,6 +14,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { 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';
@@ -41,9 +42,12 @@ export const ObjectOptionsDropdownVisibilityContent = () => {
const hasViewsPermission = useHasPermissionFlag(PermissionFlagType.VIEWS);
const { canPersistChanges } = useCanPersistViewChanges();
+ const scopedObjectOptionsDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_OPTIONS_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_OPTIONS_DROPDOWN_ID,
+ scopedObjectOptionsDropdownId,
);
const selectableItemIdArray = [
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.tsx
index 7dee8849cc0..cc266cab35a 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
@@ -30,6 +30,7 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { 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';
@@ -152,14 +153,17 @@ export const ObjectSortDropdownButton = () => {
...hiddenFieldMetadataItemsSorted.map((item) => item.id),
];
+ const scopedObjectSortDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(OBJECT_SORT_DROPDOWN_ID);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- OBJECT_SORT_DROPDOWN_ID,
+ scopedObjectSortDropdownId,
);
const setSelectedItemId = useSetAtomComponentState(
selectedItemIdComponentState,
- OBJECT_SORT_DROPDOWN_ID,
+ scopedObjectSortDropdownId,
);
const shouldShowHiddenFields = hiddenFieldMetadataItemsSorted.length > 0;
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.tsx
index 60371539d98..431e277c5ba 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,6 +17,7 @@ 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';
@@ -36,7 +37,9 @@ export const MultipleRecordPickerMenuItemContent = ({
);
const selectableListComponentInstanceId =
- getMultipleRecordPickerSelectableListId(componentInstanceId);
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ 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.tsx
index 21db14e8f41..5e0ef1f60de 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,6 +13,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { 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';
@@ -35,7 +36,9 @@ export const SingleRecordPickerMenuItem = ({
);
const selectableListComponentInstanceId =
- getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId);
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ 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.tsx
index 01dac86619e..ffb8f454d1d 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,6 +21,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
import { 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';
@@ -47,7 +48,9 @@ export const SingleRecordPickerMenuItems = ({
);
const selectableListComponentInstanceId =
- getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId);
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ getSingleRecordPickerSelectableListId(recordPickerComponentInstanceId),
+ );
const { resetSelectedItem } = useSelectableList(
selectableListComponentInstanceId,
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx
index add2e2e2b6e..9ba3a81e6de 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx
@@ -4,6 +4,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -21,10 +22,13 @@ export const RecordTableWidgetNestedRelationPickerMenuItem = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const isSelectedItemId = useAtomComponentFamilyStateValue(
isSelectedItemIdComponentFamilyState,
relationRecord.id,
- dropdownId,
+ scopedDropdownId,
);
return (
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.tsx
index 3368dab797f..3687de6099c 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,6 +10,7 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectab
import { 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';
@@ -40,9 +41,12 @@ export const MultipleSelectDropdown = ({
const { resetSelectedItem } = useSelectableList(selectableListId);
+ const scopedSelectableListId =
+ useWorkspaceSurfaceScopedComponentInstanceId(selectableListId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- selectableListId,
+ scopedSelectableListId,
);
const handleItemSelectChange = (
diff --git a/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutTabListEffect.test.tsx b/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutTabListEffect.test.tsx
index f3c953e8f4a..363bbdbc431 100644
--- a/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutTabListEffect.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutTabListEffect.test.tsx
@@ -2,7 +2,6 @@ import { PageLayoutTabListEffect } from '@/page-layout/components/PageLayoutTabL
import { makeTab } from '@/page-layout/testing/pageLayoutDraftFixtures';
import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';
-import { getWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { TabListFromUrlOptionalEffect } from '@/ui/layout/tab-list/components/TabListFromUrlOptionalEffect';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { TabListComponentInstanceContext } from '@/ui/layout/tab-list/states/contexts/TabListComponentInstanceContext';
@@ -121,11 +120,7 @@ describe('PageLayoutTabListEffect', () => {
const store = createStore();
const surfaceInstanceId = isInSidePanel ? 'side-panel-page-1' : 'main';
const activeTabAtom = activeTabIdComponentState.atomFamily({
- instanceId: getWorkspaceSurfaceScopedComponentInstanceId({
- componentInstanceId: TAB_LIST_INSTANCE_ID,
- surfaceType: isInSidePanel ? 'side-panel' : 'main',
- surfaceInstanceId,
- }),
+ instanceId: TAB_LIST_INSTANCE_ID,
});
store.set(activeTabAtom, activeTabId);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx
index 5e3b23555c9..0832ec5d1b9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx
@@ -34,7 +34,6 @@ import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/con
import { widgetCardHoveredComponentFamilyState } from '@/page-layout/widgets/states/widgetCardHoveredComponentFamilyState';
import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';
-import { getWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import {
AggregateOperations,
AxisNameDisplay,
@@ -87,12 +86,6 @@ const WIDGET_ID_ONE_TO_MANY_RELATION = 'widget-one-to-many-relation-field';
const WIDGET_ID_CATALOG = 'catalog-widget';
const TAB_ID_OVERVIEW = 'tab-overview';
const SIDE_PANEL_INSTANCE_ID = 'widget-side-panel';
-const SIDE_PANEL_PAGE_LAYOUT_INSTANCE_ID =
- getWorkspaceSurfaceScopedComponentInstanceId({
- componentInstanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- surfaceType: 'side-panel',
- surfaceInstanceId: SIDE_PANEL_INSTANCE_ID,
- });
const mockPersonRecord: ObjectRecord = {
__typename: 'Person',
@@ -1492,13 +1485,13 @@ export const InSidePanel: Story = {
);
jotaiStore.set(
pageLayoutPersistedComponentState.atomFamily({
- instanceId: SIDE_PANEL_PAGE_LAYOUT_INSTANCE_ID,
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
}),
sidePanelPageLayoutData,
);
jotaiStore.set(
pageLayoutDraftComponentState.atomFamily({
- instanceId: SIDE_PANEL_PAGE_LAYOUT_INSTANCE_ID,
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
}),
sidePanelPageLayoutData,
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx
index 0c91ffcb640..99fc1ab6ceb 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/__stories__/FieldsWidget.stories.tsx
@@ -2,8 +2,9 @@ import { type ApolloClient } from '@apollo/client';
import { useApolloClient } from '@apollo/client/react';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { MemoryRouter } from 'react-router-dom';
-import { expect, waitFor, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
import { isMinimalMetadataReadyState } from '@/metadata-store/states/isMinimalMetadataReadyState';
import { ApolloCoreClientContext } from '@/object-metadata/contexts/ApolloCoreClientContext';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
@@ -20,6 +21,7 @@ import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { FieldsWidget } from '@/page-layout/widgets/fields/components/FieldsWidget';
import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';
import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
+import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
import { type ViewWithRelations } from '@/views/types/ViewWithRelations';
import { CoreObjectNameSingular } from 'twenty-shared/types';
@@ -247,7 +249,15 @@ const createViewFieldGroup = (
viewFields,
});
-const FieldsWidgetStoryRenderer = ({ view }: { view: ViewWithRelations }) => {
+const SIDE_PANEL_SURFACE_INSTANCE_ID = 'fields-widget-story-side-panel';
+
+const FieldsWidgetStoryRenderer = ({
+ view,
+ surfaceType = 'main',
+}: {
+ view: ViewWithRelations;
+ surfaceType?: 'main' | 'side-panel';
+}) => {
const widget = createFieldsWidget(FIELDS_VIEW_ID);
const pageLayoutData = createPageLayoutWithWidget(
@@ -300,7 +310,18 @@ const FieldsWidgetStoryRenderer = ({ view }: { view: ViewWithRelations }) => {
<WidgetComponentInstanceContext.Provider
value={{ instanceId: widget.id }}
>
- <FieldsWidget widget={widget} />
+ <WorkspaceSurfaceContext.Provider
+ value={{
+ type: surfaceType,
+ instanceId:
+ surfaceType === 'side-panel'
+ ? SIDE_PANEL_SURFACE_INSTANCE_ID
+ : MAIN_CONTEXT_STORE_INSTANCE_ID,
+ ownsRouteLocation: surfaceType === 'main',
+ }}
+ >
+ <FieldsWidget widget={widget} />
+ </WorkspaceSurfaceContext.Provider>
</WidgetComponentInstanceContext.Provider>
</PageLayoutContentProvider>
</LayoutRenderingProvider>
@@ -458,3 +479,62 @@ export const Empty: Story = {
});
},
};
+
+// Hovering a field mounts an interactive copy of the cell through
+// RecordInlineCellAnchoredPortal, which finds its anchor with
+// document.getElementById after resolving the list instance id through
+// useAvailableComponentInstanceIdOrThrow -- and that resolution surface-scopes
+// the id. If the list rendered its anchors from an unscoped id, the lookup
+// misses, nothing interactive mounts, and the click lands on the inert display
+// underneath: the cell highlights but no editor ever opens.
+const openEditModeOnEmployees = async ({
+ canvasElement,
+}: {
+ canvasElement: HTMLElement;
+}) => {
+ const canvas = within(canvasElement);
+
+ const [employeesValue] = await canvas.findAllByText('250');
+ await userEvent.hover(employeesValue);
+
+ const hoveredValues = await canvas.findAllByText('250');
+ await userEvent.click(hoveredValues[hoveredValues.length - 1]);
+
+ await waitFor(() => {
+ expect(canvasElement.querySelector('input')).not.toBeNull();
+ });
+};
+
+const singleGroupView = () => {
+ const contactInfoFields = [
+ createViewField('vf-name', nameField.id, 0, 'group-contact-info'),
+ createViewField('vf-employees', employeesField.id, 1, 'group-contact-info'),
+ ];
+
+ return createView({
+ viewFields: contactInfoFields,
+ viewFieldGroups: [
+ createViewFieldGroup(
+ 'group-contact-info',
+ 'Contact Info',
+ 0,
+ contactInfoFields,
+ ),
+ ],
+ });
+};
+
+export const OpensEditModeOnMainSurface: Story = {
+ render: () => <FieldsWidgetStoryRenderer view={singleGroupView()} />,
+ play: openEditModeOnEmployees,
+};
+
+export const OpensEditModeInSidePanel: Story = {
+ render: () => (
+ <FieldsWidgetStoryRenderer
+ view={singleGroupView()}
+ surfaceType="side-panel"
+ />
+ ),
+ play: openEditModeOnEmployees,
+};
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.tsx
index 7ce07bf45c6..224dde42e05 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
@@ -41,6 +41,8 @@ const ScopedStateProbe = ({
}: {
name: 'main' | 'panel' | 'panel-second';
}) => {
+ const modalId = useWorkspaceSurfaceScopedComponentInstanceId(MODAL_ID);
+ const dropdownId = useWorkspaceSurfaceScopedComponentInstanceId(DROPDOWN_ID);
const tableId = useWorkspaceSurfaceScopedComponentInstanceId('role-table');
const settingsDraftRole = useAtomFamilyStateValue(
settingsDraftRoleFamilyState,
@@ -60,12 +62,12 @@ const ScopedStateProbe = ({
);
const isModalOpened = useAtomComponentStateValue(
isModalOpenedComponentState,
- MODAL_ID,
+ modalId,
);
const { openModal, toggleModal } = useModal();
const isDropdownOpen = useAtomComponentStateValue(
isDropdownOpenComponentState,
- DROPDOWN_ID,
+ dropdownId,
);
const { openDropdown } = useOpenDropdown();
const sortedFieldByTable = useAtomFamilyStateValue(
diff --git a/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts b/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts
index 9649ec71ef4..af0943148ad 100644
--- a/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts
+++ b/packages/twenty-front/src/modules/settings/components/layout/useSettingsActiveTabId.ts
@@ -1,4 +1,5 @@
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';
@@ -10,9 +11,11 @@ export const useSettingsActiveTabId = (
componentInstanceId: string,
tabIds: string[],
): string | null => {
+ const scopedComponentInstanceId =
+ useWorkspaceSurfaceScopedComponentInstanceId(componentInstanceId);
const activeTabId = useAtomComponentStateValue(
activeTabIdComponentState,
- componentInstanceId,
+ scopedComponentInstanceId,
);
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.tsx
index ac96945a143..b61fc84c89f 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx
@@ -13,6 +13,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -48,9 +49,12 @@ export const WebhookEntitySelect = ({
const { objectMetadataItems } = useObjectMetadataItems();
const { closeDropdown } = useCloseDropdown();
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
const metadataOptions: SelectOption<string>[] = [
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.tsx
index 7dd9123de13..8d55b601f42 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,6 +30,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { 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 =
{
@@ -89,9 +90,14 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFieldSelectS
const { advancedFilterFieldSelectDropdownId } =
useAdvancedFilterFieldSelectDropdown(recordFilterId);
+ const scopedAdvancedFilterFieldSelectDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ advancedFilterFieldSelectDropdownId,
+ );
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- advancedFilterFieldSelectDropdownId,
+ scopedAdvancedFilterFieldSelectDropdownId,
);
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.tsx
index eb111882a7c..ad4ffaaa468 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelDefaultSelectionEffect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelDefaultSelectionEffect.tsx
@@ -2,6 +2,7 @@ import { SIDE_PANEL_SELECTABLE_LIST_ID } from '@/side-panel/constants/SidePanelS
import { 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';
@@ -15,9 +16,13 @@ export const SidePanelDefaultSelectionEffect = ({
const { setSelectedItemId } = useSelectableList(
SIDE_PANEL_SELECTABLE_LIST_ID,
);
+ const scopedSelectableListId = useWorkspaceSurfaceScopedComponentInstanceId(
+ SIDE_PANEL_SELECTABLE_LIST_ID,
+ );
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- SIDE_PANEL_SELECTABLE_LIST_ID,
+ scopedSelectableListId,
);
const hasUserSelectedSidePanelListItem = useAtomStateValue(
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.tsx
index 6ffd514c4ac..630fd93a222 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,6 +7,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -42,9 +43,12 @@ export const WidgetSettingsFooter = ({
closeDropdown(dropdownId);
};
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index f1198ada5f4..a05e932403c 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,6 +12,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -40,9 +41,12 @@ export const ChartAggregateOperationSelectableListItem = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index f0090e1d02c..3a8b1ebbfc8 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,6 +11,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -34,9 +35,12 @@ export const ChartAxisNameSelectionDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index a7a3afa3713..b2571780ca1 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,6 +14,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { 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';
@@ -35,9 +36,12 @@ export const ChartColorSelectionDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 4b7766010b2..9f1fad85b85 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,6 +19,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -41,9 +42,12 @@ export const ChartDataSourceDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index add1daf1e9e..252c383864d 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,6 +13,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -108,9 +109,12 @@ export const ChartDateGranularitySelectionDropdownContent = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index b8160bacd5e..0a255eb0bed 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,6 +14,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -60,9 +61,12 @@ export const ChartFieldSelectionForAggregateOperationDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 6eab2da1d27..8be502f4869 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,6 +12,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -34,9 +35,12 @@ export const ChartGroupByFieldSelectionCompositeFieldView = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 546b6a423b0..9f02c1b55c5 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,6 +22,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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 {
@@ -80,9 +81,12 @@ export const ChartGroupByFieldSelectionDropdownContentBase = <
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index fa8b9218043..5bd8de15e78 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,6 +11,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -56,9 +57,12 @@ export const ChartGroupByFieldSelectionMorphRelationFieldView = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 8b53a3e28c2..869e64869bf 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,6 +14,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -54,9 +55,12 @@ export const ChartGroupByFieldSelectionTargetObjectFieldsView = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 2d94e7f1dcb..fd6b3fb97b2 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,6 +12,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -41,9 +42,12 @@ export const ChartNumberFormatSelectionDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 7537dd31057..0354df35ded 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,6 +7,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -24,9 +25,12 @@ export const ChartRatioAggregateOperationSelectableListItem = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 78665d79718..20df0311f6c 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,6 +8,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -31,9 +32,12 @@ export const ChartRatioOptionBooleanSelectableListItem = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 2e1ce0480a5..aea28b9a63f 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,6 +8,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -33,9 +34,12 @@ export const ChartRatioOptionSelectSelectableListItem = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index aea2ad8f0a7..a13af109e15 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,6 +19,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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 {
@@ -53,9 +54,12 @@ export const ChartSortByGroupByFieldDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 3a2bd740b11..f383ad7f9c4 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,6 +19,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -41,9 +42,12 @@ export const ChartSortBySelectionDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 988d8e51f34..110b6df5e2f 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,6 +30,7 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectab
import { 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';
@@ -93,9 +94,12 @@ export const FieldWidgetFieldDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index d42cc791b68..907bd94ca44 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,6 +30,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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 {
@@ -162,9 +163,12 @@ export const FieldWidgetLayoutDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 739fd669876..bad7f3b0c43 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,6 +12,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -39,9 +40,12 @@ export const FieldWidgetNestedFieldDropdownContent = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 2f1b9b9438f..f4d032680e9 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,6 +7,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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 = {
@@ -22,9 +23,12 @@ export const WidgetVisibilityOptionsList = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 4045fed4c8b..d380fa357ab 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,6 +9,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -37,9 +38,12 @@ export const RecordTableCalendarFieldDropdownContent = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index b0b23a02684..3474c3ddf87 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,6 +7,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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,
@@ -31,9 +32,12 @@ export const RecordTableCalendarLayoutDropdownContent = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 440700affc9..29e240f5568 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,6 +18,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -39,9 +40,12 @@ export const RecordTableDataSourceDropdownContent = () => {
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index fa58f0ec284..d7680978650 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,6 +11,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
import { 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';
@@ -48,9 +49,12 @@ export const RecordTableGroupByDropdownContent = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 5b6c47a3303..6738238db43 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,6 +14,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
import { 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;
@@ -38,9 +39,12 @@ export const RecordTableLayoutDropdownContent = ({
DropdownComponentInstanceContext,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
const { closeDropdown } = useCloseDropdown();
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.tsx
index d041bb2cbfd..305e1170ffd 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,6 +16,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states
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';
+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';
@@ -48,9 +49,14 @@ export const MultiSelectInput = ({
selectableListComponentInstanceId,
);
+ const scopedSelectableListComponentInstanceId =
+ useWorkspaceSurfaceScopedComponentInstanceId(
+ selectableListComponentInstanceId,
+ );
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- selectableListComponentInstanceId,
+ scopedSelectableListComponentInstanceId,
);
const [searchFilter, setSearchFilter] = useState('');
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index 97aacc23a3a..f4cb6b871ad 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -42,6 +42,7 @@ import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contex
import { 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,7 +413,8 @@ export const IconPicker = ({
const iconColorPickerDropdownId = `${dropdownId}-icon-color-picker`;
- const selectableListInstanceId = 'icon-list';
+ const selectableListInstanceId =
+ useWorkspaceSurfaceScopedComponentInstanceId('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.tsx
index 723526a1d78..8077921c45f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -18,6 +18,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
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';
+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';
@@ -161,9 +162,12 @@ export const Select = <Value extends SelectValue>({
const selectableItemIdArray = filteredOptions.map((option) => option.label);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
const { setSelectedItemId } = useSelectableList(dropdownId);
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.tsx
new file mode 100644
index 00000000000..9d1de64b02e
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/__tests__/useSelectableList.surfaceScope.test.tsx
@@ -0,0 +1,69 @@
+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.ts
index 84e4920613d..92a9c064c74 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,13 +4,18 @@ 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 selectableListInstanceId = useAvailableComponentInstanceIdOrThrow(
- SelectableListComponentInstanceContext,
- instanceId,
+ const unscopedSelectableListInstanceId =
+ useAvailableComponentInstanceIdOrThrow(
+ SelectableListComponentInstanceContext,
+ instanceId,
+ );
+ const selectableListInstanceId = useWorkspaceSurfaceScopedComponentInstanceId(
+ unscopedSelectableListInstanceId,
);
const store = useStore();
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/__tests__/useAvailableComponentInstanceIdOrThrow.test.tsx b/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/__tests__/useAvailableComponentInstanceIdOrThrow.test.tsx
new file mode 100644
index 00000000000..865819dab18
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/__tests__/useAvailableComponentInstanceIdOrThrow.test.tsx
@@ -0,0 +1,128 @@
+import { renderHook } from '@testing-library/react';
+import { type ReactNode } from 'react';
+
+import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
+import { RecordFieldListComponentInstanceContext } from '@/object-record/record-field-list/states/contexts/RecordFieldListComponentInstanceContext';
+import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';
+import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';
+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
+
+const CONTEXT_INSTANCE_ID = 'record-field-list-from-context';
+const PROPS_INSTANCE_ID = 'record-field-list-from-props';
+
+const buildWrapper =
+ ({
+ surfaceType,
+ provideContext,
+ }: {
+ surfaceType: 'main' | 'side-panel';
+ provideContext: boolean;
+ }) =>
+ ({ children }: { children: ReactNode }) => (
+ <WorkspaceSurfaceContext.Provider
+ value={{
+ type: surfaceType,
+ instanceId:
+ surfaceType === 'side-panel'
+ ? 'side-panel-page'
+ : MAIN_CONTEXT_STORE_INSTANCE_ID,
+ ownsRouteLocation: surfaceType === 'main',
+ }}
+ >
+ {provideContext ? (
+ <RecordFieldListComponentInstanceContext.Provider
+ value={{ instanceId: CONTEXT_INSTANCE_ID }}
+ >
+ {children}
+ </RecordFieldListComponentInstanceContext.Provider>
+ ) : (
+ children
+ )}
+ </WorkspaceSurfaceContext.Provider>
+ );
+
+// Surface isolation is opted into where an id is created, at the provider.
+// These hooks must hand back exactly what they were given on every surface:
+// a side panel may deliberately provide the same id as the main surface to
+// share state with it, and ids are also rendered into DOM anchors that get
+// looked up by the exact string the provider used.
+describe('useAvailableComponentInstanceIdOrThrow', () => {
+ it.each(['main', 'side-panel'] as const)(
+ 'returns the context id verbatim on a %s surface',
+ (surfaceType) => {
+ const { result } = renderHook(
+ () =>
+ useAvailableComponentInstanceIdOrThrow(
+ RecordFieldListComponentInstanceContext,
+ ),
+ { wrapper: buildWrapper({ surfaceType, provideContext: true }) },
+ );
+
+ expect(result.current).toBe(CONTEXT_INSTANCE_ID);
+ },
+ );
+
+ it.each(['main', 'side-panel'] as const)(
+ 'returns an explicit id verbatim on a %s surface',
+ (surfaceType) => {
+ const { result } = renderHook(
+ () =>
+ useAvailableComponentInstanceIdOrThrow(
+ RecordFieldListComponentInstanceContext,
+ PROPS_INSTANCE_ID,
+ ),
+ { wrapper: buildWrapper({ surfaceType, provideContext: true }) },
+ );
+
+ expect(result.current).toBe(PROPS_INSTANCE_ID);
+ },
+ );
+
+ it('throws when no id is provided or in context', () => {
+ expect(() =>
+ renderHook(
+ () =>
+ useAvailableComponentInstanceIdOrThrow(
+ RecordFieldListComponentInstanceContext,
+ ),
+ {
+ wrapper: buildWrapper({ surfaceType: 'main', provideContext: false }),
+ },
+ ),
+ ).toThrow('Instance id is not provided and cannot be found in context.');
+ });
+});
+
+describe('useAvailableComponentInstanceId', () => {
+ it.each(['main', 'side-panel'] as const)(
+ 'returns the context id verbatim on a %s surface',
+ (surfaceType) => {
+ const { result } = renderHook(
+ () =>
+ useAvailableComponentInstanceId(
+ RecordFieldListComponentInstanceContext,
+ ),
+ { wrapper: buildWrapper({ surfaceType, provideContext: true }) },
+ );
+
+ expect(result.current).toBe(CONTEXT_INSTANCE_ID);
+ },
+ );
+
+ it('returns null when there is no context', () => {
+ const { result } = renderHook(
+ () =>
+ useAvailableComponentInstanceId(
+ RecordFieldListComponentInstanceContext,
+ ),
+ {
+ wrapper: buildWrapper({
+ surfaceType: 'side-panel',
+ provideContext: false,
+ }),
+ },
+ );
+
+ expect(result.current).toBeNull();
+ });
+});
diff --git a/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId.ts b/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId.ts
index 9fa24e9d406..bf3de9465d3 100644
--- a/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId.ts
@@ -1,8 +1,9 @@
import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';
import { type ComponentInstanceStateContext } from '@/ui/utilities/state/component-state/types/ComponentInstanceStateContext';
-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { isNonEmptyString } from '@sniptt/guards';
+// Returns the id exactly as provided; see useAvailableComponentInstanceIdOrThrow
+// for why surface scoping belongs at the provider, not here.
export const useAvailableComponentInstanceId = <
T extends { instanceId: string },
>(
@@ -11,9 +12,10 @@ export const useAvailableComponentInstanceId = <
const instanceStateContext = useComponentInstanceStateContext(Context);
const instanceIdFromContext = instanceStateContext?.instanceId;
- const scopedInstanceId = useWorkspaceSurfaceScopedComponentInstanceId(
- instanceIdFromContext ?? '',
- );
- return isNonEmptyString(scopedInstanceId) ? scopedInstanceId : null;
+ if (isNonEmptyString(instanceIdFromContext)) {
+ return instanceIdFromContext;
+ }
+
+ return null;
};
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.ts
index 4119eec559b..6e7ab1b01cd 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
@@ -1,8 +1,13 @@
import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';
import { type ComponentInstanceStateContext } from '@/ui/utilities/state/component-state/types/ComponentInstanceStateContext';
-import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
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.
export const useAvailableComponentInstanceIdOrThrow = <
T extends { instanceId: string },
>(
@@ -12,14 +17,13 @@ export const useAvailableComponentInstanceIdOrThrow = <
const instanceStateContext = useComponentInstanceStateContext(Context);
const instanceIdFromContext = instanceStateContext?.instanceId;
- const availableInstanceId = isNonEmptyString(instanceIdFromProps)
- ? instanceIdFromProps
- : (instanceIdFromContext ?? '');
- const scopedInstanceId =
- useWorkspaceSurfaceScopedComponentInstanceId(availableInstanceId);
- if (isNonEmptyString(scopedInstanceId)) {
- return scopedInstanceId;
+ if (isNonEmptyString(instanceIdFromProps)) {
+ return instanceIdFromProps;
+ }
+
+ if (isNonEmptyString(instanceIdFromContext)) {
+ return instanceIdFromContext;
}
throw new Error(
diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useFlowOrThrow.test.tsx b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useFlowOrThrow.test.tsx
new file mode 100644
index 00000000000..bb45adab961
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useFlowOrThrow.test.tsx
@@ -0,0 +1,82 @@
+import { act, renderHook } from '@testing-library/react';
+import { createStore, Provider as JotaiProvider } from 'jotai';
+import { type ReactNode } from 'react';
+
+import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
+import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceContext';
+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
+import { useFlowOrThrow } from '@/workflow/hooks/useFlowOrThrow';
+import { flowComponentState } from '@/workflow/states/flowComponentState';
+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
+
+const VISUALIZER_INSTANCE_ID = 'workflow-visualizer-workflow-1';
+
+const buildWrapper =
+ ({
+ store,
+ surfaceType,
+ }: {
+ store: ReturnType<typeof createStore>;
+ surfaceType: 'main' | 'side-panel';
+ }) =>
+ ({ children }: { children: ReactNode }) => (
+ <JotaiProvider store={store}>
+ <WorkspaceSurfaceContext.Provider
+ value={{
+ type: surfaceType,
+ instanceId:
+ surfaceType === 'side-panel'
+ ? 'side-panel-page'
+ : MAIN_CONTEXT_STORE_INSTANCE_ID,
+ ownsRouteLocation: surfaceType === 'main',
+ }}
+ >
+ <WorkflowVisualizerComponentInstanceContext.Provider
+ value={{ instanceId: VISUALIZER_INSTANCE_ID }}
+ >
+ {children}
+ </WorkflowVisualizerComponentInstanceContext.Provider>
+ </WorkspaceSurfaceContext.Provider>
+ </JotaiProvider>
+ );
+
+describe('useFlowOrThrow', () => {
+ // The workflow diagram on the main surface writes the flow, and the side
+ // panel step editor deliberately provides the same visualizer instance id to
+ // read it. If component ids were rewritten per surface, the side panel would
+ // read a different atom and every step click would crash.
+ it('reads a flow written on the main surface from a side panel sharing the instance id', () => {
+ const store = createStore();
+ const flow = {
+ workflowVersionId: 'workflow-version-1',
+ trigger: null,
+ steps: [],
+ };
+
+ const { result: writer } = renderHook(
+ () => useSetAtomComponentState(flowComponentState),
+ { wrapper: buildWrapper({ store, surfaceType: 'main' }) },
+ );
+
+ act(() => {
+ writer.current(flow);
+ });
+
+ const { result: reader } = renderHook(() => useFlowOrThrow(), {
+ wrapper: buildWrapper({ store, surfaceType: 'side-panel' }),
+ });
+
+ expect(reader.current).toEqual(flow);
+ });
+
+ it('throws when the flow has not been written', () => {
+ expect(() =>
+ renderHook(() => useFlowOrThrow(), {
+ wrapper: buildWrapper({
+ store: createStore(),
+ surfaceType: 'side-panel',
+ }),
+ }),
+ ).toThrow('Expected the flow to be defined');
+ });
+});
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.tsx
index fd3f915182a..adddd8b6905 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,6 +6,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { 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';
@@ -45,9 +46,12 @@ export const WorkflowDiagramStepNodeOptionsDropdown = ({
WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode,
];
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
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.tsx
index 556e70bb7cf..4de7ffba04f 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,6 +12,7 @@ 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';
@@ -98,9 +99,12 @@ export const WorkflowStepFooter = ({
}
};
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
const OptionsDropdown = (
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.tsx
index 44b46e61675..f6bb37e6404 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,6 +9,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
import { useState } from 'react';
import { MenuItem } from 'twenty-ui/navigation';
@@ -73,9 +74,12 @@ export const WorkflowObjectDropdownContent = ({
(objectMetadataItem) => objectMetadataItem.nameSingular,
);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
const handleSearchInputChange = (
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.tsx
index 11029db6cb6..b591b125670 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,6 +20,7 @@ import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowS
import { 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';
@@ -147,9 +148,12 @@ export const WorkflowEditTriggerDatabaseEventForm = ({
const selectableItemIdArray = filteredObjects.map((option) => option.value);
+ const scopedDropdownId =
+ useWorkspaceSurfaceScopedComponentInstanceId(dropdownId);
+
const selectedItemId = useAtomComponentStateValue(
selectedItemIdComponentState,
- dropdownId,
+ scopedDropdownId,
);
const handleOptionClick = (value: string) => {