skip to replace link text which is a link by eh2077 · Pull Request #17451 · Expensify/App

eh2077 · 2023-04-14T08:26:16Z

Details

Fixed Issues

Tests

Go to a chat and add a new comment, like test
Edit the comment to replace it with the following link and save it

https://www.facebook.com/hashtag/__main/?__eep__=6

Verify the link text and url are same as the original link
Edit the link to remove the link by replacing the link markdown the following original link and save it

https://www.facebook.com/hashtag/__main/?__eep__=6

Verify the link is not autolinked and displayed as text https://www.facebook.com/hashtag/__main/?__eep__=6

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

mobile-chrome.mp4

Mobile Web - Safari

mobile-safar.mp4

Desktop

desktop.mov

iOS

ios.mp4

Android

android.mp4

tienifr · 2023-04-17T09:25:53Z

Should we change the name newCommentMarkdown here to newCommentHtml

tienifr · 2023-04-17T09:48:58Z

same as above

tienifr · 2023-04-17T09:49:42Z

same as above

tienifr · 2023-04-17T09:49:59Z

same as above

fedirjh · 2023-04-18T01:32:35Z

Suggested change

"expensify-common": "git+https://github.com/eh2077/expensify-common.git#540a9451c0452277151b2a63ad46c9591da4e3f5",

"expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#c15668f73079d3f5f42618b70c852d36d387e121",

Expensify/expensify-common#517 is merged

MelvinBot · 2023-04-18T01:41:37Z

@amyevans @fedirjh 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]

fedirjh · 2023-04-18T03:57:04Z

@eh2077 Can we add a comment here explaining the logic behind it.

@fedirjh Updated

fedirjh · 2023-04-18T04:43:49Z

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

Screen.Recording.2023-04-18.at.5.05.37.AM.mov

Mobile Web - Chrome

Screen.Recording.2023-04-18.at.5.09.52.AM.mov

Mobile Web - Safari

Screen.Recording.2023-04-18.at.5.13.12.AM.mov

Desktop

Screen.Recording.2023-04-18.at.5.16.55.AM.mov

iOS

Screen.Recording.2023-04-18.at.5.14.29.AM.mov

Android

Screen.Recording.2023-04-18.at.5.07.40.AM.mov

fedirjh · 2023-04-18T04:45:01Z

LGTM and tests well.

cc @amyevans all yours.

amyevans

Looks good, just some suggestions for improving comment clarity

amyevans · 2023-04-18T14:13:52Z

Nit pick, but let's move this line back to where it was to maintain alpha order.

Co-authored-by: Amy Evans <amy@expensify.com>

OSBotify · 2023-04-18T15:57:11Z

✋ 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 · 2023-04-19T18:04:47Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.2-0 🚀

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

OSBotify · 2023-04-20T22:01:08Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.2-5 🚀

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

allroundexperts · 2023-07-06T06:44:45Z

-        const linkText = linkMatch && linkMatch[1];
-        commentCopy = commentCopy.replace(`[${linkText}](${link})`, linkText);
+        // We want to match the anchor tag of the link and replace the whole anchor tag with the text of the anchor tag
+        const regex = new RegExp(`<(a)[^><]*href\\s*=\\s*(['"])(${Str.escapeForRegExp(link)})\\2(?:".*?"|'.*?'|[^'"><])*>([\\s\\S]*?)<\\/\\1>(?![^<]*(<\\/pre>|<\\/code>))`, 'gi');


This caused the following bug:
#21417

We should not have ignored the case flag.

amyevans assigned eh2077 Apr 14, 2023

tienifr reviewed Apr 17, 2023

View reviewed changes

Comment thread tests/actions/ReportTest.js Outdated

tienifr Apr 17, 2023

Copy link
Copy Markdown

Contributor

Choose a reason for hiding this comment

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

same as above

tienifr reviewed Apr 17, 2023

View reviewed changes

Comment thread tests/actions/ReportTest.js Outdated

tienifr Apr 17, 2023

Copy link
Copy Markdown

Contributor

Choose a reason for hiding this comment

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

same as above

tienifr reviewed Apr 17, 2023

View reviewed changes

