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

feat: auto link custom domain #28501

Merged
merged 7 commits into from Apr 3, 2023
Merged

feat: auto link custom domain #28501

merged 7 commits into from Apr 3, 2023

Conversation

hugocostadev
Copy link
Contributor

@hugocostadev hugocostadev commented Mar 20, 2023

Proposed changes (including videos or screenshots)

Changes:

  • Auto Link Custom Domain new setting under Message group path: /admin/settings/Message
  • New translation keys for English
  • Adding types to message-parser Options
  • New hook useAutoLinkDomains to get the setting and return an array of domains

Current:
image

Desirable:
Output when the setting has the value: local,intranet

New setting:
image

image

Issue(s)

fix #28427

Steps to test or reproduce

  1. Open the {{client_url}}/admin/settings/Message
  2. Go to the setting called Custom Domain Whitelist for Auto Link
  3. Add a custom domain of your desire, e.g: intranet
  4. Save Settings
  5. Go to a channel/DM and send the message with an URL that contains the custom domain, e.g: Here it is the link for our https://internaltool.intranet
  6. You should see the link and be able to click it

Further comments

This PR is related with: RocketChat/fuselage#1010

TC-557

@codecov
Copy link

codecov bot commented Mar 20, 2023

Codecov Report

Merging #28501 (4739e63) into develop (7b5e655) will increase coverage by 0.04%.
The diff coverage is 85.71%.

❗ Current head 4739e63 differs from pull request most recent head 19a3c23. Consider uploading reports for the commit 19a3c23 to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #28501      +/-   ##
===========================================
+ Coverage    45.33%   45.37%   +0.04%     
===========================================
  Files          727      728       +1     
  Lines        14285    14293       +8     
  Branches      2215     2216       +1     
===========================================
+ Hits          6476     6486      +10     
+ Misses        7505     7496       -9     
- Partials       304      311       +7     
Flag Coverage Δ
e2e 45.33% <85.71%> (+0.04%) ⬆️

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

@hugocostadev hugocostadev marked this pull request as ready for review March 31, 2023 12:39
@hugocostadev hugocostadev requested a review from a team as a code owner March 31, 2023 12:39
guijun13
guijun13 previously approved these changes Mar 31, 2023
@hugocostadev hugocostadev added the stat: ready to merge PR tested and approved waiting for merge label Apr 3, 2023
@kodiakhq kodiakhq bot merged commit 3f81d52 into develop Apr 3, 2023
33 checks passed
@kodiakhq kodiakhq bot deleted the feat/autoLink_customDomains branch April 3, 2023 16:45
pierre-lehnen-rc pushed a commit that referenced this pull request Apr 3, 2023
Co-authored-by: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com>
gabriellsh added a commit that referenced this pull request Apr 4, 2023
…avatarEmoji

* 'develop' of github.com:RocketChat/Rocket.Chat: (63 commits)
  fix: Messages jumping after reaction (#28770)
  fix: Quotes chain off by one error in quote chain limit settings (#28281)
  docs: update documentation (#28719)
  chore: /help notifying the shortcuts in multiple messages (#28765)
  refactor: remove Users from fibers 14 (#28780)
  regression(file-upload:s3): Fix missing store import (#28781)
  refactor: remove Users from fibers 13 (#28772)
  refactor: remove Users from fibers 12 (#28767)
  ci: revert Variable Setup changes (#28754)
  feat: auto link custom domain (#28501)
  refactor: `Rooms` model 4/4 (#28742)
  regression: invalid callback callAsync (#28766)
  refactor: remove Users from fibers 11 (#28740)
  refactor: Convert our Upload Code to TS (#28711)
  refactor: Move callbacks to ts 1X (#28710)
  refactor: Remove Users from fibers 10 (#28737)
  fix: message-parser links (#28735)
  refactor(client): Miscelaneous (#28732)
  refactor: `Rooms` model 3/4 (#28736)
  refactor: `Rooms` model 2X (#28715)
  ...
@ankar84
Copy link

ankar84 commented Apr 17, 2023

@hugocostadev hey! When do you plan to land that fix to new release?
We are waiting this a lot. Now it is a blocker for update.
cc @ggazzo @sampaiodiego

@marceloschmidt
Copy link
Member

Hey @ankar84 this is scheduled for v 6.2.0. It's already in the release-candidate.

@ankar84
Copy link

ankar84 commented Apr 19, 2023

Hey @ankar84 this is scheduled for v 6.2.0. It's already in the release-candidate.

Thank you @marceloschmidt
Waiting for 6.2.0 release!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA tested stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Link are not clickable if local environment
6 participants