Workspace admin checkbox #29422

esh-g · 2023-10-12T10:07:18Z

Details

Since accountIDs are stored as keys on object, we need to cast it to a number while comparing with props.session.accountID.

Fixed Issues

$ #28539
PROPOSAL: #28539 (comment)

Tests

Create a new workspace.
Go to contact methods.
Add a new contact method and set it as your default.
Go to workspace members page.
Make sure we are not able to select the workspace admin (current user)

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create a new workspace.
Go to contact methods.
Add a new contact method and set it as your default.
Go to workspace members page.
Make sure we are not able to select the workspace admin (current user)

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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screen.Recording.2023-10-12.at.5.08.27.PM-1.mov

Android: mWeb Chrome

Screen.Recording.2023-10-12.at.5.19.10.PM-1.mov

iOS: Native

Screen.Recording.2023-10-12.at.7.07.02.PM.mov

iOS: mWeb Safari

Screen.Recording.2023-10-12.at.3.35.38.PM-1.mov

MacOS: Chrome / Safari

Screen.Recording.2023-10-12.at.3.17.40.PM-1.mov

MacOS: Desktop

Screen.Recording.2023-10-12.at.7.04.48.PM-1.mov

melvin-bot · 2023-10-12T10:07:23Z

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

esh-g · 2023-10-12T10:10:27Z

@parasharrajat I have set the key to string type of accountID for list because react recommends using strings as keys here: https://legacy.reactjs.org/docs/lists-and-keys.html#keys

esh-g · 2023-10-12T13:39:31Z

Added all the videos for the platforms as well

marcaaron · 2023-10-12T19:23:42Z

I think in these cases selectedEmployees is an array of "string IDs"

App/src/pages/workspace/WorkspaceMembersPage.js

Lines 74 to 79 in f8cf28b

    
           const [selectedEmployees, setSelectedEmployees] = useState([]); 
        
           const [removeMembersConfirmModalVisible, setRemoveMembersConfirmModalVisible] = useState(false); 
        
           const [errors, setErrors] = useState({}); 
        
           const [searchValue, setSearchValue] = useState(''); 
        
           const prevIsOffline = usePrevious(props.network.isOffline); 
        
           const accountIDs = useMemo(() => _.keys(props.policyMembers), [props.policyMembers]);

Can you please...

Go through this component and methods
Carefully debug and make sure that wherever there is an "accountID" reference that it is a Number
Wherever we compare an accountID to another one make sure they are numbers

parasharrajat · 2023-10-12T20:13:41Z

A hack, convert the file to TS and disable strict type checking... now you should be able to see type inferred for variables which might speed up analysis.

parasharrajat · 2023-10-13T09:15:02Z

Bump @esh-g in case you missed the above requests.

esh-g · 2023-10-13T11:22:10Z

Sorry for delay. Checking now

esh-g · 2023-10-13T12:48:13Z

@parasharrajat @marcaaron All the changes have been made, hope it looks good!

esh-g · 2023-10-13T13:55:01Z

Refactored a lot of places... let me know if anything is unclear

parasharrajat · 2023-10-13T15:38:38Z

Thanks, I will check it.

parasharrajat · 2023-10-16T05:28:04Z

LGTM...

parasharrajat · 2023-10-16T05:28:09Z

Screenshots

🔲 iOS / native

Screen.Recording.2023-10-16.at.6.17.27.PM.mov

🔲 iOS / Safari

Screen.Recording.2023-10-16.at.6.19.44.PM.mov

🔲 MacOS / Desktop

Screen.Recording.2023-10-16.at.3.22.58.PM.mov

🔲 MacOS / Chrome

Screen.Recording.2023-10-16.at.10.55.47.AM.mov

🔲 Android / Chrome

Screen.Recording.2023-10-16.at.6.12.08.PM.mov

🔲 Android / native

Screen.Recording.2023-10-16.at.6.22.16.PM.mov

