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: Force highlighted code language registration #32507

Merged
merged 9 commits into from
Jun 17, 2024
Merged

Conversation

dougfabris
Copy link
Member

@dougfabris dougfabris commented May 27, 2024

Proposed changes (including videos or screenshots)

When a certain code language isn't on the Message_Code_highlight setting it wasn't registering it before trying to use on the client side. So the fix forces the registration right before being used preventing the ui from crashing.

Issue(s)

Steps to test or reproduce

Further comments

CORE-468

Copy link

changeset-bot bot commented May 27, 2024

🦋 Changeset detected

Latest commit: 10a2c32

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/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron 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/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client 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 May 27, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@dougfabris dougfabris added this to the 6.10 milestone May 27, 2024
Copy link

codecov bot commented May 27, 2024

Codecov Report

Attention: Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Project coverage is 56.39%. Comparing base (eaf2f11) to head (10a2c32).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32507      +/-   ##
===========================================
- Coverage    56.57%   56.39%   -0.19%     
===========================================
  Files         2455     2477      +22     
  Lines        54098    54555     +457     
  Branches     11148    11265     +117     
===========================================
+ Hits         30606    30766     +160     
- Misses       20833    21113     +280     
- Partials      2659     2676      +17     
Flag Coverage Δ
e2e 56.07% <85.71%> (-0.32%) ⬇️
unit 71.97% <ø> (-0.03%) ⬇️

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

@dougfabris dougfabris marked this pull request as ready for review May 28, 2024 14:07
@dougfabris dougfabris requested a review from a team as a code owner May 28, 2024 14:07
Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

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

Can we add a PR description?

apps/meteor/tests/e2e/administration.spec.ts Outdated Show resolved Hide resolved
MarcosSpessatto
MarcosSpessatto previously approved these changes Jun 3, 2024
yash-rajpal
yash-rajpal previously approved these changes Jun 3, 2024
Copy link
Member

@yash-rajpal yash-rajpal left a comment

Choose a reason for hiding this comment

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

LGTM!

MarcosSpessatto
MarcosSpessatto previously approved these changes Jun 3, 2024
@scuciatto scuciatto added the stat: QA assured Means it has been tested and approved by a company insider label Jun 13, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 13, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Jun 13, 2024
@yash-rajpal yash-rajpal added the stat: ready to merge PR tested and approved waiting for merge label Jun 17, 2024
@kodiakhq kodiakhq bot merged commit 9795e58 into develop Jun 17, 2024
45 of 48 checks passed
@kodiakhq kodiakhq bot deleted the fix/forceCodeLang branch June 17, 2024 14:46
gabriellsh added a commit that referenced this pull request Jun 18, 2024
…retention

* 'develop' of github.com:RocketChat/Rocket.Chat:
  fix: Not possible to edit room without proper permission with retention policy enabled (#32547)
  feat: Apps-Engine Deno Runtime update (#31821)
  feat: E2EE room setup header (#32446)
  fix: E2EE thread main message reactivity (#32381)
  chore: Add telemetry to CI so we can get a better understanding of resource usage (#32113)
  fix: Long katex strings breaking overflow in x axis (#32609)
  fix: Force highlighted code language registration (#32507)
  fix: sidebar last message E2EE (#32431)
  chore: remove message column on moderation console (#32432)
  fix: Accepted Media Types settings validation (#32478)
This was referenced Jun 22, 2024
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
Development

Successfully merging this pull request may close these issues.

4 participants