The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep grouped table rows from re-rendering when their group changes (#28365)
Charles Bochet42df15ef3427
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupEndDropZone.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupEndDropZone.tsxnew file mode 100644index 00000000000..498ea3db91a--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupEndDropZone.tsx@@ -0,0 +1,32 @@+import { type ReactNode } from 'react';++import { RecordDragEndDropZone } from '@/object-record/record-drag/components/RecordDragEndDropZone';+import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constants/RecordTableRowDndType';+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';++type RecordTableRecordGroupEndDropZoneProps = {+ children: ReactNode;+};++export const RecordTableRecordGroupEndDropZone = ({+ children,+}: RecordTableRecordGroupEndDropZoneProps) => {+ const currentRecordGroupId = useCurrentRecordGroupId();++ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(+ recordIndexRecordIdsByGroupComponentFamilyState,+ currentRecordGroupId,+ );++ return (+ <RecordDragEndDropZone+ droppableId={currentRecordGroupId}+ dndType={RECORD_TABLE_ROW_DND_TYPE}+ index={recordIndexRecordIdsByGroup.length}+ >+ {children}+ </RecordDragEndDropZone>+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRowList.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRowList.tsxnew file mode 100644index 00000000000..06ec5368f47--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRowList.tsx@@ -0,0 +1,17 @@+import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { RecordTableRow } from '@/object-record/record-table/record-table-row/components/RecordTableRow';+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';++export const RecordTableRecordGroupRowList = () => {+ const currentRecordGroupId = useCurrentRecordGroupId();++ const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(+ recordIndexRecordIdsByGroupComponentFamilyState,+ currentRecordGroupId,+ );++ return recordIndexRecordIdsByGroup.map((recordId) => (+ <RecordTableRow key={recordId} recordId={recordId} />+ ));+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsxindex 4bf3ea924bf..b277a3e9757 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx@@ -1,10 +1,8 @@-import { RecordDragEndDropZone } from '@/object-record/record-drag/components/RecordDragEndDropZone';import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';import { useShouldHideRecordGroup } from '@/object-record/record-group/hooks/useShouldHideRecordGroup';-import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';-import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constants/RecordTableRowDndType';+import { RecordTableRecordGroupEndDropZone } from '@/object-record/record-table/components/RecordTableRecordGroupEndDropZone';+import { RecordTableRecordGroupRowList } from '@/object-record/record-table/components/RecordTableRecordGroupRowList';import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';-import { RecordTableRow } from '@/object-record/record-table/record-table-row/components/RecordTableRow';import { RecordTableRecordGroupSectionAddNew } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew';import { RecordTableRecordGroupSectionLoadMore } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore';import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState';@@ -15,11 +13,6 @@ export const RecordTableRecordGroupRows = () => {const shouldHide = useShouldHideRecordGroup(currentRecordGroupId);- const recordIndexRecordIdsByGroup = useAtomComponentFamilyStateValue(- recordIndexRecordIdsByGroupComponentFamilyState,- currentRecordGroupId,- );-const isRecordGroupTableSectionToggled = useAtomComponentFamilyStateValue(isRecordGroupTableSectionToggledComponentState,currentRecordGroupId,@@ -35,21 +28,11 @@ export const RecordTableRecordGroupRows = () => {return (<>- {recordIndexRecordIdsByGroup.map((recordId, rowIndexInGroup) => (- <RecordTableRow- key={recordId}- recordId={recordId}- rowIndexForDrag={rowIndexInGroup}- />- ))}- <RecordDragEndDropZone- droppableId={currentRecordGroupId}- dndType={RECORD_TABLE_ROW_DND_TYPE}- index={recordIndexRecordIdsByGroup.length}- >+ <RecordTableRecordGroupRowList />+ <RecordTableRecordGroupEndDropZone><RecordTableRecordGroupSectionLoadMore /><RecordTableRecordGroupSectionAddNew />- </RecordDragEndDropZone>+ </RecordTableRecordGroupEndDropZone><RecordTableAggregateFooterkey={currentRecordGroupId}currentRecordGroupId={currentRecordGroupId}diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsxindex 9d29e4b2953..8acc60b7240 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx@@ -1,7 +1,7 @@import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';import { visibleRecordGroupIdsComponentFamilySelector } from '@/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentFamilySelector';import { RecordIndexGroupAggregatesDataLoader } from '@/object-record/record-index/components/RecordIndexGroupAggregatesDataLoader';-import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { recordIndexHasRecordsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexHasRecordsComponentSelector';import { RecordTableBodyContextProvider } from '@/object-record/record-table/components/RecordTableBodyContextProvider';import { RecordTableRecordGroupRows } from '@/object-record/record-table/components/RecordTableRecordGroupRows';import { RecordTableBody } from '@/object-record/record-table/record-table-body/components/RecordTableBody';@@ -17,8 +17,8 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/import { ViewType } from '@/views/types/ViewType';export const RecordTableRecordGroupsBody = () => {- const allRecordIds = useAtomComponentSelectorValue(- recordIndexAllRecordIdsComponentSelector,+ const recordTableHasRecords = useAtomComponentSelectorValue(+ recordIndexHasRecordsComponentSelector,);const isRecordTableInitialLoading = useAtomComponentStateValue(@@ -30,7 +30,7 @@ export const RecordTableRecordGroupsBody = () => {ViewType.TABLE,);- if (isRecordTableInitialLoading && allRecordIds.length === 0) {+ if (isRecordTableInitialLoading && !recordTableHasRecords) {return <RecordTableBodyLoading />;}diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsxindex 375b4079c4f..92736a7ce3f 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx@@ -4,9 +4,9 @@ import { isDefined } from 'twenty-shared/utils';import { isRecordIdPrimaryDragComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdPrimaryDragComponentFamilyState';import { isRecordIdSecondaryDragMultipleComponentFamilyState } from '@/object-record/record-drag/states/isRecordIdSecondaryDragMultipleComponentFamilyState';import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';-import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { RecordTableRowDraggableContextProvider } from '@/object-record/record-table/contexts/RecordTableRowDraggableContext';-import { RecordTableRowSortable } from '@/object-record/record-table/record-table-row/components/RecordTableRowSortable';+import { RecordTableRowSortableInRecordGroup } from '@/object-record/record-table/record-table-row/components/RecordTableRowSortableInRecordGroup';+import { RecordTableRowSortableWithoutRecordGroup } from '@/object-record/record-table/record-table-row/components/RecordTableRowSortableWithoutRecordGroup';import { RecordTableTr } from '@/object-record/record-table/record-table-row/components/RecordTableTr';import { DRAG_SOURCE_OPACITY } from '@/ui/utilities/drag-and-drop/constants/DragSourceOpacity';import { DragDropItemSortableHandleRefContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemSortableHandleRefContext';@@ -15,7 +15,6 @@ import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hootype RecordTableDraggableTrProps = {className?: string;recordId: string;- draggableIndex?: number;isDragDisabled?: boolean;onClick?: (event: React.MouseEvent<HTMLTableRowElement>) => void;children: ReactNode;@@ -24,7 +23,6 @@ type RecordTableDraggableTrProps = {export const RecordTableDraggableTr = ({className,recordId,- draggableIndex,isDragDisabled,onClick,children,@@ -41,10 +39,6 @@ export const RecordTableDraggableTr = ({const { recordGroupId } = useContext(RecordGroupContext);- const droppableId = isDefined(recordGroupId)- ? recordGroupId- : NO_RECORD_GROUP_FAMILY_KEY;-const rowElementRef = useRef<HTMLDivElement>(null);const handleElementRef = useRef<Element>(null);@@ -73,14 +67,22 @@ export const RecordTableDraggableTr = ({{children}</RecordTableRowDraggableContextProvider></DragDropItemSortableHandleRefContext.Provider>- <RecordTableRowSortable- recordId={recordId}- droppableId={droppableId}- draggableIndex={draggableIndex}- isDragDisabled={isDragDisabled}- rowElementRef={rowElementRef}- handleElementRef={handleElementRef}- />+ {isDefined(recordGroupId) ? (+ <RecordTableRowSortableInRecordGroup+ recordId={recordId}+ recordGroupId={recordGroupId}+ isDragDisabled={isDragDisabled}+ rowElementRef={rowElementRef}+ handleElementRef={handleElementRef}+ />+ ) : (+ <RecordTableRowSortableWithoutRecordGroup+ recordId={recordId}+ isDragDisabled={isDragDisabled}+ rowElementRef={rowElementRef}+ handleElementRef={handleElementRef}+ />+ )}</RecordTableTr>);};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsxindex e3be145a012..2824ae580e5 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRow.tsx@@ -1,3 +1,5 @@+import { memo } from 'react';+import { RecordTableDraggableTr } from '@/object-record/record-table/record-table-row/components/RecordTableDraggableTr';import { RecordTableRowCells } from '@/object-record/record-table/record-table-row/components/RecordTableRowCells';import { RecordTableStaticTr } from '@/object-record/record-table/record-table-row/components/RecordTableStaticTr';@@ -6,13 +8,10 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/usetype RecordTableRowProps = {recordId: string;- rowIndexForDrag: number;};-export const RecordTableRow = ({- recordId,- rowIndexForDrag,-}: RecordTableRowProps) => {+// The group list re-renders on every insert or removal; rows only depend on their record+export const RecordTableRow = memo(({ recordId }: RecordTableRowProps) => {const isRecordTableDragColumnHidden = useAtomComponentStateValue(isRecordTableDragColumnHiddenComponentState,);@@ -26,11 +25,8 @@ export const RecordTableRow = ({}return (- <RecordTableDraggableTr- recordId={recordId}- draggableIndex={rowIndexForDrag}- >+ <RecordTableDraggableTr recordId={recordId}><RecordTableRowCells /></RecordTableDraggableTr>);-};+});diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortable.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortable.tsxindex ed09da79cd0..7dbb1eddc6b 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortable.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortable.tsx@@ -5,11 +5,9 @@ import { v4 } from 'uuid';import { RECORD_TABLE_ROW_DND_TYPE } from '@/object-record/record-table/constants/RecordTableRowDndType';import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';-import { recordTableRowIndexOfRecordComponentFamilySelector } from '@/object-record/record-table/states/selectors/recordTableRowIndexOfRecordComponentFamilySelector';import { type RecordDragData } from '@/object-record/record-drag/types/RecordDragData';import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';import { DND_KIT_PLUGINS_WITHOUT_OPTIMISTIC } from '@/ui/utilities/drag-and-drop/constants/DndKitPluginsWithoutOptimistic';-import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';// Above TABLE_Z_INDEX.cell.sticky so sticky cells don't paint over the insertion line.const StyledRowDropTargetSlot = styled.div`@@ -22,8 +20,8 @@ const StyledRowDropTargetSlot = styled.div`type RecordTableRowSortableProps = {recordId: string;+ index: number;droppableId: string;- draggableIndex?: number;isDragDisabled?: boolean;rowElementRef: RefObject<HTMLDivElement | null>;handleElementRef: RefObject<Element | null>;@@ -31,19 +29,12 @@ type RecordTableRowSortableProps = {export const RecordTableRowSortable = ({recordId,+ index,droppableId,- draggableIndex,isDragDisabled,rowElementRef,handleElementRef,}: RecordTableRowSortableProps) => {- const rowIndex = useAtomComponentFamilySelectorValue(- recordTableRowIndexOfRecordComponentFamilySelector,- recordId,- );-- const index = draggableIndex ?? rowIndex ?? 0;-const rowDragData: RecordDragData = {droppableId,index,diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortableInRecordGroup.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortableInRecordGroup.tsxnew file mode 100644index 00000000000..ff3ad82d36e--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortableInRecordGroup.tsx@@ -0,0 +1,42 @@+import { type RefObject } from 'react';+import { isDefined } from 'twenty-shared/utils';++import { RecordTableRowSortable } from '@/object-record/record-table/record-table-row/components/RecordTableRowSortable';+import { recordGroupRowIndexOfRecordComponentFamilySelector } from '@/object-record/record-table/states/selectors/recordGroupRowIndexOfRecordComponentFamilySelector';+import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';++type RecordTableRowSortableInRecordGroupProps = {+ recordId: string;+ recordGroupId: string;+ isDragDisabled?: boolean;+ rowElementRef: RefObject<HTMLDivElement | null>;+ handleElementRef: RefObject<Element | null>;+};++export const RecordTableRowSortableInRecordGroup = ({+ recordId,+ recordGroupId,+ isDragDisabled,+ rowElementRef,+ handleElementRef,+}: RecordTableRowSortableInRecordGroupProps) => {+ const recordGroupRowIndexOfRecord = useAtomComponentFamilySelectorValue(+ recordGroupRowIndexOfRecordComponentFamilySelector,+ { recordGroupId, recordId },+ );++ if (!isDefined(recordGroupRowIndexOfRecord)) {+ return null;+ }++ return (+ <RecordTableRowSortable+ recordId={recordId}+ index={recordGroupRowIndexOfRecord}+ droppableId={recordGroupId}+ isDragDisabled={isDragDisabled}+ rowElementRef={rowElementRef}+ handleElementRef={handleElementRef}+ />+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortableWithoutRecordGroup.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortableWithoutRecordGroup.tsxnew file mode 100644index 00000000000..4af8121d0e8--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableRowSortableWithoutRecordGroup.tsx@@ -0,0 +1,41 @@+import { type RefObject } from 'react';+import { isDefined } from 'twenty-shared/utils';++import { NO_RECORD_GROUP_FAMILY_KEY } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';+import { RecordTableRowSortable } from '@/object-record/record-table/record-table-row/components/RecordTableRowSortable';+import { recordTableRowIndexOfRecordComponentFamilySelector } from '@/object-record/record-table/states/selectors/recordTableRowIndexOfRecordComponentFamilySelector';+import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';++type RecordTableRowSortableWithoutRecordGroupProps = {+ recordId: string;+ isDragDisabled?: boolean;+ rowElementRef: RefObject<HTMLDivElement | null>;+ handleElementRef: RefObject<Element | null>;+};++export const RecordTableRowSortableWithoutRecordGroup = ({+ recordId,+ isDragDisabled,+ rowElementRef,+ handleElementRef,+}: RecordTableRowSortableWithoutRecordGroupProps) => {+ const recordTableRowIndexOfRecord = useAtomComponentFamilySelectorValue(+ recordTableRowIndexOfRecordComponentFamilySelector,+ recordId,+ );++ if (!isDefined(recordTableRowIndexOfRecord)) {+ return null;+ }++ return (+ <RecordTableRowSortable+ recordId={recordId}+ index={recordTableRowIndexOfRecord}+ droppableId={NO_RECORD_GROUP_FAMILY_KEY}+ isDragDisabled={isDragDisabled}+ rowElementRef={rowElementRef}+ handleElementRef={handleElementRef}+ />+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/recordGroupRowIndexByRecordIdComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/recordGroupRowIndexByRecordIdComponentFamilySelector.tsnew file mode 100644index 00000000000..e50b8a4e867--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/recordGroupRowIndexByRecordIdComponentFamilySelector.ts@@ -0,0 +1,18 @@+import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';+import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';+import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';++export const recordGroupRowIndexByRecordIdComponentFamilySelector =+ createAtomComponentFamilySelector<Map<string, number>, string>({+ key: 'recordGroupRowIndexByRecordIdComponentFamilySelector',+ componentInstanceContext: RecordTableComponentInstanceContext,+ get:+ ({ instanceId, familyKey: recordGroupId }) =>+ ({ get }) =>+ new Map(+ get(recordIndexRecordIdsByGroupComponentFamilyState, {+ instanceId,+ familyKey: recordGroupId,+ }).map((recordId, rowIndex) => [recordId, rowIndex]),+ ),+ });diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/recordGroupRowIndexOfRecordComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/recordGroupRowIndexOfRecordComponentFamilySelector.tsnew file mode 100644index 00000000000..15ddc9425f6--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/recordGroupRowIndexOfRecordComponentFamilySelector.ts@@ -0,0 +1,19 @@+import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';+import { recordGroupRowIndexByRecordIdComponentFamilySelector } from '@/object-record/record-table/states/selectors/recordGroupRowIndexByRecordIdComponentFamilySelector';+import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';++export const recordGroupRowIndexOfRecordComponentFamilySelector =+ createAtomComponentFamilySelector<+ number | null,+ { recordGroupId: string; recordId: string }+ >({+ key: 'recordGroupRowIndexOfRecordComponentFamilySelector',+ componentInstanceContext: RecordTableComponentInstanceContext,+ get:+ ({ instanceId, familyKey: { recordGroupId, recordId } }) =>+ ({ get }) =>+ get(recordGroupRowIndexByRecordIdComponentFamilySelector, {+ instanceId,+ familyKey: recordGroupId,+ }).get(recordId) ?? null,+ });