Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added check to make sure workspace chat report belongs to user #9213

Merged
merged 1 commit into from
Jun 3, 2022

Conversation

techievivek
Copy link
Contributor

@techievivek techievivek commented May 30, 2022

Details

When an admin creates a new workspace and invites a member when the member logs in the workspace chats are not shown to the user.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/211216

Tests

  1. Created a new workspace from an account that's on the policyExpenseChat beta (e.g @expensifail.com) since for DEV every betas are enabled by default we can use any account.
  2. To this newly created workspace added a member by going to Manage Members > Invite.
  3. CMD+F and search the member's name to navigate to their workspace chat.
  4. Write a couple of messages in the member's workspace chat, then log out of the admin account.
  5. Validated the newly added member account and logged in to NewDot.
  6. we now land in the workspace chat and we are able to see the messages sent by the admin.
  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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 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.

PR Reviewer Checklist

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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 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 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.

QA Steps

  1. Create a new workspace from an account that's on the policyExpenseChat beta (e.g using @expensifail.com)
  2. To this newly created workspace added a member by going to Manage Members > Invite.
  3. CMD+F and search the member's name to navigate to their workspace chat.
  4. Write a couple of messages in the member's workspace chat, then log out of the admin account.
  5. Validate the newly added member account and log in to the NewDot.
  6. You will now land in the workspace chat and will be able to see the messages sent by the admin.
  • Verify that no errors appear in the JS console

Screenshots

Web

1.New.Expensify.mp4

Mobile Web

Desktop

iOS

Android

@techievivek techievivek requested a review from a team as a code owner May 30, 2022 06:33
@techievivek techievivek requested a review from luacmartins May 30, 2022 06:33
@melvin-bot melvin-bot bot requested review from stitesExpensify and removed request for a team May 30, 2022 06:34
@techievivek
Copy link
Contributor Author

Will add the videos and update PR checklist in a while. Thanks

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good and tests well! Holding on checklist items and videos!

@techievivek
Copy link
Contributor Author

techievivek commented May 31, 2022

@luacmartins This is interesting while testing this on Android and IOS though they are invited members to a workspace FAB shows a workspace option. Is it normal or something is going wrong. Also when the user logged in the workspace chat in the App didn't open.
Screenshot_1654016948
Screenshot 2022-05-31 at 10 41 11 PM

3.New.Expensify.mp4

@luacmartins
Copy link
Contributor

Is it normal or something is going wrong. Also when the user logged in the workspace chat in the App didn't open.

I don't think neither of those are expected. Users that are invited should not see the New workspace in FAB and should be redirected to the Workspace chat.

@techievivek
Copy link
Contributor Author

techievivek commented Jun 1, 2022

Ok, so I looked into the issue and figured out that things are happening exactly the way they should happen but the only blocker is it is not redirecting to the workspace chat.

Screenshot 2022-06-01 at 11 34 19 AM

About showing the workspace option in the FAB menu it is as per the logic here.

I am not able to figure out why it is not redirecting to the workspace chat? In the logs, we can see that it is logging redirecting to workspace chat(Report id 238). To confirm this further I created a new account and logged into it and it didn't redirect to Concierge chat.

Also don't know if we have to show the new workspace option when FAB is clicked or not because the member is already part of a workspace chat. If we plan not to show then we will have to update the logic.

@techievivek techievivek self-assigned this Jun 1, 2022
@luacmartins
Copy link
Contributor

I am not able to figure out why it is not redirecting to the workspace chat? In the logs, we can see that it is logging redirecting to workspace chat(Report id 238). To confirm this further I created a new account and logged into it and it didn't redirect to Concierge chat.

This is weird and the only thing that I can think of is some bug with react-navigation or a race-condition somewhere.

About showing the workspace option in the FAB menu it is as per the logic here.

Hmm @trjExpensify can you confirm if first time users invited to a Workspace should see the New workspace option in FAB?

@techievivek
Copy link
Contributor Author

@luacmartins If you have any free time can you please look into the navigation part is it the same for you?

@luacmartins
Copy link
Contributor

I tried to test this again, but did not experience navigation issues. I'll go ahead and merge this and we can look again if the problem is not solved.

@luacmartins luacmartins self-requested a review June 3, 2022 14:47
@luacmartins luacmartins merged commit 36a3b39 into main Jun 3, 2022
@luacmartins luacmartins deleted the techievivek_workspace_welcome_bug branch June 3, 2022 14:48
@melvin-bot
Copy link

melvin-bot bot commented Jun 3, 2022

@luacmartins looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@melvin-bot melvin-bot bot added the Emergency label Jun 3, 2022
@luacmartins
Copy link
Contributor

Tests were passing. Not an emergency.

@OSBotify
Copy link
Contributor

OSBotify commented Jun 3, 2022

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@trjExpensify
Copy link
Contributor

Hmm @trjExpensify can you confirm if first time users invited to a Workspace should see the New workspace option in FAB?

Sorry for the delay, I've been OoO! I don't recall that getting locked down in N6 tbh.

@OSBotify
Copy link
Contributor

OSBotify commented Jun 6, 2022

🚀 Deployed to staging by @luacmartins in version: 1.1.72-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jun 8, 2022

🚀 Deployed to production by @yuwenmemon in version: 1.1.73-2 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants