[CP Staging] fix: allow make admin in paid workspace only #37808

nexarvo · 2024-03-06T01:10:43Z

Details

Fixed Issues

$ #37779
PROPOSAL: #37779 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

WhatsApp.Video.2024-03-06.at.12.40.23.PM.mp4

Android: mWeb Chrome

Free Workspace:

WhatsApp.Video.Free.WS.mp4

Paid Workspace:

WhatsApp.Video.Paid.WS.mp4

iOS: Native

WhatsApp.Video.2024-03-06.at.2.32.31.PM.mp4

iOS: mWeb Safari

Free Workspace:

WhatsApp.Video.2024-03-06.at.1.27.21.PM.mp4

Paid Workspace:

WhatsApp.Video.2024-03-06.at.1.27.22.PM.mp4

MacOS: Chrome / Safari

MacOS: Desktop

Free Workspace:

Paid Workspace:

melvin-bot · 2024-03-06T01:10:48Z

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

github-actions · 2024-03-06T01:10:56Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

mkhutornyi

We should also hide "Make member"
This is full code change I suggest:

+ if (PolicyUtils.isPaidGroupPolicy(policy) {
        if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.ADMIN)) {
            options.push({
                text: translate('workspace.people.makeMember'),
                value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_MEMBER,
                icon: Expensicons.User,
                onSelected: () => changeUserRole(CONST.POLICY.ROLE.USER),
            });
        }

        if (selectedEmployees.find((employee) => policyMembers?.[employee]?.role === CONST.POLICY.ROLE.USER)) {
            options.push({
                text: translate('workspace.people.makeAdmin'),
                value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_ADMIN,
                icon: Expensicons.MakeAdmin,
                onSelected: () => changeUserRole(CONST.POLICY.ROLE.ADMIN),
            });
        }
+ }

nexarvo · 2024-03-06T01:15:26Z

@mkhutornyi if we want to hide make member as well, then your suggestion will work fine. Making that change now

luacmartins

Agree with the other reviews, the only visible option should be to remove the user

mkhutornyi · 2024-03-06T01:17:12Z

As a new contributor, sign by commenting this:

_**I have read the CLA Document and I hereby sign the CLA**_

Also, all commits should be signed

nexarvo · 2024-03-06T01:40:08Z

I have read the CLA Document and I hereby sign the CLA

mkhutornyi · 2024-03-06T01:41:50Z

nexarvo · 2024-03-06T01:43:41Z

@mkhutornyi adding signatures

mkhutornyi · 2024-03-06T02:26:28Z

One commit is missing signature

mkhutornyi · 2024-03-06T02:29:01Z

src/pages/workspace/WorkspaceMembersPage.tsx

