fix: types and improve code

Author: reneshen0328

src/elements/content-sharing/__tests__/useContactsByEmail.test.js

@@ -134,7 +134,7 @@ describe('elements/content-sharing/hooks/useContactsByEmail', () => {
 
         test('should set the value of getContactsByEmail() and retrieve contacts when isContentSharingV2Enabled is true and email is provided', async () => {
             const mockUser1 = MOCK_CONTACTS_API_RESPONSE.entries[0];
-            const { id, email, name, type } = mockUser1;
+            const { id, login: email, name, type } = mockUser1;
             const expectedTransformedResult = {
                 id,
                 email,

src/elements/content-sharing/hooks/useContactsByEmail.js

@@ -4,7 +4,12 @@ import * as React from 'react';
 import noop from 'lodash/noop';
 import API from '../../../api';
 import type { UserCollection, UserMini } from '../../../common/types/core';
-import type { ContactByEmailObject, ContentSharingHooksOptions, GetContactsByEmailFnType } from '../types';
+import type {
+    ContactByEmailObject,
+    ContentSharingHooksOptions,
+    GetContactByEmailFnType,
+    GetContactsByEmailFnType,
+} from '../types';
 
 /**
  * Generate the getContactsByEmail() function, which is used for looking up contacts added to the collaborators field in the USM.
@@ -38,41 +43,43 @@ function useContactsByEmail(
             return resolve({});
         };
 
-        const updatedGetContactsByEmailFn: GetContactsByEmailFnType =
-            () => (filterTerm: { [emails: string]: string }) => {
-                if (!filterTerm || !Array.isArray(filterTerm.emails) || !filterTerm.emails.length) {
+        if (isContentSharingV2Enabled) {
+            const getContactsByEmailV2: GetContactByEmailFnType = () => email => {
+                if (!email) {
                     return Promise.resolve({});
                 }
-                const parsedFilterTerm = filterTerm.emails[0];
 
-                return new Promise((resolve: (result: ContactByEmailObject | Array<UserMini>) => void) => {
+                return new Promise(resolve => {
                     api.getMarkerBasedUsersAPI(false).getUsersInEnterprise(
                         itemID,
-                        (response: UserCollection) => resolveAPICall(resolve, response, transformUsers),
+                        response => resolveAPICall(resolve, response, transformUsers),
                         handleError,
-                        { filter_term: parsedFilterTerm },
+                        { filter_term: email },
                     );
                 });
             };
 
-        const getContactsByEmailV2 = () => email => {
-            if (!email) {
-                return Promise.resolve({});
-            }
+            setGetContactsByEmail(getContactsByEmailV2);
+        } else {
+            const updatedGetContactsByEmailFn: GetContactsByEmailFnType =
+                () => (filterTerm: { [emails: string]: string }) => {
+                    if (!filterTerm || !Array.isArray(filterTerm.emails) || !filterTerm.emails.length) {
+                        return Promise.resolve({});
+                    }
+                    const parsedFilterTerm = filterTerm.emails[0];
 
-            return new Promise(resolve => {
-                api.getMarkerBasedUsersAPI(false).getUsersInEnterprise(
-                    itemID,
-                    response => resolveAPICall(resolve, response, transformUsers),
-                    handleError,
-                    { filter_term: email },
-                );
-            });
-        };
+                    return new Promise((resolve: (result: ContactByEmailObject | Array<UserMini>) => void) => {
+                        api.getMarkerBasedUsersAPI(false).getUsersInEnterprise(
+                            itemID,
+                            (response: UserCollection) => resolveAPICall(resolve, response, transformUsers),
+                            handleError,
+                            { filter_term: parsedFilterTerm },
+                        );
+                    });
+                };
 
-        isContentSharingV2Enabled
-            ? setGetContactsByEmail(getContactsByEmailV2)
-            : setGetContactsByEmail(updatedGetContactsByEmailFn);
+            setGetContactsByEmail(updatedGetContactsByEmailFn);
+        }
     }, [api, getContactsByEmail, handleError, handleSuccess, isContentSharingV2Enabled, itemID, transformUsers]);
 
     return getContactsByEmail;

src/elements/content-sharing/types.js

@@ -140,6 +140,8 @@ export type GetContactsByEmailFnType = () => (filterTerm: {
     [emails: string]: string,
 }) => Promise<ContactByEmailObject | Array<UserMini>> | null;
 
+export type GetContactByEmailFnType = () => (email: string) => Promise<ContactByEmailObject | Array<UserMini>> | null;
+
 export type SendInvitesFnType = () => InviteCollaboratorsRequest => Promise<null | Array<Function>>;
 
 export type ConnectToItemShareFnType = ({

src/elements/content-sharing/utils/convertContactServiceData.ts

@@ -57,8 +57,7 @@ export const convertGroupContactsResponse = contactsApiData => {
 };
 
 /**
- * Convert an enterprise users API response into an object of internal USM contacts, keyed by email, which is
- * then passed to the mergeContacts function.
+ * Convert an enterprise users API response into a single internal USM contact object (from the first entry).
  */
 export const convertUserContactByEmailResponse = contactsApiData => {
     const { entries = [] } = contactsApiData;