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

[No QA] 17885 custom user mentions renderer #18167

Merged

Conversation

robertKozik
Copy link
Contributor

@robertKozik robertKozik commented Apr 28, 2023

Details

This PR adds custom renderer used for user mentions inside chats

Fixed Issues

$ #17885
PROPOSAL:https://docs.google.com/document/d/1vhvpwQDStA0lcsI0Z33pXOKPM6nXGRuplvQTFBWvCyA/edit#heading=h.5lyudapet5j6

Tests

Prerequisites: ExpensiMark changes are applied locally and app is in offline mode

  1. open chat
  2. type the message user mention ( its '@' followed with primary login - mail of the user) and send it
  3. Properly rendered mention should appear in chat message with blue-ish background
  4. type the message which mention your account
  5. Properly rendered mention should appear in chat message with green-ish background
  • Verify that no errors appear in the JS console

Offline tests

same as above

QA Steps

same as above

In addition to mention testing, we need to check that code is rendering in chat properly, to check that there is no regression problems:

  1. open chat
  2. type the message with code block (code is the fragment between backticks f.e. `code block`) and send it
  3. Properly rendered code block with rounded corners and horizontal padding should appear in chat message
  • 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

image

Mobile Web - Chrome image
Mobile Web - Safari image
Desktop image image
iOS image
Android image

@robertKozik robertKozik force-pushed the 17885_custom_user_mentions_renderer branch from 9a9f781 to b237150 Compare May 3, 2023 15:44
@robertKozik robertKozik marked this pull request as ready for review May 3, 2023 15:47
@robertKozik robertKozik requested a review from a team as a code owner May 3, 2023 15:47
@melvin-bot melvin-bot bot requested review from parasharrajat and puneetlath and removed request for a team May 3, 2023 15:47
@MelvinBot
Copy link

@puneetlath @parasharrajat 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]

// eslint-disable-next-line react/jsx-props-no-spreading
{...defaultRendererProps}
color={themeColors.textSupporting}
style={[props.style, {backgroundColor}]}
Copy link
Member

Choose a reason for hiding this comment

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

No inline styles, we can move the whole logic of bg calculation to the Styleutils and use it here.

const backgroundColor = isOurMention ? themeColors.ourMentionBG : themeColors.mentionBG;

