Merge branch 'afontaine/inject-feature-flag-limit' into 'master'

Inject Feature Flags Limit Value

See merge request gitlab-org/gitlab!61621

app/assets/javascripts/feature_flags/components/feature_flags.vue

@@ -35,8 +35,9 @@ export default {
   inject: {
     newUserListPath: { default: '' },
     newFeatureFlagPath: { default: '' },
-    canUserConfigure: { required: true },
-    featureFlagsLimitExceeded: { required: true },
+    canUserConfigure: {},
+    featureFlagsLimitExceeded: {},
+    featureFlagsLimit: {},
   },
   data() {
     const scope = getParameterByName('scope') || SCOPES.FEATURE_FLAG_SCOPE;

app/assets/javascripts/feature_flags/index.js

@@ -24,6 +24,7 @@ export default () => {
     newFeatureFlagPath,
     newUserListPath,
     featureFlagsLimitExceeded,
+    featureFlagsLimit,
   } = el.dataset;
 
   return new Vue({
@@ -40,7 +41,8 @@ export default () => {
       canUserConfigure: canUserAdminFeatureFlag !== undefined,
       newFeatureFlagPath,
       newUserListPath,
-      featureFlagsLimitExceeded,
+      featureFlagsLimitExceeded: featureFlagsLimitExceeded !== undefined,
+      featureFlagsLimit,
     },
     render(createElement) {
       return createElement(FeatureFlagsComponent);

changelogs/unreleased/afontaine-inject-feature-flag-limit.yml

+---
+title: Inject Feature Flags Limit Value
+merge_request: 61621
+author:
+type: fixed

ee/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb

@@ -38,4 +38,16 @@ RSpec.describe 'User sees feature flag list', :js do
       )
     end
   end
+  context 'with too many feature flags' do
+    before do
+      plan_limits = create(:plan_limits, :default_plan)
+      plan_limits.update!(Operations::FeatureFlag.limit_name => 1)
+      create(:operations_feature_flag, :new_version_flag, project: project, active: false)
+    end
+
+    it 'stops users from adding another' do
+      visit(project_feature_flags_path(project))
+      expect(page).to have_text('Feature flags limit reached (1). Delete one or more feature flags before adding new ones.')
+    end
+  end
 end