Skip to content

Simplify computation of report name for certain types #81513

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
neil-marcellini merged 12 commits into from
Feb 11, 2026
Merged

Simplify computation of report name for certain types #81513

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
390694d
Simplyfy computation of report name for certain types
sosek108 Feb 5, 2026
2cc2740
Merge branch 'main' into reports/simplify-computation
sosek108 Feb 5, 2026
674ad74
Fixes from review
sosek108 Feb 5, 2026
a77b946
Merge branch 'main' into reports/simplify-computation
sosek108 Feb 6, 2026
7d1141d
Merge branch 'main' into reports/simplify-computation
sosek108 Feb 9, 2026
8b6b16b
Only EXPENSE is left in early return check in computeReportName
sosek108 Feb 9, 2026
420789a
Merge branch 'main' into reports/simplify-computation
sosek108 Feb 10, 2026
2d01fc7
Move computeReportNameBasedOnReportAction higher than shouldReturnSta…
sosek108 Feb 10, 2026
1764c72
Merge branch 'main' into reports/simplify-computation
sosek108 Feb 10, 2026
6227b43
Merge branch 'main' into reports/simplify-computation
sosek108 Feb 11, 2026
1059ffc
simplify the check
sosek108 Feb 11, 2026
d349a8b
prettier fixes
sosek108 Feb 11, 2026
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
9 changes: 5 additions & 4 deletions src/libs/ReportNameUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@

let allPersonalDetails: OnyxEntry<PersonalDetailsList>;

Onyx.connect({

Check warning on line 139 in src/libs/ReportNameUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (value) => {
allPersonalDetails = value;
Expand Down Expand Up @@ -725,12 +725,9 @@
if (!report || !report.reportID) {
return '';
}

const privateIsArchivedValue = privateIsArchived ?? allReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`]?.private_isArchived;
const reportPolicy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];

const isArchivedNonExpense = isArchivedNonExpenseReport(report, !!privateIsArchivedValue);

const reportPolicy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
const parentReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
const parentReportAction = isThread(report) ? reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`]?.[report.parentReportActionID] : undefined;

Expand All @@ -741,6 +738,10 @@
return parentReportActionBasedName;
}

if (report?.reportName && report.type === CONST.REPORT.TYPE.EXPENSE) {
Copy link
Contributor

@neil-marcellini neil-marcellini Feb 11, 2026

Choose a reason for hiding this comment

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

NAB: in a follow-up pull request, can we please move this check all the way to the top of the function for better optimization? I don't think we need the "is archived non-expense" check, because this is already within the check that the report type is an expense report.

Copy link
Contributor Author

@sosek108 sosek108 Feb 13, 2026

Choose a reason for hiding this comment

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

I agree, that indeed we don't need to check isArchivedNonExpenseReport so I'll move this after if (report?.reportName && report.type === CONST.REPORT.TYPE.EXPENSE) check.

But if we do our check before this:

if (parentReportActionBasedName) {
        return parentReportActionBasedName;
}

unit tests will break as it's assumed that there are some special cases based on parent report's actions

Copy link
Contributor Author

@sosek108 sosek108 Feb 13, 2026

Choose a reason for hiding this comment

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

Follow up: #82382

return isArchivedNonExpense ? generateArchivedReportName(report?.reportName) : report?.reportName;
}

if (isTaskReport(report)) {
return Parser.htmlToText(report?.reportName ?? '').trim();
}
Expand Down
Loading