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

Fix: Wrong assignee on loading team member picker (#1894)

Browse Source 
show only skeleton when loading
This commit is contained in:
Ayush Agrawal
2023-10-06 14:36:05 +05:30
committed by GitHub
parent 53021dc64f
commit 7574ad82fe
1 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,15 @@ export const SingleEntitySelectBase = <
return ( return (
<> <>
<StyledDropdownMenuItemsContainer ref={containerRef} hasMaxHeight> <StyledDropdownMenuItemsContainer ref={containerRef} hasMaxHeight>
{isAllEntitySelectShown && selectAllLabel && onAllEntitySelected && ( {loading ? (
<DropdownMenuSkeletonItem />
) : entitiesInDropdown.length === 0 && !isAllEntitySelectShown ? (
<MenuItem text="No result" />
) : (
<>
{isAllEntitySelectShown &&
selectAllLabel &&
onAllEntitySelected && (
<MenuItemSelect <MenuItemSelect
onClick={() => onAllEntitySelected()} onClick={() => onAllEntitySelected()}
LeftIcon={SelectAllIcon} LeftIcon={SelectAllIcon}
@ -122,12 +130,7 @@ export const SingleEntitySelectBase = <
selected={!selectedEntity} selected={!selectedEntity}
/> />
)} )}
{loading ? ( {entitiesInDropdown?.map((entity) => (
<DropdownMenuSkeletonItem />
) : entitiesInDropdown.length === 0 && !isAllEntitySelectShown ? (
<MenuItem text="No result" />
) : (
entitiesInDropdown?.map((entity) => (
<MenuItemSelectAvatar <MenuItemSelectAvatar
key={entity.id} key={entity.id}
testId="menu-item" testId="menu-item"
@ -145,7 +148,8 @@ export const SingleEntitySelectBase = <
/> />
} }
/> />
)) ))}
</>
)} )}
</StyledDropdownMenuItemsContainer> </StyledDropdownMenuItemsContainer>
{showCreateButton && ( {showCreateButton && (