Skip to content
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

Jump to bottom

Start showing the beginningOfChatHistory in other room types #44667

Merged
merged 20 commits into from
Jul 12, 2024
Merged

Start showing the beginningOfChatHistory in other room types #44667

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9f2d5a2
display begining chat history message in LHN
nkdengineer Jun 27, 2024
7595c30
Merge branch 'Expensify:main' into fix/44146
nkdengineer Jul 1, 2024
e32567e
fix lint
nkdengineer Jul 1, 2024
0051894
fix lint
nkdengineer Jul 1, 2024
b23327b
run prettier
nkdengineer Jul 1, 2024
91d090c
fix logic get welcome text
nkdengineer Jul 2, 2024
d3c7f13
Update src/libs/SidebarUtils.ts
nkdengineer Jul 3, 2024
d949ba0
fix: logic get begin of chat history
nkdengineer Jul 3, 2024
8d331c5
Merge branch 'main' into fix/44146
nkdengineer Jul 5, 2024
208bd88
consistent logic
nkdengineer Jul 5, 2024
3ae6b87
Merge branch 'main' into fix/44146
nkdengineer Jul 8, 2024
3cf8483
fix lint
nkdengineer Jul 8, 2024
15ad9f4
fix: remove useless function
nkdengineer Jul 8, 2024
8270b23
fix lint
nkdengineer Jul 8, 2024
6106529
Merge branch 'main' into fix/44146
nkdengineer Jul 10, 2024
f4ea209
refactor: cleanup function
nkdengineer Jul 10, 2024
57e761e
use messageHtml field
nkdengineer Jul 10, 2024
229402a
Update src/libs/SidebarUtils.ts
nkdengineer Jul 11, 2024
b7c57ec
Update src/libs/SidebarUtils.ts
nkdengineer Jul 11, 2024
5afc41d
resolve conflict
nkdengineer Jul 12, 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
21 changes: 11 additions & 10 deletions src/components/ReportWelcomeText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as ReportUtils from '@libs/ReportUtils';
import SidebarUtils from '@libs/SidebarUtils';
import CONST from '@src/CONST';
import type {IOUType} from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -42,7 +43,7 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
const isMultipleParticipant = participantAccountIDs.length > 1;
const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails), isMultipleParticipant);
const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(report);
const welcomeMessage = SidebarUtils.getWelcomeMessage(report);
const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, policy, participantAccountIDs);
const additionalText = moneyRequestOptions
.filter((item): item is Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND | typeof CONST.IOU.TYPE.INVOICE> => item !== CONST.IOU.TYPE.INVOICE)
Expand Down Expand Up @@ -101,11 +102,11 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
</PressableWithoutFeedback>
) : (
<Text>
<Text>{translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartOne')}</Text>
<Text>{welcomeMessage.phrase1}</Text>
<Text style={[styles.textStrong]}>{ReportUtils.getDisplayNameForParticipant(report?.ownerAccountID)}</Text>
<Text>{translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartTwo')}</Text>
<Text>{welcomeMessage.phrase2}</Text>
<Text style={[styles.textStrong]}>{ReportUtils.getPolicyName(report)}</Text>
<Text>{translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartThree')}</Text>
<Text>{welcomeMessage.phrase3}</Text>
</Text>
))}
{isChatRoom &&
Expand All @@ -125,8 +126,8 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
</PressableWithoutFeedback>
) : (
<Text>
<Text>{roomWelcomeMessage.phrase1}</Text>
{roomWelcomeMessage.showReportName && (
<Text>{welcomeMessage.phrase1}</Text>
{welcomeMessage.showReportName && (
<Text
style={[styles.textStrong]}
onPress={navigateToReport}
Expand All @@ -135,22 +136,22 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
{ReportUtils.getReportName(report)}
</Text>
)}
{roomWelcomeMessage.phrase2 !== undefined && <Text>{roomWelcomeMessage.phrase2}</Text>}
{welcomeMessage.phrase2 !== undefined && <Text>{welcomeMessage.phrase2}</Text>}
</Text>
))}
{isSelfDM && (
<Text>
<Text>{translate('reportActionsView.beginningOfChatHistorySelfDM')}</Text>
<Text>{welcomeMessage.phrase1}</Text>
</Text>
)}
{isSystemChat && (
<Text>
<Text>{translate('reportActionsView.beginningOfChatHistorySystemDM')}</Text>
<Text>{welcomeMessage.phrase1}</Text>
</Text>
)}
{isDefault && (
<Text>
<Text>{translate('reportActionsView.beginningOfChatHistory')}</Text>
<Text>{welcomeMessage.phrase1}</Text>
{displayNamesWithTooltips.map(({displayName, accountID}, index) => (
// eslint-disable-next-line react/no-array-index-key
<Text key={`${displayName}${index}`}>
Expand Down
35 changes: 1 addition & 34 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ import * as UserUtils from './UserUtils';

type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18;

type WelcomeMessage = {showReportName: boolean; phrase1?: string; phrase2?: string};

type SpendBreakdown = {
nonReimbursableSpend: number;
reimbursableSpend: number;
Expand Down Expand Up @@ -1617,37 +1615,6 @@ function canDeleteReportAction(reportAction: OnyxInputOrEntry<ReportAction>, rep
return isActionOwner || isAdmin;
}

/**
* Get welcome message based on room type
*/
function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
const welcomeMessage: WelcomeMessage = {showReportName: true};
const workspaceName = getPolicyName(report);

if (isArchivedRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartOne');
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartTwo');
} else if (isDomainRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartOne', {domainRoom: report?.reportName ?? ''});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartTwo');
} else if (isAdminRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
} else if (isAnnounceRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});
} else if (isInvoiceRoom(report)) {
welcomeMessage.showReportName = false;
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoom');
} else {
// Message for user created rooms or other room types.
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo');
}

return welcomeMessage;
}

/**
* Returns true if Concierge is one of the chat participants (1:1 as well as group chats)
*/
Expand Down Expand Up @@ -7159,7 +7126,6 @@ export {
getReportPreviewMessage,
getReportRecipientAccountIDs,
getRoom,
getRoomWelcomeMessage,
getRootParentReport,
getRouteFromLink,
getSystemChat,
Expand Down Expand Up @@ -7232,6 +7198,7 @@ export {
isIOUReport,
isIOUReportUsingReport,
isJoinRequestInAdminRoom,
isDomainRoom,
isMoneyRequest,
isMoneyRequestReport,
isMoneyRequestReportPendingDeletion,
Expand Down
145 changes: 116 additions & 29 deletions src/libs/SidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,23 @@ import {hasValidDraftComment} from './DraftCommentUtils';
import localeCompare from './LocaleCompare';
import * as LocalePhoneNumber from './LocalePhoneNumber';
import * as Localize from './Localize';
import {parseHtmlToText} from './OnyxAwareParser';
import * as OptionsListUtils from './OptionsListUtils';
import * as PolicyUtils from './PolicyUtils';
import * as ReportActionsUtils from './ReportActionsUtils';
import * as ReportUtils from './ReportUtils';
import * as TaskUtils from './TaskUtils';

type WelcomeMessage = {showReportName: boolean; phrase1?: string; phrase2?: string; phrase3?: string; concatMessage?: string};

const visibleReportActionItems: ReportActions = {};
let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (value) => {
allPersonalDetails = value ?? {};
},
});
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
callback: (actions, key) => {
Expand Down Expand Up @@ -337,7 +347,7 @@ function getOptionData({
const lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(report, lastActorDetails, policy);

// We need to remove sms domain in case the last message text has a phone number mention with sms domain.
let lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport);
const lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport);

const lastAction = visibleReportActionItems[report.reportID];

Expand Down Expand Up @@ -385,38 +395,14 @@ function getOptionData({
} else {
result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : ReportActionsUtils.getLastVisibleMessage(report.reportID, {}, lastAction)?.lastMessageText;
if (!result.alternateText) {
result.alternateText = Localize.translate(preferredLocale, 'report.noActivityYet');
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
result.alternateText = ReportUtils.formatReportLastMessageText(getWelcomeMessage(report).concatMessage || Localize.translateLocal('report.noActivityYet'));
Copy link
Contributor

Choose a reason for hiding this comment

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

Based on the above comment ^ Do we still have a case where we would return report.noActivityYet

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just updated and we still have some case messageText is undefined like chat thread or task report.

}
}
} else {
if (!lastMessageText) {
if (ReportUtils.isSystemChat(report)) {
lastMessageText = Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistorySystemDM');
} else if (ReportUtils.isSelfDM(report)) {
lastMessageText = Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistorySelfDM');
} else {
// Here we get the beginning of chat history message and append the display name for each user, adding pronouns if there are any.
// We also add a fullstop after the final name, the word "and" before the final name and commas between all previous names.
lastMessageText =
Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistory') +
displayNamesWithTooltips
.map(({displayName, pronouns}, index) => {
const formattedText = !pronouns ? displayName : `${displayName} (${pronouns})`;

if (index === displayNamesWithTooltips.length - 1) {
return `${formattedText}.`;
}
if (index === displayNamesWithTooltips.length - 2) {
return `${formattedText} ${Localize.translate(preferredLocale, 'common.and')}`;
}
if (index < displayNamesWithTooltips.length - 2) {
return `${formattedText},`;
}

return '';
})
.join(' ');
}
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
result.alternateText = ReportUtils.formatReportLastMessageText(getWelcomeMessage(report).concatMessage || Localize.translateLocal('report.noActivityYet'));
}

result.alternateText =
Expand Down Expand Up @@ -457,7 +443,108 @@ function getOptionData({
return result;
}

function getWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
const welcomeMessage: WelcomeMessage = {showReportName: true};
if (ReportUtils.isChatRoom(report)) {
return getRoomWelcomeMessage(report);
}

if (ReportUtils.isPolicyExpenseChat(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartOne');
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartTwo');
welcomeMessage.phrase3 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartThree');
if (report?.description) {
nkdengineer marked this conversation as resolved.
Show resolved Hide resolved
welcomeMessage.concatMessage = parseHtmlToText(report.description);
}
nkdengineer marked this conversation as resolved.
Show resolved Hide resolved
welcomeMessage.concatMessage = `${welcomeMessage.phrase1} ${ReportUtils.getDisplayNameForParticipant(report?.ownerAccountID)} ${welcomeMessage.phrase2} ${ReportUtils.getPolicyName(
nkdengineer marked this conversation as resolved.
Show resolved Hide resolved
report,
)} ${welcomeMessage.phrase3}`;
return welcomeMessage;
}

if (ReportUtils.isSelfDM(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistorySelfDM');
welcomeMessage.concatMessage = welcomeMessage.phrase1;
return welcomeMessage;
}

if (ReportUtils.isSystemChat(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistorySystemDM');
welcomeMessage.concatMessage = welcomeMessage.phrase1;
return welcomeMessage;
}

if (
!(ReportUtils.isChatRoom(report) || ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isSelfDM(report) || ReportUtils.isInvoiceRoom(report) || ReportUtils.isSystemChat(report))
) {
nkdengineer marked this conversation as resolved.
Show resolved Hide resolved
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistory');
const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
const isMultipleParticipant = participantAccountIDs.length > 1;
const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, allPersonalDetails),
isMultipleParticipant,
);
const displayNamesWithTooltipsText = displayNamesWithTooltips
.map(({displayName, pronouns}, index) => {
const formattedText = !pronouns ? displayName : `${displayName} (${pronouns})`;

if (index === displayNamesWithTooltips.length - 1) {
return `${formattedText}.`;
}
if (index === displayNamesWithTooltips.length - 2) {
return `${formattedText} ${Localize.translateLocal('common.and')}`;
}
if (index < displayNamesWithTooltips.length - 2) {
return `${formattedText},`;
}

return '';
})
.join(' ');
welcomeMessage.concatMessage = `${welcomeMessage.phrase1} ${displayNamesWithTooltipsText}`;
return welcomeMessage;
}

return welcomeMessage;
}

/**
* Get welcome message based on room type
*/
function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
const welcomeMessage: WelcomeMessage = {showReportName: true};
const workspaceName = ReportUtils.getPolicyName(report);

if (ReportUtils.isArchivedRoom(report)) {
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartTwo');
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartOne');
nkdengineer marked this conversation as resolved.
Show resolved Hide resolved
} else if (ReportUtils.isDomainRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartOne', {domainRoom: report?.reportName ?? ''});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartTwo');
} else if (ReportUtils.isAdminRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
} else if (ReportUtils.isAnnounceRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});
} else if (ReportUtils.isInvoiceRoom(report)) {
welcomeMessage.showReportName = false;
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoom');
} else {
// Message for user created rooms or other room types.
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo');
}
if (report?.description) {
welcomeMessage.concatMessage = parseHtmlToText(report.description);
}
welcomeMessage.concatMessage = `${welcomeMessage.phrase1} ${welcomeMessage.showReportName ? ReportUtils.getReportName(report) : ''} ${welcomeMessage.phrase2 ?? ''}`;
nkdengineer marked this conversation as resolved.
Show resolved Hide resolved

return welcomeMessage;
}

export default {
getOptionData,
getOrderedReportIDs,
getWelcomeMessage,
};
Loading