Repository navigation
Improve UX when Filters are selected but not visible #68441
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.
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
Merged
JS00001
merged 14 commits into
Expensify:main
from
sofi-a:68354-improve-ux-when-filters-are-selected-but-not-visible
Aug 19, 2025
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a55c5a2
feat: show count of hidden selected filters on the Filters button
sofi-a a06f8b0
fix: incorrect hidden filter count for date filters
sofi-a e2cf8df
fix: exclude action from hidden selected filters count
sofi-a 823e7a1
refactor: improve date filter key handling
sofi-a 6590a39
Merge branch 'main' into 68354-improve-ux-when-filters-are-selected-b…
sofi-a ce0c4eb
fix: prettier check
sofi-a 5687b2b
Merge branch 'main' into 68354-improve-ux-when-filters-are-selected-b…
sofi-a fa90fa3
fix: exclude group-by from hidden filters count
sofi-a 8a58741
refactor: extract advanced search filter key logic to useAdvancedSear…
sofi-a 925d88a
refactor: integrate useAdvancedSearchFilters hook to streamline hidde…
sofi-a ec0f4b4
fix: update hidden filters logic to correctly handle date filter keys
sofi-a 86df7a0
fix: prettier check
sofi-a 7402a5e
fix: update shouldDisplayGroupByFilter logic
sofi-a 9cc572b
Merge branch 'main' into 68354-improve-ux-when-filters-are-selected-b…
sofi-a File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,251 @@ | ||
| import {useMemo} from 'react'; | ||
| import type {OnyxCollection} from 'react-native-onyx'; | ||
| import {mergeCardListWithWorkspaceFeeds} from '@libs/CardUtils'; | ||
| import {getAllTaxRates, getTagNamesFromTagsLists, isPolicyFeatureEnabled} from '@libs/PolicyUtils'; | ||
| import {getAllPolicyValues} from '@libs/SearchQueryUtils'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type {SearchAdvancedFiltersForm} from '@src/types/form'; | ||
| import type {Policy, PolicyCategories, PolicyTagLists} from '@src/types/onyx'; | ||
| import type {PolicyFeatureName} from '@src/types/onyx/Policy'; | ||
| import {getEmptyObject, isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
| import useLocalize from './useLocalize'; | ||
| import useOnyx from './useOnyx'; | ||
| import useWorkspaceList from './useWorkspaceList'; | ||
|
|
||
| /** | ||
| * typeFiltersKeys is stored as an object keyed by the different search types. | ||
| * Each value is then an array of arrays where each inner array is a separate section in the UI. | ||
| */ | ||
| const typeFiltersKeys = { | ||
| [CONST.SEARCH.DATA_TYPES.EXPENSE]: [ | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID, | ||
| CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY, | ||
| ], | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.REIMBURSABLE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.BILLABLE, | ||
| ], | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.APPROVED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWN, | ||
| ], | ||
| ], | ||
| [CONST.SEARCH.DATA_TYPES.INVOICE]: [ | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID, | ||
| ], | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE, | ||
| ], | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.APPROVED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWAL_TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWN, | ||
| ], | ||
| ], | ||
| [CONST.SEARCH.DATA_TYPES.TRIP]: [ | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID, | ||
| CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY, | ||
| ], | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE, | ||
| ], | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.SUBMITTED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.APPROVED, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.PAID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED, | ||
| ], | ||
| ], | ||
| [CONST.SEARCH.DATA_TYPES.CHAT]: [ | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.IN, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, | ||
| ], | ||
| ], | ||
| [CONST.SEARCH.DATA_TYPES.TASK]: [ | ||
| [ | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.IN, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.ASSIGNEE, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.STATUS, | ||
| CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, | ||
| ], | ||
| ], | ||
| }; | ||
|
|
||
| function shouldDisplayFilter(numberOfFilters: number, isFeatureEnabled: boolean, singlePolicyCondition = false): boolean { | ||
| return (numberOfFilters !== 0 || singlePolicyCondition) && isFeatureEnabled; | ||
| } | ||
|
|
||
| function isFeatureEnabledInPolicies(policies: OnyxCollection<Policy>, featureName: PolicyFeatureName) { | ||
| if (isEmptyObject(policies)) { | ||
| return false; | ||
| } | ||
| return Object.values(policies).some((policy) => isPolicyFeatureEnabled(policy, featureName)); | ||
| } | ||
|
|
||
| function useAdvancedSearchFilters() { | ||
| const {localeCompare} = useLocalize(); | ||
| const [searchAdvancedFilters = getEmptyObject<SearchAdvancedFiltersForm>()] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true}); | ||
| const policyID = searchAdvancedFilters.policyID; | ||
| const groupBy = searchAdvancedFilters.groupBy; | ||
| const [userCardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: false}); | ||
| const [workspaceCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, {canBeMissing: false}); | ||
| const allCards = useMemo(() => mergeCardListWithWorkspaceFeeds(workspaceCardFeeds ?? CONST.EMPTY_OBJECT, userCardList, true), [userCardList, workspaceCardFeeds]); | ||
| const taxRates = getAllTaxRates(); | ||
|
|
||
| const [policies = getEmptyObject<NonNullable<OnyxCollection<Policy>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false}); | ||
| const [allPolicyCategories = getEmptyObject<NonNullable<OnyxCollection<PolicyCategories>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES, { | ||
| canBeMissing: false, | ||
| selector: (policyCategories) => | ||
| Object.fromEntries( | ||
| Object.entries(policyCategories ?? {}).filter(([, categories]) => { | ||
| const availableCategories = Object.values(categories ?? {}).filter((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE); | ||
| return availableCategories.length > 0; | ||
| }), | ||
| ), | ||
| }); | ||
| const selectedPolicyCategories = getAllPolicyValues(policyID, ONYXKEYS.COLLECTION.POLICY_CATEGORIES, allPolicyCategories); | ||
| const [allPolicyTagLists = getEmptyObject<NonNullable<OnyxCollection<PolicyTagLists>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS, {canBeMissing: false}); | ||
| const selectedPolicyTagLists = getAllPolicyValues(policyID, ONYXKEYS.COLLECTION.POLICY_TAGS, allPolicyTagLists); | ||
| const tagListsUnpacked = Object.values(allPolicyTagLists ?? {}) | ||
| .filter((item): item is NonNullable<PolicyTagLists> => !!item) | ||
| .map(getTagNamesFromTagsLists) | ||
| .flat(); | ||
|
|
||
| const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: (session) => session?.email}); | ||
|
|
||
| const {sections: workspaces} = useWorkspaceList({ | ||
| policies, | ||
| currentUserLogin, | ||
| shouldShowPendingDeletePolicy: false, | ||
| selectedPolicyIDs: undefined, | ||
| searchTerm: '', | ||
| localeCompare, | ||
| }); | ||
|
|
||
| // When looking if a user has any categories to display, we want to ignore the policies that are of type PERSONAL | ||
| const nonPersonalPolicyCategoryIds = Object.values(policies) | ||
| .filter((policy): policy is NonNullable<Policy> => !!(policy && policy.type !== CONST.POLICY.TYPE.PERSONAL)) | ||
| .map((policy) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy.id}`); | ||
| const nonPersonalPolicyCategoryCount = Object.keys(allPolicyCategories).filter((policyCategoryId) => nonPersonalPolicyCategoryIds.includes(policyCategoryId)).length; | ||
|
|
||
| const areCategoriesEnabled = isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED); | ||
| const areTagsEnabled = isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED); | ||
| const areCardsEnabled = | ||
| isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED) || | ||
| isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED); | ||
| const areTaxEnabled = isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED); | ||
| const shouldDisplayCategoryFilter = shouldDisplayFilter(nonPersonalPolicyCategoryCount, areCategoriesEnabled, !!selectedPolicyCategories); | ||
| const shouldDisplayTagFilter = shouldDisplayFilter(tagListsUnpacked.length, areTagsEnabled, !!selectedPolicyTagLists); | ||
| const shouldDisplayCardFilter = shouldDisplayFilter(Object.keys(allCards).length, areCardsEnabled); | ||
| const shouldDisplayTaxFilter = shouldDisplayFilter(Object.keys(taxRates).length, areTaxEnabled); | ||
| const shouldDisplayWorkspaceFilter = workspaces.some((section) => section.data.length !== 0); | ||
| const shouldDisplayGroupByFilter = groupBy === CONST.SEARCH.GROUP_BY.FROM || groupBy === CONST.SEARCH.GROUP_BY.CARD; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Coming from #75481, we remove |
||
|
|
||
| let currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE; | ||
|
|
||
| if (!Object.keys(typeFiltersKeys).includes(currentType)) { | ||
| currentType = CONST.SEARCH.DATA_TYPES.EXPENSE; | ||
| } | ||
|
|
||
| return { | ||
| currentType, | ||
| typeFiltersKeys: typeFiltersKeys[currentType] | ||
| .map((section) => | ||
| section | ||
| .map((key) => { | ||
| if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY && !shouldDisplayCategoryFilter) { | ||
| return; | ||
| } | ||
| if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG && !shouldDisplayTagFilter) { | ||
| return; | ||
| } | ||
| if ((key === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID || CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED) && !shouldDisplayCardFilter) { | ||
| return; | ||
| } | ||
| if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE && !shouldDisplayTaxFilter) { | ||
| return; | ||
| } | ||
| if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID && !shouldDisplayWorkspaceFilter) { | ||
| return; | ||
| } | ||
| if (key === CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY && !shouldDisplayGroupByFilter) { | ||
| return; | ||
| } | ||
| return key; | ||
| }) | ||
| .filter((filter): filter is NonNullable<typeof filter> => !!filter), | ||
| ) | ||
| .filter((section) => !!section.length), | ||
| }; | ||
| } | ||
|
|
||
| export default useAdvancedSearchFilters; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amount filters should also have been included here. Fixed in #73468.