Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treat no value view group as normal & enable hide/dnd for no value #8613

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ export const RecordGroupMenuItemDraggable = ({
/>
}
accent={isNoValue || showDragGrip ? 'placeholder' : 'default'}
iconButtons={!isNoValue ? getIconButtons(recordGroup) : undefined}
iconButtons={getIconButtons(recordGroup)}
showGrip={isNoValue ? true : showDragGrip}
isDragDisabled={isNoValue ? true : !isDraggable}
isHoverDisabled={isNoValue}
isDragDisabled={!isDraggable}
/>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import {
import { useRef } from 'react';

import { RecordGroupMenuItemDraggable } from '@/object-record/record-group/components/RecordGroupMenuItemDraggable';
import {
RecordGroupDefinition,
RecordGroupDefinitionType,
} from '@/object-record/record-group/types/RecordGroupDefinition';
import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition';
import { DraggableItem } from '@/ui/layout/draggable-list/components/DraggableItem';
import { DraggableList } from '@/ui/layout/draggable-list/components/DraggableList';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
Expand Down Expand Up @@ -38,15 +35,6 @@ export const RecordGroupsVisibilityDropdownSection = ({
onDragEnd?.(result, provided);
};

const noValueRecordGroups =
recordGroups.filter(
(recordGroup) => recordGroup.type === RecordGroupDefinitionType.NoValue,
) ?? [];

const recordGroupsWithoutNoValueGroups = recordGroups.filter(
(recordGroup) => recordGroup.type !== RecordGroupDefinitionType.NoValue,
);

const ref = useRef<HTMLDivElement>(null);

return (
Expand All @@ -58,7 +46,7 @@ export const RecordGroupsVisibilityDropdownSection = ({
{!!recordGroups.length && (
<>
{!isDraggable ? (
recordGroupsWithoutNoValueGroups.map((recordGroup) => (
recordGroups.map((recordGroup) => (
<RecordGroupMenuItemDraggable
recordGroup={recordGroup}
onVisibilityChange={onVisibilityChange}
Expand All @@ -71,33 +59,25 @@ export const RecordGroupsVisibilityDropdownSection = ({
onDragEnd={handleOnDrag}
draggableItems={
<>
{recordGroupsWithoutNoValueGroups.map(
(recordGroup, index) => (
<DraggableItem
key={recordGroup.id}
draggableId={recordGroup.id}
index={index + 1}
itemComponent={
<RecordGroupMenuItemDraggable
recordGroup={recordGroup}
onVisibilityChange={onVisibilityChange}
showDragGrip={showDragGrip}
isDraggable={isDraggable}
/>
}
/>
),
)}
{recordGroups.map((recordGroup, index) => (
<DraggableItem
key={recordGroup.id}
draggableId={recordGroup.id}
index={index + 1}
itemComponent={
<RecordGroupMenuItemDraggable
recordGroup={recordGroup}
onVisibilityChange={onVisibilityChange}
showDragGrip={showDragGrip}
isDraggable={isDraggable}
/>
}
/>
))}
</>
}
/>
)}
{noValueRecordGroups.map((recordGroup) => (
<RecordGroupMenuItemDraggable
recordGroup={recordGroup}
onVisibilityChange={onVisibilityChange}
/>
))}
</>
)}
</DropdownMenuItemsContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { RecordBoardColumnContext } from '@/object-record/record-board/record-bo
import { useRecordGroups } from '@/object-record/record-group/hooks/useRecordGroups';
import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/useRecordGroupVisibility';
import { RecordGroupAction } from '@/object-record/record-group/types/RecordGroupActions';
import { RecordGroupDefinitionType } from '@/object-record/record-group/types/RecordGroupDefinition';
import { RecordIndexRootPropsContext } from '@/object-record/record-index/contexts/RecordIndexRootPropsContext';
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
import { ViewType } from '@/views/types/ViewType';
Expand Down Expand Up @@ -81,17 +80,15 @@ export const useRecordGroupActions = ({
navigateToSelectSettings();
},
},
recordGroupDefinition.type !== RecordGroupDefinitionType.NoValue
? {
id: 'hide',
label: 'Hide',
icon: IconEyeOff,
position: 1,
callback: () => {
handleRecordGroupVisibilityChange(recordGroupDefinition);
},
}
: undefined,
{
id: 'hide',
label: 'Hide',
icon: IconEyeOff,
position: 1,
callback: () => {
handleRecordGroupVisibilityChange(recordGroupDefinition);
},
},
].filter(isDefined),
[
handleRecordGroupVisibilityChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,18 @@ export const mapViewGroupsToRecordGroupDefinitions = ({
(option) => option.value === viewGroup.fieldValue,
);

if (!selectedOption) return null;
if (!selectedOption) {
return {
id: 'no-value',
title: 'No Value',
type: RecordGroupDefinitionType.NoValue,
value: null,
position: viewGroup.position,
isVisible: viewGroup.isVisible,
fieldMetadataId: selectFieldMetadataItem.id,
color: 'transparent',
} satisfies RecordGroupDefinition;
}

return {
id: viewGroup.id,
Expand All @@ -57,23 +68,5 @@ export const mapViewGroupsToRecordGroupDefinitions = ({
.filter(isDefined)
.sort((a, b) => a.position - b.position);

if (selectFieldMetadataItem.isNullable === true) {
const noValueColumn = {
id: 'no-value',
title: 'No Value',
type: RecordGroupDefinitionType.NoValue,
value: null,
position:
recordGroupDefinitionsFromViewGroups
.map((option) => option.position)
.reduce((a, b) => Math.max(a, b), 0) + 1,
isVisible: true,
fieldMetadataId: selectFieldMetadataItem.id,
color: 'transparent',
} satisfies RecordGroupDefinition;

return [...recordGroupDefinitionsFromViewGroups, noValueColumn];
}

return recordGroupDefinitionsFromViewGroups;
};
Loading