-                icon: Expensicons.MakeAdmin,
-                onSelected: () => changeUserRole(CONST.POLICY.ROLE.ADMIN),
-            });
+        if(PolicyUtils.isPaidGroupPolicy(policy)) {


Suggested change

if(PolicyUtils.isPaidGroupPolicy(policy)) {

if (PolicyUtils.isPaidGroupPolicy(policy)) {

this is done

Signed-off-by: usman-ghani564 <usmanghani564.ug9@gmail.com>

ishpaul777 · 2024-03-06T05:43:10Z

@usman-ghani564 we don't allow force pushing, if you want to sign older commits please see this for future reference https://expensify.slack.com/archives/C01GTK53T8Q/p1660778311856709

ishpaul777 · 2024-03-06T05:45: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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

VIDEO-2024-03-06-12-09-03.mp4

Android: mWeb Chrome

VIDEO-2024-03-06-11-45-30.mp4

iOS: Native

Screen.Recording.2024-03-06.at.12.11.20.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-03-06.at.11.33.38.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-06.at.11.27.08.AM.mov

MacOS: Desktop

Screen.Recording.2024-03-06.at.12.03.01.PM.mov

roryabraham · 2024-03-06T05:47:23Z

we don't allow force pushing

just to clarify, force pushing is technically allowed but discouraged unless there's a strong need, because it makes it harder for reviewers to see changes since their last review. retroactively signing commits would be a case where force-pushing might be necessary/appropriate

ishpaul777 · 2024-03-06T05:49:14Z

ah thanks for clarifying @roryabraham, in past someone told me its not allowed

ishpaul777 · 2024-03-06T06:10:18Z

@usman-ghani564 please run prettier lint is failing, also add videos for all platforms

nexarvo · 2024-03-06T09:35:54Z

@ishpaul777 prettier error are fixed now. Also, attached videos / screenshots as well.

ishpaul777

Looks good! 🟢

OSBotify · 2024-03-06T14:40:35Z

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

…id-ws-only-usmanghani564 [CP Staging] fix: allow make admin in paid workspace only (cherry picked from commit aaa1795)

OSBotify · 2024-03-06T18:26:10Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.4.47-8 🚀

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.

OSBotify · 2024-03-06T21:54:58Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.4.47-10 🚀

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

nexarvo requested a review from a team as a code owner March 6, 2024 01:10

melvin-bot bot requested review from ishpaul777 and removed request for a team March 6, 2024 01:10

mkhutornyi suggested changes Mar 6, 2024

View reviewed changes

nexarvo mentioned this pull request Mar 6, 2024

[HOLD for payment 2024-03-14] [HOLD for payment 2024-03-13] Workspace - "Free" user is able to see "Admin Role" when WS is made as "Default" #37779

Closed

6 tasks

luacmartins requested changes Mar 6, 2024

View reviewed changes

nexarvo force-pushed the fix/37779-make-admin-paid-ws-only-usmanghani564 branch from fe48b2f to a27da67 Compare March 6, 2024 02:24

mkhutornyi reviewed Mar 6, 2024

View reviewed changes

nexarvo added 2 commits March 6, 2024 07:29

fix: allow make admin in paid workspace only

6bf6789

hide make-admin and make-member for free ws

ab129d0

Signed-off-by: usman-ghani564 <usmanghani564.ug9@gmail.com>

nexarvo force-pushed the fix/37779-make-admin-paid-ws-only-usmanghani564 branch from a27da67 to ab129d0 Compare March 6, 2024 02:29

add space after if

6528cf6

fix prettier issues

3014c83

ishpaul777 approved these changes Mar 6, 2024

View reviewed changes

melvin-bot bot requested a review from stitesExpensify March 6, 2024 09:41

luacmartins changed the title ~~fix: allow make admin in paid workspace only~~ [CP Staging] fix: allow make admin in paid workspace only Mar 6, 2024

luacmartins approved these changes Mar 6, 2024

View reviewed changes

luacmartins requested a review from mkhutornyi March 6, 2024 14:35

luacmartins merged commit aaa1795 into Expensify:main Mar 6, 2024
21 checks passed

OSBotify pushed a commit that referenced this pull request Mar 6, 2024

Merge pull request #37808 from usman-ghani564/fix/37779-make-admin-pa…

e793b48

…id-ws-only-usmanghani564 [CP Staging] fix: allow make admin in paid workspace only (cherry picked from commit aaa1795)

github-actions bot mentioned this pull request Mar 6, 2024

Deploy Checklist: New Expensify 2024-03-04 #37698

Closed

97 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] fix: allow make admin in paid workspace only #37808

[CP Staging] fix: allow make admin in paid workspace only #37808

nexarvo commented Mar 6, 2024 •

edited

Loading

melvin-bot bot commented Mar 6, 2024

github-actions bot commented Mar 6, 2024 •

edited

Loading

mkhutornyi left a comment

nexarvo commented Mar 6, 2024

luacmartins left a comment

mkhutornyi commented Mar 6, 2024

nexarvo commented Mar 6, 2024

mkhutornyi commented Mar 6, 2024

nexarvo commented Mar 6, 2024

mkhutornyi commented Mar 6, 2024

mkhutornyi Mar 6, 2024

nexarvo Mar 6, 2024

ishpaul777 commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited by luacmartins

Loading

roryabraham commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited

Loading

nexarvo commented Mar 6, 2024

ishpaul777 left a comment

OSBotify commented Mar 6, 2024

OSBotify commented Mar 6, 2024

OSBotify commented Mar 6, 2024

	if(PolicyUtils.isPaidGroupPolicy(policy)) {
	if (PolicyUtils.isPaidGroupPolicy(policy)) {

[CP Staging] fix: allow make admin in paid workspace only #37808

[CP Staging] fix: allow make admin in paid workspace only #37808

Conversation

nexarvo commented Mar 6, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 6, 2024

github-actions bot commented Mar 6, 2024 • edited Loading

mkhutornyi left a comment

Choose a reason for hiding this comment

nexarvo commented Mar 6, 2024

luacmartins left a comment

Choose a reason for hiding this comment

mkhutornyi commented Mar 6, 2024

nexarvo commented Mar 6, 2024

mkhutornyi commented Mar 6, 2024

nexarvo commented Mar 6, 2024

mkhutornyi commented Mar 6, 2024

mkhutornyi Mar 6, 2024

Choose a reason for hiding this comment

nexarvo Mar 6, 2024

Choose a reason for hiding this comment

ishpaul777 commented Mar 6, 2024 • edited Loading

ishpaul777 commented Mar 6, 2024 • edited by luacmartins Loading

Reviewer Checklist

Screenshots/Videos

roryabraham commented Mar 6, 2024 • edited Loading

ishpaul777 commented Mar 6, 2024 • edited Loading

ishpaul777 commented Mar 6, 2024 • edited Loading

nexarvo commented Mar 6, 2024

ishpaul777 left a comment

Choose a reason for hiding this comment

OSBotify commented Mar 6, 2024

OSBotify commented Mar 6, 2024

OSBotify commented Mar 6, 2024

nexarvo commented Mar 6, 2024 •

edited

Loading

github-actions bot commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited by luacmartins

Loading

roryabraham commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited

Loading

ishpaul777 commented Mar 6, 2024 •

edited

Loading