Fix join workspace flow #39991

nkdengineer · 2024-04-10T08:07:58Z

Details

Fixed Issues

$ #38959
PROPOSAL:

Tests

Open a workspace join link that we aren't a member of this
Verify that the workspace appear with requested label

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Open a workspace join link that we aren't a member of this
Verify that the workspace appear with requested label

Verify that no errors appear in the JS console

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-04-10.at.14.49.23.mov

Android: mWeb Chrome

Screen.Recording.2024-04-10.at.14.47.07.mov

iOS: Native

Screen.Recording.2024-04-10.at.14.50.56.mov

iOS: mWeb Safari

Screen.Recording.2024-04-10.at.14.42.35.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-10.at.14.39.23.mov

MacOS: Desktop

Screen.Recording.2024-04-10.at.14.52.23.mov

melvin-bot · 2024-04-10T08:08:17Z

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

DylanDylann · 2024-04-10T10:07:51Z

src/pages/workspace/WorkspaceJoinUserPage.tsx

@@ -39,7 +39,7 @@ function WorkspaceJoinUserPage({route, policy}: WorkspaceJoinUserPageProps) {
    }, []);

    useEffect(() => {
-        if (!policy || isUnmounted.current || isJoinLinkUsed) {
+        if (isUnmounted.current || isJoinLinkUsed) {


@nkdengineer Why do you remove this condition !policy ? Should we check isEmptyObject(policy) instead of removing it

@DylanDylann In the past we use getPolicy function which returns empty object by default so the check !policy is always false. Now, we're get policy from Onyx so we should remove this check that is preventing join workspace flow.

isEmptyObject(policy) also returns true for undefined or null.

DylanDylann · 2024-04-10T10:41:09Z

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

Screen.Recording.2024-04-11.at.15.06.29.mov

Android: mWeb Chrome

Screen.Recording.2024-04-11.at.15.08.15.mov

iOS: Native

Screen.Recording.2024-04-11.at.14.53.22.mov

iOS: mWeb Safari

Screen.Recording.2024-04-11.at.14.50.33.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-10.at.17.44.13.mov

MacOS: Desktop

DylanDylann · 2024-04-11T08:10:09Z

@nkdengineer BUG: Not found page display when clicking back button

Screen.Recording.2024-04-11.at.15.09.34.mov

nkdengineer · 2024-04-11T08:50:20Z

@DylanDylann Reverted to the previous version before we made getPolicy as local function and the result is the same. It's not related to this PR, I think we should handle it as separate issue.

Screen.Recording.2024-04-11.at.15.49.14.mov

DylanDylann · 2024-04-11T09:09:40Z

src/pages/workspace/WorkspaceJoinUserPage.tsx

            return;
        }
-        if (!isEmptyObject(policy)) {
+        if (!isEmptyObject(policy) && !policy?.isJoinRequestPending) {


@nkdengineer Why change here?

@DylanDylann After we request to join the workspace, policy will not be empty. So if we click the join link again, we will go to initial page. !policy?.isJoinRequestPending is added to prevent it. !isEmptyObject(policy) && !policy?.isJoinRequestPending is the same with isPolicyMember check.

OSBotify · 2024-04-11T15:40:52Z

✋ 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-04-18T04:58:05Z

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

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

mountiny · 2024-04-19T08:08:50Z

I believe we should have added a Design label on this one @Expensify/design 🦅 👁️

mountiny · 2024-04-19T08:10:55Z

Ah its probably already from some previous PR 🙈

shawnborton · 2024-04-19T11:21:05Z

Haha yup, I remember working with @narefyev91 on the badge styles for this one at least.

shawnborton · 2024-04-19T11:21:29Z

That being said, the table columns aren't lining up perfectly:

mountiny · 2024-04-20T18:17:53Z

that is what I meant haha

OSBotify · 2024-04-22T14:59:04Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

Fix join workspace flow

65829ea

nkdengineer marked this pull request as ready for review April 10, 2024 08:08

nkdengineer requested a review from a team as a code owner April 10, 2024 08:08

melvin-bot bot removed the request for review from a team April 10, 2024 08:08

melvin-bot bot requested a review from DylanDylann April 10, 2024 08:08

nkdengineer mentioned this pull request Apr 10, 2024

[HOLD for payment 2024-04-15] [$250] Remove deprecated ReportUtils.getPolicy() method #38959

Closed

DylanDylann reviewed Apr 10, 2024

View reviewed changes

nkdengineer mentioned this pull request Apr 10, 2024

[payment DUE] [$250] Don't show GBR to AM/guides for managed customer employee invitations #39659

Closed

6 tasks

Merge branch 'main' into fix/38959

fa0a393

fix go to inital page after requesting join

e3fa5ed

DylanDylann reviewed Apr 11, 2024

View reviewed changes

DylanDylann approved these changes Apr 11, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen April 11, 2024 13:13

tgolen approved these changes Apr 11, 2024

View reviewed changes

tgolen merged commit 8f90c25 into Expensify:main Apr 11, 2024
19 checks passed

github-actions bot mentioned this pull request Apr 18, 2024

Deploy Checklist: New Expensify 2024-04-18 #40392

Closed

lanitochka17 mentioned this pull request Apr 19, 2024

[Pay meow][$250] Workspace - Workspace type name is not showing in correct column #40524

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix join workspace flow #39991

Fix join workspace flow #39991

nkdengineer commented Apr 10, 2024 •

edited

Loading

melvin-bot bot commented Apr 10, 2024

DylanDylann Apr 10, 2024

nkdengineer Apr 10, 2024 •

edited

Loading

DylanDylann commented Apr 10, 2024 •

edited

Loading

DylanDylann commented Apr 11, 2024

nkdengineer commented Apr 11, 2024 •

edited

Loading

DylanDylann Apr 11, 2024

nkdengineer Apr 11, 2024 •

edited

Loading

OSBotify commented Apr 11, 2024

OSBotify commented Apr 18, 2024

mountiny commented Apr 19, 2024

mountiny commented Apr 19, 2024

shawnborton commented Apr 19, 2024

shawnborton commented Apr 19, 2024

mountiny commented Apr 20, 2024

OSBotify commented Apr 22, 2024

Fix join workspace flow #39991

Fix join workspace flow #39991

Conversation

nkdengineer commented Apr 10, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 10, 2024

DylanDylann Apr 10, 2024

Choose a reason for hiding this comment

nkdengineer Apr 10, 2024 • edited Loading

Choose a reason for hiding this comment

DylanDylann commented Apr 10, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Apr 11, 2024

nkdengineer commented Apr 11, 2024 • edited Loading

DylanDylann Apr 11, 2024

Choose a reason for hiding this comment

nkdengineer Apr 11, 2024 • edited Loading

Choose a reason for hiding this comment

OSBotify commented Apr 11, 2024

OSBotify commented Apr 18, 2024

mountiny commented Apr 19, 2024

mountiny commented Apr 19, 2024

shawnborton commented Apr 19, 2024

shawnborton commented Apr 19, 2024

mountiny commented Apr 20, 2024

OSBotify commented Apr 22, 2024

nkdengineer commented Apr 10, 2024 •

edited

Loading

nkdengineer Apr 10, 2024 •

edited

Loading

DylanDylann commented Apr 10, 2024 •

edited

Loading

nkdengineer commented Apr 11, 2024 •

edited

Loading

nkdengineer Apr 11, 2024 •

edited

Loading