Separate QBO and IES bulk export groups

Author: ShridharGoel

src/hooks/useSearchBulkActions.ts

@@ -7,7 +7,7 @@ import {useOpenSearchReportSubmitToPopover} from '@components/ReportSubmitToPopo
 import {useSearchQueryContext, useSearchResultsContext, useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
 import type {BulkPaySelectionData, PaymentData, SearchColumnType, SearchFilterKey, SearchQueryJSON, SelectedReports, SelectedTransactions} from '@components/Search/types';
 
-import {getAccountingIntegrationDisplayName} from '@libs/AccountingUtils';
+import {getAccountingIntegrationDisplayName, getExportLabelForConnection} from '@libs/AccountingUtils';
 import {getExpensifyCardStatementPDF} from '@libs/actions/CompanyCards';
 import {exportReceiptsToZip, exportReportsToPDF} from '@libs/actions/Export';
 import {unholdRequest} from '@libs/actions/IOU/Hold';
@@ -1782,21 +1782,33 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 return reportExportOptions.includes(exportOption);
             };
 
-            // Group the selected reports by their connected accounting integration. A single-workspace
+            // Group the selected reports by their connected accounting integration / product. A single-workspace
             // selection collapses to one group (unchanged behavior), while a multi-workspace selection
             // surfaces one export + one "Mark as exported" option per integration, each scoped to the
