The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Share record selection state between table and board (#27166)
Félix Malfait41b1dc8d5fae
diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsxindex 1a07379ff04..6fd865224dc 100644--- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx+++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx@@ -16,9 +16,8 @@ import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewTypeimport { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useActiveRecordBoardCard';import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';import { useResetFocusStackToRecordIndex } from '@/object-record/record-index/hooks/useResetFocusStackToRecordIndex';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useActiveRecordTableRow } from '@/object-record/record-table/hooks/useActiveRecordTableRow';import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';import { useOpenNewRecordTitleCell } from '@/object-record/record-title-cell/hooks/useOpenNewRecordTitleCell';@@ -66,7 +65,7 @@ export const PageChangeEffect = () => {const pageChangeEffectNavigateLocation =usePageChangeEffectNavigateLocation();- // TODO: make useResetTableRowSelection accept an empty recordTableId, then drop CoreObjectNamePlural.Person+ // TODO: make useResetRecordSelection accept an empty recordIndexId, then drop CoreObjectNamePlural.Personconst objectNamePlural =matchPath(AppPath.RecordIndexPage, location.pathname)?.params.objectNamePlural ?? CoreObjectNamePlural.Person;@@ -86,12 +85,10 @@ export const PageChangeEffect = () => {contextStoreCurrentViewId || '',);- const { resetTableRowSelection } = useResetTableRowSelection(recordIndexId);+ const { resetRecordSelection } = useResetRecordSelection(recordIndexId);const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordIndexId);const { deactivateRecordTableRow } = useActiveRecordTableRow(recordIndexId);- const { resetRecordBoardSelection } =- useResetRecordBoardSelection(recordIndexId);const { deactivateBoardCard } = useActiveRecordBoardCard(recordIndexId);const { unfocusBoardCard } = useFocusedRecordBoardCard(recordIndexId);@@ -189,13 +186,13 @@ export const PageChangeEffect = () => {);if (isLeavingRecordIndexPage) {+ resetRecordSelection();+if (contextStoreCurrentViewType === ContextStoreViewType.Table) {- resetTableRowSelection();unfocusRecordTableRow();deactivateRecordTableRow();}if (contextStoreCurrentViewType === ContextStoreViewType.Kanban) {- resetRecordBoardSelection();deactivateBoardCard();unfocusBoardCard();}@@ -412,10 +409,9 @@ export const PageChangeEffect = () => {location,previousLocation,contextStoreCurrentViewType,- resetTableRowSelection,+ resetRecordSelection,unfocusRecordTableRow,deactivateRecordTableRow,- resetRecordBoardSelection,deactivateBoardCard,unfocusBoardCard,resetFocusStackToRecordIndex,diff --git a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsxindex 882fa0daaa5..ae38ee34c7e 100644--- a/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/components/__stories__/RecordIndexCommandMenuDropdown.stories.tsx@@ -10,7 +10,7 @@ import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/uimport { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';@@ -71,7 +71,7 @@ const COMMAND_MENU_ITEMS = [const isRecordRowSelected = (recordId: string) =>jotaiStore.get(- isRowSelectedComponentFamilyState.atomFamily({+ isRecordSelectedComponentFamilyState.atomFamily({instanceId: RECORD_TABLE_ID,familyKey: recordId,}),diff --git a/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useSelectFirstRecordForEditMode.ts b/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useSelectFirstRecordForEditMode.tsindex 94596baba59..47d74bdf78e 100644--- a/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useSelectFirstRecordForEditMode.ts+++ b/packages/twenty-front/src/modules/command-menu-item/edit/hooks/useSelectFirstRecordForEditMode.ts@@ -1,10 +1,9 @@import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { getRecordIndexId } from '@/command-menu-item/edit/utils/getRecordIndexId';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';import { useResetRecordIndexSelection } from '@/object-record/record-index/hooks/useResetRecordIndexSelection';import { recordIndexViewTypeState } from '@/object-record/record-index/states/recordIndexViewTypeState';import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { ViewType } from '@/views/types/ViewType';import { useStore } from 'jotai';import { useCallback } from 'react';@@ -25,6 +24,15 @@ export const useSelectFirstRecordForEditMode = () => {resetRecordIndexSelection();+ const viewType = store.get(+ recordIndexViewTypeState.atomFamily({ instanceId: recordIndexId }),+ );++ // Calendar keeps its own selection over its own records+ if (viewType !== ViewType.TABLE && viewType !== ViewType.KANBAN) {+ return;+ }+const allRecordIds = store.get(recordIndexAllRecordIdsComponentSelector.selectorFamily({instanceId: recordIndexId,@@ -37,32 +45,13 @@ export const useSelectFirstRecordForEditMode = () => {return;}- const viewType = store.get(- recordIndexViewTypeState.atomFamily({ instanceId: recordIndexId }),+ store.set(+ isRecordSelectedComponentFamilyState.atomFamily({+ instanceId: recordIndexId,+ familyKey: firstRecordId,+ }),+ true,);-- switch (viewType) {- case ViewType.TABLE: {- store.set(- isRowSelectedComponentFamilyState.atomFamily({- instanceId: recordIndexId,- familyKey: firstRecordId,- }),- true,- );- break;- }- case ViewType.KANBAN: {- store.set(- isRecordBoardCardSelectedComponentFamilyState.atomFamily({- instanceId: recordIndexId,- familyKey: firstRecordId,- }),- true,- );- break;- }- }}, [store, resetRecordIndexSelection]);return { selectFirstRecordForEditMode };diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsxindex 555a2dbc23d..fbaf0415de0 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx@@ -12,7 +12,7 @@ import { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPimport { useIncrementalDeleteManyRecords } from '@/object-record/hooks/useIncrementalDeleteManyRecords';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { isDefined } from 'twenty-shared/utils';@@ -26,7 +26,7 @@ const DeleteWorkspaceRecordsCommand = () => {const recordId = selectedRecords[0]?.id;- const { resetTableRowSelection } = useResetTableRowSelection(+ const { resetRecordSelection } = useResetRecordSelection(recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,);@@ -55,7 +55,7 @@ const DeleteWorkspaceRecordsCommand = () => {const handleExecute = async () => {if (isDefined(recordIndexId)) {removeSelectedRecordsFromRecordBoard();- resetTableRowSelection();+ resetRecordSelection();}closeSidePanelMenu();diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsxindex 1df09a9ffd2..928c4b92137 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DestroyRecordsCommand.tsx@@ -4,7 +4,7 @@ import { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPimport { useIncrementalDestroyManyRecords } from '@/object-record/hooks/useIncrementalDestroyManyRecords';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { t } from '@lingui/core/macro';import {@@ -33,7 +33,7 @@ export const DestroyRecordsCommand = () => {const navigateApp = useNavigateApp();const { closeSidePanelMenu } = useSidePanelMenu();- const { resetTableRowSelection } = useResetTableRowSelection(+ const { resetRecordSelection } = useResetRecordSelection(recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,);const { removeSelectedRecordsFromRecordBoard } =@@ -62,7 +62,7 @@ export const DestroyRecordsCommand = () => {const handleExecute = async () => {if (isDefined(recordIndexId)) {removeSelectedRecordsFromRecordBoard();- resetTableRowSelection();+ resetRecordSelection();}if (!isDefined(graphqlFilter)) {diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsxindex c60a683c9dc..4c04a4b2d39 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx@@ -5,7 +5,7 @@ import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecimport { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';import { useRemoveSelectedRecordsFromRecordBoard } from '@/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard';import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { t } from '@lingui/core/macro';import { type RecordGqlOperationFilter } from 'twenty-shared/types';@@ -21,7 +21,7 @@ export const RestoreRecordsCommand = () => {const isSingleRecord = selectedRecords.length === 1;- const { resetTableRowSelection } = useResetTableRowSelection(+ const { resetRecordSelection } = useResetRecordSelection(recordIndexId ?? PLACEHOLDER_RECORD_INDEX_ID,);const { removeSelectedRecordsFromRecordBoard } =@@ -66,7 +66,7 @@ export const RestoreRecordsCommand = () => {const recordIdsToRestore = recordsToRestore.map((record) => record.id);if (isDefined(recordIndexId)) {- resetTableRowSelection();+ resetRecordSelection();}await restoreManyRecords({diff --git a/packages/twenty-front/src/modules/object-record/components/RecordComponentInstanceContextsWrapper.tsx b/packages/twenty-front/src/modules/object-record/components/RecordComponentInstanceContextsWrapper.tsxindex 03f54f30a08..44c48838af3 100644--- a/packages/twenty-front/src/modules/object-record/components/RecordComponentInstanceContextsWrapper.tsx+++ b/packages/twenty-front/src/modules/object-record/components/RecordComponentInstanceContextsWrapper.tsx@@ -2,6 +2,7 @@ import { RecordCalendarComponentInstanceContext } from '@/object-record/record-cimport { RecordFieldsComponentInstanceContext } from '@/object-record/record-field/states/context/RecordFieldsComponentInstanceContext';import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';import { RecordFilterGroupsComponentInstanceContext } from '@/object-record/record-filter-group/states/context/RecordFilterGroupsComponentInstanceContext';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';import { RecordSortsComponentInstanceContext } from '@/object-record/record-sort/states/context/RecordSortsComponentInstanceContext';import { type PropsWithChildren } from 'react';@@ -33,7 +34,11 @@ export const RecordComponentInstanceContextsWrapper = ({<RecordListComponentInstanceContext.Providervalue={{ instanceId: componentInstanceId }}>- {children}+ <RecordSelectionComponentInstanceContext.Provider+ value={{ instanceId: componentInstanceId }}+ >+ {children}+ </RecordSelectionComponentInstanceContext.Provider></RecordListComponentInstanceContext.Provider></RecordCalendarComponentInstanceContext.Provider></RecordFieldsComponentInstanceContext.Provider>diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsxindex 3034de9c2f1..de8963176cc 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardBodyEscapeHotkeyEffect.tsx@@ -3,8 +3,8 @@ import { Key } from 'ts-key-enum';import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';+import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';import { useResetFocusStackToRecordIndex } from '@/object-record/record-index/hooks/useResetFocusStackToRecordIndex';import { PageFocusId } from '@/types/PageFocusId';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';@@ -13,23 +13,20 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/export const RecordBoardBodyEscapeHotkeyEffect = () => {const { recordBoardId } = useContext(RecordBoardContext);- const { resetRecordBoardSelection } =- useResetRecordBoardSelection(recordBoardId);+ const { resetRecordSelection } = useResetRecordSelection(recordBoardId);const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);const { resetFocusStackToRecordIndex } = useResetFocusStackToRecordIndex();- const selectedRecordIds = useAtomComponentSelectorValue(- recordBoardSelectedRecordIdsComponentSelector,+ const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(+ isAtLeastOneRecordSelectedComponentSelector,recordBoardId,);- const isAtLeastOneRecordSelected = selectedRecordIds.length > 0;-const handleEscape = () => {unfocusBoardCard();if (isAtLeastOneRecordSelected) {- resetRecordBoardSelection();+ resetRecordSelection();}resetFocusStackToRecordIndex();diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsxindex 78a8cdbb889..74c8f7a55b3 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardClickOutsideEffect.tsx@@ -4,7 +4,7 @@ import { RECORD_BOARD_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-bimport { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useActiveRecordBoardCard';import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { RECORD_BOARD_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-board/record-board-card/constants/RecordBoardCardClickOutsideId';import { isDraggingRecordComponentState } from '@/object-record/record-drag/states/isDraggingRecordComponentState';import { SIDE_PANEL_CLICK_OUTSIDE_ID } from '@/side-panel/constants/SidePanelClickOutsideId';@@ -27,8 +27,7 @@ export const RecordBoardClickOutsideEffect = () => {const { deactivateBoardCard } = useActiveRecordBoardCard(recordBoardId);const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);- const { resetRecordBoardSelection } =- useResetRecordBoardSelection(recordBoardId);+ const { resetRecordSelection } = useResetRecordSelection(recordBoardId);useListenClickOutside({excludedClickOutsideIds: [@@ -44,7 +43,7 @@ export const RecordBoardClickOutsideEffect = () => {refs: [],callback: () => {if (!isDraggingRecord) {- resetRecordBoardSelection();+ resetRecordSelection();deactivateBoardCard();unfocusBoardCard();}diff --git a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsxindex d67dfb7548d..29c5d984784 100644--- a/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/components/RecordBoardSelectRecordsEffect.tsx@@ -3,13 +3,13 @@ import { useEffect } from 'react';import { contextStoreRecordIdsInSelectionOrderComponentState } from '@/context-store/states/contextStoreRecordIdsInSelectionOrderComponentState';import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';import { orderRecordIdsBySelection } from '@/context-store/utils/orderRecordIdsBySelection';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';export const RecordBoardSelectRecordsEffect = () => {const selectedRecordIds = useAtomComponentSelectorValue(- recordBoardSelectedRecordIdsComponentSelector,+ selectedRecordIdsComponentSelector,);const setContextStoreTargetedRecordsRule = useSetAtomComponentState(diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.tsindex c424ba0839b..f1958322e3c 100644--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardCardHotkeys.ts@@ -4,10 +4,10 @@ import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useimport { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';import { useRecordBoardSelectAllHotkeys } from '@/object-record/record-board/hooks/useRecordBoardSelectAllHotkeys';import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';@@ -24,23 +24,21 @@ export const useRecordBoardCardHotkeys = (focusId: string) => {const { activateBoardCard } = useActiveRecordBoardCard();const { setRecordAsSelected } = useRecordBoardSelection();- const { resetRecordBoardSelection } = useResetRecordBoardSelection();+ const { resetRecordSelection } = useResetRecordSelection();const { unfocusBoardCard } = useFocusedRecordBoardCard(recordBoardId);- const isRecordBoardCardSelected = useAtomComponentFamilyStateValue(- isRecordBoardCardSelectedComponentFamilyState,+ const isRecordSelected = useAtomComponentFamilyStateValue(+ isRecordSelectedComponentFamilyState,recordId,);- const selectedRecordIds = useAtomComponentSelectorValue(- recordBoardSelectedRecordIdsComponentSelector,+ const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(+ isAtLeastOneRecordSelectedComponentSelector,recordBoardId,);- const isAtLeastOneRecordSelected = selectedRecordIds.length > 0;-const handleSelectCard = () => {- setRecordAsSelected(recordId, !isRecordBoardCardSelected);+ setRecordAsSelected(recordId, !isRecordSelected);};const handleOpenRecordInSidePanel = () => {@@ -60,7 +58,7 @@ export const useRecordBoardCardHotkeys = (focusId: string) => {unfocusBoardCard();if (isAtLeastOneRecordSelected) {- resetRecordBoardSelection();+ resetRecordSelection();}};diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelectAllHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelectAllHotkeys.tsindex 793a047eda8..ca93b65ddc6 100644--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelectAllHotkeys.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelectAllHotkeys.ts@@ -1,4 +1,4 @@-import { useSelectAllCards } from '@/object-record/record-board/hooks/useSelectAllCards';+import { useSelectAllRecords } from '@/object-record/record-selection/hooks/useSelectAllRecords';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';export const useRecordBoardSelectAllHotkeys = ({@@ -8,13 +8,13 @@ export const useRecordBoardSelectAllHotkeys = ({recordBoardId: string;focusId: string;}) => {- const { selectAllCards } = useSelectAllCards(recordBoardId);+ const { selectAllRecords } = useSelectAllRecords(recordBoardId);useHotkeysOnFocusedElement({keys: ['ctrl+a', 'meta+a'],- callback: selectAllCards,+ callback: selectAllRecords,focusId,- dependencies: [selectAllCards],+ dependencies: [selectAllRecords],options: {enableOnFormTags: false,},diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.tsindex a33f3c1434a..9e220d22870 100644--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRecordBoardSelection.ts@@ -1,8 +1,8 @@import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';@@ -16,14 +16,13 @@ export const useRecordBoardSelection = (recordBoardId?: string) => {recordBoardId,);- const isRecordBoardCardSelectedFamilyState =- useAtomComponentFamilyStateCallbackState(- isRecordBoardCardSelectedComponentFamilyState,- recordBoardId,- );+ const isRecordSelectedFamilyState = useAtomComponentFamilyStateCallbackState(+ isRecordSelectedComponentFamilyState,+ recordBoardId,+ );- const recordBoardSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordBoardSelectedRecordIdsComponentSelector,+ const selectedRecordIds = useAtomComponentSelectorCallbackState(+ selectedRecordIdsComponentSelector,recordBoardId,);@@ -36,7 +35,7 @@ export const useRecordBoardSelection = (recordBoardId?: string) => {const setRecordAsSelected = useCallback((recordId: string, isSelected: boolean) => {- const atom = isRecordBoardCardSelectedFamilyState(recordId);+ const atom = isRecordSelectedFamilyState(recordId);const isRecordCurrentlySelected = store.get(atom);if (isRecordCurrentlySelected === isSelected) {@@ -45,16 +44,16 @@ export const useRecordBoardSelection = (recordBoardId?: string) => {store.set(atom, isSelected);},- [isRecordBoardCardSelectedFamilyState, store],+ [isRecordSelectedFamilyState, store],);const checkIfLastUnselectAndCloseDropdown = useCallback(() => {- const recordIds = store.get(recordBoardSelectedRecordIds);+ const recordIds = store.get(selectedRecordIds);if (recordIds.length === 0) {closeDropdown(dropdownId);}- }, [recordBoardSelectedRecordIds, store, closeDropdown, dropdownId]);+ }, [selectedRecordIds, store, closeDropdown, dropdownId]);return {setRecordAsSelected,diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.tsindex 1b81d2337fb..e5995b40c36 100644--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/hooks/useRemoveSelectedRecordsFromRecordBoard.ts@@ -1,14 +1,16 @@import { useStore } from 'jotai';-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { recordGroupDefinitionsComponentSelector } from '@/object-record/record-group/states/selectors/recordGroupDefinitionsComponentSelector';import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';+import { recordIndexViewTypeState } from '@/object-record/record-index/states/recordIndexViewTypeState';import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';+import { ViewType } from '@/views/types/ViewType';import { useCallback } from 'react';import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';@@ -32,18 +34,26 @@ export const useRemoveSelectedRecordsFromRecordBoard = (recordBoardIndexId,);- const recordBoardSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordBoardSelectedRecordIdsComponentSelector,+ const selectedRecordIds = useAtomComponentSelectorCallbackState(+ selectedRecordIdsComponentSelector,recordBoardIndexId,);- const { resetRecordBoardSelection } =- useResetRecordBoardSelection(recordBoardIndexId);+ const { resetRecordSelection } = useResetRecordSelection(recordBoardIndexId);+ const recordIndexViewType = useAtomComponentStateValue(+ recordIndexViewTypeState,+ recordBoardIndexId,+ );++ // Table and board share the selection, but only the board drops deleted+ // cards from its columns before the server confirmsconst removeSelectedRecordsFromRecordBoard = useCallback(() => {- const deletedRecordIds = store.get(- recordBoardSelectedRecordIds,- ) as string[];+ if (recordIndexViewType !== ViewType.KANBAN) {+ return;+ }++ const deletedRecordIds = store.get(selectedRecordIds);if (!isDefined(recordIndexGroupFieldMetadataItem) ||@@ -53,6 +63,10 @@ export const useRemoveSelectedRecordsFromRecordBoard = (return;}+ // Cleared while the cards are still listed, since the selection only+ // covers listed records+ resetRecordSelection();+for (const recordGroup of recordGroupDefinitions) {const currentRecordIds = store.get(recordIndexRecordIdsByGroupCallbackState(recordGroup.id),@@ -82,15 +96,14 @@ export const useRemoveSelectedRecordsFromRecordBoard = ();}}-- resetRecordBoardSelection();}, [+ recordIndexViewType,store,recordIndexGroupFieldMetadataItem,recordIndexRecordIdsByGroupCallbackState,recordGroupDefinitions,- recordBoardSelectedRecordIds,- resetRecordBoardSelection,+ selectedRecordIds,+ resetRecordSelection,]);return {diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useResetRecordBoardSelection.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useResetRecordBoardSelection.tsdeleted file mode 100644index 1e80753227e..00000000000--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useResetRecordBoardSelection.ts+++ /dev/null@@ -1,56 +0,0 @@-import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';-import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';-import { useStore } from 'jotai';-import { useCallback } from 'react';--export const useResetRecordBoardSelection = (recordBoardId?: string) => {- const instanceIdFromProps = useAvailableComponentInstanceIdOrThrow(- RecordBoardComponentInstanceContext,- recordBoardId,- );-- const isRecordBoardCardSelectedFamilyState =- useAtomComponentFamilyStateCallbackState(- isRecordBoardCardSelectedComponentFamilyState,- recordBoardId,- );-- const recordBoardSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordBoardSelectedRecordIdsComponentSelector,- recordBoardId,- );-- const { closeDropdown } = useCloseDropdown();- const store = useStore();-- const dropdownId = getCommandMenuDropdownIdFromCommandMenuId(- getCommandMenuIdFromRecordIndexId(instanceIdFromProps),- );-- const resetRecordBoardSelection = useCallback(() => {- closeDropdown(dropdownId);-- const recordIds = store.get(recordBoardSelectedRecordIds);-- for (const recordId of recordIds) {- store.set(isRecordBoardCardSelectedFamilyState(recordId), false);- }- }, [- closeDropdown,- dropdownId,- recordBoardSelectedRecordIds,- isRecordBoardCardSelectedFamilyState,- store,- ]);-- return {- resetRecordBoardSelection,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.ts b/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.tsdeleted file mode 100644index 0a171e57145..00000000000--- a/packages/twenty-front/src/modules/object-record/record-board/hooks/useSelectAllCards.ts+++ /dev/null@@ -1,56 +0,0 @@-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';-import { allCardsSelectedStatusComponentSelector } from '@/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector';-import { allRecordIdsOfAllRecordGroupsComponentSelector } from '@/object-record/record-index/states/selectors/allRecordIdsOfAllRecordGroupsComponentSelector';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';-import { useStore } from 'jotai';-import { useCallback } from 'react';--export const useSelectAllCards = (recordBoardId?: string) => {- const allCardsSelectedStatus = useAtomComponentSelectorCallbackState(- allCardsSelectedStatusComponentSelector,- recordBoardId,- );- const isRecordBoardCardSelectedFamilyState =- useAtomComponentFamilyStateCallbackState(- isRecordBoardCardSelectedComponentFamilyState,- recordBoardId,- );- const allRecordIdsOfAllRecordGroups = useAtomComponentSelectorCallbackState(- allRecordIdsOfAllRecordGroupsComponentSelector,- recordBoardId,- );-- const { resetRecordBoardSelection } =- useResetRecordBoardSelection(recordBoardId);-- const store = useStore();-- const selectAllCards = useCallback(() => {- const currentAllCardsSelectedStatus = store.get(allCardsSelectedStatus);- const allRecordIds = store.get(allRecordIdsOfAllRecordGroups);-- if (currentAllCardsSelectedStatus === 'all') {- resetRecordBoardSelection();- }-- for (const recordId of allRecordIds) {- const isSelected =- currentAllCardsSelectedStatus === 'none' ||- currentAllCardsSelectedStatus === 'some';-- store.set(isRecordBoardCardSelectedFamilyState(recordId), isSelected);- }- }, [- allCardsSelectedStatus,- allRecordIdsOfAllRecordGroups,- resetRecordBoardSelection,- isRecordBoardCardSelectedFamilyState,- store,- ]);-- return {- selectAllCards,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsxindex 4935c5d9c6a..3d0cc7cc5eb 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx@@ -4,7 +4,7 @@ import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getimport { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';import { isRecordBoardCardActiveComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardActiveComponentFamilyState';import { isRecordBoardCardFocusedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardFocusedComponentFamilyState';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { useActiveRecordBoardCard } from '@/object-record/record-board/hooks/useActiveRecordBoardCard';import { useFocusedRecordBoardCard } from '@/object-record/record-board/hooks/useFocusedRecordBoardCard';@@ -82,11 +82,10 @@ export const RecordBoardCard = () => {`record-board-card-${recordId}`,);- const [isRecordBoardCardSelected, setIsRecordBoardCardSelected] =- useAtomComponentFamilyState(- isRecordBoardCardSelectedComponentFamilyState,- recordId,- );+ const [isRecordSelected, setIsRecordSelected] = useAtomComponentFamilyState(+ isRecordSelectedComponentFamilyState,+ recordId,+ );const isRecordBoardCardFocused = useAtomComponentFamilyStateValue(isRecordBoardCardFocusedComponentFamilyState,@@ -128,7 +127,7 @@ export const RecordBoardCard = () => {const handleContextMenuOpen = (event: React.MouseEvent) => {event.preventDefault();- setIsRecordBoardCardSelected(true);+ setIsRecordSelected(true);setRecordIndexCommandMenuDropdownPosition({x: event.clientX,y: event.clientY,@@ -180,7 +179,7 @@ export const RecordBoardCard = () => {<RecordDragMultiDragStack />)}<RecordCard- data-selected={isRecordBoardCardSelected}+ data-selected={isRecordSelected}data-focused={isRecordBoardCardFocused}data-active={isRecordBoardCardActive}onMouseLeave={onMouseLeaveBoard}diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsxindex f96af408605..34615571d50 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx@@ -1,7 +1,7 @@import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { t } from '@lingui/core/macro';import { RecordChip } from '@/object-record/components/RecordChip';@@ -62,11 +62,10 @@ export const RecordBoardCardHeader = () => {const { checkIfLastUnselectAndCloseDropdown } =useRecordBoardSelection(recordBoardId);- const [isRecordBoardCardSelected, setIsRecordBoardCardSelected] =- useAtomComponentFamilyState(- isRecordBoardCardSelectedComponentFamilyState,- recordId,- );+ const [isRecordSelected, setIsRecordSelected] = useAtomComponentFamilyState(+ isRecordSelectedComponentFamilyState,+ recordId,+ );const { openRecordFromIndexView } = useOpenRecordFromIndexView();@@ -125,9 +124,9 @@ export const RecordBoardCardHeader = () => {<StopPropagationContainer><Checkboxhoverable- checked={isRecordBoardCardSelected}+ checked={isRecordSelected}onCheckedChange={(isChecked) => {- setIsRecordBoardCardSelected(isChecked);+ setIsRecordSelected(isChecked);checkIfLastUnselectAndCloseDropdown();}}variant="outline"diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.tsindex fd62def23f0..d23389b485a 100644--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-dnd/hooks/useRecordBoardDndKit.ts@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';import { isRecordBoardDropProcessingComponentState } from '@/object-record/record-board/states/isRecordBoardDropProcessingComponentState';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { getBoardCardDropBehavior } from '@/object-record/record-board/utils/getBoardCardDropBehavior';import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';@@ -52,7 +52,7 @@ export const useRecordBoardDndKit = (): {);const recordBoardSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordBoardSelectedRecordIdsComponentSelector,+ selectedRecordIdsComponentSelector,recordBoardId,);diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.tsdeleted file mode 100644index 0feba7af83f..00000000000--- a/packages/twenty-front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';--export const isRecordBoardCardSelectedComponentFamilyState =- createAtomComponentFamilyState<boolean, string>({- key: 'isRecordBoardCardSelectedComponentFamilyState',- defaultValue: false,- componentInstanceContext: RecordBoardComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.tsdeleted file mode 100644index e1bce9f0b39..00000000000--- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/allCardsSelectedStatusComponentSelector.ts+++ /dev/null@@ -1,35 +0,0 @@-import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';-import { recordBoardSelectedRecordIdsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector';-import { allRecordIdsOfAllRecordGroupsComponentSelector } from '@/object-record/record-index/states/selectors/allRecordIdsOfAllRecordGroupsComponentSelector';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';-import { type AllRowsSelectedStatus } from '@/object-record/record-table/types/AllRowSelectedStatus';--export const allCardsSelectedStatusComponentSelector =- createAtomComponentSelector<AllRowsSelectedStatus>({- key: 'allCardsSelectedStatusComponentSelector',- componentInstanceContext: RecordBoardComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(- allRecordIdsOfAllRecordGroupsComponentSelector,- { instanceId },- );-- const selectedRecordIds = get(- recordBoardSelectedRecordIdsComponentSelector,- { instanceId },- );-- const numberOfSelectedCards = selectedRecordIds.length;-- const allCardsSelectedStatus =- numberOfSelectedCards === 0- ? 'none'- : selectedRecordIds.length === allRecordIds.length- ? 'all'- : 'some';-- return allCardsSelectedStatus;- },- });diff --git a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.tsdeleted file mode 100644index c8679a9d2c9..00000000000--- a/packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardSelectedRecordIdsComponentSelector.ts+++ /dev/null@@ -1,25 +0,0 @@-import { RecordBoardComponentInstanceContext } from '@/object-record/record-board/states/contexts/RecordBoardComponentInstanceContext';-import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const recordBoardSelectedRecordIdsComponentSelector =- createAtomComponentSelector<string[]>({- key: 'recordBoardSelectedRecordIdsSelector',- componentInstanceContext: RecordBoardComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {- instanceId,- });-- return allRecordIds.filter(- (recordId) =>- get(isRecordBoardCardSelectedComponentFamilyState, {- instanceId,- familyKey: recordId,- }) === true,- );- },- });diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.tsindex 68a8a1ae99b..44339ef9cc1 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithGroupRecordDrop.ts@@ -15,7 +15,7 @@ import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-recordimport { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';-import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';@@ -42,7 +42,7 @@ export const useProcessTableWithGroupRecordDrop = () => {);const selectedRowIds = useAtomComponentSelectorCallbackState(- selectedRowIdsComponentSelector,+ selectedRecordIdsComponentSelector,recordTableId,);diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.tsindex b17024addd9..31cdc763c24 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop.ts@@ -14,7 +14,7 @@ import { useStore } from 'jotai';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';-import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { type RecordWithPosition } from '@/object-record/utils/computeNewPositionOfDraggedRecord';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';@@ -35,7 +35,7 @@ export const useProcessTableWithoutGroupRecordDrop = () => {);const selectedRowIds = useAtomComponentSelectorCallbackState(- selectedRowIdsComponentSelector,+ selectedRecordIdsComponentSelector,);const originalDragSelection = useAtomComponentStateCallbackState(diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsxindex 6cb0454bb8a..7f86d218baf 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx@@ -15,9 +15,9 @@ import { anyFieldFilterValueComponentState } from '@/object-record/record-filterimport { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';-import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';-import { unselectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';+import { unselectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -44,18 +44,18 @@ export const RecordIndexFiltersToContextStoreEffect = () => {recordIndexId,);- const hasUserSelectedAllRows = useAtomComponentStateValue(- hasUserSelectedAllRowsComponentState,+ const hasUserSelectedAllRecords = useAtomComponentStateValue(+ hasUserSelectedAllRecordsComponentState,recordIndexId,);- const selectedRowIds = useAtomComponentSelectorValue(- selectedRowIdsComponentSelector,+ const selectedRecordIds = useAtomComponentSelectorValue(+ selectedRecordIdsComponentSelector,recordIndexId,);- const unselectedRowIds = useAtomComponentSelectorValue(- unselectedRowIdsComponentSelector,+ const unselectedRecordIds = useAtomComponentSelectorValue(+ unselectedRecordIdsComponentSelector,recordIndexId,);@@ -97,15 +97,15 @@ export const RecordIndexFiltersToContextStoreEffect = () => {) => {let newRule: ContextStoreTargetedRecordsRule;- if (hasUserSelectedAllRows) {+ if (hasUserSelectedAllRecords) {newRule = {mode: 'exclusion',- excludedRecordIds: unselectedRowIds,+ excludedRecordIds: unselectedRecordIds,};} else {newRule = {mode: 'selection',- selectedRecordIds: selectedRowIds,+ selectedRecordIds,};}@@ -119,7 +119,9 @@ export const RecordIndexFiltersToContextStoreEffect = () => {);const newRecordIdsInSelectionOrder = orderRecordIdsBySelection({previousRecordIdsInSelectionOrder: currentRecordIdsInSelectionOrder,- selectedRecordIds: hasUserSelectedAllRows ? [] : selectedRowIds,+ selectedRecordIds: hasUserSelectedAllRecords+ ? []+ : selectedRecordIds,});if (!isDeeplyEqual(@@ -155,9 +157,9 @@ export const RecordIndexFiltersToContextStoreEffect = () => {},),[- hasUserSelectedAllRows,- selectedRowIds,- unselectedRowIds,+ hasUserSelectedAllRecords,+ selectedRecordIds,+ unselectedRecordIds,contextStoreTargetedRecordsRuleAtom,contextStoreRecordIdsInSelectionOrderAtom,contextStoreFiltersAtom,diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.tsindex a69d694e92a..8de564fcaa9 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useResetRecordIndexSelection.ts@@ -1,22 +1,15 @@import { useContextStoreObjectMetadataItem } from '@/context-store/hooks/useContextStoreObjectMetadataItem';import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';-import { contextStoreCurrentViewTypeComponentState } from '@/context-store/states/contextStoreCurrentViewTypeComponentState';-import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';-import { useResetRecordBoardSelection } from '@/object-record/record-board/hooks/useResetRecordBoardSelection';import { PLACEHOLDER_RECORD_INDEX_ID } from '@/object-record/record-index/constants/PlaceholderRecordIndexId';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useStore } from 'jotai';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';export const useResetRecordIndexSelection = (contextStoreInstanceId?: string,) => {- const store = useStore();-const { objectMetadataItem } = useContextStoreObjectMetadataItem(contextStoreInstanceId,);@@ -26,11 +19,6 @@ export const useResetRecordIndexSelection = (contextStoreInstanceId,);- const contextStoreCurrentViewTypeAtom = useAtomComponentStateCallbackState(- contextStoreCurrentViewTypeComponentState,- contextStoreInstanceId,- );-const objectNamePlural = objectMetadataItem?.namePlural;const hasValidContext = isDefined(objectNamePlural);@@ -42,35 +30,15 @@ export const useResetRecordIndexSelection = (): PLACEHOLDER_RECORD_INDEX_ID;- const { resetTableRowSelection } = useResetTableRowSelection(recordIndexId);-- const { resetRecordBoardSelection } =- useResetRecordBoardSelection(recordIndexId);+ const { resetRecordSelection } = useResetRecordSelection(recordIndexId);const resetRecordIndexSelection = useCallback(() => {if (!hasValidContext) {return;}- const contextStoreCurrentViewType = store.get(- contextStoreCurrentViewTypeAtom,- );-- switch (contextStoreCurrentViewType) {- case ContextStoreViewType.Table:- resetTableRowSelection();- break;- case ContextStoreViewType.Kanban:- resetRecordBoardSelection();- break;- }- }, [- hasValidContext,- store,- contextStoreCurrentViewTypeAtom,- resetTableRowSelection,- resetRecordBoardSelection,- ]);+ resetRecordSelection();+ }, [hasValidContext, resetRecordSelection]);return { resetRecordIndexSelection };};diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/allRecordIdsOfAllRecordGroupsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/allRecordIdsOfAllRecordGroupsComponentSelector.tsdeleted file mode 100644index ea22007d45a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/allRecordIdsOfAllRecordGroupsComponentSelector.ts+++ /dev/null@@ -1,30 +0,0 @@-import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState';-import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';-import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';--export const allRecordIdsOfAllRecordGroupsComponentSelector =- createAtomComponentSelector<string[]>({- key: 'allRecordIdsOfAllRecordGroupsComponentSelector',- componentInstanceContext: ViewComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const recordGroupIds = get(recordGroupIdsComponentState, {- instanceId,- });-- if (recordGroupIds.length === 0) {- return [];- }-- return recordGroupIds.reduce<string[]>((acc, recordGroupId) => {- const rowIds = get(recordIndexRecordIdsByGroupComponentFamilyState, {- instanceId,- familyKey: recordGroupId,- });-- return [...acc, ...rowIds];- }, []);- },- });diff --git a/packages/twenty-front/src/modules/object-record/record-selection/hooks/__tests__/useSelectAllRecords.test.tsx b/packages/twenty-front/src/modules/object-record/record-selection/hooks/__tests__/useSelectAllRecords.test.tsxnew file mode 100644index 00000000000..dd4a46e2f05--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/hooks/__tests__/useSelectAllRecords.test.tsx@@ -0,0 +1,105 @@+import { act, renderHook } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';++import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { useSelectAllRecords } from '@/object-record/record-selection/hooks/useSelectAllRecords';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';++const instanceId = 'record-index-id';++const Wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={jotaiStore}>+ <RecordSelectionComponentInstanceContext.Provider value={{ instanceId }}>+ {children}+ </RecordSelectionComponentInstanceContext.Provider>+ </JotaiProvider>+);++const getSelectedRecordIds = () =>+ jotaiStore.get(+ selectedRecordIdsComponentSelector.selectorFamily({ instanceId }),+ );++describe('useSelectAllRecords', () => {+ beforeEach(() => {+ resetJotaiStore();+ jotaiStore.set(+ recordIndexRecordIdsByGroupComponentFamilyState.atomFamily({+ instanceId,+ familyKey: NO_RECORD_GROUP_FAMILY_KEY,+ }),+ ['record-1', 'record-2', 'record-3'],+ );+ });++ it('should select every record, then unselect them on a second call', () => {+ const { result } = renderHook(() => useSelectAllRecords(instanceId), {+ wrapper: Wrapper,+ });++ act(() => {+ result.current.selectAllRecords();+ });++ expect(getSelectedRecordIds()).toEqual([+ 'record-1',+ 'record-2',+ 'record-3',+ ]);++ act(() => {+ result.current.selectAllRecords();+ });++ expect(getSelectedRecordIds()).toEqual([]);+ });++ it('should be cleared by useResetRecordSelection', () => {+ const { result } = renderHook(+ () => ({+ ...useSelectAllRecords(instanceId),+ ...useResetRecordSelection(instanceId),+ }),+ { wrapper: Wrapper },+ );++ act(() => {+ result.current.selectAllRecords();+ });+ act(() => result.current.resetRecordSelection());++ expect(getSelectedRecordIds()).toEqual([]);+ });++ it('should select the remaining records when some are already selected', () => {+ jotaiStore.set(+ isRecordSelectedComponentFamilyState.atomFamily({+ instanceId,+ familyKey: 'record-2',+ }),+ true,+ );+ const { result } = renderHook(() => useSelectAllRecords(instanceId), {+ wrapper: Wrapper,+ });++ act(() => {+ result.current.selectAllRecords();+ });++ expect(getSelectedRecordIds()).toEqual([+ 'record-1',+ 'record-2',+ 'record-3',+ ]);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-selection/hooks/useResetRecordSelection.ts b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useResetRecordSelection.tsnew file mode 100644index 00000000000..26bac9012ee--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useResetRecordSelection.ts@@ -0,0 +1,72 @@+import { useStore } from 'jotai';+import { useCallback } from 'react';++import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';+import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { lastSelectedRecordIndexComponentState } from '@/object-record/record-selection/states/lastSelectedRecordIndexComponentState';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';+import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';++export const useResetRecordSelection = (recordIndexId?: string) => {+ const instanceId = useAvailableComponentInstanceIdOrThrow(+ RecordSelectionComponentInstanceContext,+ recordIndexId,+ );++ const isRecordSelectedFamilyState = useAtomComponentFamilyStateCallbackState(+ isRecordSelectedComponentFamilyState,+ instanceId,+ );++ const selectedRecordIds = useAtomComponentSelectorCallbackState(+ selectedRecordIdsComponentSelector,+ instanceId,+ );++ const hasUserSelectedAllRecords = useAtomComponentStateCallbackState(+ hasUserSelectedAllRecordsComponentState,+ instanceId,+ );++ const lastSelectedRecordIndex = useAtomComponentStateCallbackState(+ lastSelectedRecordIndexComponentState,+ instanceId,+ );++ const { closeDropdown } = useCloseDropdown();+ const store = useStore();++ const resetRecordSelection = useCallback(() => {+ for (const recordId of store.get(selectedRecordIds)) {+ store.set(isRecordSelectedFamilyState(recordId), false);+ }++ store.set(hasUserSelectedAllRecords, false);+ store.set(lastSelectedRecordIndex, null);++ closeDropdown(+ getCommandMenuDropdownIdFromCommandMenuId(+ getCommandMenuIdFromRecordIndexId(instanceId),+ ),+ );+ }, [+ selectedRecordIds,+ isRecordSelectedFamilyState,+ hasUserSelectedAllRecords,+ lastSelectedRecordIndex,+ closeDropdown,+ instanceId,+ store,+ ]);++ return {+ resetRecordSelection,+ };+};diff --git a/packages/twenty-front/src/modules/object-record/record-selection/hooks/useSelectAllRecords.ts b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useSelectAllRecords.tsnew file mode 100644index 00000000000..7aaa8132fa8--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/hooks/useSelectAllRecords.ts@@ -0,0 +1,53 @@+import { useStore } from 'jotai';+import { useCallback } from 'react';++import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { allRecordsSelectedStatusComponentSelector } from '@/object-record/record-selection/states/selectors/allRecordsSelectedStatusComponentSelector';+import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';+import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';++export const useSelectAllRecords = (recordIndexId?: string) => {+ const allRecordsSelectedStatus = useAtomComponentSelectorCallbackState(+ allRecordsSelectedStatusComponentSelector,+ recordIndexId,+ );++ const isRecordSelectedFamilyState = useAtomComponentFamilyStateCallbackState(+ isRecordSelectedComponentFamilyState,+ recordIndexId,+ );++ const allRecordIds = useAtomComponentSelectorCallbackState(+ recordIndexAllRecordIdsComponentSelector,+ recordIndexId,+ );++ const { resetRecordSelection } = useResetRecordSelection(recordIndexId);++ const store = useStore();++ const selectAllRecords = useCallback(() => {+ if (store.get(allRecordsSelectedStatus) === 'all') {+ resetRecordSelection();+ return false;+ }++ for (const recordId of store.get(allRecordIds)) {+ store.set(isRecordSelectedFamilyState(recordId), true);+ }++ return true;+ }, [+ allRecordsSelectedStatus,+ allRecordIds,+ resetRecordSelection,+ isRecordSelectedFamilyState,+ store,+ ]);++ return {+ selectAllRecords,+ };+};diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext.tsnew file mode 100644index 00000000000..e163e0f550d--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext.ts@@ -0,0 +1,4 @@+import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext';++export const RecordSelectionComponentInstanceContext =+ createComponentInstanceContext();diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState.tsnew file mode 100644index 00000000000..36e3e25b382--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState.ts@@ -0,0 +1,9 @@+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';++export const hasUserSelectedAllRecordsComponentState =+ createAtomComponentState<boolean>({+ key: 'hasUserSelectedAllRecordsComponentState',+ defaultValue: false,+ componentInstanceContext: RecordSelectionComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/isRecordSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/isRecordSelectedComponentFamilyState.tsnew file mode 100644index 00000000000..5756b405b43--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/isRecordSelectedComponentFamilyState.ts@@ -0,0 +1,9 @@+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';++export const isRecordSelectedComponentFamilyState =+ createAtomComponentFamilyState<boolean, string>({+ key: 'isRecordSelectedComponentFamilyState',+ defaultValue: false,+ componentInstanceContext: RecordSelectionComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/lastSelectedRecordIndexComponentState.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/lastSelectedRecordIndexComponentState.tsnew file mode 100644index 00000000000..dee1af4909c--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/lastSelectedRecordIndexComponentState.ts@@ -0,0 +1,10 @@+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';++export const lastSelectedRecordIndexComponentState = createAtomComponentState<+ number | null | undefined+>({+ key: 'lastSelectedRecordIndexComponentState',+ defaultValue: null,+ componentInstanceContext: RecordSelectionComponentInstanceContext,+});diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/allRecordsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/allRecordsSelectedStatusComponentSelector.tsnew file mode 100644index 00000000000..b3f8bdb6dd2--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/allRecordsSelectedStatusComponentSelector.ts@@ -0,0 +1,29 @@+import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';+import { type AllRecordsSelectedStatus } from '@/object-record/record-selection/types/AllRecordsSelectedStatus';+import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';++export const allRecordsSelectedStatusComponentSelector =+ createAtomComponentSelector<AllRecordsSelectedStatus>({+ key: 'allRecordsSelectedStatusComponentSelector',+ componentInstanceContext: RecordSelectionComponentInstanceContext,+ get:+ ({ instanceId }) =>+ ({ get }) => {+ const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {+ instanceId,+ });++ const numberOfSelectedRecords = get(+ selectedRecordIdsComponentSelector,+ { instanceId },+ ).length;++ return numberOfSelectedRecords === 0+ ? 'none'+ : numberOfSelectedRecords === allRecordIds.length+ ? 'all'+ : 'some';+ },+ });diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector.tssimilarity index 52%rename from packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.tsrename to packages/twenty-front/src/modules/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector.tsindex 68638e3235e..6e20d39ee7e 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector.ts+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector.ts@@ -1,12 +1,12 @@import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';-export const isAtLeastOneTableRowSelectedSelector =+export const isAtLeastOneRecordSelectedComponentSelector =createAtomComponentSelector<boolean>({- key: 'isAtLeastOneTableRowSelectedSelector',- componentInstanceContext: RecordTableComponentInstanceContext,+ key: 'isAtLeastOneRecordSelectedComponentSelector',+ componentInstanceContext: RecordSelectionComponentInstanceContext,get:({ instanceId }) =>({ get }) => {@@ -14,13 +14,11 @@ export const isAtLeastOneTableRowSelectedSelector =instanceId,});- const isAnyRecordSelected = allRecordIds.some((recordId: string) =>- get(isRowSelectedComponentFamilyState, {+ return allRecordIds.some((recordId) =>+ get(isRecordSelectedComponentFamilyState, {instanceId,familyKey: recordId,}),);-- return isAnyRecordSelected;},});diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector.tsnew file mode 100644index 00000000000..2a41f9079b5--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector.ts@@ -0,0 +1,28 @@+import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';+import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';++export const selectedRecordIdsComponentSelector = createAtomComponentSelector<+ string[]+>({+ key: 'selectedRecordIdsComponentSelector',+ componentInstanceContext: RecordSelectionComponentInstanceContext,+ areEqual: isDeeplyEqual,+ get:+ ({ instanceId }) =>+ ({ get }) => {+ const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {+ instanceId,+ });++ return allRecordIds.filter(+ (recordId) =>+ get(isRecordSelectedComponentFamilyState, {+ instanceId,+ familyKey: recordId,+ }) === true,+ );+ },+});diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector.tsnew file mode 100644index 00000000000..542cd980bc9--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/states/selectors/unselectedRecordIdsComponentSelector.ts@@ -0,0 +1,28 @@+import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';+import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';++export const unselectedRecordIdsComponentSelector = createAtomComponentSelector<+ string[]+>({+ key: 'unselectedRecordIdsComponentSelector',+ componentInstanceContext: RecordSelectionComponentInstanceContext,+ areEqual: isDeeplyEqual,+ get:+ ({ instanceId }) =>+ ({ get }) => {+ const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {+ instanceId,+ });++ return allRecordIds.filter(+ (recordId) =>+ get(isRecordSelectedComponentFamilyState, {+ instanceId,+ familyKey: recordId,+ }) === false,+ );+ },+});diff --git a/packages/twenty-front/src/modules/object-record/record-selection/types/AllRecordsSelectedStatus.ts b/packages/twenty-front/src/modules/object-record/record-selection/types/AllRecordsSelectedStatus.tsnew file mode 100644index 00000000000..e3b1f3173c0--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-selection/types/AllRecordsSelectedStatus.ts@@ -0,0 +1 @@+export type AllRecordsSelectedStatus = 'none' | 'some' | 'all';diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsxindex a5e1c2b7d5b..971fe16373d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx@@ -11,7 +11,7 @@ import { RecordTableScrollToFocusedCellEffect } from '@/object-record/record-tabimport { RecordTableScrollToFocusedRowEffect } from '@/object-record/record-table/components/RecordTableScrollToFocusedRowEffect';import { RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-table/constants/RecordTableClickOutsideListenerId';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { isRecordTableEmptyStateHiddenComponentState } from '@/object-record/record-table/states/isRecordTableEmptyStateHiddenComponentState';import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';@@ -57,7 +57,7 @@ export const RecordTable = () => {recordTableId,);- const { resetTableRowSelection } = useResetTableRowSelection(recordTableId);+ const { resetRecordSelection } = useResetRecordSelection(recordTableId);const recordTableIsEmpty =!isRecordTableInitialLoading && !recordTableHasRecords;@@ -67,7 +67,7 @@ export const RecordTable = () => {}const handleDragSelectionStart = () => {- resetTableRowSelection();+ resetRecordSelection();toggleClickOutside(false);};diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsxindex 018e6c13f93..ee574a259fb 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContent.tsx@@ -13,7 +13,7 @@ import { RecordTableNoRecordGroupBody } from '@/object-record/record-table/recorimport { RecordTableRecordGroupsBody } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody';import { RecordTableHeader } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';import { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';import { isSomeCellInEditModeComponentSelector } from '@/object-record/record-table/states/selectors/isSomeCellInEditModeComponentSelector';import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';@@ -64,7 +64,7 @@ export const RecordTableContent = ({};const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,+ isRecordSelectedComponentFamilyState,recordTableId,);diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsxindex c27cd936419..2db4117696c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupBodyContextProvider.tsx@@ -6,7 +6,7 @@ import { useCloseRecordTableCellNoGroup } from '@/object-record/record-table/recimport { useMoveHoverToCurrentCell } from '@/object-record/record-table/record-table-cell/hooks/useMoveHoverToCurrentCell';import { useOpenRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCell';import { useTriggerCommandMenuDropdown } from '@/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';import { type MoveFocusDirection } from '@/object-record/record-table/types/MoveFocusDirection';import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';@@ -56,8 +56,8 @@ export const RecordTableNoRecordGroupBodyContextProvider = ({triggerCommandMenuDropdown(event, recordId);};- const hasUserSelectedAllRows = useAtomComponentStateValue(- hasUserSelectedAllRowsComponentState,+ const hasUserSelectedAllRecords = useAtomComponentStateValue(+ hasUserSelectedAllRecordsComponentState,recordTableId,);@@ -69,7 +69,7 @@ export const RecordTableNoRecordGroupBodyContextProvider = ({onCloseTableCell: handleCloseTableCell,onMoveHoverToCurrentCell: handleMoveHoverToCurrentCell,onCommandMenuDropdownOpened: handleCommandMenuDropdown,- hasUserSelectedAllRows,+ hasUserSelectedAllRecords,}}>{children}diff --git a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.tsindex 5e2a2e0d763..086c4067cab 100644--- a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableBodyContext.ts@@ -15,7 +15,7 @@ export type RecordTableBodyContextProps = {event: React.MouseEvent,recordId: string,) => void;- hasUserSelectedAllRows?: boolean;+ hasUserSelectedAllRecords?: boolean;};export const [diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.tsindex b0de8b23ad5..44279a85412 100644--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts@@ -1,5 +1,5 @@import { useResetFocusStackToRecordIndex } from '@/object-record/record-index/hooks/useResetFocusStackToRecordIndex';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useActiveRecordTableRow } from '@/object-record/record-table/hooks/useActiveRecordTableRow';import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';import { useUnfocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell';@@ -15,7 +15,7 @@ export const useLeaveTableFocus = (recordTableId?: string) => {recordTableId,);- const { resetTableRowSelection } = useResetTableRowSelection();+ const { resetRecordSelection } = useResetRecordSelection();const setRecordTableHoverPosition = useSetAtomComponentState(recordTableHoverPositionComponentState,@@ -44,7 +44,7 @@ export const useLeaveTableFocus = (recordTableId?: string) => {return () => {unfocusRecordTableCell();- resetTableRowSelection();+ resetRecordSelection();unfocusRecordTableRow();diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.tsdeleted file mode 100644index fc76c0b15dd..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts+++ /dev/null@@ -1,75 +0,0 @@-import { useCallback } from 'react';-import { useStore } from 'jotai';--import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';-import { getCommandMenuIdFromRecordIndexId } from '@/command-menu-item/utils/getCommandMenuIdFromRecordIndexId';-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';-import { lastSelectedRowIndexComponentState } from '@/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState';-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';--export const useResetTableRowSelection = (recordTableId?: string) => {- const recordTableIdFromContext = useAvailableComponentInstanceIdOrThrow(- RecordTableComponentInstanceContext,- recordTableId,- );-- const recordIndexAllRecordIds = useAtomComponentSelectorCallbackState(- recordIndexAllRecordIdsComponentSelector,- recordTableIdFromContext,- );-- const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,- recordTableIdFromContext,- );-- const hasUserSelectedAllRows = useAtomComponentStateCallbackState(- hasUserSelectedAllRowsComponentState,- recordTableIdFromContext,- );-- const lastSelectedRowIndexComponentCallbackState =- useAtomComponentStateCallbackState(- lastSelectedRowIndexComponentState,- recordTableIdFromContext,- );-- const { closeDropdown } = useCloseDropdown();- const store = useStore();-- const resetTableRowSelection = useCallback(() => {- const allRecordIds = store.get(recordIndexAllRecordIds);-- for (const recordId of allRecordIds) {- store.set(isRowSelectedFamilyState(recordId), false);- }-- store.set(hasUserSelectedAllRows, false);- store.set(lastSelectedRowIndexComponentCallbackState, null);-- closeDropdown(- getCommandMenuDropdownIdFromCommandMenuId(- getCommandMenuIdFromRecordIndexId(recordTableIdFromContext),- ),- );- }, [- recordIndexAllRecordIds,- hasUserSelectedAllRows,- lastSelectedRowIndexComponentCallbackState,- isRowSelectedFamilyState,- closeDropdown,- recordTableIdFromContext,- store,- ]);-- return {- resetTableRowSelection,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.tsindex bb0ba20d176..84aced53b6c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts@@ -1,65 +1,25 @@+import { useStore } from 'jotai';import { useCallback } from 'react';-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';-import { allRowsSelectedStatusComponentSelector } from '@/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';+import { useSelectAllRecords } from '@/object-record/record-selection/hooks/useSelectAllRecords';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';-import { useStore } from 'jotai';export const useSelectAllRows = (recordTableId?: string) => {- const hasUserSelectedAllRows = useAtomComponentStateCallbackState(- hasUserSelectedAllRowsComponentState,- recordTableId,- );-- const allRowsSelectedStatus = useAtomComponentSelectorCallbackState(- allRowsSelectedStatusComponentSelector,- recordTableId,- );-- const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,- recordTableId,- );+ const { selectAllRecords } = useSelectAllRecords(recordTableId);- const recordIndexAllRecordIds = useAtomComponentSelectorCallbackState(- recordIndexAllRecordIdsComponentSelector,+ const hasUserSelectedAllRecords = useAtomComponentStateCallbackState(+ hasUserSelectedAllRecordsComponentState,recordTableId,);- const { resetTableRowSelection } = useResetTableRowSelection(recordTableId);-const store = useStore();const selectAllRows = useCallback(() => {- const currentAllRowsSelectedStatus = store.get(allRowsSelectedStatus);- const allRecordIds = store.get(recordIndexAllRecordIds);-- if (currentAllRowsSelectedStatus === 'all') {- resetTableRowSelection();+ if (selectAllRecords()) {+ store.set(hasUserSelectedAllRecords, true);}-- for (const recordId of allRecordIds) {- const isSelected =- currentAllRowsSelectedStatus === 'none' ||- currentAllRowsSelectedStatus === 'some';-- store.set(isRowSelectedFamilyState(recordId), isSelected);- }-- store.set(hasUserSelectedAllRows, true);- }, [- allRowsSelectedStatus,- recordIndexAllRecordIds,- resetTableRowSelection,- isRowSelectedFamilyState,- hasUserSelectedAllRows,- store,- ]);+ }, [selectAllRecords, hasUserSelectedAllRecords, store]);return {selectAllRows,diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.tsindex 409f5d1e3c7..c4b046e3af6 100644--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts@@ -10,8 +10,8 @@ import {import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';import { useUnfocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useUnfocusRecordTableCell';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';@@ -42,12 +42,12 @@ export const useSetRecordTableData = ({);const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,+ isRecordSelectedComponentFamilyState,recordTableId,);- const hasUserSelectedAllRows = useAtomComponentStateCallbackState(- hasUserSelectedAllRowsComponentState,+ const hasUserSelectedAllRecords = useAtomComponentStateCallbackState(+ hasUserSelectedAllRecordsComponentState,recordTableId,);@@ -99,7 +99,7 @@ export const useSetRecordTableData = ({): store.get(recordIndexAllRecordIdsSelector);- const isAllRowsSelected = store.get(hasUserSelectedAllRows);+ const isAllRowsSelected = store.get(hasUserSelectedAllRecords);const recordIds = records.map((record) => record.id);@@ -149,7 +149,7 @@ export const useSetRecordTableData = ({[recordIndexRecordIdsByGroupFamilyState,recordIndexAllRecordIdsSelector,- hasUserSelectedAllRows,+ hasUserSelectedAllRecords,unfocusRecordTableCell,unfocusRecordTableRow,setRecordTableHoverPosition,diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsxindex 51835efcf26..a005f65fa00 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyDragDropContextProvider.tsx@@ -9,7 +9,7 @@ import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartReimport { type RecordDragDropResult } from '@/object-record/record-drag/types/RecordDragDropResult';import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';-import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';+import { selectedRecordIdsComponentSelector } from '@/object-record/record-selection/states/selectors/selectedRecordIdsComponentSelector';import { type RecordTableRowDragData } from '@/object-record/record-table/types/RecordTableRowDragData';import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';@@ -39,7 +39,7 @@ export const RecordTableBodyDragDropContextProvider = ({const { recordTableId } = useRecordTableContextOrThrow();const selectedRowIds = useAtomComponentSelectorCallbackState(- selectedRowIdsComponentSelector,+ selectedRecordIdsComponentSelector,recordTableId,);diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsxindex 1e644fa6a92..ce6a66add5e 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyEscapeHotkeyEffect.tsx@@ -1,21 +1,21 @@import { Key } from 'ts-key-enum';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';-import { isAtLeastOneTableRowSelectedSelector } from '@/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';+import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';import { PageFocusId } from '@/types/PageFocusId';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';export const RecordTableBodyEscapeHotkeyEffect = () => {- const { resetTableRowSelection } = useResetTableRowSelection();+ const { resetRecordSelection } = useResetRecordSelection();const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(- isAtLeastOneTableRowSelectedSelector,+ isAtLeastOneRecordSelectedComponentSelector,);const handleEscape = () => {if (isAtLeastOneRecordSelected) {- resetTableRowSelection();+ resetRecordSelection();}};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckboxPlaceholder.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckboxPlaceholder.tsxindex a4d2a3d137f..e95908dfaac 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckboxPlaceholder.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellCheckboxPlaceholder.tsx@@ -20,16 +20,16 @@ const StyledContainer = styled.div``;export const RecordTableCellCheckboxPlaceholder = () => {- const { hasUserSelectedAllRows } = useRecordTableBodyContextOrThrow();+ const { hasUserSelectedAllRecords } = useRecordTableBodyContextOrThrow();return (<RecordTableCellStyleWrapper- isSelected={hasUserSelectedAllRows}+ isSelected={hasUserSelectedAllRecords}hasRightBorder={false}widthClassName={RECORD_TABLE_COLUMN_CHECKBOX_WIDTH_CLASS_NAME}><StyledContainer data-select-disable>- <Checkbox hoverable checked={hasUserSelectedAllRows === true} />+ <Checkbox hoverable checked={hasUserSelectedAllRecords === true} /></StyledContainer></RecordTableCellStyleWrapper>);diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.tsindex 34efc768c7b..ec4e4b1ce91 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useTriggerCommandMenuDropdown.ts@@ -5,7 +5,7 @@ import { CommandMenuComponentInstanceContext } from '@/command-menu/states/conteimport { recordIndexCommandMenuDropdownPositionComponentState } from '@/command-menu-item/states/recordIndexCommandMenuDropdownPositionComponentState';import { getCommandMenuDropdownIdFromCommandMenuId } from '@/command-menu-item/utils/getCommandMenuDropdownIdFromCommandMenuId';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';@@ -22,7 +22,7 @@ export const useTriggerCommandMenuDropdown = ({);const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,+ isRecordSelectedComponentFamilyState,recordTableId,);diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsxindex 1d62d37b319..6e68ed71367 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn.tsx@@ -8,10 +8,10 @@ import { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH } from '@/object-record/record-tableimport { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH_CLASS_NAME } from '@/object-record/record-table/constants/RecordTableColumnCheckboxWidthClassName';import { RECORD_TABLE_ROW_HEIGHT } from '@/object-record/record-table/constants/RecordTableRowHeight';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';-import { allRowsSelectedStatusComponentSelector } from '@/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector';+import { allRecordsSelectedStatusComponentSelector } from '@/object-record/record-selection/states/selectors/allRecordsSelectedStatusComponentSelector';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { cx } from '@linaria/core';@@ -42,12 +42,12 @@ export const RecordTableHeaderCheckboxColumn = () => {const { t } = useLingui();const allRowsSelectedStatus = useAtomComponentSelectorValue(- allRowsSelectedStatusComponentSelector,+ allRecordsSelectedStatusComponentSelector,);const { selectAllRows } = useSelectAllRows();- const { resetTableRowSelection } = useResetTableRowSelection();+ const { resetRecordSelection } = useResetRecordSelection();const checked =allRowsSelectedStatus === 'all' || allRowsSelectedStatus === 'some';@@ -70,7 +70,7 @@ export const RecordTableHeaderCheckboxColumn = () => {const onChange = () => {if (checked) {- resetTableRowSelection();+ resetRecordSelection();} else {selectAllRows();}diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.tsindex cd4dff02c14..02712792b54 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useResizeTableHeader.ts@@ -6,7 +6,7 @@ import { RECORD_TABLE_COLUMN_LAST_EMPTY_COLUMN_WIDTH_VARIABLE_NAME } from '@/objimport { RECORD_TABLE_COLUMN_MIN_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnMinWidth';import { RECORD_TABLE_COLUMN_WITH_GROUP_LAST_EMPTY_COLUMN_WIDTH_VARIABLE_NAME } from '@/object-record/record-table/constants/RecordTableColumnWithGroupLastEmptyColumnWidthVariableName';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { recordTableWidthComponentState } from '@/object-record/record-table/states/recordTableWidthComponentState';import { useIsRecordTableCheckboxColumnHidden } from '@/object-record/record-table/hooks/useIsRecordTableCheckboxColumnHidden';@@ -59,7 +59,7 @@ export const useResizeTableHeader = () => {findByProperty('fieldMetadataItemId', resizedFieldMetadataId),);- const { resetTableRowSelection } = useResetTableRowSelection();+ const { resetRecordSelection } = useResetRecordSelection();const { saveRecordFields } = useSaveRecordFields();@@ -86,11 +86,11 @@ export const useResizeTableHeader = () => {const handleResizeHandlerStart = useCallback<PointerEventListener>(({ x }) => {- resetTableRowSelection();+ resetRecordSelection();setDragUiZoom(getUiZoom());setInitialPointerPositionX(x);},- [resetTableRowSelection],+ [resetRecordSelection],);const handleResizeHandlerMove = useCallback<PointerEventListener>(diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsxindex b543f4f5a58..dc3d5c83e67 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx@@ -3,7 +3,7 @@ import { useIsRecordDeleted } from '@/object-record/record-field/ui/hooks/useIsRimport { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';import { RecordTableRowContextProvider } from '@/object-record/record-table/contexts/RecordTableRowContext';import { RecordTableRowDiv } from '@/object-record/record-table/record-table-row/components/RecordTableRowDiv';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState';import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState';import { isRecordTableRowFocusedComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState';@@ -27,8 +27,8 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(const { objectMetadataItem, isObjectReadOnly } =useRecordTableContextOrThrow();- const isRowSelected = useAtomComponentFamilyStateValue(- isRowSelectedComponentFamilyState,+ const isRecordSelected = useAtomComponentFamilyStateValue(+ isRecordSelectedComponentFamilyState,recordId,);@@ -58,7 +58,7 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(objectNameSingular: objectMetadataItem.nameSingular,}) + recordId,objectNameSingular: objectMetadataItem.nameSingular,- isSelected: isRowSelected,+ isSelected: isRecordSelected,isRecordReadOnly: isObjectReadOnly || isRecordDeleted,}}>diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.tsindex 731a821eb5d..f66eb334677 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useRecordTableRowHotkeys.ts@@ -1,14 +1,14 @@import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext';-import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';+import { useResetRecordSelection } from '@/object-record/record-selection/hooks/useResetRecordSelection';import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';import { useActiveRecordTableRow } from '@/object-record/record-table/hooks/useActiveRecordTableRow';import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/useFocusedRecordTableRow';import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell';import { getRecordTableCellFocusId } from '@/object-record/record-table/record-table-cell/utils/getRecordTableCellFocusId';import { useSetCurrentRowSelected } from '@/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected';-import { isAtLeastOneTableRowSelectedSelector } from '@/object-record/record-table/record-table-row/states/isAtLeastOneTableRowSelectedSelector';+import { isAtLeastOneRecordSelectedComponentSelector } from '@/object-record/record-selection/states/selectors/isAtLeastOneRecordSelectedComponentSelector';import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';@@ -82,19 +82,19 @@ export const useRecordTableRowHotkeys = (focusId: string) => {});};- const { resetTableRowSelection } = useResetTableRowSelection(recordTableId);+ const { resetRecordSelection } = useResetRecordSelection(recordTableId);const { unfocusRecordTableRow } = useFocusedRecordTableRow(recordTableId);const isAtLeastOneRecordSelected = useAtomComponentSelectorValue(- isAtLeastOneTableRowSelectedSelector,+ isAtLeastOneRecordSelectedComponentSelector,recordTableId,);const handleEscape = () => {unfocusRecordTableRow();if (isAtLeastOneRecordSelected) {- resetTableRowSelection();+ resetRecordSelection();}};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.tsindex 3343793bc3a..39a836b380c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/hooks/useSetCurrentRowSelected.ts@@ -3,8 +3,8 @@ import { useStore } from 'jotai';import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { useRecordTableRowContextOrThrow } from '@/object-record/record-table/contexts/RecordTableRowContext';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';-import { lastSelectedRowIndexComponentState } from '@/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';+import { lastSelectedRecordIndexComponentState } from '@/object-record/record-selection/states/lastSelectedRecordIndexComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';@@ -14,7 +14,7 @@ export const useSetCurrentRowSelected = () => {const { recordId, rowIndex } = useRecordTableRowContextOrThrow();const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,+ isRecordSelectedComponentFamilyState,);const recordIndexAllRecordIds = useAtomComponentSelectorCallbackState(@@ -22,7 +22,7 @@ export const useSetCurrentRowSelected = () => {);const lastSelectedRowIndexComponentCallbackState =- useAtomComponentStateCallbackState(lastSelectedRowIndexComponentState);+ useAtomComponentStateCallbackState(lastSelectedRecordIndexComponentState);const store = useStore();diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.tsdeleted file mode 100644index 9c3999d5a1a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const hasUserSelectedAllRowsComponentState =- createAtomComponentState<boolean>({- key: 'hasUserSelectedAllRowsFamilyState',- defaultValue: false,- componentInstanceContext: RecordTableComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.tsdeleted file mode 100644index ccf5cdc9448..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState.ts+++ /dev/null@@ -1,11 +0,0 @@-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';--export const isRowSelectedComponentFamilyState = createAtomComponentFamilyState<- boolean,- string->({- key: 'isRowSelectedComponentFamilyState',- defaultValue: false,- componentInstanceContext: RecordTableComponentInstanceContext,-});diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.tsdeleted file mode 100644index 79da91a563f..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState.ts+++ /dev/null@@ -1,10 +0,0 @@-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const lastSelectedRowIndexComponentState = createAtomComponentState<- number | null | undefined->({- key: 'record-table/last-selected-row-index',- defaultValue: null,- componentInstanceContext: RecordTableComponentInstanceContext,-});diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.tsdeleted file mode 100644index f078909b2fa..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts+++ /dev/null@@ -1,33 +0,0 @@-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';-import { type AllRowsSelectedStatus } from '@/object-record/record-table/types/AllRowSelectedStatus';--export const allRowsSelectedStatusComponentSelector =- createAtomComponentSelector<AllRowsSelectedStatus>({- key: 'allRowsSelectedStatusComponentSelector',- componentInstanceContext: RecordTableComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {- instanceId,- });-- const selectedRowIds = get(selectedRowIdsComponentSelector, {- instanceId,- });-- const numberOfSelectedRows = selectedRowIds.length;-- const allRowsSelectedStatus =- numberOfSelectedRows === 0- ? 'none'- : selectedRowIds.length === allRecordIds.length- ? 'all'- : 'some';-- return allRowsSelectedStatus;- },- });diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.tsdeleted file mode 100644index 31d84f3cdfd..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/selectedRowIdsComponentSelector.ts+++ /dev/null@@ -1,26 +0,0 @@-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const selectedRowIdsComponentSelector = createAtomComponentSelector<- string[]->({- key: 'selectedRowIdsComponentSelector',- componentInstanceContext: RecordTableComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {- instanceId,- });-- return allRecordIds.filter(- (recordId) =>- get(isRowSelectedComponentFamilyState, {- instanceId,- familyKey: recordId,- }) === true,- );- },-});diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.tsdeleted file mode 100644index 41b6b3e4331..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/unselectedRowIdsComponentSelector.ts+++ /dev/null@@ -1,26 +0,0 @@-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';-import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const unselectedRowIdsComponentSelector = createAtomComponentSelector<- string[]->({- key: 'unselectedRowIdsComponentSelector',- componentInstanceContext: RecordTableComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(recordIndexAllRecordIdsComponentSelector, {- instanceId,- });-- return allRecordIds.filter(- (recordId) =>- get(isRowSelectedComponentFamilyState, {- instanceId,- familyKey: recordId,- }) === false,- );- },-});diff --git a/packages/twenty-front/src/modules/object-record/record-table/types/AllRowSelectedStatus.ts b/packages/twenty-front/src/modules/object-record/record-table/types/AllRowSelectedStatus.tsdeleted file mode 100644index d37df60de44..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/types/AllRowSelectedStatus.ts+++ /dev/null@@ -1 +0,0 @@-export type AllRowsSelectedStatus = 'none' | 'some' | 'all';diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedSkeleton.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedSkeleton.tsxindex 9b95d47426f..9a39e37f044 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedSkeleton.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableRowVirtualizedSkeleton.tsx@@ -13,7 +13,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useexport const RecordTableRowVirtualizedSkeleton = () => {const { visibleRecordFields } = useRecordTableContextOrThrow();- const { hasUserSelectedAllRows } = useRecordTableBodyContextOrThrow();+ const { hasUserSelectedAllRecords } = useRecordTableBodyContextOrThrow();const isRecordTableDragColumnHidden = useAtomComponentStateValue(isRecordTableDragColumnHiddenComponentState,@@ -34,18 +34,18 @@ export const RecordTableRowVirtualizedSkeleton = () => {<RecordTableCellLoadingkey={recordField.fieldMetadataItemId}recordFieldIndex={index}- isSelected={hasUserSelectedAllRows}+ isSelected={hasUserSelectedAllRecords}/>))}<RecordTableCellStyleWrapperhasRightBorder={false}widthClassName={RECORD_TABLE_COLUMN_ADD_COLUMN_BUTTON_WIDTH_CLASS_NAME}- isSelected={hasUserSelectedAllRows}+ isSelected={hasUserSelectedAllRecords}/><RecordTableCellStyleWrapperhasRightBorder={false}widthClassName={RECORD_TABLE_COLUMN_LAST_EMPTY_COLUMN_WIDTH_CLASS_NAME}- isSelected={hasUserSelectedAllRows}+ isSelected={hasUserSelectedAllRecords}/></RecordTableRowDiv>);diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useLoadRecordsToVirtualRows.ts b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useLoadRecordsToVirtualRows.tsindex cc9c1fe30f5..4c21f6ddd54 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useLoadRecordsToVirtualRows.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useLoadRecordsToVirtualRows.ts@@ -3,8 +3,8 @@ import { useStore } from 'jotai';import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';-import { isRowSelectedComponentFamilyState } from '@/object-record/record-table/record-table-row/states/isRowSelectedComponentFamilyState';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';+import { isRecordSelectedComponentFamilyState } from '@/object-record/record-selection/states/isRecordSelectedComponentFamilyState';import { dataLoadingStatusByRealIndexComponentState } from '@/object-record/record-table/virtualization/states/dataLoadingStatusByRealIndexComponentState';import { recordIdByRealIndexComponentState } from '@/object-record/record-table/virtualization/states/recordIdByRealIndexComponentState';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';@@ -25,12 +25,12 @@ export const useLoadRecordsToVirtualRows = () => {recordIndexRecordIdsByGroupComponentFamilyState,);- const hasUserSelectedAllRows = useAtomComponentStateCallbackState(- hasUserSelectedAllRowsComponentState,+ const hasUserSelectedAllRecords = useAtomComponentStateCallbackState(+ hasUserSelectedAllRecordsComponentState,);const isRowSelectedFamilyState = useAtomComponentFamilyStateCallbackState(- isRowSelectedComponentFamilyState,+ isRecordSelectedComponentFamilyState,);const store = useStore();@@ -43,7 +43,7 @@ export const useLoadRecordsToVirtualRows = () => {records: ObjectRecord[];startingRealIndex: number;}) => {- const isAllRowsSelected = store.get(hasUserSelectedAllRows);+ const isAllRowsSelected = store.get(hasUserSelectedAllRecords);const currentRecordIdMap = store.get(recordIdByRealIndex);const newRecordIdMap = new Map(currentRecordIdMap);@@ -89,7 +89,7 @@ export const useLoadRecordsToVirtualRows = () => {dataLoadingStatusByRealIndex,recordIndexRecordIdsByGroupFamilyState,isRowSelectedFamilyState,- hasUserSelectedAllRows,+ hasUserSelectedAllRecords,store,],);diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.ts b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.tsindex b3193f4fcc3..bfa14946e4b 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useReapplyRowSelection.ts@@ -2,23 +2,23 @@ import { useCallback } from 'react';import { useStore } from 'jotai';import { useSelectAllRows } from '@/object-record/record-table/hooks/internal/useSelectAllRows';-import { hasUserSelectedAllRowsComponentState } from '@/object-record/record-table/record-table-row/states/hasUserSelectedAllRowsFamilyState';+import { hasUserSelectedAllRecordsComponentState } from '@/object-record/record-selection/states/hasUserSelectedAllRecordsComponentState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';export const useReapplyRowSelection = () => {const { selectAllRows } = useSelectAllRows();- const hasUserSelectedAllRowsAtom = useAtomComponentStateCallbackState(- hasUserSelectedAllRowsComponentState,+ const hasUserSelectedAllRecordsAtom = useAtomComponentStateCallbackState(+ hasUserSelectedAllRecordsComponentState,);const store = useStore();const reapplyRowSelection = useCallback(() => {- if (store.get(hasUserSelectedAllRowsAtom)) {+ if (store.get(hasUserSelectedAllRecordsAtom)) {selectAllRows();}- }, [store, hasUserSelectedAllRowsAtom, selectAllRows]);+ }, [store, hasUserSelectedAllRecordsAtom, selectAllRows]);return {reapplyRowSelection,