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

Update optimistic data for parent report when adding comment #20762

Merged
merged 17 commits into from
Jul 13, 2023

Conversation

dukenv0307
Copy link
Contributor

@dukenv0307 dukenv0307 commented Jun 14, 2023

Details

Update optimistic data for parent report when adding comment

Fixed Issues

$ #19445
PROPOSAL: #19445 (comment)

Tests

  1. Open any report
  2. Send a message
  3. Click on reply in thread
  4. In thread report, send some message quickly
  5. Get back to the main chat
  6. Verify that both reply count and avatar of user that comment in thread are updated immediately
  • Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

  1. Open any report
  2. Send a message
  3. Click on reply in thread
  4. In thread report, send some message quickly
  5. Get back to the main chat
  6. Verify that both reply count and avatar of user that comment in thread are updated immediately
  • 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
    • 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 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
Screencast.from.15-06-2023.00.33.51.webm
Mobile Web - Chrome
Record_2023-06-15-00-36-49.mp4
Mobile Web - Safari
original-17C7887E-3BC9-4227-AC1B-C4D8AE6555DB.mp4
Desktop
Screen.Recording.2023-06-15.at.00.45.58.mov
iOS
Screen.Recording.2023-06-15.at.00.58.40.mov
Android
19445.mp4

@dukenv0307 dukenv0307 marked this pull request as ready for review June 14, 2023 18:02
@dukenv0307 dukenv0307 requested a review from a team as a code owner June 14, 2023 18:02
@melvin-bot melvin-bot bot requested review from 0xmiros and removed request for a team June 14, 2023 18:02
@melvin-bot
Copy link

melvin-bot bot commented Jun 14, 2023

@stitesExpensify @0xmiroslav One of you needs to 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]

@melvin-bot melvin-bot bot requested a review from stitesExpensify June 14, 2023 18:02
@dukenv0307
Copy link
Contributor Author

Bump @0xmiroslav Could you help to review?

@0xmiros
Copy link
Contributor

0xmiros commented Jun 16, 2023

reviewing in a few hrs

@0xmiros
Copy link
Contributor

0xmiros commented Jun 16, 2023

I am not able to test. Auto signed-out and cannot login anymore. There was slack announcement 30 min ago.
@dukenv0307 same to you?

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jun 16, 2023

@0xmiroslav Yes, I cannot sign in again after signing out.

@dukenv0307
Copy link
Contributor Author

@0xmiroslav I just could log in again. Can you check again?

Screencast.from.16-06-2023.12.14.07.webm

Comment on lines 301 to 304
childVisibleActionCount,
childCommenterCount,
childLastVisibleActionCreated,
childOldestFourEmails,
Copy link
Contributor

Choose a reason for hiding this comment

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

childCommenterCount calculation is wrong:

Screen.Recording.2023-06-19.at.5.16.42.PM.mov

All these values should match with backend.

I think we should get backend logic from @stitesExpensify which fields are updated to what values in parentReportAction whenever add new comment or delete comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. Because we cannot know this user commented or not before for some case. So I just update to 1 if parentReportAction.childCommenterCount is undefined otherwise update to itself

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Beside, we only check if childCommenterCount > 0 and last four email is not empty we will display ReportActionItemThread and use last four email to display avtar in this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@0xmiroslav To update childCommenterCount correctly, we can use the logic that we use to find lastReportAction of user in ReportActionCompose

const lastReportAction = _.find([...this.props.reportActions, parentReportAction], (action) => ReportUtils.canEditReportAction(action));

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, I'm not following the problem here. In the video are you trying to show that the avatar is not loaded until the API command comes back?

Copy link
Contributor

@stitesExpensify stitesExpensify Jun 30, 2023

Choose a reason for hiding this comment

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

Okay so on the backend it's a pretty complicated SQL query which I don't think I'm supposed to share in the public repo. We don't actually ever modify those values directly, they are calculated based on the reportActions for a given report.

So:
childVisibleActionCount = number of visible reportActions (not whispers, moderator comments/actions, type_created, markedreimbursed, task_edited)
childCommenterCount = number of distinct accountIDs in all reportActions
childLastVisibleActionCreated = MAX(created) for all reportActions AKA the biggest timestamp
childOldestFourEmails = Sort all actions by created time -> Find the last 4 distinct accountIDs

