Add ability to override features for teamtype #6247

hardillb · 2025-11-05T13:28:34Z

fixes #6222

Description

Adds ability to override

Tables
Instance Resources
Bill of Materials
NPM Packages
Git Integration

Related Issue(s)

#6222

Checklist

Labels

Includes a DB migration? -> add the area:migration label

fixes #6222 Adds ability to override - Tables - Instance Resources - Bill of Materials - NPM Packages - Git Integration

hardillb · 2025-11-05T13:29:03Z

Needs test

hardillb · 2025-11-05T13:29:17Z

Picks up defaults from the current team type

codecov · 2025-11-05T13:41:39Z

Codecov Report

❌ Patch coverage is 92.24138% with 9 lines in your changes missing coverage. Please review.
✅ Project coverage is 76.28%. Comparing base (c3beb87) to head (ae0f715).
⚠️ Report is 7 commits behind head on main.

Files with missing lines	Patch %	Lines
forge/lib/features.js	0.00%	3 Missing ⚠️
forge/ee/routes/customHostnames/index.js	0.00%	2 Missing ⚠️
forge/ee/routes/gitops/index.js	0.00%	2 Missing ⚠️
forge/ee/routes/teamBroker/schema.js	0.00%	2 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #6247   +/-   ##
=======================================
  Coverage   76.28%   76.28%           
=======================================
  Files         394      394           
  Lines       19805    19805           
  Branches     4746     4746           
=======================================
  Hits        15108    15108           
  Misses       4697     4697

Flag	Coverage Δ
backend	`76.28% <92.24%> (ø)`

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 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.

knolleary · 2025-11-05T13:55:18Z

For each feature, we need to check the permission checks in the backend to ensure they operate against the Team object and not doing Team->TeamType->Check - as that will fail to apply the team override.

For example, the npm catalogue does the check via the TeamType here:

flowfuse/forge/ee/routes/catalogues/index.js

Line 18 in 8bed051

if (!teamType.getFeatureProperty('npm', false)) {

hardillb · 2025-11-10T10:02:51Z

@knolleary ready for review again

knolleary

Found a couple places I think the logic needs looking at again.

Also, I spotted the Project.byId function doesn't include properties in the attribute list of the Team it will load - so the overrides will be missing from the object.

forge/ee/lib/alerts/index.js

forge/routes/api/project.js

forge/routes/auth/oauth.js

hardillb · 2025-11-11T11:35:14Z

@knolleary tests are passing again, should be good for a second look

fixes #4866 Adds a check box to the TeamType config that enables all features. This defaults to enabled for the default team that is create on first startup. Need to decide if we want a migration to enable this for existing installs if there is only 1 team type. This PR is built on top of #6247 and targets it (so it should be merged first).

knolleary · 2025-12-09T10:22:22Z

forge/routes/api/team.js

        result.instanceCountByType = await team.instanceCountByType()

        await appendBillingDetails(result, team, request)
+        await updateTeamFeatures(result, team)


Been debugging an odd behaviour with this PR and I think it's due to this line.

This is changing the type object in the response to represent the team-type feature flags with the team overrides applied. Whereas, I think, this should be the underlying team type flags - and the overrides are returned in the top-level properties object for the team.

Still digging into it.

Ok -so there are still lots of frontend feature flag checks that are examining the team.type.properties object directly, rather than use the featureCheck composable that would allow us to apply overrides centrally.

Going to look at how quick it would be to switch over.

It is not a quick switch over. There is a lot of inconsistent use of the featureCheck function and it doesn't cover all feature flags we have.

So I can see why the choice was made to modify the type property. It isn't the ideal solution, but it may be what we have to run with.

knolleary · 2025-12-09T10:56:07Z

frontend/src/pages/team/Settings/TeamAdminTools.vue

            }

