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

fix: markdown inconsistency with bold and italics #33157

Merged
merged 2 commits into from
Sep 20, 2024

Conversation

csuadev
Copy link
Contributor

@csuadev csuadev commented Aug 26, 2024

This PR solves an inconsistency between the markdown parser used in the composer and the parser used in the rest of the application that was causing different outputs in both sides when using bold and italics.

  • Added some tests for different markdown elements.

Proposed changes (including videos or screenshots)

Issue(s)

https://rocketchat.atlassian.net/browse/SUP-537

Steps to test or reproduce

Further comments

related to #32574
Closes #32544
Closes #32081

Copy link

changeset-bot bot commented Aug 26, 2024

🦋 Changeset detected

Latest commit: 73c7a7a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Contributor

dionisio-bot bot commented Aug 26, 2024

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 6.13.0, but it targets 6.12.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

Copy link

codecov bot commented Aug 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.33%. Comparing base (eaf9c8d) to head (73c7a7a).
Report is 108 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #33157   +/-   ##
========================================
  Coverage    59.33%   59.33%           
========================================
  Files         2548     2548           
  Lines        63320    63320           
  Branches     14248    14248           
========================================
  Hits         37570    37570           
  Misses       23043    23043           
  Partials      2707     2707           
Flag Coverage Δ
unit 75.47% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@csuadev csuadev marked this pull request as ready for review August 26, 2024 22:05
@csuadev csuadev requested a review from a team as a code owner August 26, 2024 22:05
@MarcosSpessatto MarcosSpessatto added this to the 6.13 milestone Aug 28, 2024
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ csuadev
❌ csuarez


csuarez seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Sep 19, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Sep 19, 2024
@ggazzo ggazzo merged commit 9c119a0 into develop Sep 20, 2024
52 of 53 checks passed
@ggazzo ggazzo deleted the fix/SUP-537-markdown-inconsistency branch September 20, 2024 00:16
gabriellsh added a commit that referenced this pull request Sep 23, 2024
…hAvatarById

* 'develop' of github.com:RocketChat/Rocket.Chat:
  feat: Implement proper accessbility for report user modal (#33294)
  chore: update E2EE setting text (#33226)
  fix: conference calls are shown as "not answered" after they end (#33179)
  fix: markdown inconsistency with bold and italics (#33157)
  feat: E2EE messages mentions (#32510)
  refactor: Reactions set/unset (#32994)
  ci: auto candidate releases (#33325)
  feat: `RoomSidepanel` (#33225)
  feat: contextualbar based on chat size (#33321)
  fix: error on sendmessage stub (#33317)
  fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209)
  refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309)
  fix: Mark as unread not working (#32939)
  fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296)
  feat: Allow managing association to business units on departments' creation and update (#32682)
pierre-lehnen-rc added a commit that referenced this pull request Sep 26, 2024
* Bump 6.12.1

* fix: message parser being slow to process very long messages with too many symbols (#33254)

Co-authored-by: Pierre Lehnen <[email protected]>

* fix: Allow to use the token from `room.v` when requesting transcript instead of finding visitor (#33242)

Co-authored-by: Kevin Aleman <[email protected]>

* fix: Retention Policy cached settings not updated during upgrade procedure (#33265)

Co-authored-by: gabriellsh <[email protected]>

* fix: imported fixes (#33268)

Co-authored-by: Julio A. <[email protected]>

* Release 6.12.1

[no ci]

* fix: Federation callback not awaiting model call (#33298)

* fix: correct parameter order in afterSaveMessage to restore outgoing webhooks and related features (#33295)

* feat: New endpoint for listing rooms & discussions from teams (#33177)

* chore: Update typings on callbacks to accept less than a full room object (#33305)

* fix: resolve avatar download issue on setUsername by refining service selection logic (#33193)

* feat: Allow managing association to business units on departments' creation and update (#32682)

* fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296)

Co-authored-by: gabriellsh <[email protected]>

* fix: Mark as unread not working (#32939)

Co-authored-by: Douglas Fabris <[email protected]>

* refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309)

* fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209)

* fix: error on sendmessage stub (#33317)

* feat: contextualbar based on chat size (#33321)

* feat: `RoomSidepanel` (#33225)

Co-authored-by: Guilherme Gazzo <[email protected]>

* ci: auto candidate releases (#33325)

Co-authored-by: Diego Sampaio <[email protected]>

* refactor: Reactions set/unset (#32994)

* feat: E2EE messages mentions (#32510)

* fix: markdown inconsistency with bold and italics (#33157)

* fix: conference calls are shown as "not answered" after they end (#33179)

* Release 6.13.0-rc.0

* chore: update E2EE setting text (#33226)

* feat: Implement proper accessbility for report user modal (#33294)

Co-authored-by: Tasso Evangelista <[email protected]>

* fix: imported fixes (#33330)

* chore: create network broker package (#33338)

* feat: Adds new admin feature preview setting management (#33212)

Co-authored-by: Guilherme Gazzo <[email protected]>

* chore: move common files to core-services (#33341)

* regression: `Sidepanel` color highlight (#33342)

* feat: Adds new admin feature preview setting management (#33212)

Co-authored-by: Guilherme Gazzo <[email protected]>

* fix: Avoid destructuring `connectionData` when value is undefined (#33339)

* Release 6.13.0-rc.1

[no ci]

* chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356)

* Bump rocket.chat to 6.14.0-develop (#33366)

* ci: use node20 for release action (#33343)

---------

Co-authored-by: rocketchat-github-ci <[email protected]>
Co-authored-by: dionisio-bot[bot] <117394943+dionisio-bot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Lehnen <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: gabriellsh <[email protected]>
Co-authored-by: Julio A. <[email protected]>
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: Ricardo Garim <[email protected]>
Co-authored-by: Matheus Barbosa Silva <[email protected]>
Co-authored-by: Tasso Evangelista <[email protected]>
Co-authored-by: Martin Schoeler <[email protected]>
Co-authored-by: Douglas Fabris <[email protected]>
Co-authored-by: Júlia Jaeger Foresti <[email protected]>
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Diego Sampaio <[email protected]>
Co-authored-by: Hugo Costa <[email protected]>
Co-authored-by: csuadev <[email protected]>
Co-authored-by: Henrique Guimarães Ribeiro <[email protected]>
Co-authored-by: Tasso Evangelista <[email protected]>
Co-authored-by: Lucas Pelegrino <[email protected]>
Co-authored-by: Trivikram Kamat <[email protected]>
gabriellsh added a commit that referenced this pull request Sep 26, 2024
…apped/composer-restriction

* 'develop' of github.com:RocketChat/Rocket.Chat: (55 commits)
  regression: `Sidepanel` sort requires refresh after room update (#33370)
  ci: use node20 for release action (#33343)
  Bump rocket.chat to 6.14.0-develop (#33366)
  chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356)
  Release 6.13.0-rc.1
  fix: Avoid destructuring `connectionData` when value is undefined (#33339)
  feat: Adds new admin feature preview setting management (#33212)
  regression: `Sidepanel` color highlight (#33342)
  chore: move common files to core-services (#33341)
  feat: Adds new admin feature preview setting management (#33212)
  chore: create network broker package (#33338)
  fix: imported fixes (#33330)
  feat: Implement proper accessbility for report user modal (#33294)
  chore: update E2EE setting text (#33226)
  Release 6.13.0-rc.0
  fix: conference calls are shown as "not answered" after they end (#33179)
  fix: markdown inconsistency with bold and italics (#33157)
  feat: E2EE messages mentions (#32510)
  refactor: Reactions set/unset (#32994)
  ci: auto candidate releases (#33325)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
5 participants