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

feat: Add report field picker components #34157

Merged
merged 14 commits into from
Jan 23, 2024

Conversation

allroundexperts
Copy link
Contributor

@allroundexperts allroundexperts commented Jan 9, 2024

Details

This PR adds report field picker components.

Note: Saving those fields is beyond the scope of this ticket. It will be handled in an upcoming ticket.

Fixed Issues

$ #32763
PROPOSAL: #32763

Tests

  1. Open any expense report.
  2. Execute the following in console, replacing the policyID with the policyID of the policy the opened report is attached to:
Onyx.set('policyReportFields_47FB5109E0654E15', {
    text_title: {
        "defaultValue": "{report:type} #{report:reportID}",
        "fieldID": "text_title",
        "name": "Title",
        "orderWeight": 0,
        "type": "formula",

    },
    field_id_TEST: {
        "defaultValue": null,
        "fieldID": "field_id_TEST",
        "name": "Tax Code",
        "orderWeight": 1,
        "type": "text",
    },
    field_id_ANOTHER_ONE: {

        "defaultValue": "option A",
        "fieldID": "field_id_ANOTHER_ONE",
        "name": "Project",
        "orderWeight": 2,
        "type": "dropdown",
     	"values": ["option1", "option2", "option3"]
    },
    field_id_DATE_FIELD: {
        "defaultValue": "2023-11-19",
        "fieldID": "field_id_DATE_FIELD",
        "name": "Effective Date",
        "orderWeight": 3,
        "type": "date",
    }
})
  1. Enable canUseReportFields beta in Permissions.ts file.
  2. Verify that the custom fields show up.
  3. Click on each of the field.
  4. Verify that correct value picker component shows up according to the designs below:
Screenshot 2024-01-09 at 8 44 56 PM Screenshot 2024-01-09 at 8 45 07 PM Screenshot 2024-01-09 at 8 45 16 PM
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

  1. Open any expense report.
  2. Execute the following in console, replacing the policyID with the policyID of the policy the opened report is attached to:
Onyx.set('policyReportFields_47FB5109E0654E15', {
    text_title: {
        "defaultValue": "{report:type} #{report:reportID}",
        "fieldID": "text_title",
        "name": "Title",
        "orderWeight": 0,
        "type": "formula",

    },
    field_id_TEST: {
        "defaultValue": null,
        "fieldID": "field_id_TEST",
        "name": "Tax Code",
        "orderWeight": 1,
        "type": "text",
    },
    field_id_ANOTHER_ONE: {

        "defaultValue": "option A",
        "fieldID": "field_id_ANOTHER_ONE",
        "name": "Project",
        "orderWeight": 2,
        "type": "dropdown",
     	"values": ["option1", "option2", "option3"]
    },
    field_id_DATE_FIELD: {
        "defaultValue": "2023-11-19",
        "fieldID": "field_id_DATE_FIELD",
        "name": "Effective Date",
        "orderWeight": 3,
        "type": "date",
    }
})
  1. Enable canUseReportFields beta in Permissions.ts file.
  2. Verify that the custom fields show up.
  3. Click on each of the field.
  4. Verify that correct value picker component shows up according to the designs below:
Screenshot 2024-01-09 at 8 44 56 PM Screenshot 2024-01-09 at 8 45 07 PM Screenshot 2024-01-09 at 8 45 16 PM
  • 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-01-09.at.8.23.41.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-01-09.at.8.22.36.PM.mov
iOS: Native
Screen.Recording.2024-01-09.at.8.20.44.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-01-09.at.8.16.42.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-01-09.at.8.04.04.PM.mov
MacOS: Desktop
Screen.Recording.2024-01-09.at.8.07.09.PM.mov

@allroundexperts allroundexperts requested a review from a team as a code owner January 9, 2024 15:46
@melvin-bot melvin-bot bot requested review from jjcoffee and removed request for a team January 9, 2024 15:46
Copy link

melvin-bot bot commented Jan 9, 2024

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

@jjcoffee
Copy link
Contributor

@allroundexperts Are you able to resolve the failing TS checks?

@jjcoffee
Copy link
Contributor

