Fix: ws options available from all devices for same user #42008

dragnoir · 2024-05-10T21:24:06Z

Details

This PR fix the issue where a user create a workspace from a device but can't find all the wp options from a second device

Fixed Issues

$ #40686
PROPOSAL: #40686 (comment)

Tests

Device 1: Log in with a new Gmail account
Device 2: Log in with the same account
Device 1: Create a workspace
Device 2: Navigate to the workspace settings
Device 2: Click on members
Verify that all settings are available for the second device like "Categories" and "More features"

20240511_132746.mp4

Verify that no errors appear in the JS console

Offline tests

QA Steps

Device 1: Log in with a new Gmail account
Device 2: Log in with the same account
Device 1: Create a workspace
Device 2: Navigate to the workspace settings
Device 2: Click on members
Verify that all settings are available for the second device like "Categories" and "More features"

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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-05-11T12:29:18Z

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

eh2077 · 2024-05-11T15:28:53Z

@rlinoz Can you help to add me as reviewer for this PR? Thanks

eh2077 · 2024-05-13T12:43:11Z

src/libs/PolicyUtils.ts

-const isPolicyAdmin = (policy: OnyxEntry<Policy> | EmptyObject): boolean => policy?.role === CONST.POLICY.ROLE.ADMIN;
-
+const isPolicyAdmin = (policy: OnyxEntry<Policy> | EmptyObject): boolean =>
+    policy?.role === CONST.POLICY.ROLE.ADMIN || policy?.employeeList?.[policy?.owner]?.role === CONST.POLICY.ROLE.ADMIN;


I think we should check the role of the current user accountID here. Or it'll introduce regression - non-admin members can also see protected items.

Screen.Recording.2024-05-13.at.8.38.33.PM.mov

Thank you for the note. Working on it..

eh2077 · 2024-05-16T15:29:49Z

@dragnoir Friendly bump! When can we expect an update on the PR?

dragnoir · 2024-05-17T07:26:51Z

Working on it, will be done today..

eh2077 · 2024-05-20T10:19:57Z

src/pages/workspace/WorkspaceInitialPage.tsx

+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const employee = policyProp?.employeeList?.[currentUserPersonalDetails.login ?? ''] ?? {};
+    const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policyProp) || (employee && employee.role === CONST.POLICY.ROLE.ADMIN);


I think it's better to move the fix into method isPolicyAdmin

The problem I am facing is that policyProp is not turning the role. When policyProp is checking the role from another device, it's undefined.

but policyProp has the correct logic.

What do you think?

I think you can try get accountid by policy owner, get employee and then compare employee role.

Ok, I will move the fix into the method isPolicyAdmin. I tried using useCurrentUserPersonalDetails into isPolicyAdmin but I got an error, seems I can't use a hook there, I will see.

@eh2077 can we do the following?

const isPolicyAdmin = (policy: OnyxEntry<Policy> | EmptyObject, currentUserLogin?: string): boolean =>

Where currentUserLogin will be props passed from WorkspaceInitialPage

Yeah, I think it's okay to add an optional parameter to the method

eh2077 · 2024-05-22T11:29:15Z

src/pages/workspace/WorkspaceInitialPage.tsx

-    const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policy);
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const employee = policyProp?.employeeList?.[currentUserPersonalDetails.login ?? ''] ?? {};
+    const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policyProp, employee.role);


Why do you pass the role to the method? I think you should pass current user account id.

hmmm then what should I do with the account id?

I need the role from the employeeList for the current user because policy.role is not available.
Then I can check if employeeList[currentuseremail@gmail.com].tole is equal to admin

eh2077

Let me know what do you think about the suggested changes, thanks!

src/pages/workspace/WorkspaceInitialPage.tsx

src/libs/PolicyUtils.ts

dragnoir · 2024-05-22T17:15:23Z

@eh2077 I like your approach, it's better, thank you

eh2077 · 2024-05-23T13:55:46Z

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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

0-all-in-one.mp4

Android: mWeb Chrome

0-all-in-one.mp4

iOS: Native

0-all-in-one.mp4

iOS: mWeb Safari

0-all-in-one.mp4

MacOS: Chrome / Safari

0-all-in-one.mp4

MacOS: Desktop

0-all-in-one.mp4

eh2077

@rlinoz All yours

rlinoz

This is looking good!

One question, in the second device when we click on Categories or More Features we briefly get a Not found page, is this the same root cause?

I think so, since we check if the user is a policy admin here

App/src/pages/workspace/AccessOrNotFoundWrapper.tsx

Line 22 in 8375abe

    
           [CONST.POLICY.ACCESS_VARIANTS.ADMIN]: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isPolicyAdmin(policy),

dragnoir · 2024-05-25T14:16:41Z

One question, in the second device when we click on Categories or More Features we briefly get a Not found page, is this the same root cause?

@rlinoz do you want me to dig into this and try to fix it?

rlinoz · 2024-05-27T12:49:13Z

Yeah, I mean, if it is the same root cause and we can apply the same solution, it would be great.

eh2077 · 2024-05-29T15:41:35Z

@dragnoir Friendly bump, do you have any update on the above comments?

rlinoz

It is working for me, just one question

rlinoz · 2024-05-30T15:24:32Z

src/pages/workspace/AccessOrNotFoundWrapper.tsx

