Filter out assigned guides from the policy members #16338

marcaaron · 2023-03-21T13:01:46Z

Details

Customers are confused about seeing guides in their workspaces so we are filtering them out.

Fixed Issues

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

Tests

Login as a non guide that has a guide (@team.expensify.com user) in their policy
Navigate to /workspace/[policy id]/members
Verify the guide is not visible in the policy members list
Login as the guide and verify that they can see the @team.expensify.com users in any assigned policies
Login as expensify.com and verify they can also see the @team.expensify.com users or @expensify.com users in any policies.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests, but internal I think.

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 / Chrome
- iOS / native
- iOS / 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 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 correct English and 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 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

MelvinBot · 2023-03-21T18:36:19Z

@thesahindia @marcochavezf One of you needs to 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]

thesahindia · 2023-03-22T19:48:41Z

I think it needs to reviewed internally? Or is there a way to get a guide account?

marcochavezf · 2023-03-23T18:33:23Z

src/pages/workspace/WorkspaceMembersPage.js

@@ -323,6 +325,19 @@ class WorkspaceMembersPage extends React.Component {
            || this.isKeywordMatch(member.firstName, searchValue)
            || this.isKeywordMatch(member.lastName, searchValue));

+        // eslint-disable-next-line arrow-body-style


NAB: We already have other arrow-body-style functions, so I think this is not needed.

Suggested change

// eslint-disable-next-line arrow-body-style

it's a disable next line not disable for the file.

I think you're right it's not needed though because the style is fine.

That comment is for when you want to use a curly brace for style reasons but the linter wants you to do it all on one line.

marcochavezf · 2023-03-23T19:13:15Z

Ah I'm a bit confused, afaik Guides can only be added to group policies, and group policies are not accessible in NewDot unless you enter in the browser /workspace/[policy id]/members, correct?

And if I access the Group policy in NewDot, I'm still seeing the @team.expensify.com members:

Also not sure if we should also hide the @team.expensify.com members from OldDot:

cc @sakluger

marcaaron · 2023-03-23T19:41:28Z

Ah I'm a bit confused, afaik Guides can only be added to group policies, and group policies are not accessible in NewDot unless you enter in the browser /workspace/[policy id]/members, correct?

@marcochavezf Not quite. Guides & SDRs can also be added as admins to the Workspaces of leads.

marcaaron · 2023-03-23T19:42:41Z

if I access the Group policy in NewDot, I'm still seeing the @team.expensify.com members

Signed in as what account? If you are logged in with an expensify.com or team.expensify.com domain user then you should be able to see the team.expensify.com accounts.

marcochavezf · 2023-03-23T19:50:30Z

@marcochavezf Not quite. Guides & SDRs can also be added as admins to the Workspaces of leads.

Oh should I add the Guide manually for Workspaces? Because the guide is not added, just when I create a group policy. Or maybe I'm missing something.

marcochavezf · 2023-03-23T19:51:39Z

Signed in as what account? If you are logged in with an expensify.com or team.expensify.com domain user then you should be able to see the team.expensify.com accounts.

I see, yeah I was using an expensify.com account, testing with a different account.

marcochavezf · 2023-03-23T20:02:45Z

Yes, with a non-expensify account the Guide account is not shown (only group policy):

For the Workspace I'm going to try to add manually the guide to the policy.

marcochavezf · 2023-03-23T20:28:29Z

I invited the Guide account to a Workspace policy it's not shown in the workspace members list:

But when I sign in with the Guide account to verify the @team.expensify.com users in any assigned policies, the Workspace doesn't appear. Not sure if I'm doing something wrong 🤔 :

marcaaron · 2023-03-23T21:42:35Z

We don't need to look at the members page with a group policy that is not really supported in NewDot.

But when I sign in with the Guide account to verify the @team.expensify.com users in any assigned policies, the Workspace doesn't appear. Not sure if I'm doing something wrong

Hmm... so I am not sure if adding the guide to a workspace in this way is the expected flow. The guides are added automatically and not manually added by users.

To try this out you can:

Create a guide account
Create a policy for a user here while signed in as the guide:

3. Then you can see that the guide can see themselves in the workspace members:

And the user who they created the policy for cannot

marcaaron · 2023-03-28T16:40:15Z

@marcochavezf can I get your review here please 🙏

marcochavezf · 2023-03-29T09:42:23Z

To try this out you can:

Create a guide account

Create a policy for a user here while signed in as the guide:

Oh cool, this worked. Testing on all platforms.

marcochavezf · 2023-03-29T10:03:37Z

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 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 correct English and 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 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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

OSBotify · 2023-03-29T10:23:24Z

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

mvtglobally · 2023-03-29T19:32:41Z

@marcaaron We are not able to login as guides. Can we only verify the first 3 steps only

