Fixing import and removing flickering

elastic · Aug 30, 2022 · ae3f44b · ae3f44b
1 parent 77491ff
commit ae3f44b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.tsx
@@ -61,11 +61,11 @@ export const CaseViewActivity = ({
   const userActionProfileUids = Array.from(userActionsData?.profileUids.values() ?? []);
   const uidsToRetrieve = uniq([...userActionProfileUids, ...assignees]);
 
-  const { data: userProfiles, isLoading: isLoadingUserProfiles } = useBulkGetUserProfiles({
+  const { data: userProfiles, isFetching: isLoadingUserProfiles } = useBulkGetUserProfiles({
     uids: uidsToRetrieve,
   });
 
-  const { data: currentUserProfile, isLoading: isLoadingCurrentUserProfile } =
+  const { data: currentUserProfile, isFetching: isLoadingCurrentUserProfile } =
     useGetCurrentUserProfile();
 
   const onShowAlertDetails = useCallback(

diff --git a/x-pack/plugins/cases/public/components/case_view/components/suggest_users_popover.tsx b/x-pack/plugins/cases/public/components/case_view/components/suggest_users_popover.tsx
@@ -137,7 +137,7 @@ const SuggestUsersPopoverComponent: React.FC<SuggestUsersPopoverProps> = ({
     []
   );
 
-  const { data: userProfiles, isLoading: isLoadingSuggest } = useSuggestUserProfiles({
+  const { data: userProfiles, isFetching: isLoadingSuggest } = useSuggestUserProfiles({
     name: searchTerm,
     owners: owner,
   });
@@ -173,7 +173,7 @@ const SuggestUsersPopoverComponent: React.FC<SuggestUsersPopoverProps> = ({
         searchPlaceholder: i18n.SEARCH_USERS,
         clearButtonLabel: i18n.REMOVE_ASSIGNEES,
         emptyMessage: <EmptyMessage />,
-        noMatchesMessage: <NoMatches />,
+        noMatchesMessage: searchResultProfiles ? <NoMatches /> : <EmptyMessage />,
       }}
     />
   );
@@ -183,7 +183,7 @@ SuggestUsersPopoverComponent.displayName = 'SuggestUsersPopover';
 
 export const SuggestUsersPopover = React.memo(SuggestUsersPopoverComponent);
 
-const sortProfiles = (profiles?: UserProfileWithAvatar[]) => {
+const sortProfiles = (profiles?: UserProfileWithAvatar[] | null) => {
   if (!profiles) {
     return;
   }

diff --git a/x-pack/plugins/cases/public/components/user_profiles/display_name.ts b/x-pack/plugins/cases/public/components/user_profiles/display_name.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { getUserDisplayName } from '@kbn/security-plugin/common';
-import { UserProfileUserInfo } from '@kbn/user-profile-components/target_types/user_profile';
+import { getUserDisplayName, UserProfileUserInfo } from '@kbn/user-profile-components';
 import { isEmpty } from 'lodash';
 import * as i18n from './translations';
 

diff --git a/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.ts b/x-pack/plugins/cases/public/containers/user_profiles/use_suggest_user_profiles.ts
@@ -31,16 +31,17 @@ export const useSuggestUserProfiles = ({
 
   const toasts = useToasts();
 
-  return useQuery<UserProfile[], ServerError>(
+  return useQuery<UserProfile[] | null, ServerError>(
     [
       USER_PROFILES_CACHE_KEY,
       USER_PROFILES_SUGGEST_CACHE_KEY,
       { name: debouncedName, owners, size },
     ],
     () => {
       if (isEmpty(name)) {
-        return [];
+        return null;
       }
+
       const abortCtrlRef = new AbortController();
       return suggestUserProfiles({
         http,
@@ -67,4 +68,4 @@ export const useSuggestUserProfiles = ({
   );
 };
 
-export type UseSuggestUserProfiles = UseQueryResult<UserProfile[], ServerError>;
+export type UseSuggestUserProfiles = UseQueryResult<UserProfile[] | null, ServerError>;