Skip to content

Make getReportDetails a pure function #61670

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
luacmartins merged 9 commits into from
Jun 11, 2025
Merged

Make getReportDetails a pure function #61670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4296af6
make getReportDetails pure
cretadn22 May 8, 2025
15df3e9
new main
cretadn22 May 29, 2025
c652e1a
new main
cretadn22 Jun 6, 2025
f57121b
remove getReportDetails
cretadn22 Jun 6, 2025
d9ffc26
fix type error
cretadn22 Jun 6, 2025
27a6d67
fix errors
cretadn22 Jun 9, 2025
eb36352
apply suggestion
cretadn22 Jun 11, 2025
d107aa4
modify
cretadn22 Jun 11, 2025
7416613
apply suggestion
cretadn22 Jun 11, 2025
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
33 changes: 15 additions & 18 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4861,15 +4861,15 @@ function getReportNameInternal({
if (isArchivedNonExpenseReport(report, getReportNameValuePairs(report?.reportID, reportNameValuePairs))) {
formattedName += ` (${translateLocal('common.archived')})`;
}
return formatReportLastMessageText(formattedName);
return formatReportLastMessageText(formattedName) ?? report?.reportName ?? '';

@tgolen tgolen Jun 11, 2025

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.

Ah, dang. Sucks that this had to be added so many places. It would really help if this function only had one return, but that's not your fault.

}

if (!isEmptyObject(parentReportAction) && isOldDotReportAction(parentReportAction)) {
return getMessageOfOldDotReportAction(parentReportAction);
return getMessageOfOldDotReportAction(parentReportAction) ?? report?.reportName ?? '';
}

if (isRenamedAction(parentReportAction)) {
return getRenamedAction(parentReportAction, isExpenseReport(getReport(report.parentReportID, allReports)));
return getRenamedAction(parentReportAction, isExpenseReport(getReport(report.parentReportID, allReports))) ?? report?.reportName ?? '';
}

if (parentReportActionMessage?.isDeletedParentAction) {
Expand Down Expand Up @@ -4899,7 +4899,7 @@ function getReportNameInternal({
return translateLocal('parentReportAction.hiddenMessage');
}
if (isAdminRoom(report) || isUserCreatedPolicyRoom(report)) {
return getAdminRoomInvitedParticipants(parentReportAction, reportActionMessage);
return getAdminRoomInvitedParticipants(parentReportAction, reportActionMessage) ?? report?.reportName ?? '';
}

// This will get removed as part of https://github.com/Expensify/App/issues/59961
Expand All @@ -4909,23 +4909,23 @@ function getReportNameInternal({
}
if (!isEmptyObject(parentReportAction) && isModifiedExpenseAction(parentReportAction)) {
const modifiedMessage = ModifiedExpenseMessage.getForReportAction({reportOrID: report?.reportID, reportAction: parentReportAction, searchReports: reports});
return formatReportLastMessageText(modifiedMessage);
return formatReportLastMessageText(modifiedMessage) ?? report?.reportName ?? '';
}
if (isTripRoom(report) && report?.reportName !== CONST.REPORT.DEFAULT_REPORT_NAME) {
return report?.reportName ?? '';
}
if (isCardIssuedAction(parentReportAction)) {
return getCardIssuedMessage({reportAction: parentReportAction});
return getCardIssuedMessage({reportAction: parentReportAction}) ?? report?.reportName ?? '';
}
return reportActionMessage;
return reportActionMessage ?? report?.reportName ?? '';
}

if (isClosedExpenseReportWithNoExpenses(report, transactions)) {
return translateLocal('parentReportAction.deletedReport');
}

if (isGroupChat(report)) {
return getGroupChatName(undefined, true, report) ?? '';
return getGroupChatName(undefined, true, report) ?? report?.reportName ?? '';
}

if (isChatRoom(report)) {
Expand Down Expand Up @@ -4959,13 +4959,13 @@ function getReportNameInternal({
}

if (formattedName) {
return formatReportLastMessageText(formattedName);
return formatReportLastMessageText(formattedName) ?? report?.reportName ?? '';
}

// Not a room or PolicyExpenseChat, generate title from first 5 other participants
formattedName = buildReportNameFromParticipantNames({report, personalDetails});

return formattedName;
return formattedName ?? report?.reportName ?? '';
}

/**
Expand Down Expand Up @@ -5782,18 +5782,15 @@ function getDeletedTransactionMessage(action: ReportAction) {
return message;
}

function getReportDetails(reportID: string): {reportName: string; reportUrl: string} {
const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
return {
reportName: getReportName(report) ?? report?.reportName ?? '',
reportUrl: `${environmentURL}/r/${reportID}`,
};
function getReportUrl(reportID: string) {
return `${environmentURL}/r/${reportID}`;
}

function getMovedTransactionMessage(action: ReportAction) {
function getMovedTransactionMessage(action: ReportAction, parentReportAction: OnyxEntry<ReportAction>, report?: Report) {
const movedTransactionOriginalMessage = getOriginalMessage(action as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MOVED_TRANSACTION>) ?? {};
const {toReportID} = movedTransactionOriginalMessage as OriginalMessageMovedTransaction;
const {reportName, reportUrl} = getReportDetails(toReportID);
const reportName = getReportName(report, undefined, parentReportAction);
const reportUrl = getReportUrl(toReportID);
const message = translateLocal('iou.movedTransaction', {
reportUrl,
reportName,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/PureReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ function PureReportActionItem({
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MOVED_TRANSACTION) {
children = (
<ReportActionItemBasicMessage message="">
<RenderHTML html={`<comment><muted-text>${getMovedTransactionMessage(action)}</muted-text></comment>`} />
<RenderHTML html={`<comment><muted-text>${getMovedTransactionMessage(action, parentReportAction, report)}</muted-text></comment>`} />
</ReportActionItemBasicMessage>
);
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.UNREPORTED_TRANSACTION) {
Expand Down