Selected workspace members unselect on switch from offline to online #29587

ZhenjaHorbach · 2023-10-13T20:51:28Z

Details

Selected workspace members unselect on switch from offline to online

Fixed Issues

$ #28551
PROPOSAL: #28551 (comment)

Tests

Go to Settings > Workspaces > Members
Go offline
Click on invite button
Enter email which is not in list and invite that user
From Members screen select that user
Go online

Verify that no errors appear in the JS console

Offline tests

Go to Settings > Workspaces > Members
Go offline
Click on invite button
Enter email which is not in list and invite that user
From Members screen select that user
Go online

QA Steps

Go to Settings > Workspaces > Members
Go offline
Click on invite button
Enter email which is not in list and invite that user
From Members screen select that user
Go online

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

android.mp4

Android: mWeb Chrome

web-android.mp4

iOS: Native

ios.mov

iOS: mWeb Safari

web-ios.mov

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mov

melvin-bot · 2023-10-13T20:51:33Z

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

mollfpr

Left a comment for clarification and @ZhenjaHorbach could you resolve the lint error? Thanks!

mollfpr · 2023-10-15T15:08:01Z

src/pages/workspace/WorkspaceMembersPage.js

-            _.intersection(
-                prevSelected,
+        setSelectedEmployees((prevSelected) => {
+            const currentPersonalDetails = filterPersonalDetails(props.policyMembers, props.personalDetails);


@ZhenjaHorbach Why do we need to filter the personal details here?

For optimization )
Instead of using all known PersonalDetails items
We will use only those that are needed only by the current workspace

ZhenjaHorbach · 2023-10-15T15:16:47Z

Left a comment for clarification and @ZhenjaHorbach could you resolve the lint error? Thanks!

Oh, sorry
I'll fix this )

ZhenjaHorbach · 2023-10-16T06:52:31Z

@mollfpr
Hello )
PR is ready )

mollfpr · 2023-10-16T06:54:17Z

Thanks @ZhenjaHorbach for the ping! I'll get it done in a minutes.

