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: Adds callout from cloud for subscription upgrade eligibility #33549

Merged
merged 21 commits into from
Dec 17, 2024

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Oct 11, 2024

Proposed changes (including videos or screenshots)

This PR aims to adapt the SubscriptionPage to be able to render the ui-kit Callout block properly, it also adds logic to fetch the callout information texts from the cloud and save it as a private setting, which will be used only internally by the application.

Issue(s)

CONN-365

Steps to test or reproduce

Further comments

image

Copy link
Contributor

dionisio-bot bot commented Oct 11, 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 Oct 11, 2024

🦋 Changeset detected

Latest commit: 3a49c7d

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 Minor
@rocket.chat/core-typings Minor
@rocket.chat/rest-typings Minor
@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 Major
@rocket.chat/gazzodown Major
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Major
@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 Major
@rocket.chat/ui-client Major
@rocket.chat/ui-video-conf Major
@rocket.chat/ui-voip Major
@rocket.chat/web-ui-registration Major
@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 Oct 11, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-33549/
on branch gh-pages at 2024-12-17 19:51 UTC

Copy link

codecov bot commented Oct 11, 2024

Codecov Report

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

Project coverage is 75.81%. Comparing base (7bafe03) to head (3a49c7d).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #33549      +/-   ##
===========================================
- Coverage    75.83%   75.81%   -0.03%     
===========================================
  Files          511      512       +1     
  Lines        22172    22205      +33     
  Branches      5397     5403       +6     
===========================================
+ Hits         16814    16834      +20     
- Misses        4710     4720      +10     
- Partials       648      651       +3     
Flag Coverage Δ
unit 75.81% <80.00%> (-0.03%) ⬇️

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

@casalsgh casalsgh added this to the 7.0 milestone Oct 18, 2024
Base automatically changed from chore/bump-storybok-fuselage-ui-kit to develop October 18, 2024 19:01
An error occurred while trying to automatically change base from chore/bump-storybok-fuselage-ui-kit to develop October 18, 2024 19:01
@ggazzo ggazzo force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch 2 times, most recently from 986f721 to 1925762 Compare October 19, 2024 02:02
@ggazzo ggazzo modified the milestones: 7.0, 7.1.0 Oct 21, 2024
@ggazzo ggazzo force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch 3 times, most recently from f416564 to df8e534 Compare November 11, 2024 21:57
@dougfabris dougfabris force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch from 038d4fa to 7dc8e55 Compare November 19, 2024 19:02
@lucas-a-pelegrino lucas-a-pelegrino force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch from 4b8f3e6 to 69aa3d5 Compare November 20, 2024 00:13
@lucas-a-pelegrino lucas-a-pelegrino force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch from 69aa3d5 to 54e61b1 Compare November 20, 2024 00:26
@ggazzo ggazzo force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch 9 times, most recently from ee63049 to 029541a Compare November 20, 2024 04:22
@ggazzo ggazzo force-pushed the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch from a3702a0 to d423071 Compare December 9, 2024 19:11
dougfabris
dougfabris previously approved these changes Dec 10, 2024
.changeset/wicked-socks-hide.md Outdated Show resolved Hide resolved
ee/packages/license/src/license.ts Outdated Show resolved Hide resolved
packages/core-typings/src/cloud/CloudSyncAnnouncement.ts Outdated Show resolved Hide resolved
@lucas-a-pelegrino lucas-a-pelegrino dismissed stale reviews from dougfabris and themself via 6fd40dc December 11, 2024 17:33
.changeset/wicked-socks-hide.md Outdated Show resolved Hide resolved
@lucas-a-pelegrino lucas-a-pelegrino changed the title feat: cloud surface rendered feat: Adds callout from cloud for subscription upgrade eligibility Dec 11, 2024
Co-authored-by: Kevin Aleman <[email protected]>
@barbarazanellaa barbarazanellaa added the stat: QA assured Means it has been tested and approved by a company insider label Dec 16, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Dec 16, 2024
…ithub.com:RocketChat/Rocket.Chat into chore/bump-storybok-fuselage-ui-kit-cloud-surface
@ggazzo ggazzo merged commit 75a14b2 into develop Dec 17, 2024
19 checks passed
@ggazzo ggazzo deleted the chore/bump-storybok-fuselage-ui-kit-cloud-surface branch December 17, 2024 21:27
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.

9 participants