Feature: refactor requiresAttentionFromCurrentUser function#32140
Conversation
|
@sobitneupane 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] |
sobitneupane
left a comment
There was a problem hiding this comment.
I have raised a few concerns, most of which are for clarification purposes.
|
|
||
| if (isWaitingForAssigneeToCompleteTask(option, parentReportAction)) { | ||
| return true; | ||
| if (isWaitingForAssigneeToCompleteTask(option, parentReportAction)) { |
There was a problem hiding this comment.
Looks like isWaitingForAssigneeToCompleteTask expects the first param to be report not an option.
There was a problem hiding this comment.
But only for option it was used
There was a problem hiding this comment.
I raised this because first param report of isWaitingForAssigneeToCompleteTask has type OnyxEntry<Report>
function isWaitingForAssigneeToCompleteTask(report: OnyxEntry<Report>, parentReportAction: OnyxEntry<ReportAction> | EmptyObject = {}): booleanThere was a problem hiding this comment.
Restricting the use of isWaitingForAssigneeToCompleteTask will change order of the report as requiresAttentionFromCurrentUser is being used in SidebarUtils to get ordered reportIDs (getOrderedReportIDs). This is the comparison between staging and PR.
Staging
Screen.Recording.2023-12-05.at.21.03.59.mov
PR
Screen.Recording.2023-12-05.at.21.04.31.mov
There was a problem hiding this comment.
Yes, this is a correct behaviour, this one related to this issue which this PR should fix!
There was a problem hiding this comment.
We can notice change in other chats with green dot indicator as well. Please let me know if it is expected.
There was a problem hiding this comment.
Deleted tasks were created from "fds"?
There was a problem hiding this comment.
Okay, agree, it was an issue, researched into the old code(before rewriting this function at all)
There was an issue before that in SidebarUtils getOrderedReportIDs we didnt use at all the "isWaitingForAssigneeToCompleteTask", but its in the function, but another part of the SidebarUtils were using "isWaitingForAssigneeToCompleteTask", but I removed it fully for reports, thats why this issue were happening.
Updated the code, removed isOption verification as its not needed anymore, added "reportAction" to "getOrderedReportIDs" for a correct behaviour, please retest and let me know
…-requiresAttentionFromCurrentUser
sobitneupane
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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 Copylabel 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
Screenshots/Videos
Android: Native
Screen.Recording.2023-12-07.at.16.06.33.mov
Android: mWeb Chrome
iOS: Native
Screen.Recording.2023-12-07.at.15.48.17.mov
iOS: mWeb Safari
Screen.Recording.2023-12-07.at.15.40.11.mov
MacOS: Chrome / Safari
Screen.Recording.2023-12-07.at.15.37.38.mov
MacOS: Desktop
Screen.Recording.2023-12-07.at.15.43.45.mov
| const lastMentionedTime = report.lastMentionedTime ?? ''; | ||
| const lastReadTime = report.lastReadTime ?? ''; | ||
| return lastReadTime < lastMentionedTime; | ||
| return Boolean('isUnreadWithMention' in report && report.isUnreadWithMention) || lastReadTime < lastMentionedTime; |
There was a problem hiding this comment.
Couldn't this just be this:
| return Boolean('isUnreadWithMention' in report && report.isUnreadWithMention) || lastReadTime < lastMentionedTime; | |
| return Boolean(report.isUnreadWithMention) || lastReadTime < lastMentionedTime; |
Because if report.UnreadWithMention is undefined or null it'll be false? Or will it throw?
There was a problem hiding this comment.
Ah, no, that was added because isUnreadWithMention is not exist in OnyxEntry and thats a verification to pass TS.
Boolean(report.isUnreadWithMention) - this will cause an error: Property 'isUnreadWithMention' does not exist on type 'Report | OptionData'.
Property 'isUnreadWithMention' does not exist on type 'Report'
There was a problem hiding this comment.
Ahh ok, I see. Perhaps then, instead of calling the argument report we should call it reportOrOption. So that it's more clear that the thing we are doing these checks on could be a report or option.
|
@waterim let me know when you've addressed that small feedback and I can review again. |
|
@puneetlath Updated the code! |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/puneetlath in version: 1.4.12-0 🚀
|
|
🚀 Deployed to staging by https://github.com/puneetlath in version: 1.4.12-0 🚀
|
|
🚀 Deployed to staging by https://github.com/puneetlath in version: 1.4.12-0 🚀
|
|
🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.12-2 🚀
|

Details
This PR is about to refactor requiresAttentionFromCurrentUser function
Fixed Issues
$ #30668
PROPOSAL: $ #30668 (comment)
Tests
N/A tests
Offline tests
N/A automated tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodWaiting for Copylabel for a copy review on the original GH to get the correct copy.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)/** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.