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

exclude reports in LHN that has no report type #29155

Merged

Conversation

rojiphil
Copy link
Contributor

@rojiphil rojiphil commented Oct 10, 2023

@abdulrahuman5196 @chiragsalian

Details

The original proposal considered checking for report type. However, this resulted in unit test failure which was analyzed here.

The alternate solution is to consider participantAccountIDs from where we gather personal details like avatars. However, as this seems like a hacky work, it was decided not to pursue this path.

This PR makes the following changes to the code:

  1. Additionally check for undefined report type to decide if this report must be considered for visibility in the LHN options list. The changes are made in shouldReportBeInOptionList
  2. Further, we update the failing unit tests by including report type. The changes are in OptionsListUtilsTest.js and UnreadIndicatorsTest.js

Fixed Issues

$ #27878
PROPOSAL: #27878 (comment)

Tests

  1. Sign-in as User A in Expensify App.
  2. Sign-in as User B in another Expensify App. (Note: User B should be such that user A should not have a chat history with user B)
  3. Click on FAB in User B’s app and send Money Request.
  4. Observe the LHN in User A
    Expected Behaviour: Verify that IOU Report in LHN of user A should arrive with proper display of avatar and user name
    i.e. There should not be a brief time during which avatar and user name is not displayed.
  • Verify that no errors appear in the JS console

Offline tests

There are no offline tests as this use case requires interaction between two apps and, hence, requires to be online.

QA Steps

Same as Steps for Tests Section.

  • 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 / Chrome
    • iOS / native
    • iOS / 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web-Chrome
27878-web-chrome-1.mp4
iOS
27878-ios-native.mp4
Android
27878-android-native.mp4
Mobile Web - Chrome
27878-mweb-chrome.mp4
Mobile Web - Safari
27878-mweb-safari.mp4
Web
27878-web-safari.mp4
Desktop
27878-desktop.mp4

@rojiphil rojiphil marked this pull request as ready for review October 10, 2023 08:00
@rojiphil rojiphil requested a review from a team as a code owner October 10, 2023 08:00
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and removed request for a team October 10, 2023 08:00
@melvin-bot
Copy link

melvin-bot bot commented Oct 10, 2023

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

@rojiphil
Copy link
Contributor Author

@abdulrahuman5196
Using report type as per original proposal resulted in jest unit test failure.
So, instead of using type, I propose using participantAccountIDs which looks like an even better option considering that we derive personal details from this variable. The jest unit tests are successful here. Also, this fixes the problem we have.
Kindly review the PR and let me know if there are changes required.

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Oct 10, 2023

@rojiphil what unit test is failing as per original post? Found out

@abdulrahuman5196
Copy link
Contributor

@rojiphil Why where the UTs failing? Could you provide information that?

@rojiphil
Copy link
Contributor Author

@rojiphil Why where the UTs failing? Could you provide information that?

@abdulrahuman5196
That's an interesting question. I quickly jumped on to find an alternate solution.
I will check and get back.

@rojiphil
Copy link
Contributor Author

@rojiphil Why where the UTs failing? Could you provide information that?

@abdulrahuman5196
Summary of all failing tests

  1. FAIL tests/unit/OptionsListUtilsTest.js

REASON: Reports here do not have type. Because of this, none of the reports are taken into consideration, thereby, causing the following 4 failures.

  ● OptionsListUtils › getSearchOptions()
    Expected: 2
    Received: 9
      290 |
      291 |         // Then the 2 personalDetails that don't have reports should be returned
    > 292 |         expect(results.personalDetails.length).toBe(2);

  ● OptionsListUtils › getFilteredOptions()
    Expected: 5
    Received: 0

      330 |
      331 |         // We should expect maximimum of 5 recent reports to be returned
    > 332 |         expect(results.recentReports.length).toBe(MAX_RECENT_REPORTS);

  ● OptionsListUtils › getFilteredOptions() for group Chat
    Expected: 5
    Received: 0

      418 |
      419 |         // Then we should expect only a maxmimum of 5 recent reports to be returned
    > 420 |         expect(results.recentReports.length).toBe(5);
          |                                              ^
  ● OptionsListUtils › getShareDestinationsOptions()
    Expected: 9
    Received: 0

      587 |
      588 |         // Then we should expect all the recent reports to show but exclude the archived rooms
    > 589 |         expect(results.recentReports.length).toBe(_.size(REPORTS) - 1);
  1. FAIL tests/ui/UnreadIndicatorsTest.js

REASON: As the report here does not include type, the report is not considered for browser notification. So, even though the expected length is 2, we receive only 1.

  ● Unread Indicators › Shows a browser notification and bold text when a new message arrives for a chat that is read
    Expected length: 2
    Received length: 1
    Received array:  [{"_fiber": [FiberNode]}]

      353 |                 const optionRowsHintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
      354 |                 const optionRows = screen.queryAllByAccessibilityHint(optionRowsHintText);
    > 355 |                 expect(optionRows).toHaveLength(2);

@rojiphil
Copy link
Contributor Author

@abdulrahuman5196
Based on the UT test failures, I think, there are cases where type may not be sent but participantAccountIDs are sent.
So, it looks like using participantAccountIDs to check is the better thing to do.
What are your thoughts?

@abdulrahuman5196
Copy link
Contributor

So, it looks like using participantAccountIDs to check is the better thing to do.

