admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: 801 dont show if name empty (#854)

Browse Source 
* fix: 801 dont show if name empty

* fix: 801 add same logic to multiple entity
This commit is contained in:
310387
2023-07-24 03:02:21 +03:00
committed by GitHub
parent 21d5133564
commit 2b885f2496
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
front/src/modules/ui/relation-picker/components/MultipleEntitySelect.tsx
View File

@ -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 (
<DropdownMenu>
<DropdownMenuSearch

7
front/src/modules/ui/relation-picker/components/SingleEntitySelectBase.tsx
View File

@ -7,6 +7,7 @@ import { DropdownMenuSelectableItem } from '@/ui/dropdown/components/DropdownMen
import { useScopedHotkeys } from '@/ui/hotkey/hooks/useScopedHotkeys';
import { Avatar } from '@/users/components/Avatar';
import { isDefined } from '~/utils/isDefined';
import { isNonEmptyString } from '~/utils/isNonEmptyString';
import { OverflowingTextWithTooltip } from '../../tooltip/OverflowingTextWithTooltip';
import { useEntitySelectScroll } from '../hooks/useEntitySelectScroll';
@ -35,10 +36,14 @@ export function SingleEntitySelectBase<
onCancel?: () => void;
}) {
const containerRef = useRef<HTMLDivElement>(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,