advanced filters category #46197
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
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,86 @@ | ||
| import React, {useCallback} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import PressableWithFeedback from '@components/Pressable/PressableWithFeedback'; | ||
| import SelectCircle from '@components/SelectCircle'; | ||
| import TextWithTooltip from '@components/TextWithTooltip'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import CONST from '@src/CONST'; | ||
| import BaseListItem from './BaseListItem'; | ||
| import type {InviteMemberListItemProps, ListItem} from './types'; | ||
|
|
||
| function SelectableListItem<TItem extends ListItem>({ | ||
| item, | ||
| isFocused, | ||
| showTooltip, | ||
| isDisabled, | ||
| canSelectMultiple, | ||
| onSelectRow, | ||
| onCheckboxPress, | ||
| onDismissError, | ||
| onFocus, | ||
| shouldSyncFocus, | ||
| }: InviteMemberListItemProps<TItem>) { | ||
| const styles = useThemeStyles(); | ||
| const handleCheckboxPress = useCallback(() => { | ||
| if (onCheckboxPress) { | ||
| onCheckboxPress(item); | ||
| } else { | ||
| onSelectRow(item); | ||
| } | ||
| }, [item, onCheckboxPress, onSelectRow]); | ||
|
|
||
| return ( | ||
| <BaseListItem | ||
| item={item} | ||
| wrapperStyle={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, isFocused && styles.sidebarLinkActive]} | ||
| isFocused={isFocused} | ||
| isDisabled={isDisabled} | ||
| showTooltip={showTooltip} | ||
| canSelectMultiple={canSelectMultiple} | ||
| onSelectRow={onSelectRow} | ||
| onDismissError={onDismissError} | ||
| errors={item.errors} | ||
| pendingAction={item.pendingAction} | ||
| keyForList={item.keyForList} | ||
| onFocus={onFocus} | ||
| shouldSyncFocus={shouldSyncFocus} | ||
| > | ||
| <> | ||
| <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch, styles.optionRow]}> | ||
| <View style={[styles.flexRow, styles.alignItemsCenter]}> | ||
| <TextWithTooltip | ||
| shouldShowTooltip={showTooltip} | ||
| text={item.text ?? ''} | ||
| style={[ | ||
| styles.optionDisplayName, | ||
| isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, | ||
| item.isBold !== false && styles.sidebarLinkTextBold, | ||
| styles.pre, | ||
| item.alternateText ? styles.mb1 : null, | ||
| ]} | ||
| /> | ||
| </View> | ||
| </View> | ||
| {!!item.rightElement && item.rightElement} | ||
| {canSelectMultiple && !item.isDisabled && ( | ||
| <PressableWithFeedback | ||
| onPress={handleCheckboxPress} | ||
| disabled={isDisabled} | ||
| role={CONST.ROLE.BUTTON} | ||
| accessibilityLabel={item.text ?? ''} | ||
| style={[styles.ml2, styles.optionSelectCircle]} | ||
| > | ||
| <SelectCircle | ||
| isChecked={item.isSelected ?? false} | ||
| selectCircleStyles={styles.ml0} | ||
| /> | ||
| </PressableWithFeedback> | ||
| )} | ||
| </> | ||
| </BaseListItem> | ||
| ); | ||
| } | ||
|
|
||
| SelectableListItem.displayName = 'SelectableListItem'; | ||
|
|
||
| export default SelectableListItem; | ||
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
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 |
|---|---|---|
|
|
@@ -36,6 +36,11 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel | |
| return dateValue; | ||
| } | ||
|
|
||
| if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY && filters[fieldName]) { | ||
| const categories = filters[fieldName] ?? []; | ||
| return categories.join(', '); | ||
|
Contributor
There was a problem hiding this comment. You did not sort the categories before showing which caused #48496 |
||
| } | ||
|
|
||
| // 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. | ||
|
|
@@ -68,6 +73,11 @@ function AdvancedSearchFilters() { | |
| description: 'common.date' as const, | ||
| route: ROUTES.SEARCH_ADVANCED_FILTERS_DATE, | ||
| }, | ||
| { | ||
| title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, translate), | ||
| description: 'common.category' as const, | ||
| route: ROUTES.SEARCH_ADVANCED_FILTERS_CATEGORY, | ||
| }, | ||
| ], | ||
| [searchAdvancedFilters, translate], | ||
| ); | ||
|
|
||
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,154 @@ | ||
| import React, {useCallback, useMemo, useState} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
| import Button from '@components/Button'; | ||
| import type {FormOnyxValues} from '@components/Form/types'; | ||
| import HeaderWithBackButton from '@components/HeaderWithBackButton'; | ||
| import ScreenWrapper from '@components/ScreenWrapper'; | ||
| import SelectionList from '@components/SelectionList'; | ||
| import SelectableListItem from '@components/SelectionList/SelectableListItem'; | ||
| import useDebouncedState from '@hooks/useDebouncedState'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import localeCompare from '@libs/LocaleCompare'; | ||
| import type {CategorySection} from '@libs/OptionsListUtils'; | ||
| import type {OptionData} from '@libs/ReportUtils'; | ||
| import Navigation from '@navigation/Navigation'; | ||
| import * as SearchActions from '@userActions/Search'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
|
|
||
| function SearchFiltersCategoryPage() { | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
|
|
||
| const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState(''); | ||
| const [noResultsFound, setNoResultsFound] = useState(false); | ||
|
|
||
| const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM); | ||
| const currentCategories = searchAdvancedFiltersForm?.category; | ||
| const [newCategories, setNewCategories] = useState<string[]>(currentCategories ?? []); | ||
| const policyID = searchAdvancedFiltersForm?.policyID ?? '-1'; | ||
|
|
||
| const [allPolicyIDCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES); | ||
| const singlePolicyCategories = allPolicyIDCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]; | ||
|
|
||
| const categoryNames = useMemo(() => { | ||
| let categories: string[] = []; | ||
| if (!singlePolicyCategories) { | ||
| categories = Object.values(allPolicyIDCategories ?? {}) | ||
| .map((policyCategories) => Object.values(policyCategories ?? {}).map((category) => category.name)) | ||
| .flat(); | ||
| } else { | ||
| categories = Object.values(singlePolicyCategories ?? {}).map((value) => value.name); | ||
| } | ||
|
|
||
| return [...new Set(categories)]; | ||
| }, [allPolicyIDCategories, singlePolicyCategories]); | ||
|
|
||
| const sections = useMemo(() => { | ||
| const newSections: CategorySection[] = []; | ||
| const chosenCategories = newCategories | ||
| .filter((category) => category.toLowerCase().includes(debouncedSearchTerm.toLowerCase())) | ||
| .sort((a, b) => localeCompare(a, b)) | ||
| .map((name) => ({ | ||
| text: name, | ||
| keyForList: name, | ||
| isSelected: newCategories?.includes(name) ?? false, | ||
| })); | ||
| const remainingCategories = categoryNames | ||
| .filter((category) => newCategories.includes(category) === false) | ||
| .filter((category) => category.toLowerCase().includes(debouncedSearchTerm.toLowerCase())) | ||
| .sort((a, b) => localeCompare(a, b)) | ||
| .map((name) => ({ | ||
| text: name, | ||
| keyForList: name, | ||
| isSelected: newCategories?.includes(name) ?? false, | ||
| })); | ||
| if (chosenCategories.length === 0 && remainingCategories.length === 0) { | ||
| setNoResultsFound(true); | ||
| } else { | ||
| setNoResultsFound(false); | ||
| } | ||
| newSections.push({ | ||
| title: undefined, | ||
| data: chosenCategories, | ||
| shouldShow: chosenCategories.length > 0, | ||
| }); | ||
| newSections.push({ | ||
| title: translate('common.category'), | ||
| data: remainingCategories, | ||
| shouldShow: remainingCategories.length > 0, | ||
| }); | ||
| return newSections; | ||
| }, [categoryNames, newCategories, translate, debouncedSearchTerm]); | ||
|
|
||
| const updateCategory = useCallback((values: Partial<FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>>) => { | ||
| SearchActions.updateAdvancedFilters(values); | ||
| }, []); | ||
|
|
||
| const handleConfirmSelection = useCallback(() => { | ||
| updateCategory({ | ||
| category: newCategories.sort((a, b) => localeCompare(a, b)), | ||
| }); | ||
| Navigation.goBack(); | ||
| }, [newCategories, updateCategory]); | ||
|
|
||
| const updateNewCategories = useCallback( | ||
| (item: Partial<OptionData>) => { | ||
| if (!item.text) { | ||
| return; | ||
| } | ||
| if (item.isSelected) { | ||
| setNewCategories(newCategories?.filter((category) => category !== item.text)); | ||
| } else { | ||
| setNewCategories([...(newCategories ?? []), item.text]); | ||
| } | ||
| }, | ||
| [newCategories], | ||
| ); | ||
|
|
||
| const footerContent = useMemo( | ||
| () => ( | ||
| <Button | ||
| success | ||
| text={translate('common.save')} | ||
| pressOnEnter | ||
| onPress={handleConfirmSelection} | ||
| large | ||
| /> | ||
| ), | ||
| [translate, handleConfirmSelection], | ||
| ); | ||
| return ( | ||
| <ScreenWrapper | ||
| testID={SearchFiltersCategoryPage.displayName} | ||
| shouldShowOfflineIndicatorInWideScreen | ||
| offlineIndicatorStyle={styles.mtAuto} | ||
| > | ||
| <FullPageNotFoundView shouldShow={false}> | ||
| <HeaderWithBackButton title={translate('common.category')} /> | ||
| <View style={[styles.flex1]}> | ||
| <SelectionList | ||
|
luacmartins marked this conversation as resolved.
|
||
| sections={sections} | ||
| textInputValue={searchTerm} | ||
| onChangeText={setSearchTerm} | ||
| textInputLabel={translate('common.search')} | ||
| onSelectRow={updateNewCategories} | ||
| headerMessage={noResultsFound ? translate('common.noResultsFound') : undefined} | ||
| footerContent={footerContent} | ||
| shouldStopPropagation | ||
| showLoadingPlaceholder={!noResultsFound} | ||
| shouldShowTooltips | ||
| canSelectMultiple | ||
| ListItem={SelectableListItem} | ||
| /> | ||
| </View> | ||
| </FullPageNotFoundView> | ||
| </ScreenWrapper> | ||
| ); | ||
| } | ||
|
|
||
| SearchFiltersCategoryPage.displayName = 'SearchFiltersCategoryPage'; | ||
|
|
||
| export default SearchFiltersCategoryPage; | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.