Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#35715 workspace member details page #37715

Merged

Conversation

burczu
Copy link
Contributor

@burczu burczu commented Mar 5, 2024

Details

In this PR we implement the member details page where the user can remove the member from workspace, change it role in the workspace and open its user profile. The PR does not cover changing the ownership of the workspace which will be handled in a separate PR.

Design reference used in this PR:

Screenshot 2024-03-06 at 12 19 01

Fixed Issues

$ #35715
PROPOSAL: https://docs.google.com/document/d/1gk3xqOs7epMbUrSSiX8K7YcqfPLVgqEos0sf-D-GMDA/edit?pli=1#heading=h.qjcht79r25s1

Tests

  1. Log in to the App
  2. Open any workspace
  3. Open members page
  4. Click on the member
  5. Verify the Member Details RHN opens
  6. Try to remove member from the workspace
  7. Try to change its role in the workspace
  • Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Same as above

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

Screenshots/Videos

Android: Native
Screen.Recording.2024-03-06.at.12.08.53.mov
Android: mWeb Chrome
Screen.Recording.2024-03-06.at.12.01.19.mov
iOS: Native
Screen.Recording.2024-03-06.at.11.58.13.mov
iOS: mWeb Safari
Screen.Recording.2024-03-06.at.11.59.34.mov
MacOS: Chrome / Safari
Screen.Recording.2024-03-06.at.11.48.21.mov
MacOS: Desktop
Screen.Recording.2024-03-06.at.11.50.25.mov

@burczu burczu force-pushed the feature/35715-workspace-member-details-page branch from 9a95303 to 35f5618 Compare March 5, 2024 11:37
@luacmartins luacmartins self-requested a review March 5, 2024 13:52
@burczu
Copy link
Contributor Author

burczu commented Mar 6, 2024

@luacmartins @Expensify/design One question on the design below:

Screenshot 2024-03-06 at 11 28 49

In the the header we have "Alberto Cela" which, I assume, is displayName from personalDetails object (as we do on Profile page), but what is this "Cathy's Croissants"? From where can I take it?

@burczu burczu marked this pull request as ready for review March 6, 2024 11:10
@burczu burczu requested a review from a team as a code owner March 6, 2024 11:10
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and removed request for a team March 6, 2024 11:10
Copy link

melvin-bot bot commented Mar 6, 2024

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

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Mar 6, 2024

luacmartins Expensify/design One question on the design below:

Screenshot 2024-03-06 at 11 28 49

In the the header we have "Alberto Cela" which, I assume, is displayName from personalDetails object (as we do on Profile page), but what is this "Cathy's Croissants"? From where can I take it?

@burczu It should be the workspace name.

310474204-82aa9147-00cb-41c9-93d6-805e73d1ab9a

@burczu
Copy link
Contributor Author

burczu commented Mar 6, 2024

@burczu It should be the workspace name.

@abdulrahuman5196 Ahhh... makes sense ;) I'll address this then.

@burczu
Copy link
Contributor Author

burczu commented Mar 6, 2024

@burczu It should be the workspace name.

@abdulrahuman5196 Ahhh... makes sense ;) I'll address this then.

@abdulrahuman5196 done

Copy link
Contributor

@abdulrahuman5196 abdulrahuman5196 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@burczu Could you kindly check on the above?

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated Show resolved Hide resolved
sections={[{data: items, indexOffset: 0}]}
ListItem={RadioListItem}
onSelectRow={changeRole}
initiallyFocusedOptionKey={items.find((item) => item.isSelected)?.keyForList}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the tick mark for the very first time i open a member with the new changes

Screen.Recording.2024-03-06.at.5.26.50.PM.mov

Copy link
Contributor Author

@burczu burczu Mar 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a member that was invited right before? there is known issue that we need to address regarding this... the same problem is with bulk actions and "Make admin" option for freshly invited members (before refreshing the page) - I think there was some bug for it

Copy link
Contributor Author

@burczu burczu Mar 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is related comment: #37748 (comment) - we agreed to fix this while working on inviting new members here: #37199 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated Show resolved Hide resolved
src/libs/Navigation/types.ts Outdated Show resolved Hide resolved
src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated Show resolved Hide resolved

