Classify Canadian export consistently in report rows

Author: dukenv0307

src/components/Search/FilterComponents/ExportedToSelector.tsx

@@ -9,7 +9,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getSearchValueForConnection} from '@libs/AccountingUtils';
+import {getSearchValueForConnection, getStandardExportTemplateDisplayName, isStandardExportTemplate} from '@libs/AccountingUtils';
 import {getIntegrationIcon} from '@libs/ReportUtils';
 import {getAllPolicyValues, getConnectedIntegrationNamesForPolicies} from '@libs/SearchQueryUtils';
 
@@ -28,12 +28,6 @@ type ExportedToSelectorProps = SearchFilterCommonProps<string[] | undefined> & {
     policyID: Filter | undefined;
 };
 
-const STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL: Record<string, string> = {
-    [CONST.REPORT.EXPORT_OPTIONS.REPORT_LEVEL_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.REPORT_LEVEL_EXPORT,
-    [CONST.REPORT.EXPORT_OPTIONS.EXPENSE_LEVEL_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.EXPENSE_LEVEL_EXPORT,
-    [CONST.REPORT.EXPORT_OPTIONS.MULTIPLE_TAX_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.MULTIPLE_TAX_EXPORT,
-};
-
 function ExportedToSelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: ExportedToSelectorProps) {
     const styles = useThemeStyles();
     const {localeCompare} = useLocalize();
@@ -106,13 +100,14 @@ function ExportedToSelector({value = [], policyID, selectionListTextInputStyle,
             }
 
             const displayName = template.name ?? template.templateName ?? '';
-            const filterValue = STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL[template.templateName] ?? displayName;
+            // Standard templates are filtered on by the label the backend records for them, while custom templates are filtered on by their display name
+            const isStandardTemplate = isStandardExportTemplate(template.templateName);
+            const filterValue = isStandardTemplate ? getStandardExportTemplateDisplayName(template.templateName) : displayName;
             if (usedPickerValueKeys.has(filterValue)) {
                 continue;
             }
 
             usedPickerValueKeys.add(filterValue);
-            const isStandardTemplate = !!STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL[template.templateName];
             standardAndIntegrationCustomTemplatePickerItems.push({
                 text: displayName,
                 value: filterValue,

src/components/Search/SearchList/ListItem/ExportedIconCell.tsx

@@ -5,6 +5,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {isStandardExportTemplateLabel} from '@libs/AccountingUtils';
 import {getOriginalMessage, isExportedToIntegrationAction} from '@libs/ReportActionsUtils';
 
 import CONST from '@src/CONST';
@@ -17,8 +18,6 @@ type ExportedIconCellProps = {
     reportActions?: ReportAction[];
 };
 
-const STANDARD_EXPORT_TEMPLATE_LABELS = new Set<string>([CONST.REPORT.EXPORT_OPTION_LABELS.EXPENSE_LEVEL_EXPORT, CONST.REPORT.EXPORT_OPTION_LABELS.REPORT_LEVEL_EXPORT]);
-
 function ExportedIconCell({reportActions}: ExportedIconCellProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -58,7 +57,7 @@ function ExportedIconCell({reportActions}: ExportedIconCellProps) {
             const message = getOriginalMessage(action);
             const label = message?.label;
             const type = message?.type;
-            const isStandardExportTemplate = !!label && STANDARD_EXPORT_TEMPLATE_LABELS.has(label);
+            const isStandardExportTemplate = !!label && isStandardExportTemplateLabel(label);
 
             if (type === CONST.EXPORT_TEMPLATE && isStandardExportTemplate) {
                 isExportedToStandardTemplate = true;

src/libs/AccountingUtils.ts

@@ -35,6 +35,8 @@ const STANDARD_EXPORT_TEMPLATE_NAME_MAPPING = {
     [CONST.REPORT.EXPORT_OPTIONS.MULTIPLE_TAX_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.MULTIPLE_TAX_EXPORT,
 };
 
+const STANDARD_EXPORT_TEMPLATE_LABELS = new Set<string>(Object.values(STANDARD_EXPORT_TEMPLATE_NAME_MAPPING));
+
 function getConnectionNameFromRouteParam(routeParam: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>) {
     return ROUTE_NAME_MAPPING[routeParam];
 }
@@ -51,4 +53,21 @@ function getStandardExportTemplateDisplayName(templateName: string): string {
     return STANDARD_EXPORT_TEMPLATE_NAME_MAPPING[templateName as keyof typeof STANDARD_EXPORT_TEMPLATE_NAME_MAPPING] ?? templateName;
 }
 
-export {getConnectionNameFromRouteParam, getRouteParamForConnection, getSearchValueForConnection, getStandardExportTemplateDisplayName};
+/** Whether the given template ID belongs to one of the standard (i.e. not user-defined) export templates */
+function isStandardExportTemplate(templateName: string): boolean {
+    return templateName in STANDARD_EXPORT_TEMPLATE_NAME_MAPPING;
+}
+
+/** Whether the given export label, as sent by the backend on an export report action, belongs to one of the standard (i.e. not user-defined) export templates */
+function isStandardExportTemplateLabel(label: string): boolean {
+    return STANDARD_EXPORT_TEMPLATE_LABELS.has(label);
+}
+
+export {
+    getConnectionNameFromRouteParam,
+    getRouteParamForConnection,
+    getSearchValueForConnection,
+    getStandardExportTemplateDisplayName,
+    isStandardExportTemplate,
+    isStandardExportTemplateLabel,
+};

tests/unit/SearchAutocompleteUtilsTest.ts

@@ -1,6 +1,6 @@
 import type {SubstitutionMap} from '@components/Search/SearchRouter/getQueryWithSubstitutions';
 
-import {getSearchValueForConnection, getStandardExportTemplateDisplayName} from '@libs/AccountingUtils';
+import {getSearchValueForConnection, getStandardExportTemplateDisplayName, isStandardExportTemplate, isStandardExportTemplateLabel} from '@libs/AccountingUtils';
 import {getTrimmedUserSearchQueryPreservingComma, parseForLiveMarkdown} from '@libs/SearchAutocompleteUtils';
 
 import CONST from '@src/CONST';
@@ -563,5 +563,29 @@ describe('SearchAutocompleteUtils', () => {
                 expect(getStandardExportTemplateDisplayName(customName)).toBe(customName);
             });
         });
+
+        describe('isStandardExportTemplate', () => {
+            it('returns true for every standard export template ID', () => {
+                expect(isStandardExportTemplate(CONST.REPORT.EXPORT_OPTIONS.EXPENSE_LEVEL_EXPORT)).toBe(true);
+                expect(isStandardExportTemplate(CONST.REPORT.EXPORT_OPTIONS.REPORT_LEVEL_EXPORT)).toBe(true);
+                expect(isStandardExportTemplate(CONST.REPORT.EXPORT_OPTIONS.MULTIPLE_TAX_EXPORT)).toBe(true);
+            });
+
+            it('returns false for a custom template ID', () => {
+                expect(isStandardExportTemplate('Custom Export Layout')).toBe(false);
+            });
+        });
+
+        describe('isStandardExportTemplateLabel', () => {
+            it('returns true for every standard export template label', () => {
+                expect(isStandardExportTemplateLabel(CONST.REPORT.EXPORT_OPTION_LABELS.EXPENSE_LEVEL_EXPORT)).toBe(true);
+                expect(isStandardExportTemplateLabel(CONST.REPORT.EXPORT_OPTION_LABELS.REPORT_LEVEL_EXPORT)).toBe(true);
+                expect(isStandardExportTemplateLabel(CONST.REPORT.EXPORT_OPTION_LABELS.MULTIPLE_TAX_EXPORT)).toBe(true);
+            });
+
+            it('returns false for a custom template label', () => {
+                expect(isStandardExportTemplateLabel('Custom Export Layout')).toBe(false);
+            });
+        });
     });
 });