pop the deleted workspace page from navigation #21045

honnamkuan · 2023-06-19T15:26:23Z

@adamgrzybowski , @mountiny , @allroundexperts This PR is ready for review, thanks.

Details

When deleting workspace, pop the deleted workspace page from navigation stack, so that clicking back button does not route to the deleted workspace page link.

Fixed Issues

$ #20622
PROPOSAL: #20622 (comment)

Tests

Pre-requisite: Login with user with no existing workspace.

Click FAB "+" button
Create new workspace
Click on the top-right "three dots" button > Delete Workspace > Confirm Deletion
Click on the Back icon, validate "Hmm... It's not here" page is not shown

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Pre-requisite: Login with user with no existing workspace.

Click FAB "+" button
Create new workspace
Click on the top-right "three dots" button > Delete Workspace
Click on the Back icon, validate "Hmm... It's not here" page is not shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-06-19.at.11.22.57.PM.mov

Mobile Web - Chrome

Screen.Recording.2023-06-19.at.11.18.26.PM.mov

Mobile Web - Safari

Screen.Recording.2023-06-19.at.11.20.55.PM.mov

Desktop

Screen.Recording.2023-06-19.at.11.21.54.PM.mov

iOS

Screen.Recording.2023-06-19.at.11.19.56.PM.mov

Android

Screen.Recording.2023-06-19.at.11.16.14.PM.mov

melvin-bot · 2023-06-19T15:26:30Z

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

adamgrzybowski · 2023-06-19T15:39:24Z

LGTM 🚀

mountiny · 2023-06-19T15:40:38Z

@allroundexperts could you complete a checklist on this one!

@adamgrzybowski thanks for reviewing

allroundexperts · 2023-06-19T15:44:41Z

@allroundexperts could you complete a checklist on this one!

@adamgrzybowski thanks for reviewing

Sure @mountiny!

allroundexperts · 2023-06-19T15:46:19Z

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 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-06-20.at.12.20.43.AM.mov

Mobile Web - Chrome

Screen.Recording.2023-06-20.at.12.29.47.AM.mov

Mobile Web - Safari

Screen.Recording.2023-06-20.at.12.29.22.AM.mov

Desktop

Screen.Recording.2023-06-20.at.12.23.18.AM.mov

iOS

Screen.Recording.2023-06-20.at.12.37.57.AM.mov

Android

Screen.Recording.2023-06-20.at.12.34.06.AM.mov

allroundexperts

🚀 🚀 🚀

mountiny · 2023-06-19T20:23:16Z

Can we just confirm what the browser back button does after you have deleted the workspace? @honnamkuan @allroundexperts ?

allroundexperts · 2023-06-19T20:28:12Z

Screen.Recording.2023-06-20.at.1.27.12.AM.mov

@mountiny

mountiny · 2023-06-19T20:28:50Z

Legends, thanks!

WoLewicki · 2023-06-20T10:23:16Z

Wouldn't calling replace instead of goBack and navigate right after be better? I think it might be tricky to do many navigation actions one after another like that. Or am I missing something?

mountiny · 2023-06-20T19:45:15Z

@honnamkuan Could you test that proposal please, I agree this sounds more straightforwards.

OSBotify · 2023-06-21T02:26:55Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.30-0 🚀

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

honnamkuan · 2023-06-21T02:44:28Z

Happy to test it out, however I am unable to find replace() in

App/src/libs/Navigation/Navigation.js

Lines 217 to 229 in 342d4fd

    
           export default { 
        
               canNavigate, 
        
               navigate, 
        
               setParams, 
        
               dismissModal, 
        
               isActiveRoute, 
        
               getActiveRoute, 
        
               goBack, 
        
               isNavigationReady, 
        
               setIsNavigationReady, 
        
               getReportIDFromRoute, 
        
               getTopmostReportId, 
        
           };

or in the documentation https://github.com/Expensify/App/blob/main/contributingGuides/NAVIGATION.md

Is there something I missed?

WoLewicki · 2023-06-21T08:46:18Z

Yeah, we didn't need the straight replace action before, so we would have to add it.
I'd start with something like adding and using such method in Navigation.js:

function replace(route) {
    if (!canNavigate('replace', {route})) {
        return;
    }            
    navigationRef.current.dispatch(StackActions.replace(route));
}

Also, I don't have the option to create new workspace in FAB button. cc @mountiny is my account missing something?

mountiny · 2023-06-21T10:28:43Z

@WoLewicki Can you see the workspaces in Settings? The button is not showing if you already have created workspace

WoLewicki · 2023-06-21T11:12:25Z

Oh ok, after deleting the workspaces I can see the button, thanks.

OSBotify · 2023-06-22T16:54:33Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.30-5 🚀

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

pop the deleted workspace page from navigation

ba75873

honnamkuan requested a review from a team as a code owner June 19, 2023 15:26

melvin-bot bot requested review from allroundexperts and removed request for a team June 19, 2023 15:26

mountiny assigned honnamkuan Jun 19, 2023

mountiny self-requested a review June 19, 2023 15:36

Expensify deleted a comment from adamgrzybowski Jun 19, 2023

allroundexperts approved these changes Jun 19, 2023

View reviewed changes

mountiny approved these changes Jun 19, 2023

View reviewed changes

mountiny merged commit 9559a54 into Expensify:main Jun 19, 2023

OSBotify mentioned this pull request Jun 21, 2023

Deploy Checklist: New Expensify 2023-06-21 #21172

Closed

67 tasks

allroundexperts mentioned this pull request Jun 21, 2023

[HOLD for payment 2023-08-28] [Tracking Browser back button] [$1000] mWeb- Clicking on back button on Concierge after leaving the thread gives us access to the same thread again #20908

Closed

6 tasks

melvin-bot bot mentioned this pull request Jun 22, 2023

[HOLD for payment 2023-06-29] [$1000] After deletion of workspace, stuck on create WS and "Hmm... It's not here" Page #20622

Closed

6 tasks

honnamkuan deleted the 20622 branch September 25, 2023 03:52

pop the deleted workspace page from navigation #21045

pop the deleted workspace page from navigation #21045

Uh oh!

Conversation

honnamkuan commented Jun 19, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 19, 2023

Uh oh!

adamgrzybowski commented Jun 19, 2023

Uh oh!

mountiny commented Jun 19, 2023

Uh oh!

allroundexperts commented Jun 19, 2023

Uh oh!

allroundexperts commented Jun 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jun 19, 2023

Uh oh!

allroundexperts commented Jun 19, 2023

Uh oh!

mountiny commented Jun 19, 2023

Uh oh!

WoLewicki commented Jun 20, 2023

Uh oh!

mountiny commented Jun 20, 2023

Uh oh!

OSBotify commented Jun 21, 2023

Uh oh!

honnamkuan commented Jun 21, 2023

Uh oh!

WoLewicki commented Jun 21, 2023

Uh oh!

mountiny commented Jun 21, 2023

Uh oh!

WoLewicki commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

allroundexperts commented Jun 19, 2023 •

edited

Loading