update date presets, display last-statement only if a feed is selected

Author: s77rt

src/CONST/index.ts

@@ -6449,12 +6449,6 @@ const CONST = {
             LAST_MONTH: 'last-month',
             LAST_STATEMENT: 'last-statement',
         },
-        get FILTER_DATE_PRESETS() {
-            return {
-                [this.SYNTAX_FILTER_KEYS.POSTED]: [this.DATE_PRESETS.LAST_STATEMENT, this.DATE_PRESETS.LAST_MONTH],
-                [this.SYNTAX_FILTER_KEYS.EXPORTED]: [this.DATE_PRESETS.NEVER],
-            };
-        },
         SNAPSHOT_ONYX_KEYS: [
             ONYXKEYS.COLLECTION.REPORT,
             ONYXKEYS.COLLECTION.POLICY,

src/components/Search/SearchAutocompleteList.tsx

@@ -32,6 +32,7 @@ import {
     parseForAutocomplete,
 } from '@libs/SearchAutocompleteUtils';
 import {buildSearchQueryJSON, buildUserReadableQueryString, getQueryWithoutFilters, sanitizeSearchValue, shouldHighlight} from '@libs/SearchQueryUtils';
+import {getDatePresets} from '@libs/SearchUIUtils';
 import StringUtils from '@libs/StringUtils';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
@@ -433,7 +434,7 @@ function SearchAutocompleteList(
             }
             case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED:
             case CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED: {
-                const filteredDatePresets = CONST.SEARCH.FILTER_DATE_PRESETS[autocompleteKey]
+                const filteredDatePresets = (getDatePresets(autocompleteKey, true) ?? [])
                     .filter((datePreset) => datePreset.toLowerCase().includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(datePreset.toLowerCase()))
                     .sort()
                     .slice(0, 10);

src/components/Search/SearchDatePresetFilterBasePage.tsx

@@ -9,7 +9,7 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {updateAdvancedFilters} from '@libs/actions/Search';
 import Navigation from '@libs/Navigation/Navigation';
-import type {SearchDateModifier, SearchDateModifierLower} from '@libs/SearchUIUtils';
+import {getDatePresets, type SearchDateModifier, type SearchDateModifierLower} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -24,12 +24,9 @@ type SearchDatePresetFilterBasePageProps = {
 
     /** The translation key for the page title */
     titleKey: TranslationPaths;
-
-    /** The date presets */
-    presets?: SearchDatePreset[];
 };
 
-function SearchDatePresetFilterBasePage({dateKey, titleKey, presets}: SearchDatePresetFilterBasePageProps) {
+function SearchDatePresetFilterBasePage({dateKey, titleKey}: SearchDatePresetFilterBasePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
@@ -43,6 +40,11 @@ function SearchDatePresetFilterBasePage({dateKey, titleKey, presets}: SearchDate
         [CONST.SEARCH.DATE_MODIFIERS.AFTER]: searchAdvancedFiltersForm?.[`${dateKey}${CONST.SEARCH.DATE_MODIFIERS.AFTER}`],
     };
 
+    const presets = useMemo(() => {
+        const hasFeed = !!searchAdvancedFiltersForm?.feed?.length;
+        return getDatePresets(dateKey, hasFeed);
+    }, [dateKey, searchAdvancedFiltersForm?.feed]);
+
     const title = useMemo(() => {
         if (selectedDateModifier) {
             return translate(`common.${selectedDateModifier.toLowerCase() as SearchDateModifierLower}`);

src/components/Search/SearchPageHeader/SearchFiltersBar.tsx

@@ -40,7 +40,7 @@ import {
     isFilterSupported,
     isSearchDatePreset,
 } from '@libs/SearchQueryUtils';
-import {getFeedOptions, getGroupByOptions, getStatusOptions, getTypeOptions} from '@libs/SearchUIUtils';
+import {getDatePresets, getFeedOptions, getGroupByOptions, getStatusOptions, getTypeOptions} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -250,17 +250,19 @@ function SearchFiltersBar({queryJSON, headerButtonsOptions, isMobileSelectionMod
                 updateFilterForm(dateFormValues);
             };
 
+            const hasFeed = !!filterFormValues.feed;
+
             return (
                 <DateSelectPopup
                     label={translate('search.filters.posted')}
                     value={posted}
                     onChange={onChange}
                     closeOverlay={closeOverlay}
-                    presets={CONST.SEARCH.FILTER_DATE_PRESETS[CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED]}
+                    presets={getDatePresets(CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED, hasFeed)}
                 />
             );
         },
-        [posted, translate, updateFilterForm],
+        [posted, filterFormValues.feed, translate, updateFilterForm],
     );
 
     const statusComponent = useCallback(

src/libs/SearchUIUtils.ts

@@ -8,7 +8,7 @@ import type DotLottieAnimation from '@components/LottieAnimations/types';
 import type {MenuItemWithLink} from '@components/MenuItemList';
 import type {MultiSelectItem} from '@components/Search/FilterDropdowns/MultiSelectPopup';
 import type {SingleSelectItem} from '@components/Search/FilterDropdowns/SingleSelectPopup';
-import type {SearchColumnType, SearchGroupBy, SearchQueryJSON, SearchStatus, SingularSearchStatus, SortOrder} from '@components/Search/types';
+import type {SearchColumnType, SearchDateFilterKeys, SearchDatePreset, SearchGroupBy, SearchQueryJSON, SearchStatus, SingularSearchStatus, SortOrder} from '@components/Search/types';
 import ChatListItem from '@components/SelectionList/ChatListItem';
 import TaskListItem from '@components/SelectionList/Search/TaskListItem';
 import TransactionGroupListItem from '@components/SelectionList/Search/TransactionGroupListItem';
@@ -1855,6 +1855,17 @@ function getFeedOptions(allCardFeeds: OnyxCollection<OnyxTypes.CardFeeds>, allCa
     }));
 }
 
+function getDatePresets(filterKey: SearchDateFilterKeys, hasFeed: boolean): SearchDatePreset[] | undefined {
+    switch (filterKey) {
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED:
+            return [...(hasFeed ? [CONST.SEARCH.DATE_PRESETS.LAST_STATEMENT] : []), CONST.SEARCH.DATE_PRESETS.LAST_MONTH];
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED:
+            return [CONST.SEARCH.DATE_PRESETS.NEVER];
+        default:
+            return undefined;
+    }
+}
+
 export {
     getSuggestedSearches,
     getListItem,
@@ -1888,5 +1899,6 @@ export {
     getWideAmountIndicators,
     isTransactionAmountTooLong,
     isTransactionTaxAmountTooLong,
+    getDatePresets,
 };
 export type {SavedSearchMenuItem, SearchTypeMenuSection, SearchTypeMenuItem, SearchDateModifier, SearchDateModifierLower, SearchKey, ArchivedReportsIDSet};

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExportedPage.tsx

@@ -7,7 +7,6 @@ function SearchFiltersExportedPage() {
         <SearchDatePresetFilterBasePage
             dateKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED}
             titleKey="search.filters.exported"
-            presets={CONST.SEARCH.FILTER_DATE_PRESETS[CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED]}
         />
     );
 }

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersPostedPage.tsx

@@ -7,7 +7,6 @@ function SearchFiltersPostedPage() {
         <SearchDatePresetFilterBasePage
             dateKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED}
             titleKey="search.filters.posted"
-            presets={CONST.SEARCH.FILTER_DATE_PRESETS[CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED]}
         />
     );
 }