prevent passing redundnt transaction/reportIDs for group exports

Author: getusha

src/components/Search/index.tsx

@@ -1102,7 +1102,8 @@ function Search({
                             const originalItemTransaction =
                                 searchResults?.data?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`] ??
                                 transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`];
-                            return mapTransactionItemToSelectedEntry(transactionItem, itemTransaction, originalItemTransaction, email ?? '', accountID, outstandingReportsByPolicyID);
+                            const [key, entry] = mapTransactionItemToSelectedEntry(transactionItem, itemTransaction, originalItemTransaction, email ?? '', accountID, outstandingReportsByPolicyID);
+                            return [key, {...entry, groupKey: item.keyForList}];
                         }),
                 ),
             };
@@ -1412,7 +1413,8 @@ function Search({
                     .map((transactionItem) => {
                         const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionItem.transactionID}`] as OnyxEntry<Transaction>;
                         const originalItemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`];
-                        return mapTransactionItemToSelectedEntry(transactionItem, itemTransaction, originalItemTransaction, email ?? '', accountID, outstandingReportsByPolicyID);
+                        const [key, entry] = mapTransactionItemToSelectedEntry(transactionItem, itemTransaction, originalItemTransaction, email ?? '', accountID, outstandingReportsByPolicyID);
+                        return [key, {...entry, groupKey: item.keyForList}] as [string, SelectedTransactionInfo];
                     });
             });
             updatedTransactions = Object.fromEntries(allSelections);

src/components/Search/types.ts

@@ -90,6 +90,9 @@ type SelectedTransactionInfo = {
     reportAction?: ReportAction;
 
     report?: Report;
+
+    /** The group key this transaction belongs to when in a grouped view */
+    groupKey?: string;
 };
 
 /** Model of selected transactions */

src/hooks/useSearchBulkActions.ts

@@ -130,9 +130,11 @@ function addSelectedGroupsFilter(queryJSON: SearchQueryJSON, selectedTransaction
     }
 
     const groupKeys = new Set<string>();
-    for (const key of Object.keys(selectedTransactions)) {
+    for (const [key, value] of Object.entries(selectedTransactions)) {
         if (key.startsWith(CONST.SEARCH.GROUP_PREFIX)) {
             groupKeys.add(key);
+        } else if (value.groupKey) {
+            groupKeys.add(value.groupKey);
         }
     }
 
@@ -520,13 +522,13 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     policyID,
                 });
             } else {
-                const filteredQuery = queryJSON?.groupBy ? serializeQueryJSONForBackend(addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data)) : '{}';
+                const isGroupExport = !!queryJSON?.groupBy;
                 queueExportSearchWithTemplate({
                     templateName,
                     templateType,
-                    jsonQuery: filteredQuery,
-                    reportIDList: selectedTransactionReportIDs,
-                    transactionIDList: selectedTransactionsKeys.filter((key) => !key.startsWith(CONST.SEARCH.GROUP_PREFIX)),
+                    jsonQuery: isGroupExport ? serializeQueryJSONForBackend(addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data)) : '{}',
+                    reportIDList: isGroupExport ? [] : selectedTransactionReportIDs,
+                    transactionIDList: isGroupExport ? [] : selectedTransactionsKeys,
                     policyID,
                 });
             }
@@ -605,16 +607,16 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             return;
         }
 
-        const transactionIDList = selectedTransactionsKeys.filter((key) => !key.startsWith(CONST.SEARCH.GROUP_PREFIX));
-        const reportIDList = selectedReports.length > 0 ? selectedReportIDs : selectedTransactionReportIDs;
-        const exportQuery = queryJSON?.groupBy ? addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data) : queryJSON;
+        const isGroupExport = !!queryJSON?.groupBy;
         let didFail = false;
         await exportSearchItemsToCSV(
             {
                 query: status,
-                jsonQuery: exportQuery ? serializeQueryJSONForBackend(exportQuery) : JSON.stringify(exportQuery),
-                reportIDList,
-                transactionIDList,
+                jsonQuery: isGroupExport
+                    ? serializeQueryJSONForBackend(addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data))
+                    : queryJSON ? serializeQueryJSONForBackend(queryJSON) : JSON.stringify(queryJSON),
+                reportIDList: isGroupExport ? [] : (selectedReports.length > 0 ? selectedReportIDs : selectedTransactionReportIDs),
+                transactionIDList: isGroupExport ? [] : selectedTransactionsKeys,
             },
             () => {
                 didFail = true;