Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: PDF is not cached #32678

Merged
merged 18 commits into from
Feb 28, 2024
Merged

Fix: PDF is not cached #32678

merged 18 commits into from
Feb 28, 2024

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Dec 7, 2023

Details

PDF files are not cached. This PR fixes that.

Fixed Issues

$ #32232
PROPOSAL: #32232 (comment)

Tests

Native only:

  1. Send a large PDF
  2. Open it (the file loading is long)
  3. Close the modal and reopen it
  4. Verify the file is served almost instantly
  5. Log out then login
  6. Open the attachment
  7. Verify that it is loading for a while

We can verify in the Cache folder of the app on native device that the cached PDF file is removed after logging out. We can manually log the file path in finishPDFLoad function to see where it's stored.

  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Native only:

  1. Send a large PDF
  2. Open it (the file loading is long)
  3. Close the modal and reopen it
  4. Verify the file is served almost instantly
  5. Log out then login
  6. Open the attachment
  7. Verify that it is loading for a while
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
      • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Screen.Recording.2023-12-07.at.22.57.03-compressed.mov
Android: mWeb Chrome
iOS: Native
Screen.Recording.2023-12-07.at.22.53.29-compressed.mov
Screen.Recording.2023-12-07.at.22.54.07-compressed.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2023-12-07.at.22.50.55-compressed.mov
MacOS: Desktop

@tienifr tienifr marked this pull request as ready for review December 7, 2023 16:50
@tienifr tienifr requested a review from a team as a code owner December 7, 2023 16:50
@melvin-bot melvin-bot bot requested review from getusha and removed request for a team December 7, 2023 16:50
Copy link

melvin-bot bot commented Dec 7, 2023

@getusha Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@tienifr
Copy link
Contributor Author

tienifr commented Dec 7, 2023

We don't have to manually clear the cached PDF because the app's Cached folder in native device is automatically cleared after logging out.