return (
<Tooltip containerStyles={[styles.dInline]} text={loginWhithoutLeadingAt}>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<Tooltip containerStyles={[styles.dInline]} text={loginWhithoutLeadingAt}>
<Tooltip containerStyles={[styles.dInline]} text={loginWhithoutLeadingAt}>

Instead of containerStyles you can use absolute prop.

Comment on lines 140 to 143
'mention-user': {
borderRadius: variables.componentBorderRadiusSmall,
paddingHorizontal: 2,
},
Copy link
Member

Choose a reason for hiding this comment

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

We don't have to define the styles for this tag instead just use it in the Text element in the Rendered as it seems. Not sure if this works the same but if yes why not.

@puneetlath puneetlath requested a review from shawnborton May 3, 2023 16:08
@puneetlath
Copy link
Contributor

@shawnborton could you review as well for design please 😄

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.

Just some minor comments. Overall looking really good!

<Text
// eslint-disable-next-line react/jsx-props-no-spreading
{...defaultRendererProps}
color={themeColors.textSupporting}
Copy link
Contributor

Choose a reason for hiding this comment

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

This should use mentionText or ourMentionText right?

mentionText: colors.blue200,
mentionBG: colors.blue700,
ourMentionText: colors.green200,
ourMentionBG: colors.green700,
Copy link
Contributor

Choose a reason for hiding this comment

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

In the design doc we said these should be:

mentionText: colors.blue100
mentionBG: colors.blue600
ourMentionText: colors.green100
ourMentionBG: colors.green600

In case those aren't defined:

  • blue100: #BOD9FF
  • blue600: #0164BF
  • green100: #B1F2D6
  • green600: #008C59

@shawnborton
Copy link
Contributor

Looks like the corners are not round on iOS:
image

Also, can we get more screenshots here that aren't just all offline mode?

@shawnborton
Copy link
Contributor

It also seems like the baseline of the text inside of the mention doesn't align to the baseline of the text outside of the mention. Ideally they should line up perfectly.

@puneetlath
Copy link
Contributor

@robertKozik you shouldn't need to test in offline mode anymore. The update to make it so that we don't strip the <mention-user> html tags is on staging.

@puneetlath
Copy link
Contributor

@shawnborton here's a screenshot from web from my own testing in non-offline mode.

image

@parasharrajat
Copy link
Member

It also seems like the baseline of the text inside of the mention doesn't align to the baseline of the text outside of the mention. Ideally they should line up perfectly.

This will be solved with #18167 (comment)

@shawnborton
Copy link
Contributor

Web looks pretty good other than the colors being off.

@parasharrajat
Copy link
Member

Why blueish color is removed after a few secs? I don't see the yellow color when I mention my email.

@puneetlath
Copy link
Contributor

@parasharrajat can you include a video of what you're seeing?

@puneetlath
Copy link
Contributor

@parasharrajat also, are you making sure to use staging server.

@parasharrajat
Copy link
Member

parasharrajat commented May 3, 2023

Here is the video. I missed using the staging server. Can we please add that step to the Tests? and I don't think QA can test this due to code changes being needed. Should this be No QA?

Now I can't tag myself.

Screen.Recording.2023-05-04.at.12.01.00.AM.mov

@puneetlath
Copy link
Contributor

puneetlath commented May 3, 2023

Should this be No QA

Good call

I missed using the staging server. Can we please add that step to the Tests?

Yes, sounds good. Whenever the next back-end deploy happens (hopefully today) you'll be able to test this on staging or production

Now I can't tag myself.

Ah interesting. @getusha it looks like our regex doesn't like email addresses with periods in them

@puneetlath puneetlath changed the title 17885 custom user mentions renderer [No QA] 17885 custom user mentions renderer May 3, 2023
@parasharrajat
Copy link
Member

I see, I also thought that the mention parsing is not part of this PR. Let me see if I can test it with a different account.

@getusha
Copy link
Contributor

getusha commented May 3, 2023

Ah interesting. @getusha it looks like our regex doesn't like email addresses with periods in them

Sure i will update it once more,
Also we should handle emails that has + in the middle? like test+new@gmail.com

@puneetlath
Copy link
Contributor

@getusha maybe we should just use the isValidEmail regex since it should already account for these cases.

Update JsDoc comment for MentionUserRenderer propTypes

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
@puneetlath
Copy link
Contributor

Code looks good to me. So if the checklist tests well for you @parasharrajat I think we'll be good to merge.

@parasharrajat
Copy link
Member

parasharrajat commented May 5, 2023

Screenshots

🔲 iOS / native

Screenshot 2023-05-05 at 10 23 08 PM

🔲 iOS / Safari

Screenshot 2023-05-05 at 10 21 50 PM

🔲 MacOS / Desktop

Screenshot 2023-05-05 at 10 21 10 PM

#### 🔲 MacOS / Chrome

Screenshot 2023-05-05 at 10 20 55 PM

#### 🔲 Android / Chrome

Screenshot 2023-05-05 at 10 22 47 PM

#### 🔲 Android / native

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

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.

cc: @puneetlath

🎀 👀 🎀 C+ reviewed

@puneetlath
Copy link
Contributor

Awesome!

@puneetlath puneetlath merged commit 563900d into Expensify:main May 5, 2023
@melvin-bot
Copy link

melvin-bot bot commented May 5, 2023

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

@OSBotify
Copy link
Contributor

OSBotify commented May 5, 2023

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@parasharrajat
Copy link
Member

parasharrajat commented May 5, 2023

Lol, I am not seeing the strings on the Android App. Is it only me?

@puneetlath
Copy link
Contributor

What do you mean?

@parasharrajat
Copy link
Member

Sorry, I mean I am not seeing. Trying to clean build the app. It might be a cache because it was working fine 2 hours before.

@parasharrajat
Copy link
Member

parasharrajat commented May 5, 2023

It does seem like an issue. Compare the following screenshots with others to see that mentions are not rendering on Android.
Screenshot 2023-05-05 at 11 00 05 PM

@parasharrajat
Copy link
Member

@robertKozik Can you please check this?

@getusha
Copy link
Contributor

getusha commented May 5, 2023

Yes, there is an issue a text using WrapperText is not appearing on android

@parasharrajat
Copy link
Member

@getusha Why is that? Any idea?

@getusha
Copy link
Contributor

getusha commented May 5, 2023

@parasharrajat here is the issue #17441
We are using InlineCodeBlock here, currently it is not being visible on android, so it is not related to this PR.

@parasharrajat
Copy link
Member

Ok, I found the issue #17441. Damn it! I think we will have to revert the PR because mentions won't work on Android. I remember that it was rendering on Android perfectly fine a few months back. What changed?

@puneetlath
Copy link
Contributor

Ah, damn!

@puneetlath
Copy link
Contributor

PR to revert: #18490

@getusha
Copy link
Contributor

getusha commented May 5, 2023

Ok, I found the issue #17441. Damn it! I think we will have to revert the PR because mentions won't work on Android. I remember that it was rendering on Android perfectly fine a few months back. What changed?

Tried to investigate and it doesn't seem to be a change from our codebase it might be from our react-native fork. i am not sure

@parasharrajat
Copy link
Member

Something changed with RN upgrades. Not sure which PR or version but def an RN upgrade.

@robertKozik
Copy link
Contributor Author

That escalated quickly 😮 I don't know how that happened, but sorry for that all reverting problem 😢

@OSBotify
Copy link
Contributor

OSBotify commented May 5, 2023

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

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

@OSBotify
Copy link
Contributor

OSBotify commented May 9, 2023

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀

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.

7 participants