[Search v2] Add displaying advanced filter values and type/status #46022
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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 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 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 |
|---|---|---|
|
|
@@ -129,10 +129,26 @@ function exportSearchItemsToCSV({query, reportIDList, transactionIDList, policyI | |
| } | ||
|
|
||
| /** | ||
| * Updates the form values for the advanced filters search form. | ||
| */ | ||
| function updateAdvancedFilters(values: Partial<FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>>) { | ||
| Onyx.merge(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values); | ||
| } | ||
|
|
||
| /** | ||
| * Clears all values for the advanced filters search form. | ||
| */ | ||
| function clearAdvancedFilters() { | ||
| Onyx.set(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, null); | ||
| } | ||
|
|
||
| export { | ||
| search, | ||
| createTransactionThread, | ||
| deleteMoneyRequestOnSearch, | ||
| holdMoneyRequestOnSearch, | ||
| unholdMoneyRequestOnSearch, | ||
| exportSearchItemsToCSV, | ||
| updateAdvancedFilters, | ||
| clearAdvancedFilters, | ||
| }; | ||
This file contains 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 | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -1,54 +1,111 @@ | ||||||||
| import {Str} from 'expensify-common'; | ||||||||
| import React, {useMemo} from 'react'; | ||||||||
| import {View} from 'react-native'; | ||||||||
| import {useOnyx} from 'react-native-onyx'; | ||||||||
| import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton'; | ||||||||
| import type {LocaleContextProps} from '@components/LocaleContextProvider'; | ||||||||
| import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; | ||||||||
| import type {AdvancedFiltersKeys} from '@components/Search/types'; | ||||||||
| import useLocalize from '@hooks/useLocalize'; | ||||||||
| import useSingleExecution from '@hooks/useSingleExecution'; | ||||||||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||||||||
| import useWaitForNavigation from '@hooks/useWaitForNavigation'; | ||||||||
| import Navigation from '@libs/Navigation/Navigation'; | ||||||||
| import * as SearchUtils from '@libs/SearchUtils'; | ||||||||
| import * as SearchActions from '@userActions/Search'; | ||||||||
| import CONST from '@src/CONST'; | ||||||||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||||||||
| import ROUTES from '@src/ROUTES'; | ||||||||
| import type {SearchAdvancedFiltersForm} from '@src/types/form'; | ||||||||
|
|
||||||||
| function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fieldName: AdvancedFiltersKeys, translate: LocaleContextProps['translate']) { | ||||||||
| if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE) { | ||||||||
| // the value of date filter is a combination of dateBefore + dateAfter values | ||||||||
| const {dateAfter, dateBefore} = filters; | ||||||||
| let dateValue = ''; | ||||||||
| if (dateBefore) { | ||||||||
| dateValue = translate('search.filters.date.before', dateBefore); | ||||||||
| } | ||||||||
| if (dateBefore && dateAfter) { | ||||||||
| dateValue += ', '; | ||||||||
| } | ||||||||
| if (dateAfter) { | ||||||||
| dateValue += translate('search.filters.date.after', dateAfter); | ||||||||
| } | ||||||||
|
|
||||||||
| return dateValue; | ||||||||
| } | ||||||||
|
|
||||||||
| // Todo Once all Advanced filters are implemented this line can be cleaned up. See: https://github.com/Expensify/App/issues/45026 | ||||||||
| // @ts-expect-error this property access is temporarily an error, because not every SYNTAX_FILTER_KEYS is handled by form. | ||||||||
| // When all filters are updated here: src/types/form/SearchAdvancedFiltersForm.ts this line comment + type cast can be removed. | ||||||||
| const filterValue = filters[fieldName] as string; | ||||||||
| return filterValue ? Str.recapitalize(filterValue) : undefined; | ||||||||
| } | ||||||||
|
|
||||||||
| function AdvancedSearchFilters() { | ||||||||
| const {translate} = useLocalize(); | ||||||||
| const styles = useThemeStyles(); | ||||||||
| const {singleExecution} = useSingleExecution(); | ||||||||
| const waitForNavigate = useWaitForNavigation(); | ||||||||
|
|
||||||||
| const [searchAdvancedFilters = {}] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM); | ||||||||
|
|
||||||||
| const advancedFilters = useMemo( | ||||||||
| () => [ | ||||||||
| { | ||||||||
| title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE, translate), | ||||||||
| description: 'common.type' as const, | ||||||||
| route: ROUTES.SEARCH_ADVANCED_FILTERS_TYPE, | ||||||||
| }, | ||||||||
| { | ||||||||
| title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS, translate), | ||||||||
| description: 'search.filters.status' as const, | ||||||||
| route: ROUTES.SEARCH_ADVANCED_FILTERS_STATUS, | ||||||||
| }, | ||||||||
| { | ||||||||
| title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, translate), | ||||||||
| description: 'common.date' as const, | ||||||||
| route: ROUTES.SEARCH_ADVANCED_FILTERS_DATE, | ||||||||
| }, | ||||||||
| ], | ||||||||
| [searchAdvancedFilters, translate], | ||||||||
| ); | ||||||||
|
|
||||||||
| const onFormSubmit = () => { | ||||||||
|
There was a problem hiding this comment. NAB:
Suggested change
From the Reviewer Checklist:
|
||||||||
| const query = SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters); | ||||||||
| SearchActions.clearAdvancedFilters(); | ||||||||
| Navigation.navigate( | ||||||||
| ROUTES.SEARCH_CENTRAL_PANE.getRoute({ | ||||||||
| query, | ||||||||
| isCustomQuery: true, | ||||||||
| }), | ||||||||
| ); | ||||||||
| }; | ||||||||
|
|
||||||||
| return ( | ||||||||
| <View style={[styles.flex1, styles.justifyContentBetween]}> | ||||||||
| <View> | ||||||||
| {advancedFilters.map((item) => { | ||||||||
| const onPress = singleExecution(waitForNavigate(() => Navigation.navigate(item.route))); | ||||||||
|
|
||||||||
| return ( | ||||||||
| <MenuItemWithTopDescription | ||||||||
| key={item.description} | ||||||||
| title={item.title} | ||||||||
| description={translate(item.description)} | ||||||||
| shouldShowRightIcon | ||||||||
| onPress={onPress} | ||||||||
| /> | ||||||||
| ); | ||||||||
| })} | ||||||||
| </View> | ||||||||
| <FormAlertWithSubmitButton | ||||||||
| buttonText={translate('search.viewResults')} | ||||||||
| containerStyles={[styles.m4]} | ||||||||
| onSubmit={onFormSubmit} | ||||||||
| enabledWhenOffline | ||||||||
| /> | ||||||||
|
There was a problem hiding this comment. I think that the "View results" button should not be disabled offline. based on OfflineUX_Patterns_Flowchart, No offline pattern is needed here. 
Suggested change
There was a problem hiding this comment. I think we can keep it as is for now so that we don't block other issues, but I think we should disable it offline because the Search API command only works while the user is online. |
||||||||
| </View> | ||||||||
| ); | ||||||||
| } | ||||||||
|
|
||||||||
Oops, something went wrong.
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.
NAB we should eventually move this to
CONST.SEARCH.DATA_TYPES.EXPENSEand get rid of transactions and reports. We'll do so as part of v2.2.