Remove redundant and trailing slashes in route path #33444

tienifr · 2023-12-21T20:08:34Z

Details

This PR removes redundant (consecutive) and trailing slashes in route path.

Fixed Issues

$ #33205
PROPOSAL: #33205 (comment)

Tests

Press FAB >> Request money
Complete amount and choose participant steps
In confirmation screen, refresh the page
Press back
Verify amount screen shows
Type in browser URL with consecutive and trailing slashes (e.g. /settings///preferences//language/) >> Enter
Press back
Verify that the correct previous page shows

Verify that no errors appear in the JS console

Offline tests

QA Steps

Press FAB >> Request money
Complete amount and choose participant steps
In confirmation screen, refresh the page
Press back button
Verify amount screen shows

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2023-12-22.at.15.13.49-compressed.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2023-12-22.at.15.09.33-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-22.at.14.30.00-compressed.mov

Screen.Recording.2023-12-22.at.15.03.50-compressed.mov

MacOS: Desktop

Screen.Recording.2023-12-22.at.15.06.48-compressed.mov

Screen.Recording.2023-12-22.at.15.07.13-compressed.mov

melvin-bot · 2023-12-22T08:15:04Z

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

rushatgabhane · 2023-12-26T04:07:46Z

src/libs/Navigation/Navigation.ts

@@ -117,7 +117,7 @@ function getActiveRoute(): string {
 */
 function isActiveRoute(routePath: Route): boolean {
    // We remove First forward slash from the URL before matching
-    return getActiveRoute().substring(1) === routePath;
+    return getActiveRoute().substring(1) === routePath.replace(/\/{2,}/g, '/').replace(/\/$/, '');


The regex should be moved to CONST

rushatgabhane · 2023-12-28T07:14:29Z

src/ROUTES.ts

@@ -314,61 +314,61 @@ const ROUTES = {
        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) => `create/${iouType}/start/${transactionID}/${reportID}` as const,
    },
    MONEY_REQUEST_STEP_CONFIRMATION: {
-        route: 'create/:iouType/confirmation/:transactionID/:reportID/',
+        route: 'create/:iouType/confirmation/:transactionID/:reportID',
        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string) => `create/${iouType}/confirmation/${transactionID}/${reportID}/` as const,


@tienifr should we remove the trailing / from all getRoute?

Yes, let's please clean them all up.

rushatgabhane · 2024-01-08T14:02:11Z

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

mWeb

Screen.Recording.2024-01-08.at.19.36.04.mov

iOS: Native

MacOS: Chrome / Safari

Screen.Recording.2024-01-08.at.19.34.18.mov

rushatgabhane

LGTM

OSBotify · 2024-01-08T15:49:33Z

✋ 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 · 2024-01-09T05:36:54Z

🚀 Deployed to staging by https://github.com/tgolen in version: 1.4.23-0 🚀

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

OSBotify · 2024-01-10T06:04:09Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.23-4 🚀

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

tienifr added 3 commits December 21, 2023 16:39

remove trailing slash in route

747f3ad

remove redundant slashes in route

8a04fb1

global regex to replace all rendundant slashes

e7e7762

tienifr marked this pull request as ready for review December 22, 2023 08:14

tienifr requested a review from a team as a code owner December 22, 2023 08:14

melvin-bot bot requested review from rushatgabhane and removed request for a team December 22, 2023 08:15

tienifr mentioned this pull request Dec 22, 2023

[HOLD for payment 2024-01-17] [$500] Request Money - If user reloads the IOU details page and go back, the same IOU page is shown #33205

Closed

6 tasks

rushatgabhane reviewed Dec 26, 2023

View reviewed changes

tienifr added 3 commits December 27, 2023 14:19

Merge branch 'main' of https://github.com/tienifr/App into fix/33205

b021b87

add regex to CONST

1bdc866

fix lint

fa4a8e4

rushatgabhane reviewed Dec 28, 2023

View reviewed changes

tienifr added 4 commits January 3, 2024 14:45

Merge branch 'main' into fix/33205

2065167

remove trailing slash from getRoute

eec02f9

Merge branch 'main' into fix/33205

5395262

revert redundant changes

56f2445

rushatgabhane approved these changes Jan 8, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen January 8, 2024 14:07

tgolen approved these changes Jan 8, 2024

View reviewed changes

tgolen merged commit a9f541d into Expensify:main Jan 8, 2024
16 checks passed

github-actions bot mentioned this pull request Jan 9, 2024

Deploy Checklist: New Expensify 2024-01-09 #34121

Closed

87 tasks

lanitochka17 mentioned this pull request Jan 9, 2024

Language - Back button redirects to the same page when modifying link with slashes #34184

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove redundant and trailing slashes in route path #33444

Remove redundant and trailing slashes in route path #33444

tienifr commented Dec 21, 2023 •

edited

Loading

melvin-bot bot commented Dec 22, 2023

rushatgabhane Dec 26, 2023 •

edited

Loading

tienifr Dec 27, 2023 •

edited

Loading

rushatgabhane Dec 28, 2023

tgolen Dec 28, 2023

tienifr Jan 3, 2024

rushatgabhane commented Jan 8, 2024 •

edited

Loading

rushatgabhane left a comment

OSBotify commented Jan 8, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

Remove redundant and trailing slashes in route path #33444

Remove redundant and trailing slashes in route path #33444

Conversation

tienifr commented Dec 21, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 22, 2023

rushatgabhane Dec 26, 2023 • edited Loading

Choose a reason for hiding this comment

tienifr Dec 27, 2023 • edited Loading

Choose a reason for hiding this comment

rushatgabhane Dec 28, 2023

Choose a reason for hiding this comment

tgolen Dec 28, 2023

Choose a reason for hiding this comment

tienifr Jan 3, 2024

Choose a reason for hiding this comment

rushatgabhane commented Jan 8, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 8, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

tienifr commented Dec 21, 2023 •

edited

Loading

rushatgabhane Dec 26, 2023 •

edited

Loading

tienifr Dec 27, 2023 •

edited

Loading

rushatgabhane commented Jan 8, 2024 •

edited

Loading