From 0c036efcc42db73349982999415ec5a9e1293ec2 Mon Sep 17 00:00:00 2001
From: Thomas Trompette <thomas.trompette@sfr.fr>
Date: Fri, 2 Aug 2024 15:18:29 +0200
Subject: [PATCH] Remove duplicated index from view picker (#6514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<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">
---
 .../components/ViewPickerListContent.tsx      | 62 +++++++++----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index 944bef3a8..09f5cce95 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -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 />