Comment thread tests/actions/ReportTest.js Outdated

tienifr Apr 17, 2023

Copy link
Copy Markdown

Contributor

Choose a reason for hiding this comment

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

same as above

eh2077 force-pushed the skip-to-replace-link-text-which-is-a-link branch from 3f0e99c to f680a88 Compare April 17, 2023 15:44

fedirjh reviewed Apr 18, 2023

View reviewed changes

eh2077 marked this pull request as ready for review April 18, 2023 01:41

eh2077 requested a review from a team as a code owner April 18, 2023 01:41

melvin-bot Bot requested review from amyevans and fedirjh and removed request for a team April 18, 2023 01:41

eh2077 mentioned this pull request Apr 18, 2023

[HOLD for payment 2023-04-27] [$1000] Edited autolink with several underscores contains incorrect target URL #16475

Closed

6 tasks

fedirjh reviewed Apr 18, 2023

View reviewed changes

fedirjh previously approved these changes Apr 18, 2023

View reviewed changes

eh2077 dismissed fedirjh’s stale review via 0054bd6 April 18, 2023 05:35

amyevans requested changes Apr 18, 2023

View reviewed changes

eh2077 and others added 10 commits April 18, 2023 23:38

skip to replace link text which is a link

b2327f0

fix link text replacement

0f46d46

remove unused methods and fix test cases

ebdd11a

improve test

d3e6ad8

fix lint

a6d09a9

update expensify-common

6238868

add comment for removeLinksFromHtml

979d093

Update src/libs/actions/Report.js

94a4003

Co-authored-by: Amy Evans <amy@expensify.com>

Update src/libs/actions/Report.js

5398e02

Co-authored-by: Amy Evans <amy@expensify.com>

Update tests/actions/ReportTest.js

9c4eee2

Co-authored-by: Amy Evans <amy@expensify.com>

eh2077 and others added 4 commits April 18, 2023 23:38

Update tests/actions/ReportTest.js

565cc9d

Co-authored-by: Amy Evans <amy@expensify.com>

Update tests/actions/ReportTest.js

291ee4a

Co-authored-by: Amy Evans <amy@expensify.com>

Update tests/actions/ReportTest.js

34c72f9

Co-authored-by: Amy Evans <amy@expensify.com>

fix import order

a033979

eh2077 force-pushed the skip-to-replace-link-text-which-is-a-link branch from beb6fc6 to a033979 Compare April 18, 2023 15:39

eh2077 requested a review from amyevans April 18, 2023 15:46

amyevans approved these changes Apr 18, 2023

View reviewed changes

amyevans merged commit f4e142d into Expensify:main Apr 18, 2023

OSBotify mentioned this pull request Apr 19, 2023

Deploy Checklist: New Expensify 2023-04-19 #17671

Closed

37 tasks

aimane-chnaif mentioned this pull request May 22, 2023

[HOLD for payment 2023-06-02] [$1000] Link disappeared after changing link text to be surrounded with square brackets #18911

Closed

6 tasks

allroundexperts reviewed Jul 6, 2023

View reviewed changes

allroundexperts mentioned this pull request Jul 6, 2023

[HOLD for payment 2023-07-10] [$1000] Editing link after first '/' to capital removes the link #21417

Closed

6 tasks

eh2077 mentioned this pull request Jul 13, 2023

[HOLD for payment 2023-08-21] [$1000] Multiline codeblocks disappear after editing twice #18928

Closed

6 tasks

	"expensify-common": "git+https://github.com/eh2077/expensify-common.git#540a9451c0452277151b2a63ad46c9591da4e3f5",
	"expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#c15668f73079d3f5f42618b70c852d36d387e121",

Uh oh!

Conversation

eh2077 commented Apr 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 18, 2023

Uh oh!

fedirjh Apr 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fedirjh commented Apr 18, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh commented Apr 18, 2023

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

OSBotify commented Apr 18, 2023

Uh oh!

OSBotify commented Apr 19, 2023

Uh oh!

OSBotify commented Apr 20, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

eh2077 commented Apr 14, 2023 •

edited

Loading

fedirjh Apr 18, 2023 •

edited

Loading