The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(front): reorder view fields from the rendered list instead of shifted indices (#26112)
Charles Bocheta0a55e326b39
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.tsindex 9dab99c7f3e..13304b10ddc 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard.ts@@ -1,4 +1,3 @@-import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';import { useCallback, useMemo } from 'react';import { useColumnDefinitionsFromObjectMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata';@@ -93,14 +92,16 @@ export const useObjectOptionsForBoard = ({);const handleReorderBoardFields = useCallback(- (result: DraggableListDropResult) => {- if (!result.destination) {- return;- }-+ ({+ recordFieldToMove,+ targetRecordField,+ }: {+ recordFieldToMove: Pick<RecordField, 'id' | 'fieldMetadataItemId'>;+ targetRecordField: Pick<RecordField, 'id'>;+ }) => {const updatedRecordField = reorderVisibleRecordFields({- fromIndex: result.source.index - 1,- toIndex: result.destination.index - 1,+ recordFieldToMove,+ targetRecordField,});saveViewFields([mapRecordFieldToViewField(updatedRecordField)]);diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useProcessOptionDropdownDragEnd.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useProcessOptionDropdownDragEnd.tsindex 413f7926903..e4ffa23e63e 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useProcessOptionDropdownDragEnd.ts+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useProcessOptionDropdownDragEnd.ts@@ -1,6 +1,5 @@-import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';-import { useReorderVisibleRecordFields } from '@/object-record/record-field/hooks/useReorderVisibleRecordFields';+import { type RecordField } from '@/object-record/record-field/types/RecordField';import { useSaveCurrentViewFields } from '@/views/hooks/useSaveCurrentViewFields';import { mapRecordFieldToViewField } from '@/views/utils/mapRecordFieldToViewField';@@ -13,18 +12,16 @@ export const useProcessOptionDropdownDragEnd = (recordTableId: string) => {const { saveViewFields } = useSaveCurrentViewFields();const processOptionDropdownDragEnd = useCallback(- async (result: DraggableListDropResult) => {- if (- !result.destination ||- result.destination.index === 1 ||- result.source.index === 1- ) {- return;- }-+ ({+ recordFieldToMove,+ targetRecordField,+ }: {+ recordFieldToMove: Pick<RecordField, 'id' | 'fieldMetadataItemId'>;+ targetRecordField: Pick<RecordField, 'id'>;+ }) => {const updatedRecordField = reorderVisibleRecordFields({- fromIndex: result.source.index - 1,- toIndex: result.destination.index - 1,+ recordFieldToMove,+ targetRecordField,});saveViewFields([mapRecordFieldToViewField(updatedRecordField)]);diff --git a/packages/twenty-front/src/modules/object-record/record-field/hooks/useReorderVisibleRecordFields.ts b/packages/twenty-front/src/modules/object-record/record-field/hooks/useReorderVisibleRecordFields.tsindex a5a3a3c455a..e307dd4b7cf 100644--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useReorderVisibleRecordFields.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useReorderVisibleRecordFields.ts@@ -1,19 +1,13 @@import { useUpdateRecordField } from '@/object-record/record-field/hooks/useUpdateRecordField';import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';-import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';import { type RecordField } from '@/object-record/record-field/types/RecordField';import { computeNewPositionOfDraggedRecord } from '@/object-record/utils/computeNewPositionOfDraggedRecord';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';import { useCallback } from 'react';import { useStore } from 'jotai';export const useReorderVisibleRecordFields = (recordTableId: string) => {const store = useStore();- const visibleRecordFields = useAtomComponentSelectorCallbackState(- visibleRecordFieldsComponentSelector,- recordTableId,- );const currentRecordFields = useAtomComponentStateCallbackState(currentRecordFieldsComponentState,@@ -23,36 +17,25 @@ export const useReorderVisibleRecordFields = (recordTableId: string) => {const { updateRecordField } = useUpdateRecordField(recordTableId);const reorderVisibleRecordFields = useCallback(- ({ fromIndex, toIndex }: { fromIndex: number; toIndex: number }) => {- const visibleRecordFieldsValue = store.get(visibleRecordFields);- const currentRecordFieldsValue = store.get(currentRecordFields);-- const idOfRecordToMove = visibleRecordFieldsValue[fromIndex].id;- const idOfTargetRecord = visibleRecordFieldsValue[toIndex].id;-- const recordToMove = visibleRecordFieldsValue[fromIndex];-- const isDroppedAfterList = toIndex >= visibleRecordFieldsValue.length;-- const newPositionOfTargetRecord = computeNewPositionOfDraggedRecord({- arrayOfRecordsWithPosition: currentRecordFieldsValue,- idOfItemToMove: idOfRecordToMove,- idOfTargetItem: idOfTargetRecord,- isDroppedAfterList,+ ({+ recordFieldToMove,+ targetRecordField,+ }: {+ recordFieldToMove: Pick<RecordField, 'id' | 'fieldMetadataItemId'>;+ targetRecordField: Pick<RecordField, 'id'>;+ }) => {+ const newPosition = computeNewPositionOfDraggedRecord({+ arrayOfRecordsWithPosition: store.get(currentRecordFields),+ idOfItemToMove: recordFieldToMove.id,+ idOfTargetItem: targetRecordField.id,+ isDroppedAfterList: false,});- updateRecordField(recordToMove.fieldMetadataItemId, {- position: newPositionOfTargetRecord,+ return updateRecordField(recordFieldToMove.fieldMetadataItemId, {+ position: newPosition,});-- const updatedRecordField: RecordField = {- ...recordToMove,- position: newPositionOfTargetRecord,- };-- return updatedRecordField;},- [currentRecordFields, visibleRecordFields, updateRecordField, store],+ [currentRecordFields, updateRecordField, store],);return { reorderVisibleRecordFields };diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.tsindex 31e43c7e25a..b7d8d92a47b 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/dnd/hooks/useRecordTableHeaderDndKit.ts@@ -6,7 +6,9 @@ import { useSaveCurrentViewFields } from '@/views/hooks/useSaveCurrentViewFieldsimport { mapRecordFieldToViewField } from '@/views/utils/mapRecordFieldToViewField';import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';+import { RECORD_TABLE_HEADER_DROPPABLE_ID } from '@/object-record/record-table/record-table-header/dnd/constants/RecordTableHeaderDroppableId';import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';+import { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';import { type DragDropProviderDragMoveEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragMoveEvent';@@ -85,14 +87,18 @@ export const useRecordTableHeaderDndKit = (): {return;}- const destinationIndex =- dropTargetIndex <= sourceIndex ? dropTargetIndex + 1 : dropTargetIndex;+ const sortableRecordFields = visibleRecordFields.slice(1);++ const destinationIndex = getDestinationIndex({+ dropTargetIndex,+ sourceIndex,+ sourceDroppableId: RECORD_TABLE_HEADER_DROPPABLE_ID,+ destinationDroppableId: RECORD_TABLE_HEADER_DROPPABLE_ID,+ });- // Sortable indices exclude the pinned label-identifier column at visibleRecordFields[0],- // so shift by one to address the full visible field list.const updatedRecordField = reorderVisibleRecordFields({- fromIndex: sourceIndex + 1,- toIndex: destinationIndex,+ recordFieldToMove: sortableRecordFields[sourceIndex],+ targetRecordField: sortableRecordFields[destinationIndex],});saveViewFields([mapRecordFieldToViewField(updatedRecordField)]);diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsxindex f93aba2c48a..8b08f4c8b0d 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableFieldsDropdownVisibleFieldsContent.tsx@@ -69,22 +69,16 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({.toSorted(sortByProperty('position'));const handleDragEnd = (result: DraggableListDropResult) => {- if (- !result.destination ||- result.destination.index === 1 ||- result.source.index === 1- ) {+ if (!isDefined(result.destination)) {return;}const updatedField = reorderVisibleRecordFields({- fromIndex: result.source.index - 1,- toIndex: result.destination.index - 1,+ recordFieldToMove: draggableRecordFields[result.source.index],+ targetRecordField: draggableRecordFields[result.destination.index],});- if (isDefined(updatedField)) {- onFieldUpdated?.(updatedField.id, { position: updatedField.position });- }+ onFieldUpdated?.(updatedField.id, { position: updatedField.position });};const handleHideField = (fieldMetadataId: string) => {@@ -115,10 +109,6 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({draggableItems={<>{draggableRecordFields.map((recordField, index) => {- const fieldIndex =- index +- (isDefined(fieldMetadataItemLabelIdentifier) ? 1 : 0);-const { fieldMetadataItem } = getFieldMetadataItemByIdOrThrow(recordField.fieldMetadataItemId,);@@ -127,7 +117,7 @@ export const RecordTableFieldsDropdownVisibleFieldsContent = ({<DraggableItemkey={recordField.fieldMetadataItemId}draggableId={recordField.fieldMetadataItemId}- index={fieldIndex + 1}+ index={index}itemComponent={<MenuItemDraggableLeftIcon={getIcon(fieldMetadataItem.icon)}diff --git a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsxindex 007ad656ad5..dfa7707a480 100644--- a/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewFieldsVisibleDropdownSection.tsx@@ -51,10 +51,6 @@ export const ViewFieldsVisibleDropdownSection = () => {? handleBoardFieldVisibilityChange: changeRecordFieldVisibility;- const handleDragEnd = (result: DraggableListDropResult) => {- handleReorderFields(result);- };-const { getIcon } = useIcons();const fieldMetadataItemLabelIdentifier =@@ -78,6 +74,17 @@ export const ViewFieldsVisibleDropdownSection = () => {).toSorted(sortByProperty('position'));+ const handleDragEnd = (result: DraggableListDropResult) => {+ if (!isDefined(result.destination)) {+ return;+ }++ handleReorderFields({+ recordFieldToMove: draggableRecordFields[result.source.index],+ targetRecordField: draggableRecordFields[result.destination.index],+ });+ };+return (<><DropdownMenuItemsContainer>@@ -96,10 +103,6 @@ export const ViewFieldsVisibleDropdownSection = () => {draggableItems={<>{draggableRecordFields.map((recordField, index) => {- const fieldIndex =- index +- (isDefined(fieldMetadataItemLabelIdentifier) ? 1 : 0);-const { fieldMetadataItem } = getFieldMetadataItemByIdOrThrow(recordField.fieldMetadataItemId,);@@ -108,7 +111,7 @@ export const ViewFieldsVisibleDropdownSection = () => {<DraggableItemkey={recordField.fieldMetadataItemId}draggableId={recordField.fieldMetadataItemId}- index={fieldIndex + 1}+ index={index}itemComponent={<MenuItemDraggablekey={recordField.fieldMetadataItemId}