@@ -73,7 +74,7 @@ function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageN

 function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps, shouldBeBlocked, ...props}: AccessOrNotFoundWrapperProps) {
    const {policy, policyID, featureName, isLoadingReportData} = props;
-
+    const {login = ''} = useCurrentUserPersonalDetails();


Why do we need the = ''?

TS error, login can be undefined, and one of the solutions is to set a default value.

rlinoz · 2024-05-30T15:25:19Z

There is also a conflict @dragnoir

rlinoz · 2024-05-30T18:46:25Z

@eh2077 if you could also take a last look 😄

eh2077

LGTM!

OSBotify · 2024-05-31T13:09:07Z

✋ 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-06-06T12:34:00Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

Fix: ws options available from all devices for same user

adf4099

dragnoir marked this pull request as ready for review May 11, 2024 12:28

dragnoir requested a review from a team as a code owner May 11, 2024 12:28

melvin-bot bot requested review from nkuoch and removed request for a team May 11, 2024 12:29

rlinoz requested a review from eh2077 May 13, 2024 11:52

eh2077 reviewed May 13, 2024

View reviewed changes

Rachid L added 5 commits May 20, 2024 08:31

Merge branch 'Expensify:main' into 40686-fix

b5d94a9

revert isPolicyAdmin

16145e9

fix policyUtility

67e0f08

fix role not available

7eaeda0

fix admin when not on policy

9ec30ac

dragnoir requested a review from eh2077 May 20, 2024 09:59

eh2077 reviewed May 20, 2024

View reviewed changes

move employe check into isPolicyAdmin

349b220

dragnoir requested a review from eh2077 May 22, 2024 11:15

eh2077 suggested changes May 22, 2024

View reviewed changes

src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved

src/libs/PolicyUtils.ts Outdated Show resolved Hide resolved

better approach

64a9e26

fix lint

1aeaaee

eh2077 approved these changes May 23, 2024

View reviewed changes

melvin-bot bot requested a review from rlinoz May 23, 2024 14:03

rlinoz reviewed May 24, 2024

View reviewed changes

Merge branch 'Expensify:main' into 40686-fix

799d626

Rachid L added 2 commits May 30, 2024 12:26

Merge branch 'Expensify:main' into 40686-fix

f0b1770

same logic for AccessOrNotFoundWrapper

2f349db

dragnoir requested review from rlinoz and eh2077 May 30, 2024 11:56

rlinoz reviewed May 30, 2024

View reviewed changes

dragnoir added 2 commits May 30, 2024 18:16

Merge remote-tracking branch 'upstream/main' into 40686-fix

f9e0e16

fix ts

ca4d45f

rlinoz approved these changes May 30, 2024

View reviewed changes

eh2077 approved these changes May 31, 2024

View reviewed changes

melvin-bot bot requested a review from rlinoz May 31, 2024 00:39

rlinoz approved these changes May 31, 2024

View reviewed changes

rlinoz merged commit 0de7a60 into Expensify:main May 31, 2024
17 checks passed

github-actions bot mentioned this pull request Jun 4, 2024

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: ws options available from all devices for same user #42008

Fix: ws options available from all devices for same user #42008

dragnoir commented May 10, 2024 •

edited

melvin-bot bot commented May 11, 2024

eh2077 commented May 11, 2024

eh2077 May 13, 2024

dragnoir May 14, 2024

eh2077 commented May 16, 2024

dragnoir commented May 17, 2024

eh2077 May 20, 2024

dragnoir May 20, 2024

eh2077 May 20, 2024

dragnoir May 20, 2024

dragnoir May 20, 2024

eh2077 May 20, 2024

eh2077 May 22, 2024

dragnoir May 22, 2024

eh2077 left a comment

dragnoir commented May 22, 2024

eh2077 commented May 23, 2024 •

edited

eh2077 left a comment

rlinoz left a comment •

edited

dragnoir commented May 25, 2024

rlinoz commented May 27, 2024

eh2077 commented May 29, 2024

rlinoz left a comment

rlinoz May 30, 2024

dragnoir May 30, 2024

rlinoz commented May 30, 2024

rlinoz commented May 30, 2024

eh2077 left a comment

OSBotify commented May 31, 2024

OSBotify commented Jun 6, 2024

Fix: ws options available from all devices for same user #42008

Fix: ws options available from all devices for same user #42008

Conversation

dragnoir commented May 10, 2024 • edited

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 11, 2024

eh2077 commented May 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eh2077 commented May 16, 2024

dragnoir commented May 17, 2024

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

eh2077 left a comment

Choose a reason for hiding this comment

dragnoir commented May 22, 2024

eh2077 commented May 23, 2024 • edited

Reviewer Checklist

Screenshots/Videos

eh2077 left a comment

Choose a reason for hiding this comment

rlinoz left a comment • edited

Choose a reason for hiding this comment

dragnoir commented May 25, 2024

rlinoz commented May 27, 2024

eh2077 commented May 29, 2024

rlinoz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rlinoz commented May 30, 2024

rlinoz commented May 30, 2024

eh2077 left a comment

Choose a reason for hiding this comment

OSBotify commented May 31, 2024

OSBotify commented Jun 6, 2024

dragnoir commented May 10, 2024 •

edited

eh2077 commented May 23, 2024 •

edited

rlinoz left a comment •

edited