jjcoffee commented Jan 10, 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
android-native-2024-01-22_16.08.27.mp4
Android: mWeb Chrome
android-chrome-2024-01-22_16.12.37.mp4
iOS: Native
ios-native-2024-01-22_15.41.13.mp4
iOS: mWeb Safari
ios-safari-2024-01-22_15.54.36.mp4
MacOS: Chrome / Safari
desktop-chrome-2024-01-22_15.56.04.mp4
MacOS: Desktop
desktop-app-2024-01-22_15.57.47.mp4

@allroundexperts
Copy link
Contributor Author

@allroundexperts Are you able to resolve the failing TS checks?

@jjcoffee All done!

@jjcoffee
Copy link
Contributor

@allroundexperts I get a bunch of these console warnings when opening the dropdown field:

image

@allroundexperts
Copy link
Contributor Author

@allroundexperts I get a bunch of these console warnings when opening the dropdown field:

Fixed!

@allroundexperts
Copy link
Contributor Author

Hi @jjcoffee!
Can you please review this with some priority?

Thanks!

@jjcoffee
Copy link
Contributor

Sorry yes, on it now!

@jjcoffee
Copy link
Contributor

jjcoffee commented Jan 16, 2024

@allroundexperts Shouldn't the defaultValue be selected in the dropdown? (I changed it from your example to option1 which exists in the list of options). The Recents section should also only be displayed if there are values.

image

@allroundexperts
Copy link
Contributor Author

@allroundexperts Shouldn't the defaultValue be selected in the dropdown? (I changed it from your example to option1 which exists in the list of options). The Recents section should also only be displayed if there are values.

It should, I'll investigate why it isn't. But please continue your review and let me know if there's anything else that you find.

@allroundexperts
Copy link
Contributor Author

Shouldn't the defaultValue be selected in the dropdown? (I changed it from your example to option1 which exists in the list of options). The Recents section should also only be displayed if there are values.

@jjcoffee Fixed.

@jjcoffee
Copy link
Contributor

@allroundexperts I think it needs a new section for displaying (and highlighting) the selected item at the very top, per the mockup (see also the Category selector for money requests):

image

I'm also seeing that searching doesn't highlight the top result, which might be related.

Also, maybe you missed it but I mentioned that the Recent section also shouldn't show until there are values to show there. Or will that be added in the next PR?

@allroundexperts
Copy link
Contributor Author

Also, maybe you missed it but I mentioned that the Recent section also shouldn't show until there are values to show there. Or will that be added in the next PR?

Recents would be handled in an upcoming PR. But, I'll look into the other issues.

@allroundexperts
Copy link
Contributor Author

@jjcoffee I think we can take care of #34157 (comment) as a follow up. There are couple of PRs that are depending on this one so it would be good if we can merge this.

@allroundexperts
Copy link
Contributor Author

Will you be able to complete the review today?

Co-authored-by: Joel Davies <joeld.dev@gmail.com>
Copy link
Contributor

@jjcoffee jjcoffee left a comment

Choose a reason for hiding this comment

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

LGTM! The only outstanding issue is with the dropdown, which @allroundexperts has proposed to deal with in a follow up PR. The dropdown search should also highlight the topmost matching search result, I think (which is probably more or less the same fix).

@melvin-bot melvin-bot bot requested a review from thienlnam January 22, 2024 15:26
@thienlnam thienlnam merged commit 616d75f into Expensify:main Jan 23, 2024
15 of 16 checks passed
@melvin-bot melvin-bot bot added the Emergency label Jan 23, 2024
Copy link

melvin-bot bot commented Jan 23, 2024

@thienlnam looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@thienlnam
Copy link
Contributor

Perf tests known to be flakey

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

@kavimuru
Copy link

@allroundexperts could you help us with step 3:

Enable canUseReportFields beta in Permissions.ts file.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.4.30-0 🚀

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

@thienlnam
Copy link
Contributor

@kavimuru All QA accounts should have all betas enabled I believe

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.30-1 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.30-1 🚀

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

return [
{
title: translate('common.recents'),
shouldShow: true,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should have shown this only if recent options were greater than 0. This later caused #35832

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