Skip to content

Add stricter filtering to task reports #60902

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
merged 3 commits into from
May 8, 2025
Merged

Add stricter filtering to task reports #60902

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e30d523
add better filtering
JS00001 Apr 25, 2025
0d6e556
update type to return search task
JS00001 Apr 25, 2025
2385ab0
add clarifying comment
JS00001 Apr 25, 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
93 changes: 49 additions & 44 deletions src/libs/SearchUIUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,52 +443,57 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
* Do not use directly, use only via `getSections()` facade.
*/
function getTaskSections(data: OnyxTypes.SearchResults['data']): TaskListItemType[] {
return Object.keys(data)
.filter(isReportEntry)
.map((key) => {
const taskItem = data[key] as SearchTask;
const personalDetails = data.personalDetailsList;

const assignee = personalDetails?.[taskItem.managerID] ?? emptyPersonalDetails;
const createdBy = personalDetails?.[taskItem.accountID] ?? emptyPersonalDetails;
const formattedAssignee = formatPhoneNumber(getDisplayNameOrDefault(assignee));
const formattedCreatedBy = formatPhoneNumber(getDisplayNameOrDefault(createdBy));

const report = getReportOrDraftReport(taskItem.reportID) ?? taskItem;
const parentReport = getReportOrDraftReport(taskItem.parentReportID);

const doesDataContainAPastYearTransaction = shouldShowYear(data);
const reportName = StringUtils.lineBreaksToSpaces(Parser.htmlToText(taskItem.reportName));
const description = StringUtils.lineBreaksToSpaces(Parser.htmlToText(taskItem.description));

const result: TaskListItemType = {
...taskItem,
reportName,
description,
assignee,
formattedAssignee,
createdBy,
formattedCreatedBy,
keyForList: taskItem.reportID,
shouldShowYear: doesDataContainAPastYearTransaction,
};

if (parentReport && personalDetails) {
const policy = getPolicy(parentReport.policyID);
const parentReportName = getReportName(parentReport, policy, undefined, undefined);
const icons = getIcons(parentReport, personalDetails, null, '', -1, policy);
const parentReportIcon = icons?.at(0);

result.parentReportName = parentReportName;
result.parentReportIcon = parentReportIcon;
}
return (
Object.keys(data)
.filter(isReportEntry)
// Ensure that the reports that were passed are tasks, and not some other
// type of report that was sent as the parent
.filter((key) => isTaskListItemType(data[key] as SearchListItem))
.map((key) => {
const taskItem = data[key] as SearchTask;
const personalDetails = data.personalDetailsList;

const assignee = personalDetails?.[taskItem.managerID] ?? emptyPersonalDetails;
const createdBy = personalDetails?.[taskItem.accountID] ?? emptyPersonalDetails;
const formattedAssignee = formatPhoneNumber(getDisplayNameOrDefault(assignee));
const formattedCreatedBy = formatPhoneNumber(getDisplayNameOrDefault(createdBy));

const report = getReportOrDraftReport(taskItem.reportID) ?? taskItem;
const parentReport = getReportOrDraftReport(taskItem.parentReportID);

const doesDataContainAPastYearTransaction = shouldShowYear(data);
const reportName = StringUtils.lineBreaksToSpaces(Parser.htmlToText(taskItem.reportName));
const description = StringUtils.lineBreaksToSpaces(Parser.htmlToText(taskItem.description));

const result: TaskListItemType = {
...taskItem,
reportName,
description,
assignee,
formattedAssignee,
createdBy,
formattedCreatedBy,
keyForList: taskItem.reportID,
shouldShowYear: doesDataContainAPastYearTransaction,
};

if (parentReport && personalDetails) {
const policy = getPolicy(parentReport.policyID);
const parentReportName = getReportName(parentReport, policy, undefined, undefined);
const icons = getIcons(parentReport, personalDetails, null, '', -1, policy);
const parentReportIcon = icons?.at(0);

result.parentReportName = parentReportName;
result.parentReportIcon = parentReportIcon;
}

if (report) {
result.report = report;
}
if (report) {
result.report = report;
}

return result;
});
return result;
})
);
}

/**
Expand Down