Hide Members option from non-workspace member #32857

marcaaron · 2023-12-11T20:16:07Z

Details

See this thread for details: https://expensify.slack.com/archives/C066HJM2CAZ/p1702002832829139

Fixed Issues

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

Tests

Create a new workspace
Create a workspace room with visibility "Public"
Invite a workspace member to the room
As the workspace member navigate to the report "Details" page
Verify they can see the "Members" option row
Invite a non-workspace member to the room
As the non-workspace member navigate to the report "Details" page
Verify they cannot see the "Members" option row
Try to navigate to this page directly. Verify it is not possible
Create a workspace room with visibility "Workspace"
Invite a workspace member to the room
As the workspace member navigate to the report "Details" page
Verify they can see the "Members" option row
Invite a non-workspace member to the room
As the non-workspace member navigate to the report "Details" page
Verify they cannot see the "Members" option row
Try to navigate to this page directly. Verify it is not possible
Create a workspace room with visibility "Private"
Invite a workspace member to the room
As the workspace member navigate to the report "Details" page
Verify they can see the "Members" option row
Invite a non-workspace member to the room
As the non-workspace member navigate to the report "Details" page
Verify they cannot see the "Members" option row
Try to navigate to this page directly. Verify it is not possible

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as test steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-12-11T20:16:13Z

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

marcaaron · 2023-12-11T22:14:16Z

Still need to get Android to build but this is ready for a review.

cubuspl42 · 2023-12-12T10:53:44Z

src/pages/ReportDetailsPage.js

@@ -105,7 +105,10 @@ function ReportDetailsPage(props) {
            return items;
        }

-        if ((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && (!ReportUtils.isPublicRoom(props.report) || isPolicyMember))) {
+        // The Members page is only shown when:
+        // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc


A tiny thing, but shouldn't it be "etc." instead of "etc"?

Okey, not necessarily I guess: https://en.wikipedia.org/wiki/Et_cetera

cubuspl42 · 2023-12-12T11:08:51Z

The code looks good, I'll start testing

cubuspl42 · 2023-12-12T14:11:37Z

Invite a workspace member to the room

We're missing a step of adding another user to this new workspace, don't we?

If you modify the steps, maybe you'll assign letters A/B/C to the users? And divide the steps like...

As user A:
- Create a workspace
- Invite user B to that workspace
- Do this... and that
As user B:
- Do...
As user A:
- Do this... and that

I think it will make it easier for the QA

cubuspl42 · 2023-12-12T15:20:18Z

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 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 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

(Full test flow, all users' perspectives)

hide-members-list-web.mp4

Mobile Web - Chrome

(workspace member's perspective)

Mobile Web - Safari

(workspace non-member's perspective)

Desktop

iOS

(workspace member's perspective)

hide-members-list-ios.mp4

Android

(workspace non-member's perspective)

hide-members-list-android-compressed.mp4

cubuspl42

Looks good 👍

melvin-bot · 2023-12-12T15:32:22Z

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

melvin-bot · 2023-12-12T15:32:26Z

🎯 @cubuspl42, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #32928.

grgia

LGTM, NAB comment so I'll let you decide if you'd like to merge @marcaaron

grgia · 2023-12-12T17:46:32Z

src/pages/ReportDetailsPage.js

+        // The Members page is only shown when:
+        // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc
+        // - The report is a user created room and the room and the current user is a workspace member i.e. non-workspace members should not see this option.
+        if ((!isUserCreatedPolicyRoom && participants.length) || (isUserCreatedPolicyRoom && isPolicyMember)) {


NAB but should we create a helper function that better describes these checks?

With the extra documentation here now it should be easier to understand the intended logic. In this case, it's nice to have the explanation on the report "details" page vs. abstracted somewhere.

marcaaron · 2023-12-13T03:32:49Z

@cubuspl42 Hey thanks for that feedback on the QA steps! It's always good to hear suggestions on what would make things easier for everyone. I'll try to take a crack at updating this tomorrow.

OSBotify · 2023-12-13T03:37:02Z

✋ 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 · 2023-12-13T11:31:19Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-13T11:52:02Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-13T12:19:36Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-14T15:26:19Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.12-2 🚀

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

marcaaron added 2 commits December 11, 2023 10:06

Hide Members option from non-workspace member

8ce8eb3

Hide Members page if deep linking and not policy member

ed8db59

marcaaron self-assigned this Dec 11, 2023

marcaaron requested a review from a team as a code owner December 11, 2023 20:16

melvin-bot bot requested review from cubuspl42 and removed request for a team December 11, 2023 20:16

cubuspl42 reviewed Dec 12, 2023

View reviewed changes

cubuspl42 approved these changes Dec 12, 2023

View reviewed changes

melvin-bot bot requested a review from grgia December 12, 2023 15:32

melvin-bot bot mentioned this pull request Dec 12, 2023

[hold for payment 2023-12-21] Payment issue for E/App PR#32857 #32928

Closed

grgia approved these changes Dec 12, 2023

View reviewed changes

marcaaron merged commit 7f7cfb3 into main Dec 13, 2023
18 of 24 checks passed

marcaaron deleted the marcaaron-hideMembersList branch December 13, 2023 03:32

github-actions bot mentioned this pull request Dec 13, 2023

[$500] Deploy Checklist: New Expensify 2023-12-13 #32963

Closed

64 tasks

mollfpr mentioned this pull request Jan 13, 2024

[$500] Room - Room member cannot see thread members when they are not part of the workspace #34440

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hide Members option from non-workspace member #32857

Hide Members option from non-workspace member #32857

marcaaron commented Dec 11, 2023 •

edited

Loading

melvin-bot bot commented Dec 11, 2023

marcaaron commented Dec 11, 2023

cubuspl42 Dec 12, 2023

cubuspl42 Dec 12, 2023 •

edited

Loading

cubuspl42 commented Dec 12, 2023

cubuspl42 commented Dec 12, 2023 •

edited

Loading

cubuspl42 commented Dec 12, 2023 •

edited

Loading

cubuspl42 left a comment

melvin-bot bot commented Dec 12, 2023

melvin-bot bot commented Dec 12, 2023

grgia left a comment

grgia Dec 12, 2023

marcaaron Dec 13, 2023

marcaaron commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 14, 2023

Hide Members option from non-workspace member #32857

Hide Members option from non-workspace member #32857

Conversation

marcaaron commented Dec 11, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 11, 2023

marcaaron commented Dec 11, 2023

cubuspl42 Dec 12, 2023

Choose a reason for hiding this comment

cubuspl42 Dec 12, 2023 • edited Loading

Choose a reason for hiding this comment

cubuspl42 commented Dec 12, 2023

cubuspl42 commented Dec 12, 2023 • edited Loading

cubuspl42 commented Dec 12, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

cubuspl42 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Dec 12, 2023

melvin-bot bot commented Dec 12, 2023

grgia left a comment

Choose a reason for hiding this comment

grgia Dec 12, 2023

Choose a reason for hiding this comment

marcaaron Dec 13, 2023

Choose a reason for hiding this comment

marcaaron commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 13, 2023

OSBotify commented Dec 14, 2023

marcaaron commented Dec 11, 2023 •

edited

Loading

cubuspl42 Dec 12, 2023 •

edited

Loading

cubuspl42 commented Dec 12, 2023 •

edited

Loading

cubuspl42 commented Dec 12, 2023 •

edited

Loading