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

feat: support accountid attribute in user mentions #26877

Merged
merged 7 commits into from
Sep 24, 2023
Merged

feat: support accountid attribute in user mentions #26877

merged 7 commits into from
Sep 24, 2023

Conversation

samh-nl
Copy link
Contributor

@samh-nl samh-nl commented Sep 6, 2023

Details

This PR adds support for the account ID to be provided in user mentions.
Usage examples: <mention-user accountID=12345678>@test@test.com</mention-user> or <mention-user accountID=12345678></mention-user>

Fixed Issues

$ #26306
PROPOSAL: #26306 (comment)

Tests

Precondition: The API does not yet support this feature. To allow testing, we can perform a modification here to automatically add the mentions to messages:

const mentionsHTML = [
	'1. <mention-user accountID=12345678>@test@test.com</mention-user> (hidden user: unknown account ID)',
	'2. <mention-user accountID=YOUR OWN ID>@test@test.com</mention-user> (current user provided via account ID)',
	'3. <mention-user accountID=ACCOUNT ID>@test@test.com</mention-user> (other user provided via account ID)',
	'4. <mention-user>@YOUR EMAIL</mention-user> (current user provided via email)',
	'5. <mention-user>@OTHER EMAIL</mention-user> (other user provided via email)',
	'6. <mention-user></mention-user> (no account ID or email)',
];

return <RenderHTML html={`<comment>${mentionsHTML.join('\n')}</comment>`} />;

In the above, change:

  • 12345678 with a random number if you already have an account ID stored with this number. It needs to be new.
  • YOUR OWN ID with your own account's ID.
  • ACCOUNT ID with a known account ID (but not yourself and the login field of the account must be filled).
  • YOUR EMAIL should be changed to your own email address.
  • OTHER EMAIL should be changed to another account's email address.

Verify precondition

  1. Go to any report that has a message (or post a message if none present).
  2. Verify that the message is replaced with 6 mentions.

Tests

  1. Verify that mentions 1 - 5 display the correct email address, prefixed by '@'.
  2. Verify that pressing on mentions 1 - 5 opens the profile page.
  3. Verify that mention 6 is not shown.
  4. Verify that mention 2 is highlighted in the same color as mention 4.
  5. Make the login field empty of the account of mention 3, e.g. by running (replace 123 with the account ID):
window.Onyx.merge('personalDetailsList', { 123: { login: '' }});
  1. Verify that mention 3 now correctly states the account's name prefixed with @.
  2. Verify that pressing mention 3 still opens the profile page.
  • Verify that no errors appear in the JS console

Offline tests

Identical to "Tests" section.

QA Steps

Identical to "Tests" section.

  • 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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If a new page is added, I verified it's using the 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
Web.Screen.Recording.2023-09-19.at.11.41.49.mp4
Mobile Web - Chrome
mWeb.Chrome.Screen.Recording.2023-09-19.at.13.46.33.mp4
Mobile Web - Safari
mWeb.Safari.Screen.Recording.2023-09-19.at.12.44.48.mp4
Desktop
Desktop.Screen.Recording.2023-09-19.at.11.57.37.mp4
iOS
Native.iOS.Screen.Recording.2023-09-19.at.12.23.22.mp4
Android
Native.Android.Screen.Recording.2023-09-19.at.13.38.39.mp4

@samh-nl samh-nl requested a review from a team as a code owner September 6, 2023 14:28
@melvin-bot melvin-bot bot requested review from thesahindia and removed request for a team September 6, 2023 14:28
@melvin-bot
Copy link

melvin-bot bot commented Sep 6, 2023

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

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 6, 2023

@thesahindia One thing I would like to note is that the self-closing syntax, i.e.: <mention-user accountID=12345678 /> is not compatible due to the way HTML is parsed, only certain tags like img, input and br can be self-closed. For others, it will include the content present on the same line inside the tag. So for correct usage it would be best to close it using </mention-user>.

@puneetlath
Copy link
Contributor

Oh, hm, that's interesting. So the back-end will have to return it as <mention-user accountID=12345678></mention-user>? That's a bit of a bummer.

