Skip to content

Create a FormAlertWrapper that handles more complex components #9665

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

Merged
merged 15 commits into from
Jul 7, 2022

Conversation

ctkochan22
Copy link
Contributor

@ctkochan22 ctkochan22 commented Jul 1, 2022

@Expensify/pullerbear
@tgolen @marcaaron @roryabraham

Create FormAlertWrapper component, which allows you to wrap other components. We extract the offline/error-handling functionality from FormAlertWithSubmitButton and place it in FormAlertWrapper.

For situations that requires more complex buttons, we can use FormAlertWrapper by passing the components in as child props. For more basic buttons, we can still use FormAlertWithSubmitButton.

Example: Button with Icons
This will allow us to work with buttons with icons.
Online
image

Offline
image

Example: ButtonWithDropdown
This will also work with ButtonWithMenu like in SettlementButton.js
Online:
image

Offline:
image

Fixed Issues

$ #9681

Tests

Uses of FormAlertWithSubmitButton

  • Form.js
  • SetPasswordPage.js
  • AdditionalDetailsStep.js
  • WorkspaceInvitePage.js

AddDebitCardPage

  1. Create a user
  2. Go to Settings -> Payments
  3. Add Payment method and pick "Debit Card"
  4. Use a test stripe number 4000000000009995
  5. Verify that you get an error
    image
  6. Add a successful card number: 4000056655665556
  7. Verify that the card is added

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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 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.

PR Reviewer Checklist

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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 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 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.

QA Steps

Follow test steps. The test account number should throw out an error. Verify that it does. For the success case, please add one of your own debit cards.

Screenshots

@ctkochan22 ctkochan22 self-assigned this Jul 1, 2022
@melvin-bot
Copy link

melvin-bot bot commented Jul 1, 2022

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@ctkochan22 ctkochan22 changed the title [WIP] Just testing an idea out Just testing an idea out Jul 6, 2022
@ctkochan22 ctkochan22 marked this pull request as ready for review July 6, 2022 05:08
@ctkochan22 ctkochan22 requested a review from a team as a code owner July 6, 2022 05:08
@melvin-bot melvin-bot bot requested review from amyevans and removed request for a team July 6, 2022 05:09
@ctkochan22 ctkochan22 changed the title Just testing an idea out Create a FormAlertWrapper that handles more complex components Jul 6, 2022
/** Is the button in a loading state */
isLoading: PropTypes.bool,
/** Submit function */
onSubmit: PropTypes.func.isRequired,

...withLocalizePropTypes,
Copy link
Contributor Author

@ctkochan22 ctkochan22 Jul 6, 2022

Choose a reason for hiding this comment

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

I just re-arranged them alphabetically. And removed network

{props.isAlertVisible && (
<View style={[styles.flexRow, styles.alignItemsCenter, styles.mb3]}>
<Icon src={Expensicons.Exclamation} fill={colors.red} />
{getAlertPrompt()}
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 this is an anti-pattern. Anytime you feel the need to do this you should instead:

  1. Move the rendering to this place
  2. Create a separate component

Having another method that returns stuff to render is only complicating the render process.

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree

isAlertVisible: PropTypes.bool.isRequired,

/** Whether message is in html format */
isMessageHtml: PropTypes.bool,
Copy link
Contributor

Choose a reason for hiding this comment

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

When would there be a message in HTML?

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like it's only used in one spot this.props.reimbursementAccount.errorModalMessage and I really don't like it. I can live with it, but I don't like it. I don't like that there is a component with a prop that is only used for a single use case. For me, that means we should have a separate component like <FormHTMLAlertWrapper>.

I would also be extatic if we could make a backend change so that there is no HTML message coming from the server at all. I don't think the server should be responding with HTML.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm pretty determined to remove this, but it may take some changes in Secure first. Lets address this after this PR

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, awesome. Thanks!


return (
<View style={[styles.flexRow, styles.ml2, styles.flexWrap, styles.flex1]}>
{error}
Copy link
Contributor

Choose a reason for hiding this comment

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

Move all the rendering down here to be in one block. It's really difficult to look at this component and reason about the order things are rendered in.


return (
<View style={[styles.mh5, styles.mb5, styles.flex1, styles.justifyContentEnd, ...props.containerStyles]}>
{props.isAlertVisible && (
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is isAlertVisible here instead of doing an early return at the top of render() and returning null? If the alert isn't supposed to be visible, why render the container with nothing in it?

@ctkochan22
Copy link
Contributor Author

Updated!

Copy link
Contributor

@tgolen tgolen left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for those changes.

@tgolen tgolen merged commit 1a8bc8a into main Jul 7, 2022
@tgolen tgolen deleted the ckt_refactor_tryNewWrapper branch July 7, 2022 21:44
@OSBotify
Copy link
Contributor

OSBotify commented Jul 7, 2022

✋ 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 Jul 8, 2022

🚀 Deployed to staging by @tgolen in version: 1.1.81-0 🚀

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

@mvtglobally
Copy link

@ctkochan22 Does this need to be a PROD PR?
When we run the test card in staging, we see the debit card error. Pls confirm this error is expected or we need to log it
IMG_B511DDD77BF7-1

@ctkochan22
Copy link
Contributor Author

Was this error not appearing before? @mvtglobally

@mvtglobally
Copy link

@ctkochan22 We were not explicitly testing negative scenarios, so I am not sure if this was appearing before or not.

There was a PR in OldDot for this error, i can't find it, but i think @Justicea83 was working on it (if I remember right)

@ctkochan22
Copy link
Contributor Author

I'll test it again. But the error looks good and is what the error should look like

@ctkochan22
Copy link
Contributor Author

Just tested. The error is working as expected. the Button is a bit off style wise, which is not a blocker and will be addressed in a follow up PR

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @roryabraham in version: 1.1.82-5 🚀

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

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.

5 participants