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
1 change: 1 addition & 0 deletions src/CONST/SENTRY_LABEL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ const SENTRY_LABEL = {
CREATE_EXPENSE: 'Search-EmptyState-CreateExpense',
CREATE_REPORT: 'Search-EmptyState-CreateReport',
SEND_INVOICE: 'Search-EmptyState-SendInvoice',
RESET_FILTERS: 'Search-EmptyState-ResetFilters',
BOOK_TRAVEL: 'Search-EmptyState-BookTravel',
},
EXPENSE_REPORT_CHECKBOX: 'Search-ExpenseReportCheckbox',
Expand Down
16 changes: 4 additions & 12 deletions src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ import {shouldShowInitialCategoryFilterLoading} from '@hooks/useSearchFilterSync
import useShouldReturnTripRooms from '@hooks/useShouldReturnTripRooms';

import {close} from '@libs/actions/Modal';
import {setSearchContext} from '@libs/actions/Search';
import Navigation from '@libs/Navigation/Navigation';
import {searchKeyToSavedSearchID} from '@libs/SearchKeyUtils';
import {buildQueryStringWithResetFilters, hasFiltersChangedFromDefault, isSearchQuerySavable, removeNegation} from '@libs/SearchQueryUtils';
import {isSearchQuerySavable, removeNegation} from '@libs/SearchQueryUtils';
import {
FILTER_VIEW_MAP,
getFiltersFormWithTripRoomStatuses,
Expand All @@ -46,6 +45,7 @@ import type {ReactNode} from 'react';
import React from 'react';

import DatePickerFilterPopup from './DatePickerFilterPopup';
import useSearchFiltersReset from './useSearchFiltersReset';

type FilterItem = WithRequiredSentryLabel & {
PopoverComponent: (props: PopoverComponentProps) => ReactNode;
Expand Down Expand Up @@ -235,22 +235,14 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON): UseSearchFiltersBarRes
}),
);

const resetFilters = () => {
if (!currentSearchQueryJSON) {
return;
}

Navigation.setParams({q: buildQueryStringWithResetFilters(currentSearchQueryJSON, currentDefaultSearchQueryJSON), rawQuery: undefined});
setSearchContext(false);
};
const {canReset, resetFilters} = useSearchFiltersReset();
const isCategoryFilterLoading = shouldShowInitialCategoryFilterLoading(queryJSON, areCategoriesLoaded, isLoadingCategories, isOffline);
const hasDefaultQuery = !!currentDefaultSearchQueryJSON && !!currentSearchQueryJSON;

return {
filters,
hasErrors: Object.keys(currentSearchResults?.errors ?? {}).length > 0 && !isOffline,
shouldShowFiltersBarLoading: shouldShowFiltersBarLoading || isCategoryFilterLoading,
canReset: hasDefaultQuery ? hasFiltersChangedFromDefault(currentSearchQueryJSON, currentDefaultSearchQueryJSON) : filters.length > 0,
canReset,
canSave: isSearchQuerySavable(currentSearchQueryJSON, currentDefaultSearchQueryJSON),
resetFilters,
};
Expand Down
49 changes: 49 additions & 0 deletions src/components/Search/SearchPageHeader/useSearchFiltersReset.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/** Shares the applied-filter reset behavior between the search header and empty results. */
import {useSearchQueryContext} from '@components/Search/SearchContext';

import {useCurrencyListActions} from '@hooks/useCurrencyList';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useShouldReturnTripRooms from '@hooks/useShouldReturnTripRooms';

import {setSearchContext} from '@libs/actions/Search';
import Navigation from '@libs/Navigation/Navigation';
import {buildQueryStringWithResetFilters, hasFiltersChangedFromDefault} from '@libs/SearchQueryUtils';
import {getFiltersFormWithTripRoomStatuses, mapFiltersFormToLabelValueList, SKIPPED_SEARCH_FILTERS} from '@libs/SearchUIUtils';

import ONYXKEYS from '@src/ONYXKEYS';
import type {SearchAdvancedFiltersForm} from '@src/types/form';
import {getEmptyObject} from '@src/types/utils/EmptyObject';