-            // reports that belong to it.
-            const reportsByIntegration = new Map<NonNullable<ReturnType<typeof getConnectedIntegration>>, typeof selectedReports>();
+            // reports that belong to it (e.g. QBO and IES workspaces form distinct groups).
+            const reportsByIntegration = new Map<
+                string,
+                {
+                    integration: NonNullable<ReturnType<typeof getConnectedIntegration>>;
+                    integrationPolicy: OnyxEntry<Policy>;
+                    reports: typeof selectedReports;
+                }
+            >();
             if (isReportsTab && selectedReportIDs.length > 0 && includeReportLevelExport) {
                 for (const report of selectedReports) {
                     const reportPolicy = report.policyID ? policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`] : undefined;
                     const reportIntegration = getConnectedIntegration(reportPolicy);
                     if (!reportIntegration) {
                         continue;
                     }
-                    const reportsForIntegration = reportsByIntegration.get(reportIntegration) ?? [];
-                    reportsForIntegration.push(report);
-                    reportsByIntegration.set(reportIntegration, reportsForIntegration);
+                    const exportLabel = getExportLabelForConnection(reportIntegration, reportPolicy);
+                    const group = reportsByIntegration.get(exportLabel) ?? {
+                        integration: reportIntegration,
+                        integrationPolicy: reportPolicy ?? policy,
+                        reports: [],
+                    };
+                    group.reports.push(report);
+                    reportsByIntegration.set(exportLabel, group);
                 }
             }
 
@@ -1846,7 +1858,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         if (companyIDs.size > 1) {
                             showConfirmModal({
                                 title: translate('workspace.exportDifferentCompaniesModal.title'),
-                                prompt: translate('workspace.exportDifferentCompaniesModal.description', integration),
+                                prompt: translate('workspace.exportDifferentCompaniesModal.description', integration, connectionNameFriendly),
                                 confirmText: translate('workspace.exportDifferentCompaniesModal.confirmText'),
                                 shouldShowCancelButton: false,
                             });
@@ -1918,7 +1930,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     }
 
                     showConfirmModal({
-                        title: translate('workspace.exportPartialModal.title', integrationReportIDs.length, totalSelectedReportsCount, integration),
+                        title: translate('workspace.exportPartialModal.title', integrationReportIDs.length, totalSelectedReportsCount, integration, connectionNameFriendly),
                         // Fixed subtitle describes the partial scope; the scrollable prompt lists the report names
                         // that will actually be exported for the chosen integration. A partial export can happen for
                         // two independent reasons: part of the selection belongs to other integrations, and/or some
@@ -1928,6 +1940,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                             integration,
                             integrationGroupSize < totalSelectedReportsCount,
                             integrationReportIDs.length < integrationGroupSize,
+                            connectionNameFriendly,
                         ),
                         prompt: exportableReportNames.join('\n'),
                         confirmText: translate('workspace.exportPartialModal.confirmText', {count: integrationReportIDs.length}),
@@ -1943,9 +1956,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
             // Group each integration's actions together, listing its "Export to <integration>" option
             // immediately followed by its "Mark as exported" option, before moving on to the next integration.
-            for (const [integration, reportsForIntegration] of reportsByIntegration) {
+            for (const [, {integration, integrationPolicy, reports: reportsForIntegration}] of reportsByIntegration) {
                 const integrationGroupSize = reportsForIntegration.length;
-                const integrationPolicy = reportsForIntegration.at(0)?.policyID ? policies?.[`${ONYXKEYS.COLLECTION.POLICY}${reportsForIntegration.at(0)?.policyID}`] : policy;
                 const connectionNameFriendly = getAccountingIntegrationDisplayName(integrationPolicy, integration, translate);
                 const integrationIcon = getIntegrationIcon(integration, expensifyIcons);
 

src/languages/en.ts

@@ -7469,17 +7469,17 @@ const translations = {
         },
         exportDifferentCompaniesModal: {
             title: 'Careful!',
-            description: (connectionName: ConnectionName) =>
-                `The selected reports are connected to different ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]} companies, so they can't be exported together. Select reports connected to the same company and try again.`,
+            description: (connectionName: ConnectionName, connectionNameFriendly?: string) =>
+                `The selected reports are connected to different ${connectionNameFriendly ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]} companies, so they can't be exported together. Select reports connected to the same company and try again.`,
             confirmText: 'Got it',
         },
         exportPartialModal: {
-            title: (exportableCount: number, selectedCount: number, integration: ConnectionName) =>
-                `Export ${exportableCount}/${selectedCount} reports to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration]}?`,
-            description: (integration: ConnectionName, hasReportsOnOtherIntegrations: boolean, hasIneligibleReports: boolean) => {
+            title: (exportableCount: number, selectedCount: number, integration: ConnectionName, connectionNameFriendly?: string) =>
+                `Export ${exportableCount}/${selectedCount} reports to ${connectionNameFriendly ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration]}?`,
+            description: (integration: ConnectionName, hasReportsOnOtherIntegrations: boolean, hasIneligibleReports: boolean, connectionNameFriendly?: string) => {
                 const reasons: string[] = [];
                 if (hasReportsOnOtherIntegrations) {
-                    reasons.push(`Only reports connected to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration]} will be exported.`);
+                    reasons.push(`Only reports connected to ${connectionNameFriendly ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration]} will be exported.`);
                 }
                 if (hasIneligibleReports) {
                     reasons.push(`Only reports that are eligible to export will be exported.`);

tests/unit/hooks/useSearchBulkActionsExportTest.ts

@@ -115,7 +115,15 @@ jest.mock('@hooks/useLocalize', () => {
     return {
         __esModule: true,
         default: () => ({
-            translate: (key: string) => (key === 'workspace.accounting.qbo' ? actualCONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.quickbooksOnline : key),
+            translate: (key: string) => {
+                if (key === 'workspace.accounting.qbo') {
+                    return actualCONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.quickbooksOnline;
+                }
+                if (key === 'workspace.accounting.intuitEnterpriseSuite') {
+                    return actualCONST.EXPORT_LABELS.INTUIT_ENTERPRISE_SUITE;
+                }
+                return key;
+            },
             localeCompare: (a: string, b: string) => a && b,
             formatPhoneNumber: (phone: string) => phone,
         }),
@@ -272,6 +280,7 @@ const REPORT_ID_2 = 'report2';
 const POLICY_ID_2 = 'policy2';
 const NETSUITE_FRIENDLY_NAME = CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[CONST.POLICY.CONNECTIONS.NAME.NETSUITE];
 const QBO_FRIENDLY_NAME = CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[CONST.POLICY.CONNECTIONS.NAME.QBO];
+const IES_FRIENDLY_NAME = CONST.EXPORT_LABELS.INTUIT_ENTERPRISE_SUITE;
 
 const expenseReportQueryJSON: SearchQueryJSON = {
     inputQuery: 'type:expense-report status:all',
@@ -572,6 +581,69 @@ describe('useSearchBulkActions - export options', () => {
         expect(markAsManuallyExported).not.toHaveBeenCalled();
     });
 
+    it('offers distinct QBO and IES export options and marks reports with their respective workspace product when both are selected', async () => {
+        /**
+         * Given: two selected reports across two workspaces:
+         *        - Workspace 1 connected to QuickBooks Online (QBO)
+         *        - Workspace 2 connected to Intuit Enterprise Suite (IES)
+         *
+         * When: the export bulk-action menu is built.
+         *
+         * Then: both "QuickBooks Online" and "Intuit Enterprise Suite" export options are present,
+         *       each followed by its own "Mark as exported" option scoped to that workspace.
+         */
+        const policy1 = {
+            id: POLICY_ID,
+            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBO]: {}},
+        };
+        const policy2 = {
+            id: POLICY_ID_2,
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                    config: {credentials: {scope: 'app-foundations.custom-dimensions.read'}},
+                },
+            },
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy1);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID_2}`, policy2);
+
+        mockCurrentSearchResults = makeSearchResults([makeSnapshotReport(), makeSnapshotReport(REPORT_ID_2, POLICY_ID_2)]);
+        mockSelectedReports = [makeSelectedReport(), makeSelectedReport({reportID: REPORT_ID_2, policyID: POLICY_ID_2})];
+        mockSelectedTransactions = {
+            tx1: makeSelectedTransaction(),
+            tx2: makeSelectedTransaction({reportID: REPORT_ID_2, policyID: POLICY_ID_2}),
+        };
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            const subMenuItems = getExportSubMenuItems(result.current.headerButtonsOptions);
+            expect(subMenuItems?.some((item) => item.text === IES_FRIENDLY_NAME)).toBe(true);
+        });
+
+        const subMenuItems = getExportSubMenuItems(result.current.headerButtonsOptions) ?? [];
+
+        // Both QBO and IES export options are present
+        expect(subMenuItems.some((item) => item.text === QBO_FRIENDLY_NAME)).toBe(true);
+        expect(subMenuItems.some((item) => item.text === IES_FRIENDLY_NAME)).toBe(true);
+        expect(subMenuItems.filter((item) => item.text === 'workspace.common.markAsExported')).toHaveLength(2);
+
+        const integrationOptionTexts = subMenuItems
+            .map((item) => item.text)
+            .filter((text) => text === QBO_FRIENDLY_NAME || text === IES_FRIENDLY_NAME || text === 'workspace.common.markAsExported');
+        expect(integrationOptionTexts).toEqual([QBO_FRIENDLY_NAME, 'workspace.common.markAsExported', IES_FRIENDLY_NAME, 'workspace.common.markAsExported']);
+
+        // Selecting "Mark as exported" for IES calls markAsManuallyExported with the IES policy
+        const markAsExportedIESOption = subMenuItems.find(
+            (item) => item.text === 'workspace.common.markAsExported' && item.accessibilityLabel === `workspace.common.markAsExported, ${IES_FRIENDLY_NAME}`,
+        );
+        expect(markAsExportedIESOption).toBeDefined();
+
+        markAsExportedIESOption?.onSelected?.();
+
+        expect(markAsManuallyExported).toHaveBeenCalledWith([REPORT_ID_2], CONST.POLICY.CONNECTIONS.NAME.QBO, expect.objectContaining({id: POLICY_ID_2}));
+    });
+
     it('blocks the export and shows the different-companies modal when the selection spans one integration on different companyIDs', async () => {
         /**
          * Given: two approved reports on two workspaces both connected to NetSuite, but to DIFFERENT