[CP Staging] fix: workspace member is removable when he is the report owner #50870

dominictb · 2024-10-16T09:19:39Z

Details

Fixed Issues

$ #48931
$ #50771
PROPOSAL:

Tests

As admin, create a workspace and invite a member
Go to workspace chat with that member
Click on the chat header > Members
Press the invited member
Verify Remove from chat button is disabled
Go back to Members list, press the admin
Verify Remove from chat button is disabled

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

See Tests

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

Android: mWeb Chrome

Screen.Recording.2024-10-16.at.17.59.38.mov

iOS: Native

Screen.Recording.2024-10-16.at.17.54.51.mov

iOS: mWeb Safari

Screen.Recording.2024-10-16.at.17.57.05.mov

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-10-16T11:00:40Z

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

dominictb · 2024-10-16T11:01:58Z

@eVoloshchak Please check this as a regression from #48931.

dominictb · 2024-10-16T11:06:16Z

I can't login on Android, it always tells Couldn't retrieve account details. Please try to sign in again.. Will try again later.

allgandalf · 2024-10-16T20:23: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: 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-10-17.at.2.26.21.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-10-17.at.2.25.07.AM.mov

iOS: Native

Screen.Recording.2024-10-17.at.2.27.04.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-10-17.at.2.28.11.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-17.at.2.22.19.AM.mov

Screen.Recording.2024-10-17.at.2.21.36.AM.mov

MacOS: Desktop

Screen.Recording.2024-10-17.at.2.24.02.AM.mov

allgandalf · 2024-10-16T20:30:20Z

src/libs/PolicyUtils.ts

+ */
+const isUserPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, login?: string) => !!(policy && policy.employeeList && login && policy.employeeList[login]?.role === CONST.POLICY.ROLE.ADMIN);
+
 /**


Why are we introducing a new check here ?, we already have a util which checks this:

App/src/libs/PolicyUtils.ts

Lines 197 to 201 in 0b3569a

/**

* Checks if the current user is an admin of the policy.

*/

const isPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, currentUserLogin?: string): boolean => getPolicyRole(policy, currentUserLogin) === CONST.POLICY.ROLE.ADMIN;

This will break the checklist check:

I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)

Unless i am missing something there

Ohh i get it now, the end user in this case, No worries, sorry for the confusion

allgandalf · 2024-10-16T20:37:00Z

@marcaaron is this expected that normal user can remove member from workspace ? the screenshot from @dominictb contains this screenshot

allgandalf · 2024-10-16T20:39:56Z

@marcaaron in @dominictb screenshots, he has indicated that if a member opens up the participants page he would be able to remove another member in the chat, we block this action only when the current user is admin, is this expected?

marcaaron · 2024-10-16T20:44:58Z

@allgandalf Can you list out the exact steps that lead to whatever you think the bug is?

in the steps from the description it says from the perspective of the admin so I'm not sure what you mean by "if a member opens up the participants page he would be able to remove another member in the chat".

allgandalf · 2024-10-16T20:50:22Z

Ohh actually @marcaaron nevermind, I read both the issues and got to know the context, by screenshots of @dominictb i got the feeling that the remove member option is visible to members too, but alright now thanks :)

allgandalf

LGTM!

fix: workspace member is removable when he is the report owner (cherry picked from commit d03e796) (CP triggered by marcaaron)

OSBotify · 2024-10-16T21:18:12Z

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

github-actions · 2024-10-16T22:26:29Z

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 9.0.49-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2024-10-17T01:47:30Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.49-2 🚀

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

dominictb added 2 commits October 16, 2024 16:17

fix: workspace member is removeable when he is the report owner

fb95ea3

check arbitrary buser's role instead of current user

93c573b

dominictb marked this pull request as ready for review October 16, 2024 11:00

dominictb requested a review from a team as a code owner October 16, 2024 11:00

melvin-bot bot requested review from eVoloshchak and removed request for a team October 16, 2024 11:00

marcaaron requested review from allgandalf and removed request for eVoloshchak October 16, 2024 19:37

marcaaron assigned dominictb Oct 16, 2024

allgandalf reviewed Oct 16, 2024

View reviewed changes

allgandalf approved these changes Oct 16, 2024

View reviewed changes

melvin-bot bot requested a review from madmax330 October 16, 2024 20:59

marcaaron requested review from marcaaron and removed request for madmax330 October 16, 2024 21:05

marcaaron approved these changes Oct 16, 2024

View reviewed changes

marcaaron merged commit d03e796 into Expensify:main Oct 16, 2024
20 of 23 checks passed

marcaaron changed the title ~~fix: workspace member is removable when he is the report owner~~ [CP Staging] fix: workspace member is removable when he is the report owner Oct 16, 2024

OSBotify pushed a commit that referenced this pull request Oct 16, 2024

Merge pull request #50870 from dominictb/fix/50771

4f34b9a

fix: workspace member is removable when he is the report owner (cherry picked from commit d03e796) (CP triggered by marcaaron)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Oct 16, 2024

github-actions bot mentioned this pull request Oct 16, 2024

Deploy Checklist: New Expensify 2024-10-15 #50764

Closed

71 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] fix: workspace member is removable when he is the report owner #50870

[CP Staging] fix: workspace member is removable when he is the report owner #50870

dominictb commented Oct 16, 2024 •

edited

Loading

melvin-bot bot commented Oct 16, 2024

dominictb commented Oct 16, 2024

dominictb commented Oct 16, 2024

allgandalf commented Oct 16, 2024 •

edited

Loading

allgandalf Oct 16, 2024

allgandalf Oct 16, 2024

allgandalf Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf commented Oct 16, 2024

marcaaron commented Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf left a comment

OSBotify commented Oct 16, 2024

github-actions bot commented Oct 16, 2024

github-actions bot commented Oct 17, 2024

	/**
	* Checks if the current user is an admin of the policy.
	*/
	const isPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, currentUserLogin?: string): boolean => getPolicyRole(policy, currentUserLogin) === CONST.POLICY.ROLE.ADMIN;

[CP Staging] fix: workspace member is removable when he is the report owner #50870

[CP Staging] fix: workspace member is removable when he is the report owner #50870

Conversation

dominictb commented Oct 16, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 16, 2024

dominictb commented Oct 16, 2024

dominictb commented Oct 16, 2024

allgandalf commented Oct 16, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf Oct 16, 2024

Choose a reason for hiding this comment

allgandalf Oct 16, 2024

Choose a reason for hiding this comment

allgandalf Oct 16, 2024

Choose a reason for hiding this comment

allgandalf commented Oct 16, 2024

allgandalf commented Oct 16, 2024

marcaaron commented Oct 16, 2024

allgandalf commented Oct 16, 2024

allgandalf left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 16, 2024

github-actions bot commented Oct 16, 2024

github-actions bot commented Oct 17, 2024

dominictb commented Oct 16, 2024 •

edited

Loading

allgandalf commented Oct 16, 2024 •

edited

Loading