fix: Enterprise settings disabled in `Admin > Settings` despite a license with required modules being present #35790

gabriellsh · 2025-04-11T19:54:58Z

Proposed changes (including videos or screenshots)

Added missing modules to enteprise settings.

~~Enforced modules property to be present in settings with enteprise: true by throwing an error if the property is not present at the time of the setting creation.~~ This will be done separately

Issue(s)

CORE-1034

Steps to test or reproduce

In a workspace with a valid license:

Go to admin > settings > layout
Enable Show custom content to homepage
Save
Show custom content only will be disabled despite having a valid license.

Further comments

dionisio-bot · 2025-04-11T19:55:02Z

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

changeset-bot · 2025-04-11T19:55:03Z

🦋 Changeset detected

Latest commit: fbfe2c9

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/meteor	Patch
@rocket.chat/core-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/rest-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/mock-providers	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

github-actions · 2025-04-11T20:10:09Z

PR Preview Action v1.6.1
🚀 View preview at https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-35790/
Built to branch `gh-pages` at 2025-04-17 14:51 UTC. Preview will be ready when the GitHub Pages deployment is complete.

codecov · 2025-04-11T21:33:27Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.16%. Comparing base (552ee75) to head (fbfe2c9).
Report is 3 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop   #35790      +/-   ##
===========================================
+ Coverage    61.12%   61.16%   +0.04%     
===========================================
  Files         2973     2971       -2     
  Lines        70907    70839      -68     
  Branches     16215    16185      -30     
===========================================
- Hits         43339    43329      -10     
+ Misses       24621    24558      -63     
- Partials      2947     2952       +5

Flag	Coverage Δ
e2e	`57.67% <ø> (-0.02%)`	⬇️
unit	`75.61% <ø> (ø)`

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

MarcosSpessatto

It would be nice to ensure this through type as well... WDYT?

apps/meteor/app/settings/server/SettingsRegistry.ts

…riseSettings

kody-ai · 2025-04-16T18:18:18Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

apps/meteor/server/settings/layout.ts

kody-ai · 2025-04-16T21:17:21Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kody-ai · 2025-04-17T10:19:12Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kody-ai · 2025-04-17T10:44:50Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

kody-ai · 2025-04-17T14:27:35Z

Code Review Completed! 🔥

The code review was successfully completed based on your current configurations.

Kody Guide: Usage and Configuration

Interacting with Kody

Request a Review: Ask Kody to review your PR manually by adding a comment with the @kody start-review command at the root of your PR.
Provide Feedback: Help Kody learn and improve by reacting to its comments with a 👍 for helpful suggestions or a 👎 if improvements are needed.

Current Kody Configuration

Review Options

The following review options are enabled or disabled:

Options	Enabled
Security	✅
Code Style	✅
Kody Rules	✅
Refactoring	✅
Error Handling	✅
Maintainability	✅
Potential Issues	✅
Documentation And Comments	✅
Performance And Optimization	✅
Breaking Changes	❌

Access your configuration settings here.

gabriellsh requested review from a team as code owners April 11, 2025 19:54

gabriellsh added this to the 7.6.0 milestone Apr 11, 2025

MarcosSpessatto suggested changes Apr 14, 2025

View reviewed changes

apps/meteor/app/settings/server/SettingsRegistry.ts Outdated Show resolved Hide resolved

gabriellsh and others added 3 commits April 16, 2025 15:17

Add modules property to missing settings

edf598b

Add cs

3b9727f

Merge remote-tracking branch 'origin/develop' into fix/disabledEnterp…

9753d0b

…riseSettings

gabriellsh force-pushed the fix/disabledEnterpriseSettings branch from 64f4ad2 to 9753d0b Compare April 16, 2025 18:18

kody-ai bot reviewed Apr 16, 2025

View reviewed changes

apps/meteor/server/settings/layout.ts Show resolved Hide resolved

MarcosSpessatto approved these changes Apr 16, 2025

View reviewed changes

Merge branch 'develop' into fix/disabledEnterpriseSettings

0d2c849

gabriellsh added the stat: QA assured Means it has been tested and approved by a company insider label Apr 16, 2025

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 16, 2025

Merge branch 'develop' into fix/disabledEnterpriseSettings

f280a1c

Merge branch 'develop' into fix/disabledEnterpriseSettings

fdb8bc3

Merge branch 'develop' into fix/disabledEnterpriseSettings

fbfe2c9

ggazzo merged commit aec9eaa into develop Apr 17, 2025
37 of 40 checks passed

ggazzo deleted the fix/disabledEnterpriseSettings branch April 17, 2025 15:42

rocketchat-github-ci mentioned this pull request Apr 20, 2025

Release 7.6.0 #35843

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Enterprise settings disabled in `Admin > Settings` despite a license with required modules being present #35790

fix: Enterprise settings disabled in `Admin > Settings` despite a license with required modules being present #35790

Uh oh!

gabriellsh commented Apr 11, 2025 •

edited

Loading

Uh oh!

dionisio-bot bot commented Apr 11, 2025 •

edited

Loading

Uh oh!

changeset-bot bot commented Apr 11, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Apr 11, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-04-17 14:51 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

codecov bot commented Apr 11, 2025 •

edited

Loading

Uh oh!

MarcosSpessatto left a comment

Uh oh!

Uh oh!

kody-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

Uh oh!

kody-ai bot commented Apr 16, 2025 •

edited

Loading

Uh oh!

kody-ai bot commented Apr 17, 2025 •

edited

Loading

Uh oh!

kody-ai bot commented Apr 17, 2025 •

edited

Loading

Uh oh!

kody-ai bot commented Apr 17, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fix: Enterprise settings disabled in Admin > Settings despite a license with required modules being present #35790

fix: Enterprise settings disabled in Admin > Settings despite a license with required modules being present #35790

Uh oh!

Conversation

gabriellsh commented Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

Uh oh!

dionisio-bot bot commented Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions bot commented Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Built to branch gh-pages at 2025-04-17 14:51 UTC. Preview will be ready when the GitHub Pages deployment is complete.

Uh oh!

codecov bot commented Apr 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

MarcosSpessatto left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kody-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

Uh oh!

kody-ai bot commented Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kody-ai bot commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kody-ai bot commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

kody-ai bot commented Apr 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Completed! 🔥

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fix: Enterprise settings disabled in `Admin > Settings` despite a license with required modules being present #35790

fix: Enterprise settings disabled in `Admin > Settings` despite a license with required modules being present #35790

gabriellsh commented Apr 11, 2025 •

edited

Loading

dionisio-bot bot commented Apr 11, 2025 •

edited

Loading

changeset-bot bot commented Apr 11, 2025 •

edited

Loading

github-actions bot commented Apr 11, 2025 •

edited

Loading

Built to branch `gh-pages` at 2025-04-17 14:51 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

codecov bot commented Apr 11, 2025 •

edited

Loading

kody-ai bot commented Apr 16, 2025 •

edited

Loading

kody-ai bot commented Apr 16, 2025 •

edited

Loading

kody-ai bot commented Apr 17, 2025 •

edited

Loading

kody-ai bot commented Apr 17, 2025 •

edited

Loading

kody-ai bot commented Apr 17, 2025 •

edited

Loading