Skip to content

Prioritize display name to display in tooltip text #34213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cead22 merged 15 commits into from
Feb 28, 2024
+14 −3
Merged

Prioritize display name to display in tooltip text #34213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
eb8677e
create getUserDetailsTooltipText util
dukenv0307 Jan 10, 2024
ebabfc7
fix lint
dukenv0307 Jan 10, 2024
83b98ea
fix ts lint
dukenv0307 Jan 10, 2024
2fa54df
merge main
dukenv0307 Jan 16, 2024
abe71ed
Merge branch 'main' of https://github.com/dukenv0307/App into fix/33740
dukenv0307 Jan 17, 2024
029d6c2
Merge branch 'main' into fix/33740
dukenv0307 Jan 18, 2024
032e9e3
display correct tooltip for the case subscription
dukenv0307 Jan 18, 2024
07fdde2
merge main
dukenv0307 Jan 30, 2024
5eb8eeb
Merge branch 'main' into fix/33740
dukenv0307 Feb 5, 2024
b73ad6a
merge main
dukenv0307 Feb 19, 2024
ae2f200
Merge branch 'main' into fix/33740
dukenv0307 Feb 21, 2024
3ec1803
Merge branch 'main' into fix/33740
dukenv0307 Feb 23, 2024
131d075
Update src/libs/ReportUtils.ts
dukenv0307 Feb 27, 2024
9ab82b3
Merge branch 'main' into fix/33740
dukenv0307 Feb 27, 2024
0b8d0d0
fix the case invite a new user to workspace
dukenv0307 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/MultipleAvatars.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type {ValueOf} from 'type-fest';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as ReportUtils from '@libs/ReportUtils';
import type {AvatarSource} from '@libs/UserUtils';
import variables from '@styles/variables';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -106,7 +107,8 @@ function MultipleAvatars({
let avatarContainerStyles = StyleUtils.getContainerStyles(size, isInReportAction);
const {singleAvatarStyle, secondAvatarStyles} = useMemo(() => avatarSizeToStylesMap[size as AvatarSizeToStyles] ?? avatarSizeToStylesMap.default, [size, avatarSizeToStylesMap]);

const tooltipTexts = useMemo(() => (shouldShowTooltip ? icons.map((icon) => icon.name) : ['']), [shouldShowTooltip, icons]);

@parasharrajat parasharrajat Jan 22, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we have to remove this memo. Why can't we just add the ReportUtils.getUserDetailsTooltipText( part to it.

@dukenv0307 dukenv0307 Jan 30, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@parasharrajat Actually, we use tooltipTexts as an array of user tooltip text and it will be slice accordingly below. We have two option

  1. No need to change any thing in MultipleAvatars because icon.name already uses getDisplayNameForParticipant function

  2. keep the change

@dukenv0307 dukenv0307 Feb 5, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@parasharrajat I merged main, what do you think about my comment above?

@parasharrajat parasharrajat Feb 21, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I meant to say was that tooltiptexts contain all the icons and it is used twice in the code below. Why can't we calculate the getUserDetailsTooltipText once over this array here and use to where needed.

  1. Now, you are calculating the getUserDetailsTooltipText from these icons at both places.
  2. Both those places use different slicing over this array.
  3. My suggestion was that we could convert the tooltipTexts icon array to an array of getUserDetailsTooltipText. Then just use this in those slicing operations.

@cead22 cead22 Feb 26, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@parasharrajat was your concern here addressed/resolved?

@parasharrajat parasharrajat Feb 27, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is no blocker for me.

@parasharrajat parasharrajat Feb 27, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now addressed.

const tooltipTexts = useMemo(() => (shouldShowTooltip ? icons.map((icon) => ReportUtils.getUserDetailTooltipText(Number(icon.id), icon.name)) : ['']), [shouldShowTooltip, icons]);

const avatarSize = useMemo(() => {
if (isFocusMode) {
return CONST.AVATAR_SIZE.MID_SUBSCRIPT;
Expand Down
4 changes: 2 additions & 2 deletions src/components/UserDetailsTooltip/BaseUserDetailsTooltip/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function BaseUserDetailsTooltip({accountID, fallbackUserDetails, icon, delegateA
const personalDetails = usePersonalDetails();

const userDetails = personalDetails?.[accountID] ?? fallbackUserDetails ?? {};
let userDisplayName = ReportUtils.getDisplayNameForParticipant(accountID) || (userDetails.displayName ? userDetails.displayName.trim() : '');
let userDisplayName = ReportUtils.getUserDetailTooltipText(accountID, userDetails.displayName ? userDetails.displayName.trim() : '');
let userLogin = userDetails.login?.trim() && userDetails.login !== userDetails.displayName ? Str.removeSMSDomain(userDetails.login) : '';

let userAvatar = userDetails.avatar;
Expand All @@ -29,7 +29,7 @@ function BaseUserDetailsTooltip({accountID, fallbackUserDetails, icon, delegateA
// the Copilot feature is implemented.
if (delegateAccountID) {
const delegateUserDetails = personalDetails?.[delegateAccountID];
const delegateUserDisplayName = ReportUtils.getDisplayNameForParticipant(delegateAccountID);
const delegateUserDisplayName = ReportUtils.getUserDetailTooltipText(delegateAccountID);
userDisplayName = `${delegateUserDisplayName} (${translate('reportAction.asCopilot')} ${userDisplayName})`;
userLogin = delegateUserDetails?.login ?? '';
userAvatar = delegateUserDetails?.avatar;
Expand Down
9 changes: 9 additions & 0 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,6 +1694,14 @@ function getDisplayNamesWithTooltips(
});
}

/**
* Returns the the display names of the given user accountIDs
*/
function getUserDetailTooltipText(accountID: number, fallbackUserDisplayName = ''): string {
const displayNameForParticipant = getDisplayNameForParticipant(accountID);
return displayNameForParticipant || fallbackUserDisplayName;
}

/**
* For a deleted parent report action within a chat report,
* let us return the appropriate display message
Expand Down Expand Up @@ -5195,6 +5203,7 @@ export {
buildOptimisticUnHoldReportAction,
shouldDisplayThreadReplies,
shouldDisableThread,
getUserDetailTooltipText,
doesReportBelongToWorkspace,
getChildReportNotificationPreference,
getAllAncestorReportActions,
Expand Down