function useSearchFiltersReset() {
const [searchAdvancedFiltersForm = getEmptyObject<Partial<SearchAdvancedFiltersForm>>()] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
const {translate, localeCompare, dateFnsLocale} = useLocalize();
const {convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
const {currentSearchQueryJSON, currentDefaultSearchQueryJSON, currentDefaultSearchQueryFilterKeys} = useSearchQueryContext();
const shouldReturnTripRooms = useShouldReturnTripRooms(currentSearchQueryJSON?.type);
const hasDefaultQuery = !!currentDefaultSearchQueryJSON && !!currentSearchQueryJSON;
const canReset = hasDefaultQuery
? hasFiltersChangedFromDefault(currentSearchQueryJSON, currentDefaultSearchQueryJSON)
: mapFiltersFormToLabelValueList(
shouldReturnTripRooms ? getFiltersFormWithTripRoomStatuses(searchAdvancedFiltersForm) : searchAdvancedFiltersForm,
currentDefaultSearchQueryFilterKeys,
SKIPPED_SEARCH_FILTERS,
translate,
dateFnsLocale,
localeCompare,
convertToDisplayStringWithoutCurrency,
).length > 0;

const resetFilters = () => {
if (!currentSearchQueryJSON) {
return;
}

Navigation.setParams({q: buildQueryStringWithResetFilters(currentSearchQueryJSON, currentDefaultSearchQueryJSON), rawQuery: undefined});
setSearchContext(false);
};

return {canReset, resetFilters};
}

export default useSearchFiltersReset;
1 change: 1 addition & 0 deletions src/libs/SearchSuggestionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ type SearchTypeMenuItem = {
emptyState?: {
title: TranslationPaths;
subtitle: TranslationPaths;
shouldShowResetFilters?: boolean;
buttons?: Array<{
buttonText: TranslationPaths;
buttonAction: () => void;
Expand Down
1 change: 1 addition & 0 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5347,6 +5347,7 @@ function createTypeMenuSections(params: TypeMenuSectionsParams): SearchTypeMenuS
emptyState: {
title: 'search.searchResults.emptyResults.title',
subtitle: 'search.searchResults.emptyResults.subtitle',
shouldShowResetFilters: true,
},
});
}
Expand Down
45 changes: 15 additions & 30 deletions src/pages/Search/EmptySearchView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import React from 'react';
import {Linking, View} from 'react-native';
import Animated from 'react-native-reanimated';

import SearchResetFiltersButton from './SearchResetFiltersButton';
import useSearchEmptyStateIllustration from './useSearchEmptyStateIllustration';

type EmptySearchViewProps = {
Expand Down Expand Up @@ -209,6 +210,13 @@ function EmptySearchViewContent({
// Default 'Folder' illustration styles
const defaultViewItemHeader = useSearchEmptyStateIllustration();

const getEmptyResultsContent = (): EmptySearchViewItem => ({
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
children: <SearchResetFiltersButton />,
});

const startTestDriveAction = () => {
startTestDrive();
};
Expand Down Expand Up @@ -240,6 +248,7 @@ function EmptySearchViewContent({
...button,
buttonText: translate(button.buttonText),
})),
children: menuItem.emptyState.shouldShowResetFilters ? <SearchResetFiltersButton /> : undefined,
};
break;
}
Expand Down Expand Up @@ -282,17 +291,9 @@ function EmptySearchViewContent({
break;
case CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT:
if (!isFilteredWorkspaceAccessible) {
content = {
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
};
content = getEmptyResultsContent();
} else if (hasResults && (!queryJSON || !isDefaultExpenseReportsQuery(queryJSON) || hasExpenseReports)) {
content = {
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
};
content = getEmptyResultsContent();
} else if (!hasResults || !hasExpenseReports) {
content = {
...defaultViewItemHeader.folder,
Expand Down Expand Up @@ -325,17 +326,9 @@ function EmptySearchViewContent({
case CONST.SEARCH.DATA_TYPES.EXPENSE:
if (!content) {
if (!isFilteredWorkspaceAccessible) {
content = {
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
};
content = getEmptyResultsContent();
} else if (hasResults && (!queryJSON || !isDefaultExpensesQuery(queryJSON) || hasTransactions)) {
content = {
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
};
content = getEmptyResultsContent();
} else if (!hasResults || !hasTransactions) {
content = {
...defaultViewItemHeader.expenses,
Expand Down Expand Up @@ -406,23 +399,15 @@ function EmptySearchViewContent({
case CONST.SEARCH.DATA_TYPES.CHAT:
default:
if (!content) {
content = {
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
};
content = getEmptyResultsContent();
}
break;
}
}

// Fallback to default content if somehow not set (should never happen in practice)
if (!content) {
content = {
...defaultViewItemHeader.folder,
title: translate('search.searchResults.emptyResults.title'),
subtitle: translate('search.searchResults.emptyResults.subtitle'),
};
content = getEmptyResultsContent();
}

return (
Expand Down
34 changes: 34 additions & 0 deletions src/pages/Search/SearchResetFiltersButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/** Lets empty search results share the filter bar's applied-query reset action. */
import Button from '@components/Button';
import useSearchFiltersReset from '@components/Search/SearchPageHeader/useSearchFiltersReset';

import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';

import CONST from '@src/CONST';

import React from 'react';
import {View} from 'react-native';

function SearchResetFiltersButton() {
const {canReset, resetFilters} = useSearchFiltersReset();
const {translate} = useLocalize();
const styles = useThemeStyles();

if (!canReset) {
return null;
}

return (
<View style={[styles.mt6, styles.flexRow, styles.justifyContentCenter]}>
<Button
onPress={resetFilters}
sentryLabel={CONST.SENTRY_LABEL.SEARCH.EMPTY_STATE.RESET_FILTERS}
>
<Button.Text>{translate('search.resetFilters')}</Button.Text>
</Button>
</View>
);
}

export default SearchResetFiltersButton;
Loading
Loading