Fix remove button remains enabled when removing a user in other device #18934

dukenv0307 · 2023-05-15T07:47:59Z

Details

Remove button remains enabled when removing a user in other device.

Fixed Issues

$ #17166
PROPOSAL: #17166 (comment)

Tests

Login app on a device with an account
Open Setting > Workspaces
Open any workspace that has multiple members
Open manage members
Login app on another device with the same account in step one and follow steps 2-4
On both platforms, select the same user
Using any one platform, remove the user selected
Verify that the remove button on the other platform is disabled

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Login app on a device with an account
Open Setting > Workspaces
Open any workspace that has multiple members
Open manage members
Login app on another device with the same account in step one and follow steps 2-4
On both platforms, select the same user
Using any one platform, remove the user selected
Verify that the remove button on the other platform is disabled

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screencast.from.15-05-2023.14.50.56.webm

Mobile Web - Chrome

Record_2023-05-15-14-51-23.mp4

Mobile Web - Safari

Screen-Recording-2023-05-15-at-17.00.28.mp4

Desktop

Screen-Recording-2023-05-15-at-17.01.56.mp4

iOS

Screen-Recording-2023-05-15-at-17.15.36.mp4

Android

17166.mp4

melvin-bot · 2023-05-15T13:31:10Z

@danieldoglas @s77rt One of you needs to 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]

s77rt · 2023-05-15T13:34:18Z

src/pages/workspace/WorkspaceMembersPage.js

@@ -96,6 +96,15 @@ class WorkspaceMembersPage extends React.Component {
            this.validate();
        }