return (
<ScreenWrapper testID={WorkspaceMemberDetailsPage.displayName}>
<FullPageNotFoundView>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to block these views if the user is not an admin. We can reuse AdminPolicyAccessOrNotFoundWrapper and PaidPolicyAccessOrNotFoundWrapper

Copy link
Contributor Author

@burczu burczu Mar 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added, but are you sure this feature should be available only for Paid Workspaces? I must have missed this requirement...
Should I also disable showing RHN when pressing on the member item if its non Paid Workspace?

Copy link
Contributor Author

@burczu burczu Mar 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@luacmartins ok, I think disabling RHN for non Paid Workspace is most reasonable - I've made this change, so now:

  • for Paid Workspaces, when user presses the checkbox, the item is selected and when user presses the whole item it shows the Member Details modal
  • for Non Paid Workspaces, pressing the whole item, as well as pressing the checkbox just selects the item

Please see the recording:

Screen.Recording.2024-03-07.at.14.30.22.mov

What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for Non Paid Workspaces, pressing the whole item, as well as pressing the checkbox just selects the item

Personally I don't like that there would be variability in pressing the whole item triggering the select action or not. I think we should limit selecting a row to just engaging with the checkbox, no matter what the case is. Curious if @Expensify/design agrees here.

So basically, let's not try to get tricky with using the whole row as a trigger action for the select box. Just make it so that you can only ever use the select box to select a row. For non-paid workspaces, just make the rest of the row non-tappable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shawnborton makes sense to me - I'll change it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally agree @shawnborton.

@burczu
Copy link
Contributor Author

burczu commented Mar 7, 2024

Refreshing after going to profile screen causes the back to fail. We need to add backTo route I think.

@burczu

Untitled.mov

@abdulrahuman5196 Good catch - thanks. Fixed.

@abdulrahuman5196
Copy link
Contributor

Thank you. Will check again in 30 mins.

@abdulrahuman5196
Copy link
Contributor

@burczu For workspaces where I haven't visited. It shows skeleton view and doesn't load data.

Screen.Recording.2024-03-07.at.8.54.11.PM.mov

@luacmartins
Copy link
Contributor

@abdulrahuman5196 I think that might need a backend issue to create a new API command we can call to load member data. I'll work on one. Leet's not block this PR on that though

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Mar 7, 2024

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
Screen.Recording.2024-03-08.at.12.47.34.AM.mp4
Android: mWeb Chrome
Screen.Recording.2024-03-08.at.12.35.05.AM.mp4
iOS: Native
Screen.Recording.2024-03-08.at.12.29.39.AM.mp4
iOS: mWeb Safari
Screen.Recording.2024-03-08.at.12.28.00.AM.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-03-08.at.12.19.16.AM.mp4
MacOS: Desktop
Screen.Recording.2024-03-08.at.12.24.49.AM.mp4

Copy link
Contributor

@abdulrahuman5196 abdulrahuman5196 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @luacmartins

🎀 👀 🎀
C+ Reviewed

@melvin-bot melvin-bot bot requested a review from luacmartins March 7, 2024 19:30
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've also spotted the issues below, but we can address them in a follow up:

  1. Can't see owner's profile. We should probably just navigate to the global profile here.
    https://github.com/Expensify/App/assets/22219519/00dcfb85-dbb2-45f7-b8b9-6fc21f5c2a55

  2. Info icon has active green color by default. We need to fix this.

Screenshot 2024-03-07 at 2 56 15 PM

}

if (!PolicyUtils.isPaidGroupPolicy(policy)) {
return;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we just wanna navigate to the regular profile here too

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I won't block on this, but we should follow up with a fix.

@luacmartins luacmartins merged commit 44267d3 into Expensify:main Mar 7, 2024
17 of 18 checks passed
@luacmartins
Copy link
Contributor

Created issue here for the follow up - #37927

@OSBotify
Copy link
Contributor

OSBotify commented Mar 7, 2024

✋ 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
Copy link
Contributor

OSBotify commented Mar 8, 2024

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.49-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.50-5 🚀

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

const openRoleSelectionModal = useCallback(() => {
Navigation.navigate(ROUTES.WORKSPACE_MEMBER_ROLE_SELECTION.getRoute(route.params.policyID, accountID, Navigation.getActiveRoute()));
}, [accountID, route.params.policyID]);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not checking if user is workspace member or not, ref: #41492

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants