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: license add-ons (external modules) #33433

Merged
merged 34 commits into from
Oct 18, 2024
Merged

feat: license add-ons (external modules) #33433

merged 34 commits into from
Oct 18, 2024

Conversation

d-gubert
Copy link
Member

@d-gubert d-gubert commented Oct 3, 2024

Proposed changes (including videos or screenshots)

Add-ons will extend the license's modules beyond the core features that are available

  • Prevent apps that require an add-on from being enabled if the add-on is not available
  • When the license is invalidated, disable apps that require add-on - this should already happen based on previous rules, but it did not happen when a license was removed, only when it became invalid.
  • When the license is updated, validate changes to add-ons and update configuration accordingly

Issue(s)

Jira task

Steps to test or reproduce

Further comments

ADR

Copy link
Contributor

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

🦋 Changeset detected

Latest commit: 94ac399

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

This PR includes changesets to release 36 packages
Name Type
@rocket.chat/core-typings Minor
@rocket.chat/apps-engine Minor
@rocket.chat/license Minor
@rocket.chat/meteor 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/rest-typings Minor
@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/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 3, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-33433/
on branch gh-pages at 2024-10-18 17:04 UTC

Copy link

codecov bot commented Oct 3, 2024

Codecov Report

Attention: Patch coverage is 89.06250% with 7 lines in your changes missing coverage. Please review.

Project coverage is 74.89%. Comparing base (2806cb5) to head (94ac399).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #33433      +/-   ##
===========================================
+ Coverage    74.85%   74.89%   +0.03%     
===========================================
  Files          470      473       +3     
  Lines        20744    20807      +63     
  Branches      5295     5311      +16     
===========================================
+ Hits         15528    15583      +55     
- Misses        4595     4599       +4     
- Partials       621      625       +4     
Flag Coverage Δ
unit 74.89% <89.06%> (+0.03%) ⬆️

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

@d-gubert d-gubert mentioned this pull request Oct 4, 2024
3 tasks
@d-gubert d-gubert force-pushed the feat/license-addons branch from 17a7408 to 44cb166 Compare October 4, 2024 22:59
@d-gubert d-gubert marked this pull request as ready for review October 5, 2024 16:41
@d-gubert d-gubert requested review from a team as code owners October 5, 2024 16:41
apps/meteor/ee/server/apps/communication/rest.ts Outdated Show resolved Hide resolved
ee/packages/license/src/MockedLicenseBuilder.ts Outdated Show resolved Hide resolved
ee/packages/license/src/events/emitter.ts Outdated Show resolved Hide resolved
ee/packages/license/src/events/emitter.ts Outdated Show resolved Hide resolved
ee/packages/license/src/v2/bundles.ts Show resolved Hide resolved
apps/meteor/ee/server/apps/orchestrator.js Outdated Show resolved Hide resolved
ee/packages/license/src/MockedLicenseBuilder.ts Outdated Show resolved Hide resolved
ee/packages/license/src/MockedLicenseBuilder.ts Outdated Show resolved Hide resolved
@d-gubert d-gubert force-pushed the feat/license-addons branch from df3e668 to c76c2d9 Compare October 7, 2024 18:07
@d-gubert d-gubert added the stat: QA assured Means it has been tested and approved by a company insider label Oct 17, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Oct 17, 2024
@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Oct 17, 2024
Copy link
Contributor

kodiakhq bot commented Oct 17, 2024

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

@d-gubert d-gubert added stat: ready to merge PR tested and approved waiting for merge automerge labels Oct 18, 2024
@kodiakhq kodiakhq bot merged commit 81998f3 into develop Oct 18, 2024
50 checks passed
@kodiakhq kodiakhq bot deleted the feat/license-addons branch October 18, 2024 17:37
This was referenced Oct 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge 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