diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/constants.js b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/constants.js index 4ed64d576e63a4bc2429dc525a429dc0b220ff13..7f04a4fe8d4ad10320fb3aa960d19eb558e0d3ca 100644 --- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/constants.js +++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/constants.js @@ -217,9 +217,8 @@ export const SCAN_EXECUTION_BRANCH_TYPE_OPTIONS = ({ SPECIFIC_BRANCHES, ]; - // Feature flag dependent options - if (window.gon?.features?.flexibleScanExecutionPolicy && includeTargetTypes) { - // Additional options when feature flag is enabled + // Additional options when it is a pipeline scan + if (includeTargetTypes) { const additionalOptions = [ TARGET_PROTECTED_BRANCHES, isGroupNamespace ? GROUP_TARGET_DEFAULT_BRANCHES : PROJECT_TARGET_DEFAULT_BRANCH, diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution/editor_component.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution/editor_component.vue index 8b27ce603e18ab372fd8a6905ebe8394de4b6a8a..30e5bfc481b53c50ec1a4d208e46d73e447c3c68 100644 --- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution/editor_component.vue +++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution/editor_component.vue @@ -2,7 +2,7 @@ import { GlButton, GlEmptyState, - GlFormRadio, + GlFormRadioGroup, GlIcon, GlLink, GlSprintf, @@ -116,7 +116,7 @@ export default { EditorLayout, GlButton, GlEmptyState, - GlFormRadio, + GlFormRadioGroup, GlIcon, GlLink, GlSprintf, @@ -203,9 +203,6 @@ export default { isDefaultConfig() { return this.configType === SELECTION_CONFIG_DEFAULT; }, - hasFlexibleScanExecutionPolicy() { - return this.glFeatures.flexibleScanExecutionPolicy; - }, hasNewSplitView() { return this.glFeatures.securityPoliciesSplitView; }, @@ -247,6 +244,20 @@ export default { isValidOptimizedPolicy() { return getConfiguration(this.policy) === SELECTION_CONFIG_DEFAULT; }, + configurationOptions() { + return [ + { + value: SELECTION_CONFIG_DEFAULT, + disabled: !this.isValidOptimizedPolicy, + text: s__('SecurityOrchestration|Template'), + }, + { + value: SELECTION_CONFIG_CUSTOM, + disabled: !this.isValidOptimizedPolicy, + text: s__('SecurityOrchestration|Custom'), + }, + ]; + }, }, methods: { areManifestsEqual(manifest) { @@ -344,6 +355,9 @@ export default { this.$emit('save', { action, policy: policyBodyToYaml(policy) }); }, + updateConfigType(value) { + this.configType = value; + }, updateOptimizedAction({ enabled, scanner }) { if (enabled) { this.addAction({ scanner, isOptimized: true }); @@ -390,77 +404,8 @@ export default { @update-yaml="updateYaml" @update-editor-mode="changeEditorMode" > - - - -