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

Feature/35712 redesign of members list #37074

Merged

Conversation

burczu
Copy link
Contributor

@burczu burczu commented Feb 22, 2024

Details

In this PR the list of members displayed on the Workspace Members Page is re-designed to match the new design.

The new design for reference:

Screenshot 2024-02-22 at 11 15 21

Fixed Issues

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

Tests

  1. LogIn to the App
  2. Open any Workspace
  3. Open Members page
  4. Check if the members list looks the same as on the design.
  • 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

Screenshot 2024-02-22 at 12 47 29

Android: mWeb Chrome

Screenshot 2024-02-22 at 12 42 20

iOS: Native

Screenshot 2024-02-22 at 12 40 35

iOS: mWeb Safari

Screenshot 2024-02-22 at 12 41 34

MacOS: Chrome / Safari

Screenshot 2024-02-22 at 12 33 51

MacOS: Desktop

Screenshot 2024-02-22 at 12 35 07

@burczu burczu marked this pull request as ready for review February 22, 2024 11:48
@burczu burczu requested a review from a team as a code owner February 22, 2024 11:48
@melvin-bot melvin-bot bot requested review from getusha and removed request for a team February 22, 2024 11:48
Copy link

melvin-bot bot commented Feb 22, 2024

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

@ArekChr
Copy link
Contributor

ArekChr commented Feb 22, 2024

cc: @Expensify/design

@getusha
Copy link
Contributor

getusha commented Feb 22, 2024

@shawnborton i wonder if we should also use the new Badge design here?

@shawnborton
Copy link
Contributor

Looking pretty good!

Totally agree that we should use the new badge component. Has that been merged into main yet?

For this area here:
CleanShot 2024-02-22 at 07 47 57@2x

I would think that the "Role" heading would be right-aligned since it's the last column. It also feels like each row has too much padding-right - I would expect the badge to be further over to the right. How much right-padding is currently being applied?

@burczu
Copy link
Contributor Author

burczu commented Feb 22, 2024

Looking pretty good!

Totally agree that we should use the new badge component. Has that been merged into main yet?

For this area here: CleanShot 2024-02-22 at 07 47 57@2x

I would think that the "Role" heading would be right-aligned since it's the last column. It also feels like each row has too much padding-right - I would expect the badge to be further over to the right. How much right-padding is currently being applied?

@shawnborton What is the new badge and where can I find it? Regarding alignment - I recall a long discussion (first in the Proposal document, and later in Slack) and I thought there was a conclusion that the last column should be aligned left and it was finally reflected in Figma.

@shawnborton
Copy link
Contributor

Ah okay, you can ignore me then. cc @trjExpensify @JmillsExpensify @Expensify/design for confirmation.

Can you show me how much right padding is being used though?

@shawnborton
Copy link
Contributor

If you pull main, perhaps the new badge component should be there already.

<Text style={styles.peopleBadgeText}>{props.translate('common.admin')}</Text>
</View>
) : null,
rightElement: roleBadge,
Copy link
Contributor

Choose a reason for hiding this comment

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

<Badge
text={badgeText}
textStyles={styles.textStrong}
badgeStyles={[
styles.alignSelfCenter,
styles.badgeBordered,
brickRoadIndicator ? styles.mr2 : undefined,
focused || isHovered || pressed ? styles.activeItemBadge : {},
badgeStyle,
]}

@burczu
Copy link
Contributor Author

burczu commented Feb 22, 2024

Ah okay, you can ignore me then. cc @trjExpensify @JmillsExpensify @Expensify/design for confirmation.

Can you show me how much right padding is being used though?

