[22523] Fix path calculation by Talha345 · Pull Request #25479 · Expensify/App

Talha345 · 2023-08-18T12:52:47Z

Details

This PR is an extension of #24483 since we are using query parameters in attachment URLs and the previous implementation only catered pretty URLs and removed any query params in the path.

Fixed Issues

$ #22523
$ #24483 (comment)

PROPOSAL:
Original Proposal: #22523 (comment)
Proposal for this PR: #24483 (comment)

Tests

Open a chat and send an attachment.
Open the attachment preview and copy the URL then send it in the chat.
Click the URL you send it in step 2.
The attachment should be previewed internally.

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

mweb.chrome.mp4

Mobile Web - Safari

safari.mov

Desktop

desktop1.mov

iOS

ios.mov

Android

Android build is stuck locally and taking a long time.Will update once it is done.

melvin-bot · 2023-08-18T12:52:52Z

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

Talha345 · 2023-08-18T12:53:10Z

@situchan @francoisl Please review.

situchan · 2023-08-18T12:58:59Z

-            expect(Url.getPathFromURL('http://foo.bar/?q=Test%20URL-encoded%20stuff')).toEqual('');
-            expect(Url.getPathFromURL('http://www.test.com/path?param=123#123')).toEqual('path');
+            expect(Url.getPathFromURL('http://foo.bar/?q=Test%20URL-encoded%20stuff')).toEqual('?q=Test%20URL-encoded%20stuff');
+            expect(Url.getPathFromURL('http://www.test.com/path?param=123#123')).toEqual('path?param=123');


#123 should not be removed

@situchan Done

situchan · 2023-08-18T13:15:09Z

    try {
-        const path = new URL(url).pathname;
+        const parsedUrl = new URL(url);
+        const path = parsedUrl.pathname + parsedUrl.search + parsedUrl.hash;


There should be better way to get full path just removing host. Can you research on that?

@situchan We can obviously just slice the URL string and remove the host and just return the path but imo this is a better approach since we actually parse the URL to check if the URL is valid or not and also encodes some characters into valid URL characters like '%20'.

If we just slice the string and remove the host and return the rest of the string that isn't very efficient and that is how it was actually done previously.

situchan · 2023-08-18T15:29:29Z

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 / Chrome
- iOS / native
- iOS / 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(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 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 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

Web

Screen.Recording.2023-08-18.at.9.26.07.PM.mov

Screen.Recording.2023-08-18.at.9.27.28.PM.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

situchan

Looks good. Sorry for not catching this earlier.

cc: @francoisl

ayazhussain79 · 2023-08-18T20:36:36Z

@situchan @Talha345 when clicking on deleted image url "notFound.goBackHome" is not showing in correct way it should be "Go back to Home page"

situchan · 2023-08-18T20:40:01Z

That should not be caused by this PR

situchan · 2023-08-18T20:41:49Z

@ayazhussain79 you should have commented on #23143. Seems like that PR is related to your screenshot.

ayazhussain79 · 2023-08-18T20:42:59Z

Well thank you I thought it might be because of this PR.

OSBotify · 2023-08-21T22:24:40Z

🚀 Deployed to staging by https://github.com/francoisl in version: 1.3.56-0 🚀

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

OSBotify · 2023-08-24T03:07:41Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

Talha345 added 2 commits August 18, 2023 01:29

Added query params to path and updated tests to reflect changes

0998d14

Added test for attachment URL

41d6b0c

Talha345 requested a review from a team as a code owner August 18, 2023 12:52

melvin-bot Bot requested review from situchan and removed request for a team August 18, 2023 12:52

situchan reviewed Aug 18, 2023

View reviewed changes

Added hash to path and fixed tests

045abfa

Talha345 requested a review from situchan August 18, 2023 13:13

situchan reviewed Aug 18, 2023

View reviewed changes

Talha345 requested a review from situchan August 18, 2023 13:20

Lint code

399c308

situchan approved these changes Aug 18, 2023

View reviewed changes

melvin-bot Bot requested a review from francoisl August 18, 2023 15:30

francoisl approved these changes Aug 18, 2023

View reviewed changes

francoisl merged commit 38e2f00 into Expensify:main Aug 18, 2023

OSBotify mentioned this pull request Aug 21, 2023

Deploy Checklist: New Expensify 2023-08-21 #25625

Closed

Conversation

Talha345 commented Aug 18, 2023 • 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 Aug 18, 2023

Uh oh!

Talha345 commented Aug 18, 2023

Uh oh!

situchan Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

Talha345 Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

situchan Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

Talha345 Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

situchan commented Aug 18, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

ayazhussain79 commented Aug 18, 2023

Uh oh!

situchan commented Aug 18, 2023

Uh oh!

situchan commented Aug 18, 2023

Uh oh!

ayazhussain79 commented Aug 18, 2023

Uh oh!

OSBotify commented Aug 21, 2023

Uh oh!

OSBotify commented Aug 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Talha345 commented Aug 18, 2023 •

edited

Loading