I'm not sure that's really helpful in this case unfortunately unless we want to also calculate all of that on the front end (which could be very slow for very large chat rooms). I'm thinking that we should manually assume that if you are offline and post a comment, that:
childVisibleActionCount has gone up by 1
childCommenterCount has gone up by 1 if you have not commented before
childLastVisibleActionCreated is the new comment with its generated timestamp
childOldestFourEmails is the same as it was if you were already in the list, otherwise the oldest one should be removed and you should be added (i'm not sure which one in the list is the oldest, but the position should be the same every time because of the query)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@0xmiroslav What do you think about the suggestion of @stitesExpensify above?

Copy link
Contributor

Choose a reason for hiding this comment

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

I like that suggestion

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@0xmiroslav Do you think we also should update for deleting report comment?

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 so as we're updating same values

@0xmiros
Copy link
Contributor

0xmiros commented Jun 22, 2023

I think we can hold this until next Tuesday when @stitesExpensify is back from OOO.
Current blocker: #20762 (comment)

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jun 28, 2023

@0xmiroslav I saw that @stitesExpensify seems to be back from OOO. Should we have any updates here?

@0xmiros
Copy link
Contributor

0xmiros commented Jun 28, 2023

@0xmiroslav I saw that @stitesExpensify seems to be back from OOO. Should we have any updates here?

yes, @stitesExpensify was catching up pending reviews from yesterday. Let's still wait.

@stitesExpensify
Copy link
Contributor

Hi there, sorry for the delay. Still working through a big backlog! I commented on the comment in question

@dukenv0307
Copy link
Contributor Author

@0xmiroslav I just updated logic to update when deleting report comment. Because it could be very slow for very large chat rooms to update correctly childOldestFourAccountIDs when we delete a comment, I just update it if childVisibleActionCount is 0 after deleting a comment to hide the thread item.

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 5, 2023

@0xmiroslav Please help me to review the update.

@0xmiros
Copy link
Contributor

0xmiros commented Jul 5, 2023

@dukenv0307 you see bugs from my videos?

1:

1.bug.mov

4:

4.bug.mov

5, 6:

Screen.Recording.2023-07-05.at.6.28.42.AM.mov

@0xmiros
Copy link
Contributor

0xmiros commented Jul 5, 2023

Please test all possible cases:

Status before commenting on thread:

  1. has others' replies, also has reply from me (tested in task report)
add-4 replies, 2 people
  1. has my reply, no others' replies
add-my reply
  1. new IOU report
add-new IOU report
  1. new IOU request
add-new IOU request
  1. no reply yet, thread created from my message
add-new thread(mine)
  1. no reply yet, thread created from other's message
add-new thread(other)
  1. has others' replies, no reply from me
add-other reply
2.mov
3.mov
7.mov

@0xmiros
Copy link
Contributor

0xmiros commented Jul 6, 2023

And with the case above, parent report action of assign task is shareSomeWhere.

shareSomeWhere is #admins. Not sure if it's expected to create in DM as well.
I think this can be out of scope unless @stitesExpensify disagrees.

@0xmiros
Copy link
Contributor

0xmiros commented Jul 6, 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 / Chrome
    • iOS / native
    • iOS / 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 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
web.mov
web.-.delete.mov
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
ios1.mov
ios2.mov
Android

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 6, 2023

I think this can be out of scope unless @stitesExpensify disagrees.

@0xmiroslav That makes sense for me because when we add a comment in task report, BE also only returns the data that update parent report action.

Copy link
Contributor

@0xmiros 0xmiros left a comment

Choose a reason for hiding this comment

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

@stitesExpensify all yours! (please check correct backend logic and following discussion of task issue)

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

Getting there, but I'm a bit unsure about the logic and formatting of the changes in ReportUtils

if (oldestFourAccountIDs.length < 4) {
const index = _.findIndex(oldestFourAccountIDs, (accountID) => accountID === currentUserAccountID.toString());
if (index === -1) {
childCommenterCount += 1;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm confused why we are adding a commenter based on the oldestFourAccountIDs. We want to check that they've never commented in the thread before changing this right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For this case, oldestFourAccountIDs.length < 4 and the user isn't already in list that mean this is the first time the user comment, so I think increase childCommenterCount for this case makes sense.

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 should still be extracted outside of the <4 section actually. With the code you have here, we will only increase the childCommenterCount if there are less than 4. We need to increase that regardless of how many people have commented, if it is this user's first time commenting. Right?

Copy link
Contributor Author

@dukenv0307 dukenv0307 Jul 13, 2023

Choose a reason for hiding this comment

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

I think this should still be extracted outside of the <4 section actually. With the code you have here, we will only increase the childCommenterCount if there are less than 4. We need to increase that regardless of how many people have commented, if it is this user's first time commenting. Right?

@stitesExpensify We update childCommenterCount for this case because we know for sure that it's the user's first comment. For the case, oldestFourAccountIDs.length === 4, in FE we don't know the user had commented before or not. So we dont't update childCommenterCount.

Copy link
Contributor

Choose a reason for hiding this comment

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

childCommenterCount value isn't that important in frontend as long as it meets > 0.
Only used here:

const shouldDisplayThreadReplies = hasReplies && props.action.childCommenterCount && !ReportUtils.isThreadFirstChat(props.action, props.report.reportID);

@dukenv0307
Copy link
Contributor Author

@stitesExpensify I updated, help me to check again.

Comment on lines 1365 to 1366
if (!childCommenterCount) childCommenterCount = 1;
if (!oldestFourAccountIDs.length) oldestFourAccountIDs.push(currentUserAccountID);
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good. I had suggested these conditions just for safety (i.e. childCommenterCount accidentally set to undefined even thougholdestFourAccountIDs > 4 already), but yes redundant.

@stitesExpensify
Copy link
Contributor

Re-reviewing this today

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

I think we're looking good here! Just one small style change

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

One more question. We're super close here!

if (oldestFourAccountIDs.length < 4) {
const index = _.findIndex(oldestFourAccountIDs, (accountID) => accountID === currentUserAccountID.toString());
if (index === -1) {
childCommenterCount += 1;
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 should still be extracted outside of the <4 section actually. With the code you have here, we will only increase the childCommenterCount if there are less than 4. We need to increase that regardless of how many people have commented, if it is this user's first time commenting. Right?

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

LGTM!

@stitesExpensify stitesExpensify merged commit 7e78792 into Expensify:main Jul 13, 2023
@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/stitesExpensify in version: 1.3.41-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.41-3 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 1.3.42-0 🚀

platform result
🤖 android 🤖 cancelled 🔪
🖥 desktop 🖥 cancelled 🔪
🍎 iOS 🍎 cancelled 🔪
🕸 web 🕸 cancelled 🔪

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.41-3 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.42-26 🚀

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.

4 participants