diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/editor_layout.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/editor_layout.vue index d297f466e1537eb7230e82df35db02bcd60b32d2..f0e2a665e84ae377fd538263ec9ba7a2af2c3525 100644 --- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/editor_layout.vue +++ b/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}'), { diff --git a/ee/app/assets/javascripts/security_orchestration/policy_editor.js b/ee/app/assets/javascripts/security_orchestration/policy_editor.js index 16eef06723651a959b9a49d20bd33dfbb1544cdd..4e1b7d95422bd22d80ada6a922917f7c38b0b0fb 100644 --- a/ee/app/assets/javascripts/security_orchestration/policy_editor.js +++ b/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 diff --git a/ee/spec/frontend/security_orchestration/components/policy_editor/editor_layout_spec.js b/ee/spec/frontend/security_orchestration/components/policy_editor/editor_layout_spec.js index f59dcfeca03c2ee93086810281ef389e3f5250e4..083691fbc220c1427f505b678208f0f63dba8cf3 100644 --- a/ee/spec/frontend/security_orchestration/components/policy_editor/editor_layout_spec.js +++ b/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, diff --git a/ee/spec/frontend_integration/security_orchestration/policy_editor/mocks/mocks.js b/ee/spec/frontend_integration/security_orchestration/policy_editor/mocks/mocks.js index 0dfca4a32c47f0adef6725197f5ae566f891cd49..837a51ff4c123ec172aec7d95d63faf897f9b9f6 100644 --- a/ee/spec/frontend_integration/security_orchestration/policy_editor/mocks/mocks.js +++ b/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, };