Remove pending-remove thread from LHN #21854

bernhardoj · 2023-06-29T07:39:18Z

Details

A message that is flagged as harassment/assault will be removed from the chat. In case it's a thread, we also want to remove the thread report on LHN. Additionally, we don't want the user to be able to access the report by deeplink/type the URL in the browser address bar.

Fixed Issues

$ #21497
PROPOSAL: #21497 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisites: User B sends a message to User A
The below step is for User A

Press "Reply in thread" of the message sent by B
Send any message in the thread
Verify you see the new thread on LHN
Go back to the chat with B
Flag B's message as Harassment/Assault
Verify the message is removed
Verify the thread chat on LHN is removed

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

Screen.Recording.2023-06-29.at.14.52.46.mov

Mobile Web - Chrome

Screen.Recording.2023-06-29.at.15.15.09.mov

Mobile Web - Safari

Screen.Recording.2023-06-29.at.15.11.14.mov

Desktop

Screen.Recording.2023-06-29.at.14.56.33.mov

iOS

Screen.Recording.2023-06-29.at.15.31.49.mov

Android

Screen.Recording.2023-06-29.at.15.12.39.mov

melvin-bot · 2023-06-29T07:39:22Z

@s77rt Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

bernhardoj · 2023-06-29T07:42:12Z

Additional video showing the not found page when we access the removed thread.

Screen.Recording.2023-06-29.at.15.16.16.mov

bernhardoj · 2023-06-29T07:44:36Z

src/pages/home/sidebar/SidebarLinks.js

+        message: [
+            {
+                moderationDecisions: [{decision: lodashGet(reportAction, 'message[0].moderationDecisions[0].decision')}],
+            },
+        ],


Added this so SidebarLinks rerender when the moderationDecisions value changed

bernhardoj · 2023-06-29T07:47:09Z

src/pages/home/sidebar/SidebarLinks.js

+                ),
+            }),
+        ),
+    ),


reportActionPropTypes have a required property (specifically inside reportActionFragmentPropTypes), but the reportActions selector only includes errors and message.moderationDecisions which will give a warning.

s77rt · 2023-06-29T09:56:12Z

src/libs/ReportUtils.js

-    if (getPolicyType(report, policies) === CONST.POLICY.TYPE.FREE) {
+    if (getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.FREE) {


Please revert this and all other instances that change the source of policies. I seen instances where what we pass as a parameter is not in onyx e.g. something that we are still about to create. I don't think this applies here but it's better to keep the changes minimal.

Yes, it doesn't apply here, but I did that so we don't need to connect the Policy Onyx in withReportOrNotFound. So, let's revert it and connect the policy Onyx in withReportOrNotFound?

Yeah that's safer

s77rt · 2023-06-29T17:00:01Z

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

Mobile Web - Chrome

mweb-chrome.mp4

Mobile Web - Safari

mweb-safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

s77rt · 2023-06-29T17:00:48Z

@bernhardoj Can you please resolve that conflict?

bernhardoj · 2023-06-29T17:04:20Z

@s77rt Conflicts solved!

s77rt

LGTM! 🚀

🎀 👀 🎀 C+ reviewed

OSBotify · 2023-06-29T22:47:23Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 1.3.35-2 🚀

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

OSBotify · 2023-07-03T14:34:48Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

OSBotify · 2023-07-03T15:17:23Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

bernhardoj added 3 commits June 29, 2023 15:18

create common function for pending remove

e6ad2d0

hide pending remove thread from LHN

79ff36c

prevent user to access report they don't have access to

d4060dd

bernhardoj requested a review from a team as a code owner June 29, 2023 07:39

melvin-bot bot requested review from s77rt and removed request for a team June 29, 2023 07:39

bernhardoj commented Jun 29, 2023

View reviewed changes

prettier and lint

a8c54a4

bernhardoj commented Jun 29, 2023

View reviewed changes

s77rt suggested changes Jun 29, 2023

View reviewed changes

bernhardoj added 4 commits June 29, 2023 19:32

pass policies onyx through func params

4634aa9

added missing jsdoc

4c3240d

pass policies onyx

04a6918

prettier

40792b2

Merge branch 'main' into fix/21497-hide-pending-remove-thread

17977b7

s77rt approved these changes Jun 29, 2023

View reviewed changes

melvin-bot bot requested a review from AndrewGable June 29, 2023 17:29

AndrewGable approved these changes Jun 29, 2023

View reviewed changes

AndrewGable merged commit 2767383 into Expensify:main Jun 29, 2023

OSBotify mentioned this pull request Jun 29, 2023

Deploy Checklist: New Expensify 2023-06-29 #21911

Closed

51 tasks

melvin-bot bot mentioned this pull request Jul 3, 2023

[HOLD for payment 2023-07-10] [$1000] A threaded message that is flagged with harassment or assault is not removed from LHN #21497

Closed

6 tasks

Talha345 mentioned this pull request Jul 17, 2023

[HOLD for payment 2024-02-14] [$1000] Whole thread disappears if the thread header is flagged as an Assault or Harassment #22383

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove pending-remove thread from LHN #21854

Remove pending-remove thread from LHN #21854

bernhardoj commented Jun 29, 2023

melvin-bot bot commented Jun 29, 2023

bernhardoj commented Jun 29, 2023

bernhardoj Jun 29, 2023

bernhardoj Jun 29, 2023

s77rt Jun 29, 2023

bernhardoj Jun 29, 2023

s77rt Jun 29, 2023

bernhardoj Jun 29, 2023

s77rt commented Jun 29, 2023 •

edited

Loading

s77rt commented Jun 29, 2023

bernhardoj commented Jun 29, 2023

s77rt left a comment

OSBotify commented Jun 29, 2023

OSBotify commented Jul 3, 2023

OSBotify commented Jul 3, 2023

		if (getPolicyType(report, policies) === CONST.POLICY.TYPE.FREE) {
		if (getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.FREE) {

Remove pending-remove thread from LHN #21854

Remove pending-remove thread from LHN #21854

Conversation

bernhardoj commented Jun 29, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 29, 2023

bernhardoj commented Jun 29, 2023

bernhardoj Jun 29, 2023

Choose a reason for hiding this comment

bernhardoj Jun 29, 2023

Choose a reason for hiding this comment

s77rt Jun 29, 2023

Choose a reason for hiding this comment

bernhardoj Jun 29, 2023

Choose a reason for hiding this comment

s77rt Jun 29, 2023

Choose a reason for hiding this comment

bernhardoj Jun 29, 2023

Choose a reason for hiding this comment

s77rt commented Jun 29, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

s77rt commented Jun 29, 2023

bernhardoj commented Jun 29, 2023

s77rt left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 29, 2023

OSBotify commented Jul 3, 2023

OSBotify commented Jul 3, 2023

s77rt commented Jun 29, 2023 •

edited

Loading