feat: display members(admin) and profile only for collect group policy by ArekChr · Pull Request #36672 · Expensify/App

ArekChr · 2024-02-16T11:29:12Z

Details

This update removes the menu options for the free plan in the collect policy section. It also makes sure that only admins can see and use the members menu option.

Fixed Issues

$ #36606
PROPOSAL:

Tests

Free Policy - Member (Non-Admin)

Log in as a member under the free policy group.
Go to workspace settings.
Ensure only "Profile" is visible.

Free Policy - Admin

Log in as an admin under the free policy group.
Go to workspace settings.
Ensure "Profile," "Reimbursements," "Bills," "Invoices," "Travel," and "Members" are visible.

Collect Policy - Member (Non-Admin)

Log in as a member under the collect policy group.
Switch to the appropriate workspace if necessary.
Go to workspace settings.
Ensure only "Profile" is visible.

Collect Policy - Admin

Log in as an admin under the collect policy group.
Switch to the appropriate workspace if necessary.
Go to workspace settings.
Ensure "Profile" and "Members" are visible.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Free Policy - Member (Non-Admin)

Log in as a member under the free policy group.
Go to workspace settings.
Ensure only "Profile" is visible.

Free Policy - Admin

Log in as an admin under the free policy group.
Go to workspace settings.
Ensure "Profile," "Reimbursements," "Bills," "Invoices," "Travel," and "Members" are visible.

Collect Policy - Member (Non-Admin)

Log in as a member under the collect policy group.
Switch to the appropriate workspace if necessary.
Go to workspace settings.
Ensure only "Profile" is visible.

Collect Policy - Admin

Log in as an admin under the collect policy group.
Switch to the appropriate workspace if necessary.
Go to workspace settings.
Ensure "Profile" and "Members" are visible.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

collect policy - admin

free policy admin

Android: mWeb Chrome

iOS: Native

free policy admin

colect policy admin

iOS: mWeb Safari

MacOS: Chrome / Safari

collect policy (admin)

collect policy member

free policy admin

free policy member

MacOS: Desktop

collect:

free:

melvin-bot · 2024-02-16T13:08:06Z

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

rushatgabhane · 2024-02-17T03:30:53Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

rushatgabhane · 2024-02-17T03:35:15Z


+const isCollectPolicy = (policy: OnyxEntry<Policy> | EmptyObject): boolean => policy?.type === CONST.POLICY.TYPE.TEAM;
+
+const isFreePolicy = (policy: OnyxEntry<Policy> | EmptyObject): boolean => policy?.type === CONST.POLICY.TYPE.FREE;


There is a policy type Personal also. Should we show the protect items for policy type personal?

Asked here - https://expensify.slack.com/archives/C01GTK53T8Q/p1708141365502539

App/src/CONST.ts

Lines 1333 to 1334 in f8080a2

FREE: 'free',

PERSONAL: 'personal',

got confirmation here. the current logic looks good

rushatgabhane

LGTM

mountiny

Thank you!

OSBotify · 2024-02-20T19:03:18Z

✋ 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 · 2024-02-26T21:08:05Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.44-0 🚀

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

OSBotify · 2024-02-28T23:56:41Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

feat: display members(admin) and profile only for collect group policy

729abf6

ArekChr marked this pull request as ready for review February 16, 2024 13:08

ArekChr requested a review from a team as a code owner February 16, 2024 13:08

melvin-bot Bot requested review from rushatgabhane and removed request for a team February 16, 2024 13:08

rushatgabhane reviewed Feb 17, 2024

View reviewed changes

rushatgabhane approved these changes Feb 19, 2024

View reviewed changes

melvin-bot Bot requested a review from mountiny February 19, 2024 18:26

mountiny assigned ArekChr Feb 19, 2024

mountiny requested changes Feb 19, 2024

View reviewed changes

Comment thread src/pages/workspace/WorkspaceInitialPage.tsx Resolved

refactor: change & rename logic isCollectPolicy to isPaidPolicy

7d3eadd

lakchote mentioned this pull request Feb 20, 2024

[Simplified Collect][Workflows] Create main workflow page (App) #36345

Merged

50 tasks done

Merge branch 'main' into refactor/collect_ws_menu_items

3babafa

ArekChr requested a review from mountiny February 20, 2024 15:59

mountiny approved these changes Feb 20, 2024

View reviewed changes

mountiny merged commit e43a372 into Expensify:main Feb 20, 2024

github-actions Bot mentioned this pull request Feb 26, 2024

Deploy Checklist: New Expensify 2024-02-26 #37224

Closed

trjExpensify mentioned this pull request Mar 18, 2024

[Wave8] [Simplified Collect] Remove the free workspace menu items from collect workspace settings in NewDot #36606

Closed

Navigation Menu

Repository navigation

feat: display members(admin) and profile only for collect group policy - #36672

feat: display members(admin) and profile only for collect group policy#36672
mountiny merged 3 commits into
Expensify:mainfrom
ArekChr:refactor/collect_ws_menu_items

ArekChr commented Feb 16, 2024 •

edited

Loading

Uh oh!

melvin-bot Bot commented Feb 16, 2024

Uh oh!

rushatgabhane commented Feb 17, 2024 •

edited

Loading

Uh oh!

rushatgabhane Feb 17, 2024 •

edited

Loading

Uh oh!

rushatgabhane Feb 19, 2024

Uh oh!

rushatgabhane left a comment

Uh oh!

Uh oh!

mountiny left a comment

Uh oh!

OSBotify commented Feb 20, 2024

Uh oh!

OSBotify commented Feb 26, 2024

Uh oh!

OSBotify commented Feb 28, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants


		const isCollectPolicy = (policy: OnyxEntry<Policy> \| EmptyObject): boolean => policy?.type === CONST.POLICY.TYPE.TEAM;

		const isFreePolicy = (policy: OnyxEntry<Policy> \| EmptyObject): boolean => policy?.type === CONST.POLICY.TYPE.FREE;

Conversation

ArekChr commented Feb 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Feb 16, 2024

Uh oh!

rushatgabhane commented Feb 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

rushatgabhane Feb 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rushatgabhane Feb 19, 2024

Choose a reason for hiding this comment

Uh oh!

rushatgabhane left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Feb 20, 2024

Uh oh!

OSBotify commented Feb 26, 2024

Uh oh!

OSBotify commented Feb 28, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ArekChr commented Feb 16, 2024 •

edited

Loading

rushatgabhane commented Feb 17, 2024 •

edited

Loading

rushatgabhane Feb 17, 2024 •

edited

Loading