Is that specifically a restriction of the renderHTML library we're using?

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 8, 2023

It's on the HTML specification level so the default behavior should be the same across renderers. It's explained quite well here: https://developer.mozilla.org/en-US/docs/Glossary/Void_element#self-closing_tags

For the <edited> tag we similarly close it with </edited> despite there being no children (here).

There is a prop htmlParserOptions.recognizeSelfClosing that can be set true (reference). It seems to work well in testing. Please note this would be a non-specific change, i.e. it would allow self-closing of other tags as well.

If you'd like me to pursue, I will incorporate this here, and I will update the tests to cover the extra scenarios involved. There are two usages of the htmlparser2 library where this prop can also be added, however these involve extracting attachments from reports (extractAttachmentsFromReport) or deal with the browser DOM (getHTMLOfSelection), and it would not be relevant there.

@puneetlath
Copy link
Contributor

Ok, got it! Thanks for the detailed explanation! Let's go with the way you have it for now. If we want to add the recognizeSelfClosing option later, we can always do so.

@puneetlath
Copy link
Contributor

@samh-nl now that the merge freeze is over, please merge main into your branch.

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 11, 2023

I have performed the merge.

@puneetlath
Copy link
Contributor

Ok great. @thesahindia let us know when you'll be able to review.

@thesahindia
Copy link
Member

I will review it today.

@puneetlath
Copy link
Contributor

@thesahindia bump.

@thesahindia
Copy link
Member

Hey @puneetlath, sorry for the delay here. I am having some issues with my system and won't be able to look into it soon. Please reassign.

@puneetlath puneetlath requested a review from situchan September 13, 2023 18:30
@puneetlath
Copy link
Contributor

@situchan bump!

@situchan
Copy link
Contributor

Mostly looks good.

If the accountID is not present in the personalDetailsList then we should render the mention as @Hidden

@puneetlath in this case, should we disable navigation to open detail page?

Screen.Recording.2023-09-15.at.11.51.34.PM.mov

@situchan
Copy link
Contributor

I am not sure if this is possible case: <mention-user></mention-user>

Screen.Recording.2023-09-16.at.12.05.34.AM.mov

@puneetlath
Copy link
Contributor

If the accountID is not present in the personalDetailsList then we should render the mention as @hidden
@puneetlath in this case, should we disable navigation to open detail page?

Yes, if we have the accountID in the mention itself, then we can still open the profile page. Only if for some reason there isn't an accountID present, we shouldn't open the profile page.

I am not sure if this is possible case:

Let's handle it. It shouldn't happen, but let's handle it in case it does.

@situchan
Copy link
Contributor

situchan commented Sep 16, 2023

Yes, if we have the accountID in the mention itself, then we can still open the profile page. Only if for some reason there isn't an accountID present, we shouldn't open the profile page.

So what I was asking about the case when accountID exists in mention itself but not exist in personalDetailsList.
In this case, we show @hidden so you meant still open profile page with hidden display in email field, correct?

Let's handle it. It shouldn't happen, but let's handle it in case it does.

So this is the case when neither accountID nor email exists in mention tag. What would be the expected behavior here?
Just render nothing?

@situchan
Copy link
Contributor

@samh-nl let's address feedback above

@puneetlath
Copy link
Contributor

So what I was asking about the case when accountID exists in mention itself but not exist in personalDetailsList.
In this case, we show @hidden so you meant still open profile page with hidden display in email field, correct?

Yes, let's show @hidden in that scenario and still open the profile page. The profile page should already handle the scenario where the accountID isn't present in personalDetails and will also call the API to get whatever info it can.

@puneetlath
Copy link
Contributor

So this is the case when neither accountID nor email exists in mention tag. What would be the expected behavior here?
Just render nothing?

Render nothing makes sense to me for this scenario.

@puneetlath
Copy link
Contributor

Good questions.

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 18, 2023

Yes, let's show @hidden in that scenario and still open the profile page. The profile page should already handle the scenario where the accountID isn't present in personalDetails and will also call the API to get whatever info it can.

