Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix filter based on reportField.disabledOptions #38958

Merged
merged 2 commits into from
Mar 25, 2024
Merged

Fix filter based on reportField.disabledOptions #38958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4caf61a
Fix filter
aldo-expensify Mar 25, 2024
cd7d814
Filter out unexisting options from "Recents"
aldo-expensify Mar 25, 2024
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
2 changes: 1 addition & 1 deletion src/pages/EditReportFieldDropdownPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function EditReportFieldDropdownPage({fieldName, onSubmit, fieldKey, fieldValue,
});
}

const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue);
const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue && fieldOptions.includes(option));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't show options that are not available in "Recent"

if (filteredRecentlyUsedOptions.length > 0) {
newSections.push({
title: translate('common.recents'),
Expand Down
2 changes: 1 addition & 1 deletion src/pages/EditReportFieldPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
fieldKey={fieldKey}
fieldName={Str.UCFirst(reportField.name)}
fieldValue={fieldValue}
fieldOptions={reportField.values.filter((value) => !(value in reportField.disabledOptions))}
fieldOptions={reportField.values.filter((_value: string, index: number) => !reportField.disabledOptions[index])}
onSubmit={handleReportFieldChange}
/>
);
Expand Down
Loading