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

Remove export ReportUtil.getReport function #43632

Merged
merged 22 commits into from
Jun 20, 2024
Merged

Conversation

nkdengineer
Copy link
Contributor

@nkdengineer nkdengineer commented Jun 13, 2024

Details

  • Use useOnyx() to load the data in view components
  • Use Onyx.connect() to load the data in other action files
  • Remove the usage of ReportUtils.getReport() and prevent it from being exported by adding a test to EnforceActionExportRestrictions.ts

Fixed Issues

$ #40316
PROPOSAL: #40316 (comment)

Tests

  1. Verify that getReport function isn't exported and is only used in the local action files
  2. Verify that we use useOnyx() to load the data in view components
  • Ancestor test
  1. As user A create a group chat with user B
  2. Open the group chat and send a message
  3. Reply in thread of the message above
  4. Verify that the thread divider line is clickable and tap on it will get the user go to the correct ancestor report
  5. Mention user C in the thread and then invite this user to the thread
  6. As user C open the thread and verify that the thread divider line is not clickable
  • Copy to clipboard test
  1. Submit an expense
  2. Hover or long press on the report preview action and select Copy to clipboard
  3. Paste the message to the composer and verify that the copied message is correct
  • Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

  • Ancestor test
  1. As user A create a group chat with user B
  2. Open the group chat and send a message
  3. Reply in thread of the message above
  4. Verify that the thread divider line is clickable and tap on it will get the user go to the correct ancestor report
  5. Mention user C in the thread and then invite this user to the thread
  6. As user C open the thread and verify that the thread divider line is not clickable
  • Copy to clipboard test
  1. Submit an expense
  2. Hover or long press on the report preview action and select Copy to clipboard
  3. Paste the message to the composer and verify that the copied message is correct
  • 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
  • Ancestor test
Screen.Recording.2024-06-13.at.12.53.18.mov
  • Copy to clipboard test
Screen.Recording.2024-06-13.at.12.53.50.mov
Android: mWeb Chrome
  • Ancestor test
Screen.Recording.2024-06-13.at.12.52.34.mov
  • Copy to clipboard test
Screen.Recording.2024-06-13.at.12.52.46.mov
iOS: Native
  • Ancestor test
Screen.Recording.2024-06-13.at.13.01.31.mov
  • Copy to clipboard test
Screen.Recording.2024-06-13.at.13.01.50.mov
iOS: mWeb Safari
  • Ancestor test
Screen.Recording.2024-06-13.at.12.54.51.mov
  • Copy to clipboard test
Screen.Recording.2024-06-13.at.12.55.07.mov
MacOS: Chrome / Safari
  • Ancestor test
Screen.Recording.2024-06-13.at.12.51.14.mov
  • Copy to clipboard test
Screen.Recording.2024-06-13.at.12.51.27.mov
MacOS: Desktop
  • Ancestor test
Screen.Recording.2024-06-13.at.12.58.30.mov
  • Copy to clipboard test
Screen.Recording.2024-06-13.at.12.58.40.mov

@nkdengineer nkdengineer marked this pull request as ready for review June 13, 2024 06:02
@nkdengineer nkdengineer requested a review from a team as a code owner June 13, 2024 06:02
@melvin-bot melvin-bot bot requested review from s77rt and removed request for a team June 13, 2024 06:02
Copy link

melvin-bot bot commented Jun 13, 2024

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