Ok I will change it, the current implementation is based on #26306 (comment).

@situchan
Copy link
Contributor

Yes, let's show @hidden in that scenario and still open the profile page. The profile page should already handle the scenario where the accountID isn't present in personalDetails and will also call the API to get whatever info it can.

Ok I will change it, the current implementation is based on #26306 (comment).

I checked that discussion too but it seems odd to me that it's not actionable as mention is colored always.
From user's aspect, I'd like to see that user details (even if nothing to show actually) 😄

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 19, 2023

I've merged main into the branch and updated the test steps/videos.

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 20, 2023

Bump

@situchan
Copy link
Contributor

in a few hrs

@puneetlath
Copy link
Contributor

@situchan will you be able to get to this today?

@situchan
Copy link
Contributor

@samh-nl

Sometimes infinite loading

Screen.Recording.2023-09-21.at.3.31.52.PM.mov

Also it doesn't make sense to message Hidden

Screen.Recording.2023-09-21.at.3.35.12.PM.mov

@situchan
Copy link
Contributor

I think they can be out of scope as not caused by this PR

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 21, 2023

Being able to message a Hidden user might make sense if the user is offline and we're unable to determine if the account ID really exists.

@puneetlath
Copy link
Contributor

I agree that both of those seem out of scope for this PR.

@situchan
Copy link
Contributor

Server is down at the moment - https://expensify.slack.com/archives/C01GTK53T8Q/p1695314249132269
Will checklist once it's back

@puneetlath
Copy link
Contributor

Let's try to get this across the finish line today please!

@situchan
Copy link
Contributor

Long press on mention doesn't open context menu on native. Works on mWeb
Already existing bug so out of scope

@situchan
Copy link
Contributor

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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If a new page is added, I verified it's using the 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
Mobile Web - Chrome
mchrome.mov
Mobile Web - Safari
msafari.mov
Desktop
desktop.mov
iOS
ios.mov
Android
android.mov

Copy link
Contributor

@situchan situchan left a comment

Choose a reason for hiding this comment

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

:shipit:

@puneetlath all yours!

@melvin-bot melvin-bot bot requested a review from puneetlath September 22, 2023 23:02
Copy link
Contributor

@puneetlath puneetlath left a comment

Choose a reason for hiding this comment

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

Looks good!

@puneetlath puneetlath merged commit 4ea4a55 into Expensify:main Sep 24, 2023
13 checks passed
@puneetlath puneetlath mentioned this pull request Sep 25, 2023
58 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 1.3.74-0 🚀

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

@kavimuru
Copy link

@situchan @thesahindia

Are these QA steps?

  1. Verify that mentions 1 - 5 display the correct email address, prefixed by '@'.
  2. Verify that pressing on mentions 1 - 5 opens the profile page.
  3. Verify that mention 6 is not shown.
  4. Verify that mention 2 is highlighted in the same color as mention 4.
  5. Make the login field empty of the account of mention 3, e.g. by running (replace 123 with the account ID):
  6. window.Onyx.merge('personalDetailsList', { 123: { login: '' }});
  7. Verify that mention 3 now correctly states the account's name prefixed with @.
  8. Verify that pressing mention 3 still opens the profile page.

@puneetlath
Copy link
Contributor

@kavimuru actually this will be basically impossible for you to QA, so you can check it off. As long as mentions are continuing to work as expected in the regression tests, we should be good.

@jasperhuangg
Copy link
Contributor

jasperhuangg commented Sep 26, 2023

Hey @puneetlath @samh-nl. Not sure if you're already aware of this, but I'm not sure if we updated the report previews to support the new accountID based mentions. Is this something on your radar?

Screenshot 2023-09-26 at 3 40 57 PM

@samh-nl
Copy link
Contributor Author

samh-nl commented Sep 26, 2023

@jasperhuangg I believe in this case we just render message[0].html here so that comes from the BE (and thus would need to be updated there)?

In addition to html, there's also the text attribute in report action messages that is possibly affected.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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.

7 participants