@shawnborton the last "column" (which is not an actual column because in fact it is not a table) has a fixed width of 60px and right-margin of 16px; the wrapper has padding of 16px so putting this together the badge is 32px far from the right edge of the item container (in Figma it is 29px from the right edge, so I guess it's quite random, but I could change the right margin of the badge to 12px so it would be 30px from the edge then)

regarding badge styles - is one of the below designs what we are looking for?:

Screenshot 2024-02-22 at 14 11 04

Screenshot 2024-02-22 at 14 14 25

@shawnborton
Copy link
Contributor

That is quite random, and I think it's a mistake because there was a hidden caret layer that never got removed. I would just remove the 16px margin from the badge so that there is a clean 16px padding between the badge and the edge of the row.

And yes, this is the style we're after:
image

@burczu
Copy link
Contributor Author

burczu commented Feb 22, 2024

@shawnborton Alright, fixed the badge - thanks. It looks like below now:

Screenshot 2024-02-22 at 14 24 37

@dannymcclain
Copy link
Contributor

@shawnborton I'm down to standardize the padding for "tables" everywhere (here, money page, tags, categories, etc.). Your most recent "tightened spacing" for the money page had the padding at 12px—do we want to standardize on 12px or 16px? I'm good either way, I kinda just want them to be the same for all of these types of rows.

Also, this "Role" column label still looks misaligned to me (I realize it is technically properly aligned left, but I think it looks weird). I think we need to center align the column header like we're doing for the "Action" column on the money page designs.

CleanShot 2024-02-22 at 08 25 31@2x

@getusha
Copy link
Contributor

getusha commented Feb 22, 2024

@getusha Thanks for pointing this out - I didn't touch the removal functionality yet. I'll be working on it in the next issue so I think I'll address this there (it's not a breaking issue I guess). What do you think?

Yes, it is minor, can be handled later.

@shawnborton
Copy link
Contributor

@dannymcclain I think I am team 16px right now, will tag ya in Figma where I'm using that currently.

@dannymcclain
Copy link
Contributor

:gavel: :gavel: :gavel: 16px sounds good to me! :send-it:

@luacmartins
Copy link
Contributor

Thanks for the reviews so far! @burczu would you mind addressing the latest comments and fixing the conflict so we can get this merged today?

@burczu
Copy link
Contributor Author

burczu commented Feb 22, 2024

@getusha your comments addressed + storybook updated
@shawnborton 16px vertical padding applied
@dannymcclain the Role column label center aligned as requested
@luacmartins conflicts solved and all the comments and requests addressed, I believe

@getusha
Copy link
Contributor

getusha commented Feb 22, 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 Screenshot 2024-02-22 at 8 15 27 PM
Android: mWeb Chrome Screenshot 2024-02-22 at 8 29 49 PM
iOS: Native Screenshot 2024-02-22 at 8 29 08 PM
iOS: mWeb Safari Screenshot 2024-02-22 at 8 40 15 PM
MacOS: Chrome / Safari Screenshot 2024-02-22 at 7 48 11 PM
MacOS: Desktop Screenshot 2024-02-22 at 8 42 56 PM

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.

There are a couple of small issues, but I think we can address those in a follow up since this PR unblocks Categories main page and the whole dependency chain of issues there.

@@ -195,6 +195,7 @@ export default {
iAcceptThe: 'Acepto los ',
remove: 'Eliminar',
admin: 'Administrador',
owner: 'Poseedor',
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB I think this should be Dueño

};
const getHeaderContent = () => (
<>
<Text style={[styles.pl5, styles.mb5, styles.mt3]}>{translate('workspace.people.membersListTitle')}</Text>
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB I think this text should use textSupporting color

Copy link
Contributor

@getusha getusha left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@melvin-bot melvin-bot bot requested a review from luacmartins February 22, 2024 18:18
@luacmartins luacmartins merged commit 510d118 into Expensify:main Feb 22, 2024
16 of 19 checks passed
@OSBotify
Copy link
Contributor

✋ 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

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

Comment on lines +32 to +33
pressableStyle={[[styles.selectionListPressableItemWrapper, isFocused && styles.activeComponentBG]]}
wrapperStyle={[styles.flexRow, styles.flex1, styles.justifyContentBetween, styles.userSelectNone, styles.alignItemsCenter, isFocused && styles.sidebarLinkActive]}
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi team, come from this issue #37293:

  • For a focused background in this case, we should use styles.sidebarLinkActive
  • We don't need to add isFocused style in wrapperStyle otherwise it causes the above bug.

const isAdmin = session?.email === details.login || policyMember.role === CONST.POLICY.ROLE.ADMIN;

let roleBadge = null;
if (isOwner || isAdmin) {
roleBadge = (
Copy link
Contributor

Choose a reason for hiding this comment

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

The badge wasn't being styled properly when removing admin while offline in the native apps: #37776

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.

9 participants