Skip to content

Commit

Permalink
1886/fix/dont show unhideable files in fields menu (twentyhq#1931)
Browse files Browse the repository at this point in the history
* 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
abhithory authored Oct 9, 2023
1 parent 73617e3 commit f49333f
Showing 2 changed files with 24 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -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
}`}
/>
}
/>
))}
</>
}
/>
Original file line number Diff line number Diff line change
@@ -7,4 +7,5 @@ export type ViewFieldForVisibility = Pick<
> & {
isVisible?: boolean;
index: number;
size?: number | undefined;
};

0 comments on commit f49333f

Please sign in to comment.