+            Object.keys(this.editableLimits.features).forEach(feature => {
+                // only store the delta from the TeamType


This isn't working as intended - because the API is modifying team.type.properties.features to include the overrides, this check is not comparing against the underlying type properties.

Working on a fix.

knolleary · 2025-12-09T11:17:36Z

I've pushed a UI rework for the edit dialog:

Including an indicator for any applied overrides:

As noted in my inline comments, I think there is a big tidy up needed in how feature flags are checked in the frontend. We have lots of places access team.type.properties directly - which has meant this PR is mutating that object to apply the overrides. It would be much clearer for team.type to be unchanged, and for the frontend to provide a central place to do feature checks. That central place does exist for some flags, but not used consistently. I will raise an issue to address that, then we can revisit the change made by this PR.

knolleary

Approving - but will hold off merge until after the imminent maint release

Add ability to override features for teamtype

8bed051

fixes #6222 Adds ability to override - Tables - Instance Resources - Bill of Materials - NPM Packages - Git Integration

hardillb self-assigned this Nov 5, 2025

hardillb requested a review from knolleary November 5, 2025 13:31

hardillb temporarily deployed to staging November 5, 2025 13:32 — with GitHub Actions Inactive

Add tests

8839ee0

hardillb temporarily deployed to staging November 5, 2025 14:01 — with GitHub Actions Inactive

Update pre-handler

c1148cf

hardillb temporarily deployed to staging November 5, 2025 14:08 — with GitHub Actions Inactive

hardillb marked this pull request as draft November 5, 2025 14:12

This comment was marked as outdated.

Sign in to view

Fix tests and prevent TeamType defaults being pushed

b8b97af

hardillb temporarily deployed to staging November 5, 2025 14:53 — with GitHub Actions Inactive

Centralise list of features

05022ca

hardillb temporarily deployed to staging November 5, 2025 16:17 — with GitHub Actions Inactive

fix lint

4227fdf

hardillb temporarily deployed to staging November 5, 2025 16:26 — with GitHub Actions Inactive

Update all TeamType tests to also test overrides

c5595e1

hardillb temporarily deployed to staging November 6, 2025 11:20 — with GitHub Actions Inactive

Fix some tests

1314e3c

hardillb temporarily deployed to staging November 6, 2025 11:52 — with GitHub Actions Inactive

More test fixes

7bcbf12

hardillb temporarily deployed to staging November 6, 2025 12:00 — with GitHub Actions Inactive

Last of test fixes

ef52226

hardillb temporarily deployed to staging November 6, 2025 13:41 — with GitHub Actions Inactive

Add TeamOverride test

23b4efc

hardillb temporarily deployed to staging November 6, 2025 17:14 — with GitHub Actions Inactive

hardillb temporarily deployed to staging November 7, 2025 11:36 — with GitHub Actions Inactive

knolleary requested changes Nov 11, 2025

View reviewed changes

forge/ee/lib/alerts/index.js Outdated Show resolved Hide resolved

forge/routes/api/project.js Outdated Show resolved Hide resolved

forge/routes/auth/oauth.js Show resolved Hide resolved

hardillb added 3 commits November 11, 2025 10:06

Resolve Suggestions

c7aff6d

Add the default

a794475

Remove unneeded test

95e96c5

hardillb requested a review from knolleary November 11, 2025 10:13

hardillb temporarily deployed to staging November 11, 2025 10:17 — with GitHub Actions Inactive

Fix email alerts tests

0b350af

hardillb temporarily deployed to staging November 11, 2025 11:09 — with GitHub Actions Inactive

hardillb mentioned this pull request Nov 26, 2025

Add 'auto-enable all feature flags' to TeamType configuration #4866

Closed

Merge branch 'main' into more-team-overrides

fa188e1

hardillb temporarily deployed to staging November 26, 2025 14:15 — with GitHub Actions Inactive

hardillb mentioned this pull request Nov 26, 2025

Allow default TeamType to enabled all feats default #6339

Merged

11 tasks

knolleary reviewed Dec 9, 2025

View reviewed changes

Rework teamtypeedit dialog

8123a96

Merge branch 'main' into more-team-overrides

d3766b9

knolleary approved these changes Dec 9, 2025

View reviewed changes

knolleary temporarily deployed to staging December 9, 2025 11:23 — with GitHub Actions Inactive

Fix linting

c3beb87

knolleary temporarily deployed to staging December 9, 2025 13:28 — with GitHub Actions Inactive

Merge branch 'main' into more-team-overrides

ae0f715

hardillb merged commit f69e838 into main Dec 10, 2025
20 checks passed

hardillb deleted the more-team-overrides branch December 10, 2025 10:20

hardillb temporarily deployed to staging December 10, 2025 10:23 — with GitHub Actions Inactive

hardillb temporarily deployed to staging December 10, 2025 10:26 — with GitHub Actions Inactive

Add ability to override features for teamtype #6247

Add ability to override features for teamtype #6247

Uh oh!

Conversation

hardillb commented Nov 5, 2025

Description

Related Issue(s)

Checklist

Labels

Uh oh!

hardillb commented Nov 5, 2025

Uh oh!

hardillb commented Nov 5, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

knolleary commented Nov 5, 2025

Uh oh!

This comment was marked as outdated.

hardillb commented Nov 10, 2025

Uh oh!

knolleary left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hardillb commented Nov 11, 2025

Uh oh!

knolleary Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

knolleary Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

knolleary Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

knolleary Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

knolleary commented Dec 9, 2025

Uh oh!

knolleary left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Nov 5, 2025 •

edited

Loading