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

If a deleted parent doesn't have a thread anymore, hide it #22690

Merged
merged 4 commits into from
Jul 13, 2023

Conversation

dangrous
Copy link
Contributor

@dangrous dangrous commented Jul 11, 2023

Details

Hides the [Deleted message] of a parent of a thread if the thread no longer exists. Actually applies in a broader set of circumstances than listed in the linked issue (unless I'm missing something).

It introduces one slight UI weirdness that I'd love your thoughts on, reviewers! Namely, if you delete the last child message of a thread, you are still in that thread, with only the [Deleted message] there, but as soon as you leave that thread disappears. I think that that's fine? At least I'm not sure what else to do that would be better.

Additionally, there is some weirdness with how these tests behave offline, but I checked and it seems to be the same on dev (the thread still is shown in the parent report even if it's deleted) so I'm not worrying about that.

Fixed Issues

$ #21508
$ #22674

Tests

Same as QA

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. In any chat, add a message
  2. Add another message as a thread off of that message
  3. Delete the initial message, either from the parent report or the chat
  4. Verify it is shown in both places as [Deleted message] and that the thread still exists and is accessible
  5. Delete the message in the thread
  6. Once you move away from the thread, ensure the thread no longer exists in the LHN
  7. Ensure that there is no [Deleted message] in the parent chat anymore
  8. [Additional tests for second issue]
  9. Send a new message
  10. Open a thread on that message, but don't actually send anything
  11. Go back to the main chat
  12. Set your connection to Slow 3G
  13. Delete that message
  14. Ensure you don't see [Deleted message] and the chat is fully deleted 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
    • 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 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

Still having trouble with mWeb Chrome overall, unable to load (on main too)

Web
desktopweb.mp4
Mobile Web - Chrome
Mobile Web - Safari
Safari.mp4
Desktop
desktop.mp4
iOS
IOS.mp4
Android
android.mp4

@dangrous dangrous requested a review from a team as a code owner July 11, 2023 20:25
@dangrous dangrous self-assigned this Jul 11, 2023
@melvin-bot melvin-bot bot requested review from mananjadhav and removed request for a team July 11, 2023 20:25
@melvin-bot
Copy link

melvin-bot bot commented Jul 11, 2023

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

Copy link
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

Change looks fine, testing this out.

@melvin-bot melvin-bot bot requested a review from yuwenmemon July 12, 2023 15:40
@melvin-bot
Copy link

melvin-bot bot commented Jul 12, 2023

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

@mananjadhav
Copy link
Collaborator

mananjadhav commented Jul 12, 2023

@dangrous I can see an issue related to [Deleted Message] visibility. do we want to tackle it here itself?

Steps:

  1. Go to any chat, and send a message
  2. Click on Reply to thread for the sent message (it should open the thread screen)
  3. Do not enter any message and click on the header (From ...) to open the original chat
  4. Delete the last sent message, and you'll see [Deleted Message] momentarily.

Here's the video with the applied steps.

deleted-thread-message.mov

Also after refreshing/logging out and logging in I can see these [Deleted Message] messages back.

image

@dangrous
Copy link
Contributor Author

Hmmm @mananjadhav yeah that first issue seems like something we can tackle here as well. I think we just need to update the optimistic data to match, let me see what I can do.

As for the second you called out, I'm not seeing that, is there a specific circumstance that made that happen (e.g. slow connection, something like that?). If you inspect those with react dev tools, what are the values of isDeletedParentAction and childVisibleActionCount?

@dangrous
Copy link
Contributor Author

dangrous commented Jul 12, 2023

I added a change that seems to fix that other issue, using hasCommentThread. Seems to work on my end, let me know how it tests!

Also after refreshing/logging out and logging in I can see these [Deleted Message] messages back.

@mananjadhav I managed to see the behavior you're talking about - but it only happens when I revert the code in this PR... Is it possible you didn't have the branch loaded when you were testing out that other issue?
2023-07-12_14-22-43 (1)

@mananjadhav
Copy link
Collaborator

You're right. I think I had switched my branch by then. I'll retest the feature in your branch.

@mananjadhav
Copy link
Collaborator

mananjadhav commented Jul 12, 2023

@dangrous one more scenario, assume before we delete the last message, we copy the thread chat URL, and after deleting the last message we paste and visit the thread URL. At the moment, it loads [Deleted Message] chat window. I think this is fine for the expected behavior right? or should it redirect to the parent chat?

Screenshot 2023-07-13 at 1 52 07 AM

@dangrous
Copy link
Contributor Author

@dangrous one more scenario, assume before we delete the last message, we copy the thread chat URL, and after deleting the last message we paste and visit the thread URL. At the moment, it loads [Deleted Message] chat window. I think this is fine for the expected behavior right? or should it redirect to the parent chat?

Hmmm yeah I think that's probably fine. That way, if there was an old URL somewhere, you'd know what happened (oh, the thread has been deleted) vs. just being redirected without a note. Technically then you could reopen a thread on a deleted message that you otherwise can't see, but I don't see how that would be used, for good or for bad.

@melvin-bot melvin-bot bot requested a review from srikarparsi July 12, 2023 19:39
@melvin-bot
Copy link

melvin-bot bot commented Jul 12, 2023

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

@mananjadhav
Copy link
Collaborator

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-deleted-message.mov
Mobile Web - Chrome
mweb-chrome-deleted-message.mov
Mobile Web - Safari
mweb-safari-deleted-message.mov
Desktop
desktop-deleted-message.mov
iOS
ios-deleted-message.mov
Android
android-deleted-message.mov

Thanks for the answers @dangrous. Can you rerun the lint action? It looks failed. @yuwenmemon All yours.

@dangrous
Copy link
Contributor Author

Yeah lint is not happy - seems like it's not just this PR, discussing here

@dangrous
Copy link
Contributor Author

woo lint is good to go

Copy link
Contributor

@srikarparsi srikarparsi left a comment

Choose a reason for hiding this comment

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

lgtm!

@dangrous
Copy link
Contributor Author

So I think Melvin double-assigned an internal reviewer here, I don't think we need you @yuwenmemon but if you'd like to join in, have at it!

@srikarparsi
Copy link
Contributor

Cool! I'll just go ahead and merge this since it seems pretty straightforward

@srikarparsi srikarparsi merged commit 3948833 into main Jul 13, 2023
10 checks passed
@srikarparsi srikarparsi deleted the dangrous-fullyremovedeletedparentsifnothread branch July 13, 2023 19:16
@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/srikarparsi 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/srikarparsi 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 ✅

@@ -90,7 +90,7 @@ function isReportPreviewAction(reportAction) {
* @returns {Boolean}
*/
function hasCommentThread(reportAction) {
return lodashGet(reportAction, 'childType', '') === CONST.REPORT.TYPE.CHAT;
return lodashGet(reportAction, 'childType', '') === CONST.REPORT.TYPE.CHAT && lodashGet(reportAction, 'childVisibleActionCount', 0) > 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

@dangrous I think this change is one level depth, It doesn’t check for nested threads, and that may lead to detached threads. For example :

  1. Create Root Thread inside the parent report
  2. Open Root Thread and create another thread inside it Thread 1
  3. Open Thread 1 and create another thread inside it Thread 2
  4. Go back to Root Thread and delete it and delete Thread 1
  5. The thread is removed from the parent report even when we have nested thread
  6. Now you can open Thread 2 and if you try to navigate the root thread it will navigate through all the deleted threads until you reach the parent thread.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hm, that's interesting. Can you bring this up in Slack? It's probably not ideal behavior but I honestly can't think of what would be better. Like we'd still want to be able to access that content, so maybe it's fine? Do you think we should keep [Deleted message] all the way down until there's a real thread? It seems a bit confusing.

@fedirjh
Copy link
Contributor

fedirjh commented Sep 23, 2023

This PR caused a little regression in #23139 , more context in #23139 (comment)

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