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: no spaces between emoji aliases #33278

Merged
merged 5 commits into from
Nov 15, 2024
Merged

Conversation

abhinavkrin
Copy link
Member

@abhinavkrin abhinavkrin commented Sep 13, 2024

Proposed changes (including videos or screenshots)

This PR fixes the issue where emoji aliases were not displayed properly in the custom emoji list. There were no spaces between the aliases. The change ensures that emojis.aliases is checked to be an array before displaying and joined with a comma.

Screenshot 2024-09-13 at 12 47 39 PM

Issue(s)

Steps to test or reproduce

Further comments

CORE-691

Copy link
Contributor

dionisio-bot bot commented Sep 13, 2024

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

Copy link

changeset-bot bot commented Sep 13, 2024

🦋 Changeset detected

Latest commit: ce9582d

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

This PR includes changesets to release 35 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground 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/freeswitch 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/network-broker Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip 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

github-actions bot commented Sep 13, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-33278/
on branch gh-pages at 2024-11-15 12:10 UTC

Copy link

codecov bot commented Sep 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.18%. Comparing base (daa1934) to head (ce9582d).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #33278   +/-   ##
========================================
  Coverage    75.18%   75.18%           
========================================
  Files          495      495           
  Lines        21600    21600           
  Branches      5362     5362           
========================================
  Hits         16241    16241           
  Misses        4717     4717           
  Partials       642      642           
Flag Coverage Δ
unit 75.18% <ø> (ø)

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

@abhinavkrin abhinavkrin marked this pull request as ready for review September 13, 2024 07:56
@abhinavkrin abhinavkrin requested a review from a team as a code owner September 13, 2024 07:56
@abhinavkrin abhinavkrin added this to the 6.13 milestone Sep 13, 2024
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 test here?

Also, lets add a changeset.

Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

Please update the title as per Our docs

The title should describe what's being fixed, not how it was fixed.

Here's a suggestion: fix: no spaces between emoji aliases

Also both in the task and PR, the issue is not well described, since it is presented that there is an issue but it does not convey what is happening. I had to look at the code to be able to discover what the actual issue was.

@scuciatto scuciatto modified the milestones: 6.13, 6.14 Sep 23, 2024
@ggazzo ggazzo modified the milestones: 6.14, 7.0 Oct 17, 2024
@scuciatto scuciatto modified the milestones: 7.0, 7.1.0 Oct 17, 2024
@abhinavkrin abhinavkrin changed the title fix: correctly display emoji aliases in custom emoji list fix: no spaces between emoji aliases Oct 28, 2024
@abhinavkrin abhinavkrin force-pushed the fix/emoji-aliases-display branch from 9cd27db to 04ef147 Compare October 28, 2024 16:25
@abhinavkrin abhinavkrin force-pushed the fix/emoji-aliases-display branch from 5d8dcac to fae142f Compare November 6, 2024 18:52
MarcosSpessatto
MarcosSpessatto previously approved these changes Nov 7, 2024
@abhinavkrin abhinavkrin added the stat: QA assured Means it has been tested and approved by a company insider label Nov 8, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Nov 8, 2024
@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Nov 14, 2024
Copy link
Contributor

kodiakhq bot commented Nov 14, 2024

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

Signed-off-by: Abhinav Kumar <[email protected]>
Signed-off-by: Abhinav Kumar <[email protected]>
Signed-off-by: Abhinav Kumar <[email protected]>
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

@yash-rajpal yash-rajpal removed the request for review from gabriellsh November 14, 2024 16:04
@abhinavkrin abhinavkrin added stat: QA assured Means it has been tested and approved by a company insider and removed stat: QA assured Means it has been tested and approved by a company insider labels Nov 15, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Nov 15, 2024
@kodiakhq kodiakhq bot merged commit 41d1cd5 into develop Nov 15, 2024
49 checks passed
@kodiakhq kodiakhq bot deleted the fix/emoji-aliases-display branch November 15, 2024 12:41
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.

6 participants