Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions src/hooks/useExportedToFilterOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,18 @@ export default function useExportedToFilterOptions(): UseExportedToFilterDataRes
}

const combinedUniqueExportTemplates = Array.from(uniqueExportTemplatesByName.values());
const integrationConnectionNamesSet = new Set<string>(Object.values(CONST.POLICY.CONNECTIONS.NAME));

const standardExportTemplates: string[] = [];
const standardAndCustomExportTemplates: string[] = [];
for (const template of combinedUniqueExportTemplates) {
const displayName = getStandardExportTemplateDisplayName(template.templateName);
const isStandardTemplate = displayName !== template.templateName;

if (isStandardTemplate) {
standardExportTemplates.push(displayName);
// Classic export formats map to in-app templates and cannot be identified in exported-to filter.
if (template.type === CONST.EXPORT_TEMPLATE_TYPES.IN_APP || integrationConnectionNamesSet.has(template.templateName)) {
continue;
}

const standardExportTemplateDisplayName = getStandardExportTemplateDisplayName(template.templateName);
const filterValue = standardExportTemplateDisplayName !== template.templateName ? standardExportTemplateDisplayName : (template.name ?? template.templateName);
standardAndCustomExportTemplates.push(filterValue);
Comment thread
samranahm marked this conversation as resolved.
Resolved
}

const connectedIntegrationNames = policyIDs && policyIDs.length === 0 ? new Set<string>() : getConnectedIntegrationNamesForPolicies(policies, policyIDs);
Expand All @@ -84,7 +87,7 @@ export default function useExportedToFilterOptions(): UseExportedToFilterDataRes
return connectionName && connectedIntegrationNames.has(connectionName);
});

const exportedToFilterOptions = [...connectedIntegrationDisplayNames, ...standardExportTemplates];
const exportedToFilterOptions = [...new Set([...connectedIntegrationDisplayNames, ...standardAndCustomExportTemplates])];

