Fix showing not found page after deleting a workspace #38488

WojtekBoman · 2024-03-18T16:01:55Z

Details

This PR fixes showing not found page after deleting a workspace.

Fixed Issues

$ #38301 (comment)
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Launch New Expensify app.
Go to Profile > Workspaces > any workspace.
Go to Profile.
Tap Delete.
Delete the workspace.
Verify that we navigated to the All workspaces page.

Offline tests

N/A

QA Steps

Same as tests

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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.

Screenshots/Videos

Android: Native

Screen.Recording.2024-03-21.at.15.35.08.mov

Android: mWeb Chrome

Screen.Recording.2024-03-21.at.15.36.51.mov

iOS: Native

Screen.Recording.2024-03-21.at.15.37.38.mov

iOS: mWeb Safari

Screen.Recording.2024-03-21.at.15.33.36.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-21.at.15.31.34.mov

MacOS: Desktop

Screen.Recording.2024-03-21.at.15.32.57.mov

melvin-bot · 2024-03-19T12:33:35Z

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

jayeshmangwani · 2024-03-20T08:53:00Z

@WojtekBoman Please upload Screenshots/Videos for all the platforms

WojtekBoman · 2024-03-20T14:02:12Z

@jayeshmangwani Done :)

jayeshmangwani · 2024-03-20T19:28:29Z

src/pages/workspace/WorkspacePageWithSections.tsx