@@ -155,7 +155,7 @@ class PDFView extends Component {
fitPolicy={0}
trustAllCerts={false}
renderActivityIndicator={() => <FullScreenLoadingIndicator />}
source={{uri: this.props.sourceURL}}
source={{uri: this.props.sourceURL, cache: true, expiration: 864000}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tienifr I think we should raise a discussion for the expiration interval. IMO 12 hours should be good.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Raised discussion on Slack.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

another question: will the cache be removed when attachment is deleted from the chat?

Copy link
Contributor Author

@tienifr tienifr Dec 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will the cache be removed when attachment is deleted from the chat

Seems like it does not. But it still gets removed when we logged out.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it does not. But it still gets removed when we logged out.

We should clear the cache when the attachment is deleted, and i am not sure how this will work incase of protected pdf i am checking.

@getusha
Copy link
Contributor

getusha commented Dec 18, 2023

@tienifr any updates on #32678 (comment)?

@tienifr
Copy link
Contributor Author

tienifr commented Dec 20, 2023

Working on it. Seems like we still need Onyx.

@getusha
Copy link
Contributor

getusha commented Jan 6, 2024

@tienifr Any updates?

@tienifr
Copy link
Contributor Author

tienifr commented Jan 6, 2024

Code changes seem good but I'm trying to refactor to make it as short as possible.

@getusha
Copy link
Contributor

getusha commented Jan 16, 2024

@tienifr any updates on this?

@tienifr
Copy link
Contributor Author

tienifr commented Jan 16, 2024

I'm sorry will get this done today.

@getusha
Copy link
Contributor

getusha commented Jan 23, 2024

@tienifr could we please get an update? ty!

@tienifr
Copy link
Contributor Author

tienifr commented Jan 24, 2024

@getusha Sorry for the delay. This is ready for review.

@getusha
Copy link
Contributor

getusha commented Jan 24, 2024

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Screen.Recording.2024-01-26.at.1.35.08.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-01-26.at.2.12.53.PM.mov
iOS: Native
Screen.Recording.2024-01-24.at.7.24.21.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-01-26.at.2.26.06.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-01-26.at.2.08.21.PM.mov
MacOS: Desktop
Screen.Recording.2024-02-28.at.9.50.50.AM.mov

@getusha
Copy link
Contributor

getusha commented Jan 24, 2024

@tienifr looks like we've got a conflict.

exists(path).then((exist) => {
if (!exist) {
resolve();
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets also update the list stored in Onyx

            if (pdfPaths[path]) {
                delete pdfPaths[path];
                Onyx.set(ONYXKEYS.CACHED_PDF_PATHS, pdfPaths);
            }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I already did that in the caller fucntion here and here.

@getusha
Copy link
Contributor

getusha commented Jan 24, 2024

There is also another case, when the pdf cached is sent from the other user and it gets deleted.

@tienifr
Copy link
Contributor Author

tienifr commented Jan 25, 2024

@getusha I think that is infeasible. We don't even need to remove cache when delete attachment. IMO, the expiration time alone is enough for this. What do you think?

@getusha
Copy link
Contributor

getusha commented Jan 31, 2024

@tienifr any updates, looks like we've got a merge conflict.

@getusha
Copy link
Contributor

getusha commented Feb 4, 2024

@tienifr gentle bump :)

@getusha
Copy link
Contributor

getusha commented Feb 8, 2024

@tienifr any updates?

@tienifr
Copy link
Contributor Author

tienifr commented Feb 8, 2024

I'm working on it. Wrapping up today.

@getusha
Copy link
Contributor

getusha commented Feb 11, 2024

@tienifr lets get this done this week.

@tienifr
Copy link
Contributor Author

tienifr commented Feb 15, 2024

Sorry I've been OOO the last week. This gets quite complicated and may introduce unnecessary and risky changes. Give me a day or two to do some tests.

@getusha
Copy link
Contributor

getusha commented Feb 22, 2024

@tienifr we must complete this, this week 😄

@tienifr
Copy link
Contributor Author

tienifr commented Feb 24, 2024

@getusha I took a look at react-native-pdf's source code. The caching mechanism there is too simple. Whenever you open a file, it will check if the cache is expired then delete it and re-cache a new file. That means the cached file, once created, never goes away unless we log out. And the expiration here is the time to cache a new file, not to completely remove it from memory. By that, we can verify that we will never have many duplicated caches for the same file.

So if we want to remove the cache when expiration is over, we need to implement it ourself. The implementation is:

  1. When any PDF file is loaded, we check every single cached paths in Onyx to see if they are expired (based on the file's last modified time metadata)
  2. If yes, then remove it from memory

IMO, the implementation is quite complicated and not a good ROI (i.e. not brings much value). We'd better keep it simple and let they all be wiped out when signed out. What do you think? Do you want to go with it anw?

@getusha
Copy link
Contributor

getusha commented Feb 24, 2024

IMO, the implementation is quite complicated and not a good ROI (i.e. not brings much value). We'd better keep it simple and let they all be wiped out when signed out. What do you think? Do you want to go with it anw?

I agree we should keep it simple, thanks for looking into that deeply.

@tienifr
Copy link
Contributor Author

tienifr commented Feb 26, 2024

TS check failure is on main and not related to this PR. I'll try to pull main today. If we don't need to improve anything, are we good to go? @getusha

@@ -153,6 +159,15 @@ function AttachmentView({
if ((_.isString(source) && Str.isPDF(source)) || (file && Str.isPDF(file.name || translate('attachmentView.unknownFilename')))) {
const encryptedSourceUrl = isAuthTokenRequired ? addEncryptedAuthTokenToURL(source) : source;

const onPDFLoadComplete = (path) => {
if (isUsedInCarousel && reportActionID && path) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this? isUsedInCarousel, logged pdfPaths and it is not storing the paths anymore due to this condition.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's my fault. I removed it.

@tienifr
Copy link
Contributor Author

tienifr commented Feb 26, 2024

@getusha I also handled the case of deleting iou request with PDF receipt.

Copy link
Contributor

@MonilBhavsar MonilBhavsar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looks good to me

@MonilBhavsar MonilBhavsar merged commit b8e0989 into Expensify:main Feb 28, 2024
16 of 17 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 1.4.45-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.45-6 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants