Merge branch '443594-policies-remove-feature-toggle-policy-scope' into 'master'

Remove feature toggle for policy scope

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145997



Merged-by: Alexander Turinske <aturinske@gitlab.com>
Approved-by: Ross Byrne <robyrne@gitlab.com>
Approved-by: Alexander Turinske <aturinske@gitlab.com>
Co-authored-by: Artur Fedorov <afedorov@gitlab.com>

ee/app/assets/javascripts/security_orchestration/components/policy_editor/editor_layout.vue

@@ -60,7 +60,7 @@ export default {
   },
   directives: { GlModal: GlModalDirective, GlTooltip: GlTooltipDirective },
   mixins: [glFeatureFlagsMixin()],
-  inject: ['namespaceType', 'policiesPath', 'securityPoliciesPolicyScopeToggleEnabled'],
+  inject: ['namespaceType', 'policiesPath'],
   props: {
     customSaveButtonText: {
       type: String,
@@ -138,11 +138,9 @@ export default {
       return this.namespaceType === NAMESPACE_TYPES.GROUP;
     },
     shouldShowScope() {
-      const featureFlagEnabled = this.isGroupLevel
+      return this.isGroupLevel
         ? this.glFeatures.securityPoliciesPolicyScope
         : this.glFeatures.securityPoliciesPolicyScopeProject;
-
-      return featureFlagEnabled && this.securityPoliciesPolicyScopeToggleEnabled;
     },
     deleteModalTitle() {
       return sprintf(s__('SecurityOrchestration|Delete policy: %{policy}'), {

ee/app/assets/javascripts/security_orchestration/policy_editor.js

@@ -30,7 +30,6 @@ export default (el, namespaceType) => {
     scanResultApprovers,
     softwareLicenses,
     timezones,
-    securityPoliciesPolicyScopeToggleEnabled,
   } = el.dataset;
 
   const policyProject = JSON.parse(assignedPolicyProject);
@@ -87,9 +86,6 @@ export default (el, namespaceType) => {
       scanPolicyDocumentationPath,
       scanResultPolicyApprovers,
       parsedSoftwareLicenses,
-      securityPoliciesPolicyScopeToggleEnabled: parseBoolean(
-        securityPoliciesPolicyScopeToggleEnabled,
-      ),
       timezones: parsedTimezones,
       existingPolicy: policy ? { type: policyType, ...JSON.parse(policy) } : undefined,
       assignedPolicyProject: policyProject

ee/spec/frontend/security_orchestration/components/policy_editor/editor_layout_spec.js

@@ -42,7 +42,6 @@ describe('EditorLayout component', () => {
         ...propsData,
       },
       provide: {
-        securityPoliciesPolicyScopeToggleEnabled: false,
         policiesPath,
         namespaceType,
         ...provide,
@@ -300,29 +299,18 @@ describe('EditorLayout component', () => {
 
   describe('policy scope', () => {
     it.each`
-      flagEnabledGroup | flagEnabledProject | securityPoliciesPolicyScopeToggleEnabled | type                       | expectedResult
-      ${true}          | ${false}           | ${true}                                  | ${NAMESPACE_TYPES.GROUP}   | ${true}
-      ${true}          | ${false}           | ${true}                                  | ${NAMESPACE_TYPES.PROJECT} | ${false}
-      ${false}         | ${false}           | ${false}                                 | ${NAMESPACE_TYPES.GROUP}   | ${false}
-      ${false}         | ${false}           | ${false}                                 | ${NAMESPACE_TYPES.PROJECT} | ${false}
-      ${true}          | ${false}           | ${false}                                 | ${NAMESPACE_TYPES.GROUP}   | ${false}
-      ${true}          | ${false}           | ${false}                                 | ${NAMESPACE_TYPES.PROJECT} | ${false}
-      ${false}         | ${false}           | ${true}                                  | ${NAMESPACE_TYPES.GROUP}   | ${false}
-      ${false}         | ${true}            | ${true}                                  | ${NAMESPACE_TYPES.PROJECT} | ${true}
-      ${false}         | ${false}           | ${false}                                 | ${NAMESPACE_TYPES.PROJECT} | ${false}
-      ${true}          | ${true}            | ${false}                                 | ${NAMESPACE_TYPES.GROUP}   | ${false}
+      flagEnabledGroup | flagEnabledProject | type                       | expectedResult
+      ${false}         | ${false}           | ${NAMESPACE_TYPES.GROUP}   | ${false}
+      ${false}         | ${false}           | ${NAMESPACE_TYPES.PROJECT} | ${false}
+      ${true}          | ${false}           | ${NAMESPACE_TYPES.GROUP}   | ${true}
+      ${true}          | ${false}           | ${NAMESPACE_TYPES.PROJECT} | ${false}
+      ${false}         | ${true}            | ${NAMESPACE_TYPES.PROJECT} | ${true}
+      ${true}          | ${true}            | ${NAMESPACE_TYPES.GROUP}   | ${true}
     `(
       'renders policy scope conditionally for $namespaceType level based on feature flag',
-      ({
-        flagEnabledGroup,
-        flagEnabledProject,
-        securityPoliciesPolicyScopeToggleEnabled,
-        type,
-        expectedResult,
-      }) => {
+      ({ flagEnabledGroup, flagEnabledProject, type, expectedResult }) => {
         factory({
           provide: {
-            securityPoliciesPolicyScopeToggleEnabled,
             namespaceType: type,
             glFeatures: {
               securityPoliciesPolicyScope: flagEnabledGroup,

ee/spec/frontend_integration/security_orchestration/policy_editor/mocks/mocks.js

@@ -26,6 +26,5 @@ export const DEFAULT_PROVIDE = {
   rootNamespacePath: 'path/to/root',
   parsedSoftwareLicenses: [],
   timezones: [],
-  securityPoliciesPolicyScopeToggleEnabled: true,
   customCiToggleEnabled: true,
 };