[CP Staging] Revert "Add support for groupBy week in Search"

src/CONST/index.ts

@@ -6893,7 +6893,6 @@ const CONST = {
             MERCHANT: 'merchant',
             TAG: 'tag',
             MONTH: 'month',
-            WEEK: 'week',
         },
         get TYPE_CUSTOM_COLUMNS() {
             return {
@@ -6990,11 +6989,6 @@ const CONST = {
                     EXPENSES: this.TABLE_COLUMNS.GROUP_EXPENSES,
                     TOTAL: this.TABLE_COLUMNS.GROUP_TOTAL,
                 },
-                WEEK: {
-                    WEEK: this.TABLE_COLUMNS.GROUP_WEEK,
-                    EXPENSES: this.TABLE_COLUMNS.GROUP_EXPENSES,
-                    TOTAL: this.TABLE_COLUMNS.GROUP_TOTAL,
-                },
             };
         },
         get TYPE_DEFAULT_COLUMNS() {
@@ -7040,7 +7034,6 @@ const CONST = {
                 MERCHANT: [this.TABLE_COLUMNS.GROUP_MERCHANT, this.TABLE_COLUMNS.GROUP_EXPENSES, this.TABLE_COLUMNS.GROUP_TOTAL],
                 TAG: [this.TABLE_COLUMNS.GROUP_TAG, this.TABLE_COLUMNS.GROUP_EXPENSES, this.TABLE_COLUMNS.GROUP_TOTAL],
                 MONTH: [this.TABLE_COLUMNS.GROUP_MONTH, this.TABLE_COLUMNS.GROUP_EXPENSES, this.TABLE_COLUMNS.GROUP_TOTAL],
-                WEEK: [this.TABLE_COLUMNS.GROUP_WEEK, this.TABLE_COLUMNS.GROUP_EXPENSES, this.TABLE_COLUMNS.GROUP_TOTAL],
             };
         },
         BOOLEAN: {
@@ -7140,7 +7133,6 @@ const CONST = {
             GROUP_MERCHANT: 'groupMerchant',
             GROUP_TAG: 'groupTag',
             GROUP_MONTH: 'groupmonth',
-            GROUP_WEEK: 'groupweek',
         },
         SYNTAX_OPERATORS: {
             AND: 'and',
@@ -7332,8 +7324,6 @@ const CONST = {
                 [this.TABLE_COLUMNS.GROUP_CATEGORY]: 'group-category',
                 [this.TABLE_COLUMNS.GROUP_MERCHANT]: 'group-merchant',
                 [this.TABLE_COLUMNS.GROUP_TAG]: 'group-tag',
-                [this.TABLE_COLUMNS.GROUP_MONTH]: 'group-month',
-                [this.TABLE_COLUMNS.GROUP_WEEK]: 'group-week',
             };
         },
         NOT_MODIFIER: 'Not',

src/components/Search/SearchList/index.tsx

@@ -30,7 +30,6 @@ import type {
     TransactionListItemType,
     TransactionMerchantGroupListItemType,
     TransactionMonthGroupListItemType,
-    TransactionWeekGroupListItemType,
 } from '@components/SelectionListWithSections/types';
 import Text from '@components/Text';
 import useKeyboardState from '@hooks/useKeyboardState';
@@ -168,13 +167,6 @@ function isTransactionMatchWithGroupItem(transaction: Transaction, groupItem: Se
         const transactionDateString = transaction.modifiedCreated ?? transaction.created ?? '';
         return DateUtils.isDateStringInMonth(transactionDateString, monthGroup.year, monthGroup.month);
     }
-    if (groupBy === CONST.SEARCH.GROUP_BY.WEEK) {
-        const weekGroup = groupItem as TransactionWeekGroupListItemType;
-        const transactionDateString = transaction.modifiedCreated ?? transaction.created ?? '';
-        const datePart = transactionDateString.substring(0, 10);
-        const {start: weekStart, end: weekEnd} = DateUtils.getWeekDateRange(weekGroup.week);
-        return datePart >= weekStart && datePart <= weekEnd;
-    }
     return false;
 }
 

src/components/Search/index.tsx

