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) => ( - - } - /> - ))} + {fields + .filter(({ index, size }) => index !== 0 || !size) + .map((field, index) => ( + + } + /> + ))} } /> 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; };