mollfpr · 2023-10-16T09:49: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(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

29587.Web.mp4

Mobile Web - Chrome

29587.mWeb-Chrome.mp4

Mobile Web - Safari

29587.mWeb-Safari.mp4

Desktop

29587.Desktop.mp4

iOS

29587.iOS.mp4

Android

29587.Android.mp4

mollfpr

The test looks good, just final thing to clean up the function.

mollfpr · 2023-10-16T09:52:57Z

src/pages/workspace/WorkspaceMembersPage.js

@@ -80,6 +80,24 @@ function WorkspaceMembersPage(props) {
    const prevAccountIDs = usePrevious(accountIDs);
    const textInputRef = useRef(null);
    const isOfflineAndNoMemberDataAvailable = _.isEmpty(props.policyMembers) && props.network.isOffline;
+    const prevPersonalDetails = usePrevious(props.personalDetails);
+
+    function filterPersonalDetails(policyMembers, personalDetails) {


This should be an arrow function, and also please add JSDoc here.

mollfpr

LGTM 👍

mollfpr · 2023-10-16T12:34:12Z

Manually bump @Li357 for the final review.

Li357 · 2023-10-16T13:21:43Z

src/pages/workspace/WorkspaceMembersPage.js

+        setSelectedEmployees((prevSelected) => {
+            // Filter all personal details in order to use the elements needed for the current workspace
+            const currentPersonalDetails = filterPersonalDetails(props.policyMembers, props.personalDetails);
+            // Checking selected elements. Necessary in cases where there is a transition from offline to online mode, since after this the id changes for new members


I think this comment could be better: "We need to filter the previous selected employees by the new personal details, since unknown/new user id's change when transitioning from offline to online" or, note this change also covers others cases where we just need to use the most up to date personal details we know.

It makes sense )
Done )

mollfpr · 2023-10-17T04:59:32Z

@ZhenjaHorbach Could you fix the conflict? Thanks!

ZhenjaHorbach · 2023-10-17T07:08:55Z

@ZhenjaHorbach Could you fix the conflict? Thanks!

Done )

mollfpr

LGTM and tests well on the latest commit 👍

All yours @Li357

OSBotify · 2023-10-17T18:54:53Z

✋ 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-17T23:56:39Z

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

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

OSBotify · 2023-10-18T23:54:09Z

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

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

Fix bug with Selected members unselect on switch from offline to online

ff22661

ZhenjaHorbach requested a review from a team as a code owner October 13, 2023 20:51

melvin-bot bot requested review from mollfpr and removed request for a team October 13, 2023 20:51

mollfpr reviewed Oct 15, 2023

View reviewed changes

ZhenjaHorbach added 2 commits October 15, 2023 17:29

Fix comment

5932418

Add some comments in code

c1000e8

mollfpr suggested changes Oct 16, 2023

View reviewed changes

Update filterPersonalDetails

392d9ae

mollfpr approved these changes Oct 16, 2023

View reviewed changes

Li357 reviewed Oct 16, 2023

View reviewed changes

Update comment for setSelectedEmployees

e654ca0

Fix conflicts

684c1bf

mollfpr approved these changes Oct 17, 2023

View reviewed changes

Li357 approved these changes Oct 17, 2023

View reviewed changes

Li357 merged commit aa0ff3f into Expensify:main Oct 17, 2023
12 checks passed

OSBotify mentioned this pull request Oct 17, 2023

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

Closed

melvin-bot bot mentioned this pull request Oct 18, 2023

[HOLD for payment 2023-10-25] [$500] Workspace - Selected members unselect on switch from offline to online #28551

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Selected workspace members unselect on switch from offline to online #29587

Selected workspace members unselect on switch from offline to online #29587

ZhenjaHorbach commented Oct 13, 2023 •

edited

Loading

melvin-bot bot commented Oct 13, 2023

mollfpr left a comment

mollfpr Oct 15, 2023

ZhenjaHorbach Oct 15, 2023

ZhenjaHorbach commented Oct 15, 2023

ZhenjaHorbach commented Oct 16, 2023

mollfpr commented Oct 16, 2023

mollfpr commented Oct 16, 2023 •

edited

Loading

mollfpr left a comment

mollfpr Oct 16, 2023

ZhenjaHorbach Oct 16, 2023

mollfpr left a comment

mollfpr commented Oct 16, 2023

Li357 Oct 16, 2023 •

edited

Loading

ZhenjaHorbach Oct 16, 2023

mollfpr commented Oct 17, 2023

ZhenjaHorbach commented Oct 17, 2023

mollfpr left a comment

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

Selected workspace members unselect on switch from offline to online #29587

Selected workspace members unselect on switch from offline to online #29587

Conversation

ZhenjaHorbach commented Oct 13, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 13, 2023

mollfpr left a comment

Choose a reason for hiding this comment

mollfpr Oct 15, 2023

Choose a reason for hiding this comment

ZhenjaHorbach Oct 15, 2023

Choose a reason for hiding this comment

ZhenjaHorbach commented Oct 15, 2023

ZhenjaHorbach commented Oct 16, 2023

mollfpr commented Oct 16, 2023

mollfpr commented Oct 16, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mollfpr left a comment

Choose a reason for hiding this comment

mollfpr Oct 16, 2023

Choose a reason for hiding this comment

ZhenjaHorbach Oct 16, 2023

Choose a reason for hiding this comment

mollfpr left a comment

Choose a reason for hiding this comment

mollfpr commented Oct 16, 2023

Li357 Oct 16, 2023 • edited Loading

Choose a reason for hiding this comment

ZhenjaHorbach Oct 16, 2023

Choose a reason for hiding this comment

mollfpr commented Oct 17, 2023

ZhenjaHorbach commented Oct 17, 2023

mollfpr left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

ZhenjaHorbach commented Oct 13, 2023 •

edited

Loading

mollfpr commented Oct 16, 2023 •

edited

Loading

Li357 Oct 16, 2023 •

edited

Loading