parasharrajat · 2023-10-16T11:04:29Z

@esh-g Please merge main.

esh-g · 2023-10-16T11:15:04Z

@parasharrajat Merged main

parasharrajat

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

🎀 👀 🎀 C+ reviewed

esh-g · 2023-10-16T13:27:11Z

Bump @marcaaron 😇

marcaaron

Looks great, thanks!

OSBotify · 2023-10-16T20:34:57Z

✋ 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-10-16T21:47:30Z

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

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

OSBotify · 2023-10-17T23:12:15Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.85-4 🚀

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

OSBotify · 2023-10-17T23:58:15Z

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

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

OSBotify · 2023-10-18T23:55:45Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

esh-g added 2 commits October 12, 2023 15:22

Set accountID to number

05d8890

Set list key to string

eb6e9c2

esh-g requested a review from a team as a code owner October 12, 2023 10:07

melvin-bot bot requested review from parasharrajat and removed request for a team October 12, 2023 10:07

Fix lint

f8cf28b

esh-g mentioned this pull request Oct 12, 2023

[HOLD for payment 2023-10-24] [$500] Workspace - Admin Checkbox in Members Section Ticked When Changing Contact Method #28539

Closed

6 tasks

esh-g added 3 commits October 13, 2023 17:40

Convert accountID to number

36409d3

convert accountIDs to Number

5513483

Fix lint

5fb957c

Merge branch 'main' into workspace-admin-checkbox

6891b3c

parasharrajat approved these changes Oct 16, 2023

View reviewed changes

melvin-bot bot requested a review from marcaaron October 16, 2023 12:53

marcaaron approved these changes Oct 16, 2023

View reviewed changes

marcaaron merged commit 7eca60b into Expensify:main Oct 16, 2023
12 checks passed

marcaaron assigned esh-g Oct 16, 2023

OSBotify mentioned this pull request Oct 16, 2023

Deploy Checklist: New Expensify 2023-10-16 #29717

Closed

OSBotify mentioned this pull request Oct 17, 2023

Deploy Checklist: New Expensify 2023-10-17 #29837

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Workspace admin checkbox #29422

Workspace admin checkbox #29422

esh-g commented Oct 12, 2023 •

edited

Loading

melvin-bot bot commented Oct 12, 2023

esh-g commented Oct 12, 2023

esh-g commented Oct 12, 2023

marcaaron commented Oct 12, 2023

parasharrajat commented Oct 12, 2023

parasharrajat commented Oct 13, 2023

esh-g commented Oct 13, 2023

esh-g commented Oct 13, 2023

esh-g commented Oct 13, 2023

parasharrajat commented Oct 13, 2023

parasharrajat commented Oct 16, 2023

parasharrajat commented Oct 16, 2023 •

edited

Loading

parasharrajat commented Oct 16, 2023

esh-g commented Oct 16, 2023

parasharrajat left a comment

esh-g commented Oct 16, 2023

marcaaron left a comment

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

Workspace admin checkbox #29422

Workspace admin checkbox #29422

Conversation

esh-g commented Oct 12, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 12, 2023

esh-g commented Oct 12, 2023

esh-g commented Oct 12, 2023

marcaaron commented Oct 12, 2023

parasharrajat commented Oct 12, 2023

parasharrajat commented Oct 13, 2023

esh-g commented Oct 13, 2023

esh-g commented Oct 13, 2023

esh-g commented Oct 13, 2023

parasharrajat commented Oct 13, 2023

parasharrajat commented Oct 16, 2023

parasharrajat commented Oct 16, 2023 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat commented Oct 16, 2023

esh-g commented Oct 16, 2023

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

esh-g commented Oct 16, 2023

marcaaron left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 16, 2023

OSBotify commented Oct 16, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

esh-g commented Oct 12, 2023 •

edited

Loading

parasharrajat commented Oct 16, 2023 •

edited

Loading