diff --git a/front/src/modules/ui/relation-picker/components/MultipleEntitySelect.tsx b/front/src/modules/ui/relation-picker/components/MultipleEntitySelect.tsx index 93520ca68..639ba3054 100644 --- a/front/src/modules/ui/relation-picker/components/MultipleEntitySelect.tsx +++ b/front/src/modules/ui/relation-picker/components/MultipleEntitySelect.tsx @@ -7,6 +7,7 @@ import { DropdownMenuItemsContainer } from '@/ui/dropdown/components/DropdownMen import { DropdownMenuSearch } from '@/ui/dropdown/components/DropdownMenuSearch'; import { DropdownMenuSeparator } from '@/ui/dropdown/components/DropdownMenuSeparator'; import { Avatar } from '@/users/components/Avatar'; +import { isNonEmptyString } from '~/utils/isNonEmptyString'; import { EntityForSelect } from '../types/EntityForSelect'; @@ -43,11 +44,15 @@ export function MultipleEntitySelect< onSearchFilterChange(event.currentTarget.value); } - const entitiesInDropdown = [ + let entitiesInDropdown = [ ...(entities.filteredSelectedEntities ?? []), ...(entities.entitiesToSelect ?? []), ]; + entitiesInDropdown = entitiesInDropdown.filter((entity) => + isNonEmptyString(entity.name), + ); + return ( void; }) { const containerRef = useRef(null); - const entitiesInDropdown = isDefined(entities.selectedEntity) + let entitiesInDropdown = isDefined(entities.selectedEntity) ? [entities.selectedEntity, ...(entities.entitiesToSelect ?? [])] : entities.entitiesToSelect ?? []; + entitiesInDropdown = entitiesInDropdown.filter((entity) => + isNonEmptyString(entity.name), + ); + const { hoveredIndex, resetScroll } = useEntitySelectScroll({ entities: entitiesInDropdown, containerRef,