Merge branch '11607-group-saml-setting-toggles-have-no-effect' into 'master'

Resolve "Group SAML setting toggles have no effect"

Closes #11607

See merge request gitlab-org/gitlab-ee!13078

ee/app/assets/javascripts/pages/groups/saml_providers/shared/init_saml.js

@@ -4,11 +4,13 @@ import SCIMTokenToggleArea from 'ee/saml_providers/scim_token_toggle_area';
 export default function initSAML() {
   const groupPath = document.querySelector('#issuer').value;
 
-  // eslint-disable-next-line no-new
-  new SCIMTokenToggleArea(
-    '.js-generate-scim-token-container',
-    '.js-scim-token-container',
-    groupPath,
-  );
+  if (gon.features.groupScim) {
+    // eslint-disable-next-line no-new
+    new SCIMTokenToggleArea(
+      '.js-generate-scim-token-container',
+      '.js-scim-token-container',
+      groupPath,
+    );
+  }
   new SamlSettingsForm('#js-saml-settings-form').init();
 }

ee/app/controllers/groups/saml_providers_controller.rb

@@ -7,6 +7,9 @@ class Groups::SamlProvidersController < Groups::ApplicationController
   before_action :authorize_manage_saml!
   before_action :check_group_saml_available!
   before_action :check_group_saml_configured
+  before_action do
+    push_frontend_feature_flag(:group_scim)
+  end
 
   def show
     @saml_provider = @group.saml_provider || @group.build_saml_provider

ee/changelogs/unreleased/11607-group-saml-setting-toggles-have-no-effect.yml

+---
+title: Add feature flag to group_scim javascript
+merge_request: 13078
+author:
+type: fixed