@chiragsalian Could you kindly confirm if its fine to check for participantAccountIDs, or we should stick with type ?

@chiragsalian
Copy link
Contributor

I think its fine to update this to check for participantAccountIDs.
But do we always have participantAccountIDs for reports? I'm just wondering for an optimistically created report do we always set participantAccountIDs now? Because if not then we would have to update optimistically created reports too as necessary.

@rojiphil
Copy link
Contributor Author

But do we always have participantAccountIDs for reports? I'm just wondering for an optimistically created report do we always set participantAccountIDs now? Because if not then we would have to update optimistically created reports too as necessary.

@chiragsalian
That's a good question. This needs to be looked into. I will check and get back.

@rojiphil
Copy link
Contributor Author

I think its fine to update this to check for participantAccountIDs.
But do we always have participantAccountIDs for reports? I'm just wondering for an optimistically created report do we always set participantAccountIDs now? Because if not then we would have to update optimistically created reports too as necessary.

@chiragsalian @abdulrahuman5196
Currently, we have four types of chat as seen here

ParticipantAccountIDs is assigned optimistically in three of the report types (i.e)

  1. chat : assigned here
  2. iou : assigned here
  3. task : assigned here

However, for expense report type, ParticipantAccountIDs is not optimistically set as seen here. We can add participantAccountIDs: [] to buildOptimisticExpenseReport as well to keep regression at bay.

@rojiphil
Copy link
Contributor Author

@abdulrahuman5196

I have added participantAccountIDs: [] to buildOptimisticExpenseReport and have verified that it works.
Also, I have attached a test video for this in the PR description.
Kindly review.

@abdulrahuman5196
Copy link
Contributor

I think its fine to update this to check for participantAccountIDs. But do we always have participantAccountIDs for reports? I'm just wondering for an optimistically created report do we always set participantAccountIDs now? Because if not then we would have to update optimistically created reports too as necessary.

@chiragsalian Logically I am not sure if this is correct, because we can have a task without assignee meaning it won't have participantAccountIDs(although we get/set empty [] now in the object so it should work fine). And in the failing UTs I don't think the type is intentionally left out, it could be that the type was missed during implementation and we haven't checked/updated since then. Even I can see commits adding type field to UTs ff1d770

I think type would be better and we can update UTs as well on the same. It would be better if you could confirm again which is more reliable from backend/logical perspective. Is it type field or participantAccountIDs field?

@rojiphil

This comment was marked as outdated.

@chiragsalian
Copy link
Contributor

chiragsalian commented Oct 11, 2023

Ah poop i was hoping that reports always had participants but i forgot about report-type tasks. I thought this would be a quick answer. I'm not a fan of adding participantAccountIDs: [] just to make the functionality work. (its too hacky IMO even if it works)

When in doubt i usually check what the backend has and try to make the front end work with values that is usually more expected.
Checking against a much smaller sample set than production

sqlite> select count(reportID) from reports where reportID NOT IN (SELECT reportID from reportNameValuePairs where name = 'type');
count(reportID)
---------------
0

This means that all reports have type in the backend. So the front end tests should be updated to consider them if we want it to closely match the backend.

sqlite> select count(reportID) from reports where reportID NOT IN (SELECT reportID from sharedReports);
count(reportID)
---------------
128

This tells us there are a number of reports not shared with others which can possibly result in participantAccountIDs: [] values. (there are exceptions like owners etc)

So yeah i think checking for type is the better approach moving forward. If there is any API request not providing report type then we should update it because the backend has this information. Finally, we should update the tests as necessary to account for report type too.

@rojiphil
Copy link
Contributor Author

So yeah i think checking for type is the better approach moving forward. If there is any API request not providing report type then we should update it because the backend has this information. Finally, we should update the tests as necessary to account for report type too.

@abdulrahuman5196 @chiragsalian
Ok. So, we have a consensus on this.
I will revert the code and make the necessary changes to align with this.

@rojiphil
Copy link
Contributor Author

@abdulrahuman5196
The required changes are made and the PR description is updated accordingly.
Works well too.
Over to you for review.

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Oct 12, 2023

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(themeColors.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 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

Web
Screen.Recording.2023-10-12.at.2.35.45.PM.mp4
Mobile Web - Chrome
Screen.Recording.2023-10-12.at.2.44.05.PM.mp4
Mobile Web - Safari
Screen.Recording.2023-10-12.at.2.42.14.PM.mp4
Desktop
Screen.Recording.2023-10-12.at.3.52.17.PM.mp4
iOS
Screen.Recording.2023-10-12.at.3.48.13.PM.mp4
Android
Screen.Recording.2023-10-12.at.3.50.47.PM.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. @chiragsalian

🎀 👀 🎀
C+ Reviewed

@melvin-bot melvin-bot bot requested a review from chiragsalian October 12, 2023 10:57
@rojiphil
Copy link
Contributor Author

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

All yours. @chiragsalian

🎀 👀 🎀 C+ Reviewed

@chiragsalian
Gentle bump on review here.

Copy link
Contributor

@chiragsalian chiragsalian left a comment

Choose a reason for hiding this comment

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

LGTM

@chiragsalian chiragsalian merged commit 7b484e5 into Expensify:main Oct 16, 2023
13 checks passed
@melvin-bot
Copy link

melvin-bot bot commented Oct 16, 2023

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

@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/chiragsalian in version: 1.3.86-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-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.

4 participants