[NoQA] Add policyID to getOrderedReportIDs and sortReportsByLastRead

src/libs/ReportUtils.ts

@@ -568,10 +568,15 @@ function isDraftExpenseReport(report: OnyxEntry<Report>): boolean {
 }
 
 /**
- * Given a collection of reports returns them sorted by last read
+ * Given a collection of reports returns them sorted by last read and optionally filtered by a specific policyID.
  */
-function sortReportsByLastRead(reports: OnyxCollection<Report>): Array<OnyxEntry<Report>> {
-    return Object.values(reports ?? {})
+function sortReportsByLastRead(reports: OnyxCollection<Report>, policyID?: string): Array<OnyxEntry<Report>> {
+    let reportsValues = Object.values(reports ?? {});
+    if (policyID) {
+        reportsValues = reportsValues.filter((report) => report?.policyID === policyID);
+    }
+
+    return reportsValues
         .filter((report) => !!report?.reportID && !!report?.lastReadTime)
         .sort((a, b) => {
             const aTime = new Date(a?.lastReadTime ?? '');

src/libs/SidebarUtils.ts

@@ -118,11 +118,12 @@ function getOrderedReportIDs(
     policies: Record<string, Policy>,
     priorityMode: ValueOf<typeof CONST.PRIORITY_MODE>,
     allReportActions: OnyxCollection<ReportAction[]>,
+    currentPolicyID = '',
 ): string[] {
     // Generate a unique cache key based on the function arguments
     const cachedReportsKey = JSON.stringify(
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        [currentReportId, allReports, betas, policies, priorityMode, allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentReportId}`]?.length || 1],
+        [currentPolicyID, currentReportId, allReports, betas, policies, priorityMode, allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentReportId}`]?.length || 1],
         (key, value: unknown) => {
             /**
              *  Exclude 'participantAccountIDs', 'participants' and 'lastMessageText' not to overwhelm a cached key value with huge data,
@@ -149,7 +150,7 @@ function getOrderedReportIDs(
     const isInDefaultMode = !isInGSDMode;
     const allReportsDictValues = Object.values(allReports);
     // Filter out all the reports that shouldn't be displayed
-    const reportsToDisplay = allReportsDictValues.filter((report) => ReportUtils.shouldReportBeInOptionList(report, currentReportId ?? '', isInGSDMode, betas, policies, true));
+    let reportsToDisplay = allReportsDictValues.filter((report) => ReportUtils.shouldReportBeInOptionList(report, currentReportId ?? '', isInGSDMode, betas, policies, true));
 
     if (reportsToDisplay.length === 0) {
         // Display Concierge chat report when there is no report to be displayed
@@ -173,6 +174,10 @@ function getOrderedReportIDs(
     const nonArchivedReports: Report[] = [];
     const archivedReports: Report[] = [];
 
+    if (currentPolicyID) {
+        reportsToDisplay = reportsToDisplay.filter((report) => report.policyID === currentPolicyID);
+    }
+
     // There are a few properties that need to be calculated for the report which are used when sorting reports.
     reportsToDisplay.forEach((report) => {
         // Normally, the spread operator would be used here to clone the report and prevent the need to reassign the params.