From f49333f2e80f7694a0202e4c45d31a1d113191b2 Mon Sep 17 00:00:00 2001
From: Abhishek Thory <76877003+abhithory@users.noreply.github.com>
Date: Mon, 9 Oct 2023 20:20:16 +0530
Subject: [PATCH] 1886/fix/dont show unhideable files in fields menu (#1931)

* in compaines>fields Name fields is hided.

* in Opputunities>Options>Fieds   make closeData dragable

* close data (first colum) make hideable

* added size field

* added filter in fields with index and size

* index updated
---
 .../ViewFieldsVisibilityDropdownSection.tsx   | 54 ++++++++-----------
 .../view-bar/types/ViewFieldForVisibility.ts  |  1 +
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx b/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx
index 30e9358b4..83ff28ea5 100644
--- a/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx
+++ b/front/src/modules/ui/view-bar/components/ViewFieldsVisibilityDropdownSection.tsx
@@ -47,17 +47,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
   };
 
   const getIconButtons = (index: number, field: ViewFieldForVisibility) => {
-    const isFirstColumn = isDraggable && index === 0;
-    if (isFirstColumn && field.infoTooltipContent) {
-      return [
-        {
-          Icon: IconInfoCircle,
-          onClick: () => handleInfoButtonClick(index),
-          isActive: openToolTipIndex === index,
-        },
-      ];
-    }
-    if (!isFirstColumn && field.infoTooltipContent) {
+    if (field.infoTooltipContent) {
       return [
         {
           Icon: IconInfoCircle,
@@ -70,7 +60,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
         },
       ];
     }
-    if (!isFirstColumn && !field.infoTooltipContent) {
+    if (!field.infoTooltipContent) {
       return [
         {
           Icon: field.isVisible ? IconMinus : IconPlus,
@@ -98,25 +88,27 @@ export const ViewFieldsVisibilityDropdownSection = ({
             onDragEnd={handleOnDrag}
             draggableItems={
               <>
-                {fields.map((field, index) => (
-                  <DraggableItem
-                    key={field.key}
-                    draggableId={field.key}
-                    index={index}
-                    isDragDisabled={index === 0}
-                    itemComponent={
-                      <MenuItemDraggable
-                        key={field.key}
-                        LeftIcon={field.Icon}
-                        iconButtons={getIconButtons(index, field)}
-                        isTooltipOpen={openToolTipIndex === index}
-                        text={field.name}
-                        isDragDisabled={index === 0}
-                        className={`${title}-draggable-item-tooltip-anchor-${index}`}
-                      />
-                    }
-                  />
-                ))}
+                {fields
+                  .filter(({ index, size }) => index !== 0 || !size)
+                  .map((field, index) => (
+                    <DraggableItem
+                      key={field.key}
+                      draggableId={field.key}
+                      index={index + 1}
+                      itemComponent={
+                        <MenuItemDraggable
+                          key={field.key}
+                          LeftIcon={field.Icon}
+                          iconButtons={getIconButtons(index + 1, field)}
+                          isTooltipOpen={openToolTipIndex === index + 1}
+                          text={field.name}
+                          className={`${title}-draggable-item-tooltip-anchor-${
+                            index + 1
+                          }`}
+                        />
+                      }
+                    />
+                  ))}
               </>
             }
           />
diff --git a/front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts b/front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts
index 2c2860fd5..c7d2039d5 100644
--- a/front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts
+++ b/front/src/modules/ui/view-bar/types/ViewFieldForVisibility.ts
@@ -7,4 +7,5 @@ export type ViewFieldForVisibility = Pick<
 > & {
   isVisible?: boolean;
   index: number;
+  size?: number | undefined;
 };