@@ -61,7 +59,7 @@ function MentionReportRenderer({style, tnode, TDefaultRenderer, reports, ...defa
const htmlAttributeReportID = tnode.attributes.reportid;

const currentReportID = useCurrentReportID();
const currentReport = getReport(currentReportID?.currentReportID);
const [currentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${currentReportID?.currentReportID}`);
Copy link
Contributor

Choose a reason for hiding this comment

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

getReport returns either the report or the draft report. Are we sure that in this case we are only interested in the report? (Please double check on other instances too). You may refer to #40668 and its PRs to see where we may need to fallback to the draft report.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@s77rt I checked the mentioned PR when investigating this PR. The draft report is only used when we move transaction from track expense. It will be cleared in optimistic data when we confirm to move the transaction from track expense and it's not used to display any other UI of the App.

src/libs/OptionsListUtils.ts Outdated Show resolved Hide resolved
src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
src/libs/actions/Report.ts Outdated Show resolved Hide resolved
src/libs/actions/Task.ts Outdated Show resolved Hide resolved
src/pages/home/ReportScreen.tsx Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Jun 15, 2024

There is a function getReportPolicyID that we should remove as well

@nkdengineer
Copy link
Contributor Author

@s77rt I updated. please help to check again.

src/components/Attachments/AttachmentCarousel/index.tsx Outdated Show resolved Hide resolved
src/components/Attachments/AttachmentCarousel/index.tsx Outdated Show resolved Hide resolved
src/components/Attachments/AttachmentCarousel/index.tsx Outdated Show resolved Hide resolved
src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
tests/actions/EnforceActionExportRestrictions.ts Outdated Show resolved Hide resolved
tests/actions/EnforceActionExportRestrictions.ts Outdated Show resolved Hide resolved
tests/actions/EnforceActionExportRestrictions.ts Outdated Show resolved Hide resolved
tests/actions/EnforceActionExportRestrictions.ts Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Jun 17, 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 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 android
Android: mWeb Chrome mweb-chrome
iOS: Native ios
iOS: mWeb Safari mweb-safari
MacOS: Chrome / Safari web
MacOS: Desktop desktop desktop related

@s77rt
Copy link
Contributor

s77rt commented Jun 17, 2024

After creating a group chat the app crashes

Screen.Recording.2024-06-17.at.6.48.44.PM.mov

@nkdengineer
Copy link
Contributor Author

@s77rt I fixed the bug above and updated your suggestion, please help to check again.

src/components/LHNOptionsList/OptionRowLHN.tsx Outdated Show resolved Hide resolved
src/pages/home/report/ReportAttachments.tsx Outdated Show resolved Hide resolved
src/pages/home/report/SystemChatReportFooterMessage.tsx Outdated Show resolved Hide resolved
src/pages/iou/HoldReasonPage.tsx Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Jun 18, 2024

Bug: Can't submit an expense (IOU info keep resetting)

Screen.Recording.2024-06-18.at.4.06.57.PM.mov

@nkdengineer
Copy link
Contributor Author

@s77rt I updated to fallback reportID to -1

Bug: Can't submit an expense (IOU info keep resetting)

I can't reproduce this bug now.

@melvin-bot melvin-bot bot requested a review from tgolen June 19, 2024 11:40
src/components/SettlementButton.tsx Outdated Show resolved Hide resolved
@@ -1227,7 +1227,8 @@ function isClosedExpenseReportWithNoExpenses(report: OnyxEntry<Report>): boolean
/**
* Whether the provided report is an archived room
*/
function isArchivedRoom(report: OnyxInputOrEntry<Report> | EmptyObject, reportNameValuePairs?: OnyxInputOrEntry<ReportNameValuePairs> | EmptyObject): boolean {
function isArchivedRoom(reportOrID: OnyxInputOrEntry<Report> | EmptyObject | string, reportNameValuePairs?: OnyxInputOrEntry<ReportNameValuePairs> | EmptyObject): boolean {
Copy link
Contributor

Choose a reason for hiding this comment

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

I was looking at this one (and also isInvoiceRoom above) and I don't really like that the first param could be either a reportID (string) or a report (object). It makes the code feel much less uncertain and if I was looking at it, I'd be wondering when I should use a reportID vs just a report. Some suggestions I have:

  • Keep it two separate parameters for clarity (reportID, report)
  • Make two separate methods
  • Anywhere that is only using the reportID, have it get the report from the collection first and then these methods would only have a report parameter.

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 was looking at this one (and also isInvoiceRoom above) and I don't really like that the first param could be either a reportID (string) or a report (object). It makes the code feel much less uncertain and if I was looking at it, I'd be wondering when I should use a reportID vs just a report. Some suggestions I have:

It's the same way we use for other functions like isMoneyRequestReport, isMoneyRequest,...

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, I don't think that is a pattern that we should be following, so let's not do it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tgolen I updated with two separate methods.

src/libs/actions/ReportActions.ts Outdated Show resolved Hide resolved
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.

Thanks!

@tgolen tgolen merged commit 9a6019a into Expensify:main Jun 20, 2024
17 checks passed
@tgolen
Copy link
Contributor

tgolen commented Jun 20, 2024

I really appreciate you stepping in and taking this one over.

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

@war-in
Copy link
Contributor

war-in commented Jun 21, 2024

Hi all 👋 I think this PR broke the room mentions 😅
Currently, reports on the main are displayed as IDs
image

This is the draft PR which should fix the issue.
Please let me know if the issue should be created and who should I ping 🙏

@nkdengineer
Copy link
Contributor Author

@war-in I can take this and raise a PR to fix this issue.

@nkdengineer
Copy link
Contributor Author

@war-in Or you can mention this issue #40316 in link issue of proposal description. So the current C+ and internal of our issue can be assigned.

@war-in
Copy link
Contributor

war-in commented Jun 21, 2024

@war-in Or you can mention this issue #40316 in link issue of proposal description. So the current C+ and internal of our issue can be assigned.

Thanks for linking! I'll write a comment there :)

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/tgolen in version: 9.0.1-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.1-19 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 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