Merge pull request #79611 from Expensify/revert-75261-fix-v2/70591

Revert "Can't select an empty report from the Reports > Reports page"

(cherry picked from commit 917fb82)

(cherry-picked to staging by francoisl)

Author: luacmartins

src/components/MoneyReportHeader.tsx

@@ -1401,8 +1401,8 @@ function MoneyReportHeader({
                 }
 
                 const result = await showConfirmModal({
-                    title: translate('iou.deleteReport', {count: transactionCount}),
-                    prompt: translate('iou.deleteReportConfirmation', {count: transactionCount}),
+                    title: translate('iou.deleteReport'),
+                    prompt: translate('iou.deleteReportConfirmation'),
                     confirmText: translate('common.delete'),
                     cancelText: translate('common.cancel'),
                     danger: true,

src/components/Search/SearchContext.tsx

@@ -92,15 +92,7 @@ function SearchContextProvider({children}: ChildrenProps) {
 
         if (data.length && data.every(isTransactionReportGroupListItemType)) {
             selectedReports = data
-                .filter((item) => {
-                    if (!isMoneyRequestReport(item)) {
-                        return false;
-                    }
-                    if (item.transactions.length === 0) {
-                        return !!item.keyForList && selectedTransactions[item.keyForList]?.isSelected;
-                    }
-                    return item.transactions.every(({keyForList}) => selectedTransactions[keyForList]?.isSelected);
-                })
+                .filter((item) => isMoneyRequestReport(item) && item.transactions.length > 0 && item.transactions.every(({keyForList}) => selectedTransactions[keyForList]?.isSelected))
                 .map(({reportID, action = CONST.SEARCH.ACTION_TYPES.VIEW, total = CONST.DEFAULT_NUMBER_ID, policyID, allActions = [action], currency, chatReportID}) => ({
                     reportID,
                     action,

src/components/Search/SearchList/index.tsx

@@ -42,7 +42,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import navigationRef from '@libs/Navigation/navigationRef';
-import {getTableMinWidth, isTransactionReportGroupListItemType} from '@libs/SearchUIUtils';
+import {getTableMinWidth} from '@libs/SearchUIUtils';
 import variables from '@styles/variables';
 import type {TransactionPreviewData} from '@userActions/Search';
 import CONST from '@src/CONST';
@@ -196,51 +196,16 @@ function SearchList({
         }
         return data;
     }, [data, groupBy, type]);
-    const emptyReports = useMemo(() => {
-        if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT && isTransactionGroupListItemArray(data)) {
-            return data.filter((item) => item.transactions.length === 0);
-        }
-        return [];
-    }, [data, type]);
+    const flattenedItemsWithoutPendingDelete = useMemo(() => flattenedItems.filter((t) => t?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE), [flattenedItems]);
 
     const selectedItemsLength = useMemo(() => {
-        const selectedTransactionsCount = flattenedItems.reduce((acc, item) => {
-            const isTransactionSelected = !!(item?.keyForList && selectedTransactions[item.keyForList]?.isSelected);
-            return acc + (isTransactionSelected ? 1 : 0);
-        }, 0);
-
-        if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT && isTransactionGroupListItemArray(data)) {
-            const selectedEmptyReports = emptyReports.reduce((acc, item) => {
-                const isEmptyReportSelected = !!(item.keyForList && selectedTransactions[item.keyForList]?.isSelected);
-                return acc + (isEmptyReportSelected ? 1 : 0);
-            }, 0);
-
-            return selectedEmptyReports + selectedTransactionsCount;
-        }
-
-        return selectedTransactionsCount;
-    }, [flattenedItems, type, data, emptyReports, selectedTransactions]);
-
-    const totalItems = useMemo(() => {
-        if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT && isTransactionGroupListItemArray(data)) {
-            const selectableEmptyReports = emptyReports.filter((item) => item.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
-            const selectableTransactions = flattenedItems.filter((item) => {
-                if ('pendingAction' in item) {
-                    return item.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                }
-                return true;
-            });
-            return selectableEmptyReports.length + selectableTransactions.length;
-        }
-
-        const selectableTransactions = flattenedItems.filter((item) => {
-            if ('pendingAction' in item) {
-                return item.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+        return flattenedItemsWithoutPendingDelete.reduce((acc, item) => {
+            if (item.keyForList && selectedTransactions[item.keyForList]?.isSelected) {
+                return acc + 1;
             }
-            return true;
-        });
-        return selectableTransactions.length;
-    }, [data, type, flattenedItems, emptyReports]);
+            return acc;
+        }, 0);
+    }, [flattenedItemsWithoutPendingDelete, selectedTransactions]);
 
     const itemsWithSelection = useMemo(() => {
         return data.map((item) => {
@@ -251,16 +216,10 @@ function SearchList({
                 if (!canSelectMultiple) {
                     itemWithSelection = {...item, isSelected: false};
                 } else {
-                    const isEmptyReportSelected =
-                        item.transactions.length === 0 && isTransactionReportGroupListItemType(item) && !!(item.keyForList && selectedTransactions[item.keyForList]?.isSelected);
-
-                    const hasAnySelected = item.transactions.some((t) => t.keyForList && selectedTransactions[t.keyForList]?.isSelected) || isEmptyReportSelected;
+                    const hasAnySelected = item.transactions.some((t) => t.keyForList && selectedTransactions[t.keyForList]?.isSelected);
 
                     if (!hasAnySelected) {
                         itemWithSelection = {...item, isSelected: false};
-                    } else if (isEmptyReportSelected) {
-                        isSelected = true;
-                        itemWithSelection = {...item, isSelected};
                     } else {
                         let allNonDeletedSelected = true;
                         let hasNonDeletedTransactions = false;
@@ -353,7 +312,10 @@ function SearchList({
             if (shouldPreventLongPressRow || !isSmallScreenWidth || item?.isDisabled || item?.isDisabledCheckbox) {
                 return;
             }
-
+            // disable long press for empty expense reports
+            if ('transactions' in item && item.transactions.length === 0 && !groupBy) {
+                return;
+            }
             if (isMobileSelectionModeEnabled) {
                 onCheckboxPress(item, itemTransactions);
                 return;
@@ -362,7 +324,7 @@ function SearchList({
             setLongPressedItemTransactions(itemTransactions);
             setIsModalVisible(true);
         },
-        [route.key, shouldPreventLongPressRow, isSmallScreenWidth, isMobileSelectionModeEnabled, onCheckboxPress],
+        [groupBy, route.key, shouldPreventLongPressRow, isSmallScreenWidth, isMobileSelectionModeEnabled, onCheckboxPress],
     );
 
     const turnOnSelectionMode = useCallback(() => {
@@ -491,7 +453,7 @@ function SearchList({
 
     const tableHeaderVisible = canSelectMultiple || !!SearchTableHeader;
     const selectAllButtonVisible = canSelectMultiple && !SearchTableHeader;
-    const isSelectAllChecked = selectedItemsLength > 0 && selectedItemsLength === totalItems;
+    const isSelectAllChecked = selectedItemsLength > 0 && selectedItemsLength === flattenedItemsWithoutPendingDelete.length;
 
     const content = (
         <View style={[styles.flex1, !isKeyboardShown && safeAreaPaddingBottomStyle, containerStyle]}>
@@ -501,7 +463,7 @@ function SearchList({
                         <Checkbox
                             accessibilityLabel={translate('workspace.people.selectAll')}
                             isChecked={isSelectAllChecked}
-                            isIndeterminate={selectedItemsLength > 0 && selectedItemsLength !== totalItems}
+                            isIndeterminate={selectedItemsLength > 0 && selectedItemsLength !== flattenedItemsWithoutPendingDelete.length}
                             onPress={() => {
                                 onAllCheckboxPress();
                             }}