@@ -143,7 +143,7 @@ function WorkspacePageWithSections({
            return true;
        }

-        return (!isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) || PolicyUtils.isPendingDeletePolicy(policy);
+        return !isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin;


This change will cause the regression

Go to the workspace that we going to delete

Press Reimbursements > Copy the URL

Press workspace Profile > Press Delete

Go to any chat paste the workspace reimbursements URL and send

Press the link, it will show the reimbursements page and we can edit the Rate

regression.mov

To understand clearly the output I am attaching staging result.

staging.mov

WojtekBoman · 2024-03-20T20:08:54Z

I've tried to reproduce that, but it seems to work fine. Am I doing something wrong? I've noticed on your video that you still have the deleted workspace on the list, for me it disappears right after deletion. I've merged the latest main into this branch, maybe it impacts somehow

Screen.Recording.2024-03-20.at.20.59.36.mov

jayeshmangwani · 2024-03-20T20:13:46Z

@WojtekBoman can you please try with below steps (I have updated the first step)

Go to the workspace that we going to delete > Now go offline
Press Reimbursements > Copy the URL
Press workspace Profile > Press Delete
Go to any chat paste the workspace reimbursements URL and send
Press the link, it will show the reimbursements page and we can edit the Rate

jayeshmangwani · 2024-03-20T20:15:29Z

You need to be offline to reproduce this issue

WojtekBoman · 2024-03-20T20:57:29Z

I've added the fix and now it should work fine in offline mode :) There is still one issue with the navigation history after deleting a workspace created from the workspace switcher, but it will no longer appear once I finish fixing this issue

Screen.Recording.2024-03-20.at.21.56.47.mov

It's also present on the main branch, so I believe we can go further with this

jayeshmangwani · 2024-03-21T12:55:38Z

It's also present on the main branch, so I believe we can go further with this

Thanks for fixing @WojtekBoman ,I also can reproduce this double navigation issue on the main branch

double-navigation.mov

jayeshmangwani · 2024-03-21T12:59:49Z

@WojtekBoman Can we please update the Tests steps like this:

Launch New Expensify app.
Go to Profile > Workspaces > any workspace.
Go to Profile.
Tap Delete.
Delete the workspace.
Verify that we navigated to the All workspaces page.

Note: your attached videos does not reflect the original steps of reproduction steps

jayeshmangwani · 2024-03-21T13:19:38Z

@mountiny At the time of testing the PR we're facing another issue and Same issue is happens on staging, so we've not handled this in this PR, steps to reproduce issue

Go to workspace switcher > create a workspace
Go to workspace profile > Delete
We are navigating to All workspaces > Press back button

Now we can see a not found page instead of the going back to Home page(Chats)

jayeshmangwani · 2024-03-21T13:20:21Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

Android.mov

Android: mWeb Chrome

mWeb-chrome.mov

iOS: Native

iOS.mov

iOS: mWeb Safari

mWeb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

jayeshmangwani

Added a comment here to update the test steps and except that change, code LGTM 🎉

cc: @mountiny

WojtekBoman · 2024-03-21T13:50:33Z

@WojtekBoman Can we please update the Tests steps like this:

Launch New Expensify app.

Go to Profile > Workspaces > any workspace.

Go to Profile.

Tap Delete.

Delete the workspace.

Verify that we navigated to the All workspaces page.

Note: your attached videos does not reflect the original steps of reproduction steps

You're right, thanks for noticing that! I've already updated the test steps in the description and I'll attach new videos :)

WojtekBoman · 2024-03-21T13:51:57Z

@mountiny At the time of testing the PR we're facing another issue and Same issue is happens on staging, so we've not handled this in this PR, steps to reproduce issue

Go to workspace switcher > create a workspace

Go to workspace profile > Delete

We are navigating to All workspaces > Press back button

Now we can see a not found page instead of the going back to Home page(Chats)

This issue will be fixed by this PR

OSBotify · 2024-03-21T14:40:28Z

✋ 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-03-22T16:21:36Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.4.56-0 🚀

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

OSBotify · 2024-03-27T04:50:45Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀

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

ishpaul777 · 2024-11-30T19:49:31Z

src/pages/workspace/WorkspacePageWithSections.tsx

@@ -143,7 +145,11 @@ function WorkspacePageWithSections({
            return true;
        }

-        return (!isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) || PolicyUtils.isPendingDeletePolicy(policy);
+        // We check isPendingDelete for both policy and prevPolicy to prevent the NotFound view from showing right after we delete the workspace


coming from #49093, we should use PolicyUtils.shouldShowPolicy to check if workspace is deleted or not, More detaills #49093 (comment)

WojtekBoman added 2 commits March 18, 2024 15:06

Fix shouldShow in WorkspacePageWithSections

f960ccc

Run prettier

7782d5e

WojtekBoman marked this pull request as ready for review March 19, 2024 12:33

WojtekBoman requested a review from a team as a code owner March 19, 2024 12:33

melvin-bot bot requested review from jayeshmangwani and removed request for a team March 19, 2024 12:33

Merge branch 'main' into fix/delete-workspace-not-found

c98834f

jayeshmangwani reviewed Mar 20, 2024

View reviewed changes

Merge branch 'main' into fix/delete-workspace-not-found

5ed9f31

Fix showing not found page after deleting workspace

d8184b4

mountiny assigned WojtekBoman Mar 21, 2024

mountiny self-requested a review March 21, 2024 12:15

jayeshmangwani approved these changes Mar 21, 2024

View reviewed changes

melvin-bot bot requested a review from pecanoro March 21, 2024 13:21

pecanoro approved these changes Mar 21, 2024

View reviewed changes

pecanoro merged commit 34731fe into Expensify:main Mar 21, 2024
17 checks passed

github-actions bot mentioned this pull request Mar 22, 2024

Deploy Checklist: New Expensify 2024-03-22 #38811

Closed

ishpaul777 reviewed Nov 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix showing not found page after deleting a workspace #38488

Fix showing not found page after deleting a workspace #38488

WojtekBoman commented Mar 18, 2024 •

edited

Loading

melvin-bot bot commented Mar 19, 2024

jayeshmangwani commented Mar 20, 2024

WojtekBoman commented Mar 20, 2024

jayeshmangwani Mar 20, 2024

jayeshmangwani Mar 20, 2024

WojtekBoman commented Mar 20, 2024

jayeshmangwani commented Mar 20, 2024

jayeshmangwani commented Mar 20, 2024

WojtekBoman commented Mar 20, 2024 •

edited

Loading

jayeshmangwani commented Mar 21, 2024

jayeshmangwani commented Mar 21, 2024

jayeshmangwani commented Mar 21, 2024

jayeshmangwani commented Mar 21, 2024

jayeshmangwani left a comment

WojtekBoman commented Mar 21, 2024

WojtekBoman commented Mar 21, 2024

OSBotify commented Mar 21, 2024

OSBotify commented Mar 22, 2024

OSBotify commented Mar 27, 2024

ishpaul777 Nov 30, 2024

Fix showing not found page after deleting a workspace #38488

Fix showing not found page after deleting a workspace #38488

Conversation

WojtekBoman commented Mar 18, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 19, 2024

jayeshmangwani commented Mar 20, 2024

WojtekBoman commented Mar 20, 2024

jayeshmangwani Mar 20, 2024

Choose a reason for hiding this comment

jayeshmangwani Mar 20, 2024

Choose a reason for hiding this comment

WojtekBoman commented Mar 20, 2024

jayeshmangwani commented Mar 20, 2024

jayeshmangwani commented Mar 20, 2024

WojtekBoman commented Mar 20, 2024 • edited Loading

jayeshmangwani commented Mar 21, 2024

jayeshmangwani commented Mar 21, 2024

jayeshmangwani commented Mar 21, 2024

jayeshmangwani commented Mar 21, 2024

Reviewer Checklist

Screenshots/Videos

jayeshmangwani left a comment

Choose a reason for hiding this comment

WojtekBoman commented Mar 21, 2024

WojtekBoman commented Mar 21, 2024

OSBotify commented Mar 21, 2024

OSBotify commented Mar 22, 2024

OSBotify commented Mar 27, 2024

ishpaul777 Nov 30, 2024

Choose a reason for hiding this comment

WojtekBoman commented Mar 18, 2024 •

edited

Loading

WojtekBoman commented Mar 20, 2024 •

edited

Loading