Display blocking view and remove download button when user have no access to the report by Ahmed-Abdella · Pull Request #42312 · Expensify/App

Ahmed-Abdella · 2024-05-16T18:23:27Z

Details

Fixed Issues

$ #23374

$ PROPOSAL: #23374 comment

Tests

Open any chat room and send an image
Open the image and copy the link of the image
Login as a user who DOESN'T have access to that room
Navigate to the link you copied

Verify that no errors appear in the JS console

Offline tests

Same as above, just go offline before step 4

QA Steps

Same

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-18.at.5.27.25.AM.mov

Screen.Recording.2024-05-18.at.5.28.14.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-05-18.at.4.53.29.AM.1.mov

iOS: Native

Screen.Recording.2024-05-18.at.7.16.47.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-05-18.at.7.21.00.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-18.at.6.09.49.AM.1.mov

MacOS: Desktop

Screen.Recording.2024-05-18.at.6.53.11.AM.mov

…cess using reportID

melvin-bot · 2024-05-16T18:23:32Z

@parasharrajat 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]

github-actions · 2024-05-16T18:23:39Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

Ahmed-Abdella · 2024-05-16T18:45:24Z

Hi, @parasharrajat

I just used the report?.reportID here, waiting for your thoughts to how we should subscribe to the IS_LOADING_APP key. After this comment ,you said we may subscribe to the IS_LOADING_APP key ReportAttachments.tsx.

I have tried this before my solution but I found that we shouldn't use the Onyx.connect inside Components, we should use it inside utils, So I put it inside the Reportutils.ts.

If we want to subscribe to the key inside Components then I think we should use withOnyx, shouldn't we?

Please let me know your thoughts.

I will upload the screen records, and go through the PR Author Checklist again after finshing.

parasharrajat · 2024-05-16T18:42:37Z

                ComposerFocusManager.setReadyToFocus();
            }}
            onCarouselAttachmentChange={onCarouselAttachmentChange}
+            shouldShowNotFoundPage={!report?.reportID}


As suggested please use data from Onyx key.

we can directly subscribe to the key: ONYXKEYS.IS_LOADING_APP key on the ReportAttachments

We can subscribe to that key in this component.

Subscriping will be through the withOnyx function?

May be hook is better. useOnyx.

parasharrajat · 2024-05-16T18:46:30Z

                            />
                        )}