@@ -41,7 +41,6 @@ import {isSplitAction} from '@libs/ReportSecondaryActionUtils';
 import {canEditFieldOfMoneyRequest, canHoldUnholdReportAction, canRejectReportAction, isOneTransactionReport, selectFilteredReportActions} from '@libs/ReportUtils';
 import {buildCannedSearchQuery, buildSearchQueryJSON, buildSearchQueryString} from '@libs/SearchQueryUtils';
 import {
-    adjustTimeRangeToDateFilters,
     createAndOpenSearchTransactionThread,
     getColumnsToShow,
     getListItem,
@@ -61,7 +60,6 @@ import {
     isTransactionMerchantGroupListItemType,
     isTransactionMonthGroupListItemType,
     isTransactionTagGroupListItemType,
-    isTransactionWeekGroupListItemType,
     isTransactionWithdrawalIDGroupListItemType,
     shouldShowEmptyState,
     shouldShowYear as shouldShowYearUtil,
@@ -547,7 +545,7 @@ function Search({
 
                 // For expense reports: when ANY transaction is selected, we want ALL transactions in the report selected.
                 // This ensures report-level selection persists when new transactions are added.
-                const hasAnySelected = isExpenseReportType && transactionGroup.transactions.some((transaction: TransactionListItemType) => transaction.transactionID in selectedTransactions);
+                const hasAnySelected = isExpenseReportType && transactionGroup.transactions.some((transaction) => transaction.transactionID in selectedTransactions);
 
                 for (const transactionItem of transactionGroup.transactions) {
                     const isSelected = transactionItem.transactionID in selectedTransactions;
@@ -907,47 +905,13 @@ function Search({
                 return;
             }
 
-            if (isTransactionWeekGroupListItemType(item)) {
-                const weekGroupItem = item;
-                if (!weekGroupItem.week) {
-                    return;
-                }
-                // Extract the existing date filter to check for year-to-date or other date limits
-                const existingDateFilter = queryJSON.flatFilters.find((filter) => filter.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE);
-                const {start: weekStart, end: weekEnd} = adjustTimeRangeToDateFilters(DateUtils.getWeekDateRange(weekGroupItem.week), existingDateFilter);
-                const newFlatFilters = queryJSON.flatFilters.filter((filter) => filter.key !== CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE);
-                newFlatFilters.push({
-                    key: CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE,
-                    filters: [
-                        {operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO, value: weekStart},
-                        {operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO, value: weekEnd},
-                    ],
-                });
-                const newQueryJSON: SearchQueryJSON = {...queryJSON, groupBy: undefined, flatFilters: newFlatFilters};
-                const newQuery = buildSearchQueryString(newQueryJSON);
-                const newQueryJSONWithHash = buildSearchQueryJSON(newQuery);
-                if (!newQueryJSONWithHash) {
-                    return;
-                }
-                handleSearch({queryJSON: newQueryJSONWithHash, searchKey, offset: 0, shouldCalculateTotals: false, isLoading: false});
-                return;
-            }
-
-            // After handling all group types, item should be TransactionListItemType or ReportActionListItemType
-            if (!isTransactionItem && !isReportActionListItemType(item)) {
-                return;
-            }
-
-            const transactionItem = item as TransactionListItemType;
-            const reportActionItem = item as ReportActionListItemType;
-
-            let reportID = transactionItem.reportID ?? reportActionItem.reportID;
-            if (isTransactionItem && transactionItem?.reportAction?.childReportID) {
-                const isFromSelfDM = transactionItem.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
-                const isFromOneTransactionReport = isOneTransactionReport(transactionItem.report);
+            let reportID = item.reportID;
+            if (isTransactionItem && item?.reportAction?.childReportID) {
+                const isFromSelfDM = item.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+                const isFromOneTransactionReport = isOneTransactionReport(item.report);
 
                 if (isFromSelfDM || !isFromOneTransactionReport) {
-                    reportID = transactionItem?.reportAction?.childReportID;
+                    reportID = item?.reportAction?.childReportID;
                 }
             }
 
@@ -963,17 +927,16 @@ function Search({
             });
 
             if (isTransactionGroupListItemType(item)) {
-                const groupItem = item as TransactionGroupListItemType;
-                const firstTransaction = groupItem.transactions.at(0);
-                if (groupItem.isOneTransactionReport && firstTransaction && transactionPreviewData) {
+                const firstTransaction = item.transactions.at(0);
+                if (item.isOneTransactionReport && firstTransaction && transactionPreviewData) {
                     if (!firstTransaction?.reportAction?.childReportID) {
                         createAndOpenSearchTransactionThread(firstTransaction, backTo, firstTransaction?.reportAction?.childReportID, transactionPreviewData, false);
                     } else {
                         setOptimisticDataForTransactionThreadPreview(firstTransaction, transactionPreviewData, firstTransaction?.reportAction?.childReportID);
                     }
                 }
 
-                if (groupItem.transactions.length > 1) {
+                if (item.transactions.length > 1) {
                     markReportIDAsMultiTransactionExpense(reportID);
                 } else {
                     unmarkReportIDAsMultiTransactionExpense(reportID);
@@ -984,15 +947,15 @@ function Search({
             }
 
             if (isReportActionListItemType(item)) {
-                const reportActionID = reportActionItem.reportActionID;
+                const reportActionID = item.reportActionID;
                 Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, reportActionID, backTo}));
                 return;
             }
 
             markReportIDAsExpense(reportID);
 
             if (isTransactionItem && transactionPreviewData) {
-                setOptimisticDataForTransactionThreadPreview(transactionItem, transactionPreviewData, transactionItem?.reportAction?.childReportID);
+                setOptimisticDataForTransactionThreadPreview(item, transactionPreviewData, item?.reportAction?.childReportID);
             }
 
             requestAnimationFrame(() => Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo})));

src/components/SelectionListWithSections/Search/BaseListItemHeader.tsx

@@ -30,16 +30,14 @@ type GroupColumnKey =
     | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_CATEGORY
     | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_MERCHANT
     | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_TAG
-    | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH
-    | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_WEEK;
+    | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH;
 
 /** Supported column style keys for sizing */
 type ColumnStyleKey =
     | typeof CONST.SEARCH.TABLE_COLUMNS.CATEGORY
     | typeof CONST.SEARCH.TABLE_COLUMNS.MERCHANT
     | typeof CONST.SEARCH.TABLE_COLUMNS.TAG
-    | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH
-    | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_WEEK;
+    | typeof CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH;
 
 type BaseListItemHeaderProps<TItem extends ListItem> = {
     /** The group item being rendered */

src/components/SelectionListWithSections/Search/TransactionGroupListItem.tsx

@@ -22,7 +22,6 @@ import type {
     TransactionMonthGroupListItemType,
     TransactionReportGroupListItemType,
     TransactionTagGroupListItemType,
-    TransactionWeekGroupListItemType,
     TransactionWithdrawalIDGroupListItemType,
 } from '@components/SelectionListWithSections/types';
 import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
@@ -51,7 +50,6 @@ import MonthListItemHeader from './MonthListItemHeader';
 import ReportListItemHeader from './ReportListItemHeader';
 import TagListItemHeader from './TagListItemHeader';
 import TransactionGroupListExpandedItem from './TransactionGroupListExpanded';
-import WeekListItemHeader from './WeekListItemHeader';
 import WithdrawalIDListItemHeader from './WithdrawalIDListItemHeader';
 
 function TransactionGroupListItem<TItem extends ListItem>({
@@ -342,19 +340,6 @@ function TransactionGroupListItem<TItem extends ListItem>({
                         isExpanded={isExpanded}
                     />
                 ),
-                [CONST.SEARCH.GROUP_BY.WEEK]: (
-                    <WeekListItemHeader
-                        week={groupItem as TransactionWeekGroupListItemType}
-                        onCheckboxPress={onCheckboxPress}
-                        isDisabled={isDisabledOrEmpty}
-                        columns={columns}
-                        canSelectMultiple={canSelectMultiple}
-                        isSelectAllChecked={isSelectAllChecked}
-                        isIndeterminate={isIndeterminate}
-                        onDownArrowClick={onExpandIconPress}
-                        isExpanded={isExpanded}
-                    />
-                ),
             };
 
             if (searchType === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) {

src/components/SelectionListWithSections/SearchTableHeader.tsx

@@ -409,24 +409,6 @@ const getTransactionGroupHeaders = (groupBy: SearchGroupBy, icons: SearchHeaderI
                     isColumnSortable: true,
                 },
             ];
-        case CONST.SEARCH.GROUP_BY.WEEK:
-            return [
-                {
-                    columnName: CONST.SEARCH.TABLE_COLUMNS.GROUP_WEEK,
-                    translationKey: 'common.week',
-                    isColumnSortable: true,
-                },
-                {
-                    columnName: CONST.SEARCH.TABLE_COLUMNS.GROUP_EXPENSES,
-                    translationKey: 'common.expenses',
-                    isColumnSortable: true,
-                },
-                {
-                    columnName: CONST.SEARCH.TABLE_COLUMNS.GROUP_TOTAL,
-                    translationKey: 'common.total',
-                    isColumnSortable: true,
-                },
-            ];
         default:
             return [];
     }

src/components/SelectionListWithSections/types.ts

@@ -38,7 +38,6 @@ import type {
     SearchTagGroup,
     SearchTask,
     SearchTransactionAction,
-    SearchWeekGroup,
     SearchWithdrawalIDGroup,
 } from '@src/types/onyx/SearchResults';
 import type {ReceiptErrors} from '@src/types/onyx/Transaction';
@@ -524,11 +523,6 @@ type TransactionTagGroupListItemType = TransactionGroupListItemType & {groupedBy
         formattedTag?: string;
     };
 
-type TransactionWeekGroupListItemType = TransactionGroupListItemType & {groupedBy: typeof CONST.SEARCH.GROUP_BY.WEEK} & SearchWeekGroup & {
-        /** Final and formatted "week" value used for displaying */
-        formattedWeek: string;
-    };
-
 type ListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     /** The section list item */
     item: TItem;
@@ -1174,7 +1168,6 @@ export type {
     TransactionCategoryGroupListItemType,
     TransactionMerchantGroupListItemType,
     TransactionTagGroupListItemType,
-    TransactionWeekGroupListItemType,
     Section,
     SectionListDataType,
     SectionWithIndexOffset,

src/languages/de.ts

@@ -641,7 +641,6 @@ const translations: TranslationDeepObject<typeof en> = {
         newFeature: 'Neue Funktion',
         month: 'Monat',
         home: 'Startseite',
-        week: 'Woche',
     },
     supportalNoAccess: {
         title: 'Nicht so schnell',
@@ -7003,7 +7002,6 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
                 [CONST.SEARCH.GROUP_BY.MERCHANT]: 'Händler',
                 [CONST.SEARCH.GROUP_BY.TAG]: 'Stichwort',
                 [CONST.SEARCH.GROUP_BY.MONTH]: 'Monat',
-                [CONST.SEARCH.GROUP_BY.WEEK]: 'Woche',
             },
             feed: 'Feed',
             withdrawalType: {

src/languages/en.ts

@@ -633,7 +633,6 @@ const translations = {
         reimbursableTotal: 'Reimbursable total',
         nonReimbursableTotal: 'Non-reimbursable total',
         month: 'Month',
-        week: 'Week',
     },
     supportalNoAccess: {
         title: 'Not so fast',
@@ -6894,7 +6893,6 @@ const translations = {
                 [CONST.SEARCH.GROUP_BY.MERCHANT]: 'Merchant',
                 [CONST.SEARCH.GROUP_BY.TAG]: 'Tag',
                 [CONST.SEARCH.GROUP_BY.MONTH]: 'Month',
-                [CONST.SEARCH.GROUP_BY.WEEK]: 'Week',
             },
             feed: 'Feed',
             withdrawalType: {

src/languages/es.ts

@@ -392,7 +392,6 @@ const translations: TranslationDeepObject<typeof en> = {
         reimbursableTotal: 'Total reembolsable',
         nonReimbursableTotal: 'Total no reembolsable',
         month: 'Monat',
-        week: 'Semana',
     },
     supportalNoAccess: {
         title: 'No tan rápido',
@@ -6645,7 +6644,6 @@ ${amount} para ${merchant} - ${date}`,
                 [CONST.SEARCH.GROUP_BY.MERCHANT]: 'Comerciante',
                 [CONST.SEARCH.GROUP_BY.TAG]: 'Etiqueta',
                 [CONST.SEARCH.GROUP_BY.MONTH]: 'Mes',
-                [CONST.SEARCH.GROUP_BY.WEEK]: 'Semana',
             },
             feed: 'Feed',
             withdrawalType: {

src/languages/fr.ts

@@ -643,7 +643,6 @@ const translations: TranslationDeepObject<typeof en> = {
         newFeature: 'Nouvelle fonctionnalité',
         month: 'Mois',
         home: 'Accueil',
-        week: 'Semaine',
     },
     supportalNoAccess: {
         title: 'Pas si vite',
@@ -7015,7 +7014,6 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
                 [CONST.SEARCH.GROUP_BY.MERCHANT]: 'Commerçant',
                 [CONST.SEARCH.GROUP_BY.TAG]: 'Étiquette',
                 [CONST.SEARCH.GROUP_BY.MONTH]: 'Mois',
-                [CONST.SEARCH.GROUP_BY.WEEK]: 'Semaine',
             },
             feed: 'Flux',
             withdrawalType: {