Revert CachedPDFPaths refactor

Author: pasyukevich

src/components/Attachments/AttachmentView/index.tsx

@@ -123,7 +123,6 @@ function AttachmentView({
     reportID,
 }: AttachmentViewProps) {
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
-    const [pdfsPaths] = useOnyx(ONYXKEYS.CACHED_PDF_PATHS, {canBeMissing: true});
     const {translate} = useLocalize();
     const {updateCurrentURLAndReportID} = usePlaybackContext();
 
@@ -213,7 +212,7 @@ function AttachmentView({
         const onPDFLoadComplete = (path: string) => {
             const id = (transaction && transaction.transactionID) ?? reportActionID;
             if (path && id) {
-                addCachedPDFPaths(id, path, pdfsPaths ?? {});
+                addCachedPDFPaths(id, path);
             }
             if (!loadComplete) {
                 setLoadComplete(true);

src/libs/actions/CachedPDFPaths/index.native.ts

@@ -7,7 +7,15 @@ import type {Add, Clear, ClearByKey} from './types';
  * We need to save the paths of PDF files so we can delete them later.
  * This is to remove the cached PDFs when an attachment is deleted or the user logs out.
  */
-const add: Add = (id: string, path: string, pdfPaths: Record<string, string>) => {
+let pdfPaths: Record<string, string> = {};
+Onyx.connect({
+    key: ONYXKEYS.CACHED_PDF_PATHS,
+    callback: (val) => {
+        pdfPaths = val ?? {};
+    },
+});
+
+const add: Add = (id: string, path: string) => {
     if (pdfPaths[id]) {
         return Promise.resolve();
     }
@@ -28,7 +36,7 @@ const clear: Clear = (path: string) => {
     });
 };
 
-const clearByKey: ClearByKey = (id: string, pdfPaths: Record<string, string>) => {
+const clearByKey: ClearByKey = (id: string) => {
     clear(pdfPaths[id] ?? '').then(() => Onyx.merge(ONYXKEYS.CACHED_PDF_PATHS, {[id]: null}));
 };
 

src/libs/actions/CachedPDFPaths/types.ts

@@ -1,5 +1,5 @@
-type Add = (id: string, path: string, pdfPaths: Record<string, string>) => Promise<void | void[]>;
+type Add = (id: string, path: string) => Promise<void | void[]>;
 type Clear = (path: string) => Promise<void>;
-type ClearByKey = (id: string, pdfPaths: Record<string, string>) => void;
+type ClearByKey = (id: string) => void;
 
 export type {Add, Clear, ClearByKey};

src/libs/actions/IOU.ts

@@ -8019,7 +8019,6 @@ function deleteMoneyRequest(
     violations: OnyxCollection<OnyxTypes.TransactionViolations>,
     isSingleTransactionView = false,
     transactionIDsPendingDeletion?: string[],
-    pdfsPaths?: Record<string, string>,
 ) {
     if (!transactionID) {
         return;
@@ -8304,7 +8303,7 @@ function deleteMoneyRequest(
 
     // STEP 3: Make the API request
     API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
-    clearPdfByOnyxKey(transactionID, pdfsPaths ?? {});
+    clearPdfByOnyxKey(transactionID);
 
     return urlToNavigateBack;
 }
@@ -8316,7 +8315,6 @@ function deleteTrackExpense(
     transactions: OnyxCollection<OnyxTypes.Transaction>,
     violations: OnyxCollection<OnyxTypes.TransactionViolations>,
     isSingleTransactionView = false,
-    pdfsPaths?: Record<string, string>,
 ) {
     if (!chatReportID || !transactionID) {
         return;
@@ -8327,7 +8325,7 @@ function deleteTrackExpense(
     // STEP 1: Get all collections we're updating
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
     if (!isSelfDM(chatReport)) {
-        deleteMoneyRequest(transactionID, reportAction, transactions, violations, isSingleTransactionView, undefined, pdfsPaths);
+        deleteMoneyRequest(transactionID, reportAction, transactions, violations, isSingleTransactionView);
         return urlToNavigateBack;
     }
 
@@ -8346,7 +8344,7 @@ function deleteTrackExpense(
 
     // STEP 6: Make the API request
     API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
-    clearPdfByOnyxKey(transactionID, pdfsPaths ?? {});
+    clearPdfByOnyxKey(transactionID);
 
     // STEP 7: Navigate the user depending on which page they are on and which resources were deleted
     return urlToNavigateBack;

src/libs/actions/Report.ts

@@ -1848,7 +1848,7 @@ function handleReportChanged(report: OnyxEntry<Report>) {
 }
 
 /** Deletes a comment from the report, basically sets it as empty string */
-function deleteReportComment(reportID: string | undefined, reportAction: ReportAction, pdfsPaths: Record<string, string>) {
+function deleteReportComment(reportID: string | undefined, reportAction: ReportAction) {
     const originalReportID = getOriginalReportID(reportID, reportAction);
     const reportActionID = reportAction.reportActionID;
 
@@ -1970,7 +1970,7 @@ function deleteReportComment(reportID: string | undefined, reportAction: ReportA
         reportActionID,
     };
 
-    clearByKey(reportActionID, pdfsPaths);
+    clearByKey(reportActionID);
 
     API.write(
         WRITE_COMMANDS.DELETE_COMMENT,
@@ -2036,13 +2036,7 @@ function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMar
 }
 
 /** Saves a new message for a comment. Marks the comment as edited, which will be reflected in the UI. */
-function editReportComment(
-    reportID: string | undefined,
-    originalReportAction: OnyxEntry<ReportAction>,
-    textForNewComment: string,
-    videoAttributeCache?: Record<string, string>,
-    pdfsPaths?: Record<string, string>,
-) {
+function editReportComment(reportID: string | undefined, originalReportAction: OnyxEntry<ReportAction>, textForNewComment: string, videoAttributeCache?: Record<string, string>) {
     const originalReportID = getOriginalReportID(reportID, originalReportAction);
     if (!originalReportID || !originalReportAction) {
         return;
@@ -2074,7 +2068,7 @@ function editReportComment(
 
     //  Delete the comment if it's empty
     if (!htmlForNewComment) {
-        deleteReportComment(originalReportID, originalReportAction, pdfsPaths ?? {});
+        deleteReportComment(originalReportID, originalReportAction);
         return;
     }
 

src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx

@@ -6,7 +6,6 @@ import React, {forwardRef, useCallback, useContext, useEffect, useImperativeHand
 import type {EmitterSubscription, GestureResponderEvent, NativeTouchEvent, View} from 'react-native';
 import {DeviceEventEmitter, Dimensions, InteractionManager} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {useOnyx} from 'react-native-onyx';
 import {Actions, ActionSheetAwareScrollViewContext} from '@components/ActionSheetAwareScrollView';
 import ConfirmModal from '@components/ConfirmModal';
 import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent';
@@ -17,7 +16,6 @@ import {deleteReportComment} from '@libs/actions/Report';
 import calculateAnchorPosition from '@libs/calculateAnchorPosition';
 import {getOriginalMessage, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {AnchorDimensions} from '@src/styles';
 import type {ReportAction} from '@src/types/onyx';
 import BaseReportActionContextMenu from './BaseReportActionContextMenu';
@@ -38,7 +36,6 @@ function extractPointerEvent(event: GestureResponderEvent | MouseEvent): MouseEv
 
 function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<ReportActionContextMenu>) {
     const {translate} = useLocalize();
-    const [pdfsPaths] = useOnyx(ONYXKEYS.CACHED_PDF_PATHS, {canBeMissing: true});
     const reportIDRef = useRef<string | undefined>(undefined);
     const typeRef = useRef<ContextMenuType | undefined>(undefined);
     const reportActionRef = useRef<NonNullable<OnyxEntry<ReportAction>> | null>(null);
@@ -298,19 +295,19 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         if (isMoneyRequestAction(reportAction)) {
             const originalMessage = getOriginalMessage(reportAction);
             if (isTrackExpenseAction(reportAction)) {
-                deleteTrackExpense(reportIDRef.current, originalMessage?.IOUTransactionID, reportAction, duplicateTransactions, duplicateTransactionViolations, false, pdfsPaths ?? {});
+                deleteTrackExpense(reportIDRef.current, originalMessage?.IOUTransactionID, reportAction, duplicateTransactions, duplicateTransactionViolations);
             } else {
-                deleteMoneyRequest(originalMessage?.IOUTransactionID, reportAction, duplicateTransactions, duplicateTransactionViolations, false, undefined, pdfsPaths ?? {});
+                deleteMoneyRequest(originalMessage?.IOUTransactionID, reportAction, duplicateTransactions, duplicateTransactionViolations);
             }
         } else if (reportAction) {
             InteractionManager.runAfterInteractions(() => {
-                deleteReportComment(reportIDRef.current, reportAction, pdfsPaths ?? {});
+                deleteReportComment(reportIDRef.current, reportAction);
             });
         }
 
         DeviceEventEmitter.emit(`deletedReportAction_${reportIDRef.current}`, reportAction?.reportActionID);
         setIsDeleteCommentConfirmModalVisible(false);
-    }, [pdfsPaths, duplicateTransactions, duplicateTransactionViolations]);
+    }, [duplicateTransactions, duplicateTransactionViolations]);
 
     const hideDeleteModal = () => {
         callbackWhenDeleteModalHide.current = () => (onCancelDeleteModal.current = runAndResetCallback(onCancelDeleteModal.current));