-                        {!isEmptyObject(report) && !isReceiptAttachment ? (
+                        {!isEmptyObject(report) && !isReceiptAttachment && !shouldShowNotFoundPage ? (


Let's wrap the whole view in a condition as !shouldShowNotFoundPage is common between both expressions of ternary. But we should test this thoroughly.

@parasharrajat Done

…ition

parasharrajat · 2024-05-16T19:39:58Z

                            />
                        )}
-                        {!isEmptyObject(report) && !isReceiptAttachment ? (
+                        {!shouldShowNotFoundPage && (!isEmptyObject(report) && !isReceiptAttachment ? (


This is now wrong.

could you please tell me what is exactly wrong about it, I tested it and it works just fine, like before wrapping. The whole view now is wrapped inside ( after !shouldShowNotFoundPage.

Oh, missed the (). All good here.

parasharrajat · 2024-05-17T20:02:04Z

                            />
                        )}
-                        {!isEmptyObject(report) && !isReceiptAttachment ? (
+                        {!shouldShowNotFoundPage && (!isEmptyObject(report) && !isReceiptAttachment ? (


Could you please format this a little differently? It is hard to see the (which makes it confusing.

parasharrajat · 2024-05-17T20:02:34Z

@Ahmed-Abdella Please add all videos in the checklist.

parasharrajat · 2024-05-17T20:02:55Z

Please sign the CLA #42312 (comment)

Ahmed-Abdella · 2024-05-18T00:03:36Z

I have read the CLA Document and I hereby sign the CLA

Ahmed-Abdella · 2024-05-18T04:49:17Z

As suggested please use data from Onyx key.
Could you please format this a little differently? It is hard to see the (which makes it confusing.
Please sign the CLA
Please add all videos in the checklist.

@parasharrajat All Done Now. Can't use Links in iOS: Native, Android: Native and MacOS: Desktop, So recorded normal uploading and openning attachments

One last thing:
After building the ios app, two files changed Podfile.lock and project.pbxproj
Should I push those changes or not?

parasharrajat · 2024-05-18T08:05:18Z

No don't push these files.

parasharrajat · 2024-05-20T20:33:47Z

Screenshots

🔲 iOS / native

Screen.Recording.2024-05-23.at.6.15.56.PM.mov

🔲 iOS / Safari

Screen.Recording.2024-05-23.at.6.03.22.PM.mov

🔲 MacOS / Desktop

Screen.Recording.2024-05-23.at.5.29.35.PM.mov

🔲 MacOS / Chrome

Screen.Recording.2024-05-23.at.5.29.35.PM.mov

🔲 Android / Chrome

Screen.Recording.2024-05-23.at.6.05.34.PM.mov

🔲 Android / native

Screen.Recording.2024-05-23.at.6.27.34.PM.mov

parasharrajat · 2024-05-23T13:03:12Z

Unfortunately, I wasn't able to open any accessible images on native devices as URLs from the web do not work.

I also noticed that there are two notFound UIs for attachments.

One is rendered from our changes.

App/src/components/AttachmentModal.tsx

Line 507 in aa9bbcf

<BlockingView

Another one is configured in the attachment carousel which is shown when somehow the image rendering fails (like when data is not available).

App/src/components/Attachments/AttachmentCarousel/index.tsx

Line 168 in aa9bbcf

<BlockingView

I think both are good.

parasharrajat

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.

🎀 👀 🎀 C+ reviewed

Ahmed-Abdella · 2024-05-29T00:15:37Z

@tylerkaraszewski friendly bump for review

Ahmed-Abdella · 2024-05-29T18:23:58Z

@tylerkaraszewski If you have time could you please merge this?

tylerkaraszewski · 2024-05-30T18:13:37Z

This has conflicts that need to be fixed now, sorry. Please update.

Ahmed-Abdella · 2024-05-30T20:05:43Z

@tylerkaraszewski solved now
@parasharrajat could you please check my changes again?

melvin-bot · 2024-05-30T22:00:22Z

@tylerkaraszewski looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

francoisl · 2024-05-30T22:31:53Z

Not an emergency - removing the label.

Follow-up PR to fix the linter error here #42878.

OSBotify · 2024-06-06T12:34:31Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

display blocking view and remove download button when user have no ac…

0315738

…cess using reportID

Ahmed-Abdella requested a review from a team as a code owner May 16, 2024 18:23

melvin-bot Bot requested review from parasharrajat and removed request for a team May 16, 2024 18:23

parasharrajat suggested changes May 16, 2024

View reviewed changes

Wrapping the whole attachment view inside shouldShowNotFoundPage cond…

5d90f64

…ition

parasharrajat reviewed May 16, 2024

View reviewed changes

using IS_LOADING_APP from Onyx beside reportID

e692ac1

parasharrajat suggested changes May 17, 2024

View reviewed changes

format the code to be more readable

a9352da

parasharrajat approved these changes May 23, 2024

View reviewed changes

melvin-bot Bot requested a review from tylerkaraszewski May 23, 2024 13:10

Ahmed-Abdella added 2 commits May 30, 2024 22:52

solve conflicts

bc863c6

remove unnecessary space

f7fbbe6

tylerkaraszewski approved these changes May 30, 2024

View reviewed changes

tylerkaraszewski merged commit 42e67e7 into Expensify:main May 30, 2024

melvin-bot Bot added the Emergency label May 30, 2024

This was referenced May 30, 2024

Investigate workflow job failing on main: lint / Run ESLint #42874

Closed

[HOLD for payment 2024-06-13] Investigate workflow job failing on main: confirmPassingBuild #42875

Closed

tylerkaraszewski mentioned this pull request May 30, 2024

Revert "Display blocking view and remove download button when user have no access to the report" #42877

Closed

francoisl mentioned this pull request May 30, 2024

Fix linter error on main #42878

Merged

48 of 50 tasks

francoisl removed the Emergency label May 30, 2024

github-actions Bot mentioned this pull request Jun 4, 2024

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

melvin-bot Bot mentioned this pull request Jun 6, 2024

[HOLD for payment 2024-06-13] [$500] Infinite loading spinner when trying to open a link to an Image that is in a room I have no access to. #23374

Closed

1 of 6 tasks

Conversation

Ahmed-Abdella commented May 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 16, 2024

Uh oh!

github-actions Bot commented May 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ahmed-Abdella commented May 16, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ahmed-Abdella May 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented May 17, 2024

Uh oh!

parasharrajat commented May 17, 2024

Uh oh!

Ahmed-Abdella commented May 18, 2024

Uh oh!

Ahmed-Abdella commented May 18, 2024

Uh oh!

parasharrajat commented May 18, 2024

Uh oh!

parasharrajat commented May 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

Uh oh!

parasharrajat commented May 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parasharrajat left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

Ahmed-Abdella commented May 29, 2024

Uh oh!

Ahmed-Abdella commented May 29, 2024

Uh oh!

tylerkaraszewski commented May 30, 2024

Uh oh!

Ahmed-Abdella commented May 30, 2024

Uh oh!

melvin-bot Bot commented May 30, 2024

Uh oh!

francoisl commented May 30, 2024

Uh oh!

OSBotify commented Jun 6, 2024

Uh oh!

Ahmed-Abdella commented May 16, 2024 •

edited

Loading

github-actions Bot commented May 16, 2024 •

edited

Loading

Ahmed-Abdella May 16, 2024 •

edited

Loading

parasharrajat commented May 20, 2024 •

edited

Loading

parasharrajat commented May 23, 2024 •

edited

Loading

parasharrajat left a comment •

edited

Loading