From 7574ad82fe37fe65a5c4bb9fc629ef85ea35f8ab Mon Sep 17 00:00:00 2001
From: Ayush Agrawal <54364088+AyushAgrawal-A2@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:36:05 +0530
Subject: [PATCH] Fix: Wrong assignee on loading team member picker (#1894)

show only skeleton when loading
---
 .../components/SingleEntitySelectBase.tsx     | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx
index 48f2783d3..fc659d972 100644
--- a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx
+++ b/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx
@@ -104,48 +104,52 @@ export const SingleEntitySelectBase = <
   return (
     <>
       <StyledDropdownMenuItemsContainer ref={containerRef} hasMaxHeight>
-        {isAllEntitySelectShown && selectAllLabel && onAllEntitySelected && (
-          <MenuItemSelect
-            onClick={() => onAllEntitySelected()}
-            LeftIcon={SelectAllIcon}
-            text={selectAllLabel}
-            hovered={preselectedOptionId === EmptyButtonId}
-            selected={!!isAllEntitySelected}
-          />
-        )}
-        {emptyLabel && (
-          <MenuItemSelect
-            onClick={() => onEntitySelected()}
-            LeftIcon={EmptyIcon}
-            text={emptyLabel}
-            hovered={preselectedOptionId === EmptyButtonId}
-            selected={!selectedEntity}
-          />
-        )}
         {loading ? (
           <DropdownMenuSkeletonItem />
         ) : entitiesInDropdown.length === 0 && !isAllEntitySelectShown ? (
           <MenuItem text="No result" />
         ) : (
-          entitiesInDropdown?.map((entity) => (
-            <MenuItemSelectAvatar
-              key={entity.id}
-              testId="menu-item"
-              selected={selectedEntity?.id === entity.id}
-              onClick={() => onEntitySelected(entity)}
-              text={entity.name}
-              hovered={preselectedOptionId === entity.id}
-              avatar={
-                <Avatar
-                  avatarUrl={entity.avatarUrl}
-                  colorId={entity.id}
-                  placeholder={entity.name}
-                  size="md"
-                  type={entity.avatarType ?? 'rounded'}
+          <>
+            {isAllEntitySelectShown &&
+              selectAllLabel &&
+              onAllEntitySelected && (
+                <MenuItemSelect
+                  onClick={() => onAllEntitySelected()}
+                  LeftIcon={SelectAllIcon}
+                  text={selectAllLabel}
+                  hovered={preselectedOptionId === EmptyButtonId}
+                  selected={!!isAllEntitySelected}
                 />
-              }
-            />
-          ))
+              )}
+            {emptyLabel && (
+              <MenuItemSelect
+                onClick={() => onEntitySelected()}
+                LeftIcon={EmptyIcon}
+                text={emptyLabel}
+                hovered={preselectedOptionId === EmptyButtonId}
+                selected={!selectedEntity}
+              />
+            )}
+            {entitiesInDropdown?.map((entity) => (
+              <MenuItemSelectAvatar
+                key={entity.id}
+                testId="menu-item"
+                selected={selectedEntity?.id === entity.id}
+                onClick={() => onEntitySelected(entity)}
+                text={entity.name}
+                hovered={preselectedOptionId === entity.id}
+                avatar={
+                  <Avatar
+                    avatarUrl={entity.avatarUrl}
+                    colorId={entity.id}
+                    placeholder={entity.name}
+                    size="md"
+                    type={entity.avatarType ?? 'rounded'}
+                  />
+                }
+              />
+            ))}
+          </>
         )}
       </StyledDropdownMenuItemsContainer>
       {showCreateButton && (