return {
exportedToFilterOptions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ const STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL: Record<string, string> = {
[CONST.REPORT.EXPORT_OPTIONS.EXPENSE_LEVEL_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.EXPENSE_LEVEL_EXPORT,
};

function getPickerItemValueKey(value: SearchMultipleSelectionPickerItem['value']): string {
return typeof value === 'string' ? value : (value.at(0) ?? '');
}

function SearchFiltersExportedToPage() {
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand Down Expand Up @@ -83,6 +87,7 @@ function SearchFiltersExportedToPage() {
};
});

const usedPickerValueKeys = new Set(connectedIntegrationPickerItems.map((item) => getPickerItemValueKey(item.value)));
const policiesToLoadTemplatesFrom = policyIDs.length > 0 ? policyIDs.map((id) => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${id}`]).filter(Boolean) : Object.values(policies ?? {});
const exportTemplatesFromPolicies = policiesToLoadTemplatesFrom.flatMap((policy) => getExportTemplates([], {}, translate, policy, false));
const exportTemplatesFromAccount = getExportTemplates(integrationsExportTemplates ?? [], csvExportLayouts ?? {}, translate, undefined, true);
Expand All @@ -96,27 +101,29 @@ function SearchFiltersExportedToPage() {
}
const deduplicatedExportTemplates = Array.from(exportTemplatesByTemplateId.values());

const standardExportTemplatePickerItems: SearchMultipleSelectionPickerItem[] = [];
const standardAndIntegrationCustomTemplatePickerItems: SearchMultipleSelectionPickerItem[] = [];

for (const template of deduplicatedExportTemplates) {
if (!template.templateName || integrationConnectionNamesSet.has(template.templateName)) {
if (!template.templateName || integrationConnectionNamesSet.has(template.templateName) || template.type === CONST.EXPORT_TEMPLATE_TYPES.IN_APP) {
continue;
}

if (!STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL[template.templateName]) {
const displayName = template.name ?? template.templateName ?? '';
const filterValue = STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL[template.templateName] ?? displayName;
const filterValueKey = getPickerItemValueKey(filterValue);
if (usedPickerValueKeys.has(filterValueKey)) {
continue;
}

const displayName = template.name ?? template.templateName ?? '';
const filterValue = STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL[template.templateName] ?? template.templateName;
standardExportTemplatePickerItems.push({
usedPickerValueKeys.add(filterValueKey);
standardAndIntegrationCustomTemplatePickerItems.push({
name: displayName,
value: filterValue,
Comment thread
samranahm marked this conversation as resolved.
Resolved
leftElement: tableIconForExportOption,
});
}

return [...connectedIntegrationPickerItems, ...standardExportTemplatePickerItems];
return [...connectedIntegrationPickerItems, ...standardAndIntegrationCustomTemplatePickerItems];
Comment thread
samranahm marked this conversation as resolved.
Resolved
})();

const initiallySelectedPickerItems: SearchMultipleSelectionPickerItem[] | undefined = (() => {
Expand All @@ -125,12 +132,10 @@ function SearchFiltersExportedToPage() {
}
const normalizedSelectedValues = new Set(selectedExportedToValues);
const selectedOptionsPresentInCurrentList = exportedToPickerOptions.filter((option) => {
const optionValue = typeof option.value === 'string' ? option.value : (option.value.at(0) ?? '');
const optionValue = getPickerItemValueKey(option.value);
return normalizedSelectedValues.has(optionValue);
});
const selectedValueIdsFoundInCurrentOptions = new Set(
selectedOptionsPresentInCurrentList.map((option) => (typeof option.value === 'string' ? option.value : (option.value.at(0) ?? ''))),
);
const selectedValueIdsFoundInCurrentOptions = new Set(selectedOptionsPresentInCurrentList.map((option) => getPickerItemValueKey(option.value)));
const unavailableSelectedValues = selectedExportedToValues.filter((value) => !selectedValueIdsFoundInCurrentOptions.has(value));
const unavailableSelectedOptions: SearchMultipleSelectionPickerItem[] = unavailableSelectedValues.map((value) => {
const connectionName = integrationConnectionNames.find((name) => CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[name] === value);
Expand Down
25 changes: 22 additions & 3 deletions tests/unit/hooks/useExportedToFilterOptions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,32 @@ describe('useExportedToFilterOptions', () => {
expect(result.current.connectedIntegrationNames).toContain(CONST.POLICY.CONNECTIONS.NAME.QBO);
});

it('excludes custom template name from options when getExportTemplates returns custom template', () => {
it('includes integration custom template name from options when getExportTemplates returns integration template', () => {
const customName = 'Export Layout';
mockGetExportTemplates.mockReturnValue([{templateName: customName, name: customName} as ExportTemplate]);
mockGetExportTemplates.mockReturnValue([{templateName: customName, name: customName, type: CONST.EXPORT_TEMPLATE_TYPES.INTEGRATIONS} as ExportTemplate]);

const {result} = renderHook(() => useExportedToFilterOptions());

expect(result.current.exportedToFilterOptions).not.toContain(customName);
expect(result.current.exportedToFilterOptions).toContain(customName);
});

it('excludes in-app custom templates from options', () => {
const templateName = 'Custom Export Format from OD';
mockGetExportTemplates.mockReturnValue([{templateName, name: templateName, type: CONST.EXPORT_TEMPLATE_TYPES.IN_APP} as ExportTemplate]);

const {result} = renderHook(() => useExportedToFilterOptions());

expect(result.current.exportedToFilterOptions).not.toContain(templateName);
});

it('excludes templates whose templateName matches integration connection key', () => {
const templateName = CONST.POLICY.CONNECTIONS.NAME.QBO;
const templateDisplayName = 'QBO Custom Template';
mockGetExportTemplates.mockReturnValue([{templateName, name: templateDisplayName, type: CONST.EXPORT_TEMPLATE_TYPES.INTEGRATIONS} as ExportTemplate]);

const {result} = renderHook(() => useExportedToFilterOptions());

expect(result.current.exportedToFilterOptions).not.toContain(templateDisplayName);
});

it('includes standard export label in options when getExportTemplates returns standard template', () => {
Expand Down
Loading