Fix room mentions in editing comments #44160

war-in · 2024-06-21T13:51:19Z

Details

Fixed Issues

$ #42521
PROPOSAL:

Tests

Go to workspace room
Create a comment with room mention
Start editing the created comment and verify that room mentions are highlighted
Go to DM (1:1 chat)
Create a comment with room mention
Start editing the created comment and verify that room mentions are not highlighted

Offline tests

QA Steps

Go to workspace room
Create a comment with room mention
Start editing the created comment and verify that room mentions are highlighted
Go to DM (1:1 chat)
Create a comment with room mention
Start editing the created comment and verify that room mentions are not highlighted

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.

Screenshots/Videos

Android: Native

Android.Native.mov

Android: mWeb Chrome

android.-.web.mov

iOS: Native

ios.-.native.mov

iOS: mWeb Safari

ios.-.web.mov

MacOS: Chrome / Safari

Web.video.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-06-21T14:15:21Z

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

eh2077 · 2024-06-21T14:24:39Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

eh2077 · 2024-06-21T14:56:07Z

src/pages/home/report/ReportActionItem.tsx

@@ -671,6 +671,7 @@ function ReportActionItem({
                                shouldDisableEmojiPicker={
                                    (ReportUtils.chatIncludesConcierge(report) && User.isBlockedFromConcierge(blockedFromConcierge)) || ReportUtils.isArchivedRoom(report)
                                }
+                                isGroupPolicyReport={!!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE}


Should we use isReportInGroupPolicy here? See also

App/src/components/Composer/types.ts

Lines 80 to 81 in 7512346

/** Indicates whether the composer is in a group policy report. Used for disabling report mentioning style in markdown input */

isGroupPolicyReport?: boolean;

I'm not sure what is the personal policy, but I can use it if we don't want to enable mentions there

Since the prop is named ...Group... I think you're right

Let's pull @rlinoz here to bring clarity

But in ReportActionCompose we set isGroupPolicyReport like I did. Which one is correct? 🤔 I think we should have the same solution in both places

App/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx

Line 349 in 7512346

const isGroupPolicyReport = useMemo(() => !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE, [report]);

cc @eh2077

Yes, I also saw it. If we go with same logic with ReportActionCompose, then I think we can consider wrapping it into an utility method.

Let's wait a little while for @rlinoz 's input

Let's use the same solution we did for the ReportActionCompose, the problem with using the isReportInGroupPolicy is that users who are not members of the policy but got invited to the room won't have the policy object in onyx.

eh2077

LGTM and tested well

rlinoz · 2024-06-21T16:48:21Z

I am having a hard time testing this with the reports showing as IDs, not sure what is up with that, but it is happening in main as well.

war-in · 2024-06-21T17:34:30Z

@rlinoz I've already created a PR fixing that #44140 (comment) and it was just merged 🚀 I'll merge main in a moment

…n-edit

rlinoz · 2024-06-21T17:38:25Z

That is great, thanks!!

war-in · 2024-06-21T17:42:40Z

@rlinoz Please try now :) Mentions should work as expected

rlinoz

Tests well, thanks!

OSBotify · 2024-06-21T18:08:31Z

✋ 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 · 2024-06-21T21:45:17Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.0.1-0 🚀

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

OSBotify · 2024-06-25T19:45:53Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.1-19 🚀

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

add isGroupPolicyReport to ReportActionItemMessageEdit

f4479b4

SzymczakJ approved these changes Jun 21, 2024

View reviewed changes

war-in marked this pull request as ready for review June 21, 2024 14:15

war-in requested a review from a team as a code owner June 21, 2024 14:15

melvin-bot bot removed the request for review from a team June 21, 2024 14:15

melvin-bot bot requested a review from Pujan92 June 21, 2024 14:15

eh2077 reviewed Jun 21, 2024

View reviewed changes

eh2077 approved these changes Jun 21, 2024

View reviewed changes

melvin-bot bot requested a review from carlosmiceli June 21, 2024 16:21

Merge branch 'refs/heads/main' into war-in/fix-room-mention-styling-i…

c3b0734

…n-edit

rlinoz approved these changes Jun 21, 2024

View reviewed changes

rlinoz merged commit 5d9ffd9 into Expensify:main Jun 21, 2024
14 checks passed

github-actions bot mentioned this pull request Jun 21, 2024

Deploy Checklist: New Expensify 2024-06-21 #44186

Closed

war-in deleted the war-in/fix-room-mention-styling-in-edit branch June 24, 2024 09:50

melvin-bot bot mentioned this pull request Jun 25, 2024

[HOLD for payment 2024-07-10] [HOLD for payment 2024-07-02] Mention - Report mention #admins is not styled when editing comment in room chat #42521

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix room mentions in editing comments #44160

Fix room mentions in editing comments #44160

war-in commented Jun 21, 2024 •

edited

Loading

melvin-bot bot commented Jun 21, 2024

eh2077 commented Jun 21, 2024 •

edited

Loading

eh2077 Jun 21, 2024

war-in Jun 21, 2024

war-in Jun 21, 2024

eh2077 Jun 21, 2024

war-in Jun 21, 2024

eh2077 Jun 21, 2024

rlinoz Jun 21, 2024

eh2077 left a comment

rlinoz commented Jun 21, 2024

war-in commented Jun 21, 2024

rlinoz commented Jun 21, 2024

war-in commented Jun 21, 2024

rlinoz left a comment

OSBotify commented Jun 21, 2024

OSBotify commented Jun 21, 2024

OSBotify commented Jun 25, 2024

	/** Indicates whether the composer is in a group policy report. Used for disabling report mentioning style in markdown input */
	isGroupPolicyReport?: boolean;

Fix room mentions in editing comments #44160

Fix room mentions in editing comments #44160

Conversation

war-in commented Jun 21, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 21, 2024

eh2077 commented Jun 21, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 Jun 21, 2024

Choose a reason for hiding this comment

war-in Jun 21, 2024

Choose a reason for hiding this comment

war-in Jun 21, 2024

Choose a reason for hiding this comment

eh2077 Jun 21, 2024

Choose a reason for hiding this comment

war-in Jun 21, 2024

Choose a reason for hiding this comment

eh2077 Jun 21, 2024

Choose a reason for hiding this comment

rlinoz Jun 21, 2024

Choose a reason for hiding this comment

eh2077 left a comment

Choose a reason for hiding this comment

rlinoz commented Jun 21, 2024

war-in commented Jun 21, 2024

rlinoz commented Jun 21, 2024

war-in commented Jun 21, 2024

rlinoz left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 21, 2024

OSBotify commented Jun 21, 2024

OSBotify commented Jun 25, 2024

war-in commented Jun 21, 2024 •

edited

Loading

eh2077 commented Jun 21, 2024 •

edited

Loading