+        if (!_.isEqual(prevProps.policyMemberList, this.props.policyMemberList)) {


I don't think we need deep comparison here (_.isEqual). Just a shallow comparison will do it.

@s77rt I just updated.

s77rt · 2023-05-15T13:38:02Z

src/pages/workspace/WorkspaceMembersPage.js

+            this.setState((prevState) => {
+                const selectedEmployees = _.filter(prevState.selectedEmployees, (selectedEmployee) => _.has(this.props.policyMemberList, selectedEmployee));
+                return {
+                    selectedEmployees,
+                };
+            });


Didn't you propose to use intersection? Is there something wrong with that?

this.setState((prevState) => ({ selectedEmployees: _.intersection(prevState.selectedEmployees, this.props.policyMemberList), }));

selectedEmployees is a string array, but policyMemberList is an object that has key is an email of user

Right, this should do it then

this.setState((prevState) => ({ selectedEmployees: _.intersection(prevState.selectedEmployees, _.keys(this.props.policyMemberList)), }));

The main purpose of my solution is the way to fix this issue and this code above is for illustration purposes only.

Can you apply the suggested fix

@s77rt Sorry, I missed your suggestion above. I will update right now.

@s77rt I just updated, please help to check again.

s77rt · 2023-05-15T17:26:42Z

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.

Screenshots/Videos

Web

web.mp4

Mobile Web - Chrome

mweb-chrome.mp4

Mobile Web - Safari

mweb-safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

s77rt

LGTM! 🚀

cc @danieldoglas

OSBotify · 2023-05-15T21:35:58Z

✋ 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-05-17T01:08:57Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 1.3.15-0 🚀

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

OSBotify · 2023-05-18T06:52:08Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.15-12 🚀

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

Beamanator · 2023-06-01T16:52:48Z

src/pages/workspace/WorkspaceMembersPage.js

@@ -96,6 +96,12 @@ class WorkspaceMembersPage extends React.Component {
            this.validate();
        }

+        if (prevProps.policyMemberList !== this.props.policyMemberList) {


I'm pretty sure policyMemberList is an array, and !== can't be used to compare array length / values - they're just pointers in JS. So this is only checking that the pointers are the same, not that the values in the arrays are the same - is that what y'all are trying to do?

Yes, that's exactly what we are trying to do. I have requested this change here #18934 (comment).

Huh, i haven't seen that idea on purpose before (checking if pointers stay the same) - seems fishy but you're sure this works? 😅

😅 Yeah I'm sure. The idea is to do some logic only if the pointer change. If the pointer change then it's likely the values are changed too (if the pointer change but we have same values than this is a bad design somewhere else, yet it won't cause any bug if this ever happened). Also there is no case where the values change but keep using the same pointer (onyx do not mutate objects). This is just an optimisation (comparing addresses should be the fastest).

Just curious though, how did you end up here 😁?

Innnnnnnnnteresting, that all sounds legit! 👍 Thanks for explaining :D

Hahaha I ended up here just because i saw some arrays being compared and had to ask why 😅

mollfpr · 2023-10-25T14:03:59Z

src/pages/workspace/WorkspaceMembersPage.js

+        if (prevProps.policyMemberList !== this.props.policyMemberList) {
+            this.setState((prevState) => ({
+                selectedEmployees: _.intersection(prevState.selectedEmployees, _.keys(this.props.policyMemberList)),
+            }));


✋ Coming from #28551

This is an excellent start to aligning the policyMembers. The attached issue is another case in which we want to keep the selected optimistic members' accountID aligned with the new accountID from the API response, so the selection remains.

dukenv0307 added 2 commits May 15, 2023 14:41

Fix remove button remains enabled when removing a user in other device

deaec05

format code

3cfd644

dukenv0307 marked this pull request as ready for review May 15, 2023 13:31

dukenv0307 requested a review from a team as a code owner May 15, 2023 13:31

melvin-bot bot requested review from danieldoglas and s77rt and removed request for a team May 15, 2023 13:31

s77rt suggested changes May 15, 2023

View reviewed changes

dukenv0307 added 2 commits May 15, 2023 20:51

update check change

fbdc927

change method update selectedEmplyees

20ae498

s77rt approved these changes May 15, 2023

View reviewed changes

danieldoglas approved these changes May 15, 2023

View reviewed changes

danieldoglas merged commit 6bc1bce into Expensify:main May 15, 2023

OSBotify mentioned this pull request May 16, 2023

Deploy Checklist: New Expensify 2023-05-16 #19088

Closed

71 tasks

kavimuru mentioned this pull request May 17, 2023

Remove button is not disabled when removing user from 2nd device in offline #19155

Closed

6 tasks

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

[HOLD for payment 2023-05-25] [$1000] Remove button remains enabled when removing a user in other device #17166

Closed

6 tasks

Beamanator reviewed Jun 1, 2023

View reviewed changes

mollfpr reviewed Oct 25, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix remove button remains enabled when removing a user in other device #18934

Fix remove button remains enabled when removing a user in other device #18934

dukenv0307 commented May 15, 2023 •

edited

Loading

melvin-bot bot commented May 15, 2023

s77rt May 15, 2023

dukenv0307 May 15, 2023

s77rt May 15, 2023

dukenv0307 May 15, 2023

s77rt May 15, 2023

dukenv0307 May 15, 2023

s77rt May 15, 2023

dukenv0307 May 15, 2023

dukenv0307 May 15, 2023

s77rt commented May 15, 2023

s77rt left a comment

OSBotify commented May 15, 2023

OSBotify commented May 17, 2023

OSBotify commented May 18, 2023

Beamanator Jun 1, 2023

s77rt Jun 1, 2023

Beamanator Jun 1, 2023

s77rt Jun 1, 2023

Beamanator Jun 2, 2023

mollfpr Oct 25, 2023

Fix remove button remains enabled when removing a user in other device #18934

Fix remove button remains enabled when removing a user in other device #18934

Conversation

dukenv0307 commented May 15, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 15, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented May 15, 2023

Reviewer Checklist

Screenshots/Videos

s77rt left a comment

Choose a reason for hiding this comment

OSBotify commented May 15, 2023

OSBotify commented May 17, 2023

OSBotify commented May 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dukenv0307 commented May 15, 2023 •

edited

Loading