admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove duplicated index from view picker (#6514)

Browse Source 
<img width="815" alt="Capture d’écran 2024-08-02 à 15 15 51"
src="https://github.com/user-attachments/assets/0b192091-39f9-46c4-80b8-3c1a97f00480">
This commit is contained in:
Thomas Trompette
2024-08-02 15:18:29 +02:00
committed by GitHub
parent 950882d9fa
commit 0c036efcc4
1 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
View File

@ -102,40 +102,34 @@ export const ViewPickerListContent = () => {
)}
<DraggableList
onDragEnd={handleDragEnd}
draggableItems={viewsOnCurrentObject.map((view, index) => (
<DraggableItem
key={view.id}
draggableId={view.id}
index={index}
isDragDisabled={viewsOnCurrentObject.length === 1}
itemComponent={
<MenuItemDraggable
key={view.id}
iconButtons={
indexView?.id === view.id
? [
{
Icon: IconLock,
},
]
: [
{
Icon: IconPencil,
onClick: (event: MouseEvent<HTMLButtonElement>) =>
handleEditViewButtonClick(event, view.id),
},
].filter(isDefined)
}
isIconDisplayedOnHoverOnly={
indexView?.id === view.id ? false : true
}
onClick={() => handleViewSelect(view.id)}
LeftIcon={getIcon(view.icon)}
text={view.name}
/>
}
/>
))}
draggableItems={viewsOnCurrentObject
.filter((view) => indexView?.id !== view.id)
.map((view, index) => (
<DraggableItem
key={view.id}
draggableId={view.id}
index={index}
isDragDisabled={viewsOnCurrentObject.length === 1}
itemComponent={
<MenuItemDraggable
key={view.id}
iconButtons={[
{
Icon: IconPencil,
onClick: (event: MouseEvent<HTMLButtonElement>) =>
handleEditViewButtonClick(event, view.id),
},
].filter(isDefined)}
isIconDisplayedOnHoverOnly={
indexView?.id === view.id ? false : true
}
onClick={() => handleViewSelect(view.id)}
LeftIcon={getIcon(view.icon)}
text={view.name}
/>
}
/>
))}
/>
</DropdownMenuItemsContainer>
<DropdownMenuSeparator />