OSBotify · 2023-03-29T20:23:31Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.2.92-0 🚀

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

marcaaron · 2023-03-30T09:42:20Z

I'll check do QA for this now thanks.

marcaaron · 2023-03-30T09:51:55Z

Ok tested a policy on staging and verified the team.expensify.com accounts and expensify.com are not showing....

OSBotify · 2023-03-31T11:09:12Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.2.92-2 🚀

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

s77rt · 2023-06-01T10:49:11Z

src/pages/workspace/WorkspaceMembersPage.js

+            // If this policy is owned by Expensify then show all support (expensify.com or team.expensify.com) emails
+            if (PolicyUtils.isExpensifyTeam(lodashGet(this.props.policy, 'owner'))) {
+                return;
+            }


This caused a "bug" #17252. The root cause was internal, just noting here for reference. If we delete the workspace the owner would be undefined and the PolicyUtils.isExpensifyTeam will crash.

marcaaron added 2 commits March 21, 2023 02:57

Filter out assigned guides from the policy members

e007b95

remove eslint disable rule

62082cb

marcaaron self-assigned this Mar 21, 2023

marcaaron added 2 commits March 21, 2023 07:32

disable for Expensify

45ffd35

Merge branch 'main' into marcaaron-hideAssignedGuides

aaa1024

marcaaron marked this pull request as ready for review March 21, 2023 18:35

marcaaron requested a review from a team as a code owner March 21, 2023 18:35

melvin-bot bot requested review from marcochavezf and thesahindia and removed request for a team March 21, 2023 18:36

fix trailing space

c27b780

marcochavezf reviewed Mar 23, 2023

View reviewed changes

remove unnecessary style

0f0f885

marcaaron requested a review from marcochavezf March 28, 2023 16:41

marcochavezf closed this Mar 29, 2023

marcochavezf reopened this Mar 29, 2023

marcochavezf approved these changes Mar 29, 2023

View reviewed changes

marcochavezf merged commit dfb2222 into main Mar 29, 2023

marcochavezf deleted the marcaaron-hideAssignedGuides branch March 29, 2023 10:18

OSBotify mentioned this pull request Mar 29, 2023

Deploy Checklist: New Expensify 2023-03-29 #16701

Closed

21 tasks

marcaaron removed the request for review from thesahindia April 3, 2023 19:40

s77rt reviewed Jun 1, 2023

View reviewed changes

s77rt mentioned this pull request Jun 1, 2023

[HOLD for payment 2023-06-01] [HOLD for payment] [$1000] Workspace - App crashed when delete Workspace on Web #17252

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Filter out assigned guides from the policy members #16338

Filter out assigned guides from the policy members #16338

marcaaron commented Mar 21, 2023 •

edited

Loading

MelvinBot commented Mar 21, 2023

thesahindia commented Mar 22, 2023

marcochavezf Mar 23, 2023

marcaaron Mar 23, 2023

marcaaron Mar 23, 2023

marcaaron Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcaaron commented Mar 23, 2023

marcaaron commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcaaron commented Mar 23, 2023

marcaaron commented Mar 28, 2023

marcochavezf commented Mar 29, 2023 •

edited

Loading

marcochavezf commented Mar 29, 2023 •

edited

Loading

OSBotify commented Mar 29, 2023

mvtglobally commented Mar 29, 2023

OSBotify commented Mar 29, 2023

marcaaron commented Mar 30, 2023

marcaaron commented Mar 30, 2023

OSBotify commented Mar 31, 2023

s77rt Jun 1, 2023

Filter out assigned guides from the policy members #16338

Filter out assigned guides from the policy members #16338

Conversation

marcaaron commented Mar 21, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Mar 21, 2023

thesahindia commented Mar 22, 2023

marcochavezf Mar 23, 2023

Choose a reason for hiding this comment

marcaaron Mar 23, 2023

Choose a reason for hiding this comment

marcaaron Mar 23, 2023

Choose a reason for hiding this comment

marcaaron Mar 23, 2023

Choose a reason for hiding this comment

marcochavezf commented Mar 23, 2023

marcaaron commented Mar 23, 2023

marcaaron commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcochavezf commented Mar 23, 2023

marcaaron commented Mar 23, 2023

marcaaron commented Mar 28, 2023

marcochavezf commented Mar 29, 2023 • edited Loading

marcochavezf commented Mar 29, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Mar 29, 2023

mvtglobally commented Mar 29, 2023

OSBotify commented Mar 29, 2023

marcaaron commented Mar 30, 2023

marcaaron commented Mar 30, 2023

OSBotify commented Mar 31, 2023

s77rt Jun 1, 2023

Choose a reason for hiding this comment

marcaaron commented Mar 21, 2023 •

edited

Loading

marcochavezf commented Mar 29, 2023 •

edited

Loading

marcochavezf commented Mar 29, 2023 •

edited

Loading