diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/constants.js b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/constants.js
index 54723596b8bbe1ae0fdf2c7b60f995d86395d037..13cc10ffb4fb757d1e841950d64324fa3c18a83a 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/constants.js
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/constants.js
@@ -51,10 +51,6 @@ export const SCANNER_HUMANIZED_TEMPLATE = s__(
'ScanExecutionPolicy|Run a %{scan} scan with the following options:',
);
-export const DAST_HUMANIZED_TEMPLATE = s__(
- 'ScanExecutionPolicy|Run a %{scan} scan with %{dastProfiles} with the following options:',
-);
-
export const POLICY_ACTION_BUILDER_TAGS_ERROR_KEY = 'tags';
export const POLICY_ACTION_BUILDER_DAST_PROFILES_ERROR_KEY = 'profiles';
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector.vue
deleted file mode 100644
index 74ccc3bcc8856d774d3d31ed1c343d70fab280b6..0000000000000000000000000000000000000000
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<script>
-import { GlSprintf, GlFormGroup, GlFormInput } from '@gitlab/ui';
-import { s__ } from '~/locale';
-
-export default {
- i18n: {
- dastProfilesMessage: s__(
- 'ScanExecutionPolicy|scanner profile %{scannerProfile} and site profile %{siteProfile}',
- ),
- selectedScannerProfilePlaceholder: s__('ScanExecutionPolicy|Select scanner profile'),
- selectedSiteProfilePlaceholder: s__('ScanExecutionPolicy|Select site profile'),
- },
- name: 'GroupDastProfileSelector',
- components: {
- GlSprintf,
- GlFormGroup,
- GlFormInput,
- },
- props: {
- savedScannerProfileName: {
- type: String,
- required: false,
- default: null,
- },
- savedSiteProfileName: {
- type: String,
- required: false,
- default: null,
- },
- },
- data() {
- return {
- siteProfile: this.savedSiteProfileName ?? '',
- scannerProfile: this.savedScannerProfileName ?? '',
- };
- },
- watch: {
- scannerProfile(value) {
- this.$emit('set-profile', { scannerProfile: value, siteProfile: this.siteProfile });
- },
- siteProfile(value) {
- this.$emit('set-profile', { siteProfile: value, scannerProfile: this.scannerProfile });
- },
- },
-};
-</script>
-
-<template>
- <div class="gl-display-flex gl-align-items-center gl-gap-3">
- <gl-sprintf :message="$options.i18n.dastProfilesMessage">
- <template #scannerProfile>
- <gl-form-group
- class="gl-mb-0"
- :label="s__('ScanExecutionPolicy|Scanner profile')"
- label-for="scanner-profile"
- label-sr-only
- >
- <gl-form-input
- id="scanner-profile"
- v-model="scannerProfile"
- :placeholder="$options.i18n.selectedScannerProfilePlaceholder"
- data-testid="scan-profile-selection"
- />
- </gl-form-group>
- </template>
- <template #siteProfile>
- <gl-form-group
- class="gl-mb-0"
- :label="s__('ScanExecutionPolicy|Site profile')"
- label-for="site-profile"
- label-sr-only
- >
- <gl-form-input
- id="site-profile"
- v-model="siteProfile"
- :placeholder="$options.i18n.selectedSiteProfilePlaceholder"
- data-testid="site-profile-selection"
- />
- </gl-form-group>
- </template>
- </gl-sprintf>
- </div>
-</template>
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder.vue
index 843f821d3bc74a097071475290bcb38e8cc4cf3d..15331239c3bf21d652154be6dd9c063a953d4f00 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder.vue
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder.vue
@@ -8,17 +8,16 @@ import { ACTION_AND_LABEL, RULE_MODE_SCANNERS } from '../constants';
import ScanFilterSelector from '../scan_filter_selector.vue';
import { CI_VARIABLE, RUNNER_TAGS, FILTERS } from './scan_filters/constants';
import CiVariablesSelectors from './scan_filters/ci_variables_selectors.vue';
+import GroupDastProfileSelector from './scan_filters/group_dast_profile_selector.vue';
+import ProjectDastProfileSelector from './scan_filters/project_dast_profile_selector.vue';
import RunnerTagsFilter from './scan_filters/runner_tags_filter.vue';
import {
- DAST_HUMANIZED_TEMPLATE,
DEFAULT_SCANNER,
SCANNER_DAST,
SCANNER_HUMANIZED_TEMPLATE,
POLICY_ACTION_BUILDER_TAGS_ERROR_KEY,
POLICY_ACTION_BUILDER_DAST_PROFILES_ERROR_KEY,
} from './constants';
-import ProjectDastProfileSelector from './project_dast_profile_selector.vue';
-import GroupDastProfileSelector from './group_dast_profile_selector.vue';
import { buildScannerAction } from './lib';
export default {
@@ -66,11 +65,6 @@ export default {
text,
}));
},
- actionMessage() {
- return this.selectedScanner === SCANNER_DAST
- ? DAST_HUMANIZED_TEMPLATE
- : SCANNER_HUMANIZED_TEMPLATE;
- },
ciVariables() {
return this.initAction.variables || {};
},
@@ -79,6 +73,9 @@ export default {
this.isFilterSelected(this.$options.CI_VARIABLE) || Object.keys(this.ciVariables).length > 0
);
},
+ isDast() {
+ return this.selectedScanner === SCANNER_DAST;
+ },
isRunnerTagFilterSelected() {
return this.isFilterSelected(RUNNER_TAGS) || this.tags.length > 0;
},
@@ -88,6 +85,9 @@ export default {
isFirstAction() {
return this.actionIndex === 0;
},
+ isGroup() {
+ return this.namespaceType === NAMESPACE_TYPES.GROUP;
+ },
isProject() {
return this.namespaceType === NAMESPACE_TYPES.PROJECT;
},
@@ -163,6 +163,7 @@ export default {
},
i18n: {
scannersHeaderText: s__('ScanExecutionPolicy|Select a scanner'),
+ scannerHumanizedTemplate: SCANNER_HUMANIZED_TEMPLATE,
},
};
</script>
@@ -180,7 +181,7 @@ export default {
<template #content>
<generic-base-layout-component class="gl-w-full gl-bg-white" @remove="$emit('remove')">
<template #content>
- <gl-sprintf :message="actionMessage">
+ <gl-sprintf :message="$options.i18n.scannerHumanizedTemplate">
<template #scan>
<gl-collapsible-listbox
:items="actionScannerList"
@@ -190,24 +191,6 @@ export default {
@select="setSelectedScanner({ scanner: $event })"
/>
</template>
- <template #dastProfiles>
- <project-dast-profile-selector
- v-if="isProject"
- :full-path="namespacePath"
- :saved-scanner-profile-name="scannerProfile"
- :saved-site-profile-name="siteProfile"
- @error="
- $emit('parsing-error', $options.POLICY_ACTION_BUILDER_DAST_PROFILES_ERROR_KEY)
- "
- @profiles-selected="setSelectedScanner"
- />
- <group-dast-profile-selector
- v-else
- :saved-scanner-profile-name="scannerProfile"
- :saved-site-profile-name="siteProfile"
- @set-profile="setSelectedScanner"
- />
- </template>
</gl-sprintf>
</template>
</generic-base-layout-component>
@@ -215,6 +198,22 @@ export default {
</generic-base-layout-component>
<generic-base-layout-component class="gl-pt-3" :show-remove-button="false">
<template #content>
+ <project-dast-profile-selector
+ v-if="isProject && isDast"
+ :full-path="namespacePath"
+ :saved-scanner-profile-name="scannerProfile"
+ :saved-site-profile-name="siteProfile"
+ @error="$emit('parsing-error', $options.POLICY_ACTION_BUILDER_DAST_PROFILES_ERROR_KEY)"
+ @profiles-selected="setSelectedScanner"
+ />
+
+ <group-dast-profile-selector
+ v-if="isGroup && isDast"
+ :saved-scanner-profile-name="scannerProfile"
+ :saved-site-profile-name="siteProfile"
+ @set-profile="setSelectedScanner"
+ />
+
<runner-tags-filter
v-if="isRunnerTagFilterSelected"
:selected="tags"
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/constants.js b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/constants.js
index bf65835053b619ce031c52c42a0eb7e96de7501d..367b6b048b1b941139bb2be0cc828df29439be14 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/constants.js
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/constants.js
@@ -16,3 +16,12 @@ export const FILTERS = [
tooltip: s__('ScanExecutionPolicy|Maximum number of CI-criteria is one'),
},
];
+
+export const DAST_PROFILE_I18N = {
+ selectedScannerProfilePlaceholder: s__('ScanExecutionPolicy|Select scanner profile'),
+ selectedSiteProfilePlaceholder: s__('ScanExecutionPolicy|Select site profile'),
+ scanCreate: s__('ScanExecutionPolicy|Create new scan profile'),
+ scanLabel: s__('ScanExecutionPolicy|DAST scan profiles'),
+ siteCreate: s__('ScanExecutionPolicy|Create new site profile'),
+ siteLabel: s__('ScanExecutionPolicy|DAST site profiles'),
+};
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f21900211ece4a98b267183c2d91141870d57869
--- /dev/null
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector.vue
@@ -0,0 +1,80 @@
+<script>
+import { GlFormInput } from '@gitlab/ui';
+import GenericBaseLayoutComponent from '../../generic_base_layout_component.vue';
+import { DAST_PROFILE_I18N } from './constants';
+
+export default {
+ i18n: { ...DAST_PROFILE_I18N },
+ name: 'GroupDastProfileSelector',
+ components: {
+ GenericBaseLayoutComponent,
+ GlFormInput,
+ },
+ props: {
+ savedScannerProfileName: {
+ type: String,
+ required: false,
+ default: null,
+ },
+ savedSiteProfileName: {
+ type: String,
+ required: false,
+ default: null,
+ },
+ },
+ data() {
+ return {
+ siteProfile: this.savedSiteProfileName ?? '',
+ scannerProfile: this.savedScannerProfileName ?? '',
+ };
+ },
+ watch: {
+ scannerProfile(value) {
+ this.$emit('set-profile', { scannerProfile: value, siteProfile: this.siteProfile });
+ },
+ siteProfile(value) {
+ this.$emit('set-profile', { siteProfile: value, scannerProfile: this.scannerProfile });
+ },
+ },
+};
+</script>
+
+<template>
+ <div class="gl-w-full">
+ <generic-base-layout-component
+ class="gl-w-full gl-bg-white gl-mb-3"
+ :show-remove-button="false"
+ >
+ <template #selector>
+ <label class="gl-mb-0 gl-mr-4" for="scanner-profile">
+ {{ $options.i18n.scanLabel }}
+ </label>
+ </template>
+ <template #content>
+ <gl-form-input
+ id="scanner-profile"
+ v-model="scannerProfile"
+ class="gl-w-30p"
+ :placeholder="$options.i18n.selectedScannerProfilePlaceholder"
+ data-testid="scan-profile-selection"
+ />
+ </template>
+ </generic-base-layout-component>
+ <generic-base-layout-component class="gl-w-full gl-bg-white" :show-remove-button="false">
+ <template #selector>
+ <label class="gl-mb-0 gl-mr-4" for="site-profile">
+ {{ $options.i18n.siteLabel }}
+ </label>
+ </template>
+ <template #content>
+ <gl-form-input
+ id="site-profile"
+ v-model="siteProfile"
+ class="gl-w-30p"
+ :placeholder="$options.i18n.selectedSiteProfilePlaceholder"
+ data-testid="site-profile-selection"
+ />
+ </template>
+ </generic-base-layout-component>
+ </div>
+</template>
diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector.vue
similarity index 75%
rename from ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector.vue
rename to ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector.vue
index 11aea1e0e674c8c4c09cee11148c4f461c72fe72..be5bf1531d574d4545ca8678aef2edc85d96133f 100644
--- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector.vue
+++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector.vue
@@ -1,27 +1,22 @@
<script>
-import { GlButton, GlSprintf, GlTruncate } from '@gitlab/ui';
+import { GlButton, GlTruncate } from '@gitlab/ui';
import DastProfilesDrawer from 'ee/security_configuration/dast_profiles/dast_profiles_drawer/dast_profiles_drawer.vue';
-import { s__ } from '~/locale';
import dastProfileConfiguratorMixin from 'ee/security_configuration/dast_profiles/dast_profiles_configurator_mixin';
import { SCANNER_TYPE, SITE_TYPE, DRAWER_VIEW_MODE } from 'ee/on_demand_scans/constants';
+import GenericBaseLayoutComponent from '../../generic_base_layout_component.vue';
+import { DAST_PROFILE_I18N } from './constants';
export default {
SITE_TYPE,
SCANNER_TYPE,
DRAWER_VIEW_MODE,
- i18n: {
- scannerButtonText: s__('ScanExecutionPolicy|Select scanner profile'),
- siteButtonText: s__('ScanExecutionPolicy|Select site profile'),
- dastProfilesMessage: s__(
- 'ScanExecutionPolicy|scanner profile %{scannerProfile} and site profile %{siteProfile}',
- ),
- },
+ i18n: { ...DAST_PROFILE_I18N },
name: 'ProjectDastProfileSelector',
components: {
GlButton,
- GlSprintf,
GlTruncate,
DastProfilesDrawer,
+ GenericBaseLayoutComponent,
},
mixins: [dastProfileConfiguratorMixin()],
provide() {
@@ -41,10 +36,15 @@ export default {
},
computed: {
scannerProfileButtonText() {
- return this.selectedScannerProfile?.profileName || this.$options.i18n.scannerButtonText;
+ return (
+ this.selectedScannerProfile?.profileName ||
+ this.$options.i18n.selectedScannerProfilePlaceholder
+ );
},
siteProfileButtonText() {
- return this.selectedSiteProfile?.profileName || this.$options.i18n.siteButtonText;
+ return (
+ this.selectedSiteProfile?.profileName || this.$options.i18n.selectedSiteProfilePlaceholder
+ );
},
profileIdInUse() {
return this.isScannerProfile ? this.savedScannerProfileId : this.savedSiteProfileId;
@@ -95,10 +95,19 @@ export default {
</script>
<template>
- <div class="gl-display-flex gl-align-items-center gl-gap-3">
- <gl-sprintf :message="$options.i18n.dastProfilesMessage">
- <template #scannerProfile>
+ <div class="gl-w-full">
+ <generic-base-layout-component
+ class="gl-w-full gl-bg-white gl-mb-3"
+ :show-remove-button="false"
+ >
+ <template #selector>
+ <label class="gl-mb-0 gl-mr-4" for="scanner-profile">
+ {{ $options.i18n.scanLabel }}
+ </label>
+ </template>
+ <template #content>
<gl-button
+ id="scanner-profile"
data-testid="scanner-profile-trigger"
:disabled="failedToLoadProfiles"
:loading="isLoadingProfiles"
@@ -112,8 +121,16 @@ export default {
<gl-truncate :text="scannerProfileButtonText" />
</gl-button>
</template>
- <template #siteProfile>
+ </generic-base-layout-component>
+ <generic-base-layout-component class="gl-w-full gl-bg-white" :show-remove-button="false">
+ <template #selector>
+ <label class="gl-mb-0 gl-mr-4" for="site-profile">
+ {{ $options.i18n.siteLabel }}
+ </label>
+ </template>
+ <template #content>
<gl-button
+ id="site-profile"
data-testid="site-profile-trigger"
:disabled="failedToLoadProfiles"
:loading="isLoadingProfiles"
@@ -127,7 +144,7 @@ export default {
<gl-truncate :text="siteProfileButtonText" />
</gl-button>
</template>
- </gl-sprintf>
+ </generic-base-layout-component>
<dast-profiles-drawer
:active-profile="activeProfile"
diff --git a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder_spec.js b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder_spec.js
index 125b42bd5b66872f866352d68c74ddcc58219bfd..ec665c11a8a54675441d9cf578eea406cc274336 100644
--- a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder_spec.js
+++ b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder_spec.js
@@ -1,22 +1,18 @@
-import { nextTick } from 'vue';
import { GlSprintf, GlCollapsibleListbox } from '@gitlab/ui';
import { __ } from '~/locale';
-import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import PolicyActionBuilder from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/policy_action_builder.vue';
-import ProjectDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector.vue';
+import ProjectDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector.vue';
import projectRunnerTags from 'ee/vue_shared/components/runner_tags_dropdown/graphql/get_project_runner_tags.query.graphql';
import groupRunnerTags from 'ee/vue_shared/components/runner_tags_dropdown/graphql/get_group_runner_tags.query.graphql';
-import GroupDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector.vue';
+import GroupDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector.vue';
import GenericBaseLayoutComponent from 'ee/security_orchestration/components/policy_editor/generic_base_layout_component.vue';
import RunnerTagsFilter from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/runner_tags_filter.vue';
import CiVariablesSelectors from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/ci_variables_selectors.vue';
import ScanFilterSelector from 'ee/security_orchestration/components/policy_editor/scan_filter_selector.vue';
import { buildScannerAction } from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/lib';
import { NAMESPACE_TYPES } from 'ee/security_orchestration/constants';
-import {
- DAST_HUMANIZED_TEMPLATE,
- SCANNER_HUMANIZED_TEMPLATE,
-} from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/constants';
+import { SCANNER_HUMANIZED_TEMPLATE } from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/constants';
import { createMockApolloProvider } from 'ee_jest/security_configuration/dast_profiles/graphql/create_mock_apollo_provider';
import { RUNNER_TAG_LIST_MOCK } from 'ee_jest/vue_shared/components/runner_tags_dropdown/mocks/mocks';
import {
@@ -54,13 +50,12 @@ describe('PolicyActionBuilder', () => {
};
const factory = ({
- mountFn = mountExtended,
propsData = {},
stubs = {},
handlers = defaultHandlerValue(),
provide = {},
} = {}) => {
- wrapper = mountFn(PolicyActionBuilder, {
+ wrapper = shallowMountExtended(PolicyActionBuilder, {
apolloProvider: createApolloProvider(handlers),
propsData: {
initAction: DEFAULT_ACTION,
@@ -72,7 +67,11 @@ describe('PolicyActionBuilder', () => {
namespaceType,
...provide,
},
- stubs: { ...stubs },
+ stubs: {
+ GenericBaseLayoutComponent,
+ GlSprintf,
+ ...stubs,
+ },
});
};
@@ -87,9 +86,8 @@ describe('PolicyActionBuilder', () => {
const findProjectDastSelector = () => wrapper.findComponent(ProjectDastProfileSelector);
const findGroupDastSelector = () => wrapper.findComponent(GroupDastProfileSelector);
- it('renders correctly with DAST as the default scanner', async () => {
- factory({ stubs: { GlCollapsibleListbox: true } });
- await nextTick();
+ it('renders DAST as the default scanner', () => {
+ factory();
expect(findActionSeperator().exists()).toBe(false);
expect(findDropdown().props()).toMatchObject({
@@ -98,56 +96,29 @@ describe('PolicyActionBuilder', () => {
});
});
- it('renders correctly the message with DAST as the default scanner', async () => {
- factory({
- mountFn: shallowMountExtended,
- stubs: { GenericBaseLayoutComponent, GlCollapsibleListbox: true },
- });
- await nextTick();
-
- expect(findSprintf().attributes('message')).toBe(DAST_HUMANIZED_TEMPLATE);
+ it('renders the action message correctly', () => {
+ factory({ stubs: { GlSprintf: true } });
+ expect(findSprintf().attributes('message')).toBe(SCANNER_HUMANIZED_TEMPLATE);
});
- it('renders correctly with non-DAST scanner action', async () => {
- factory({ stubs: { GlCollapsibleListbox: true } });
- await nextTick();
-
- findDropdown().vm.$emit('select', NEW_SCANNER);
- await nextTick();
+ it('renders the scanner action with the newly selected scanner', async () => {
+ factory();
+ await findDropdown().vm.$emit('select', NEW_SCANNER);
expect(findActionSeperator().exists()).toBe(false);
expect(findDropdown().props('selected')).toBe(NEW_SCANNER);
});
- it('renders correctly the message with non-DAST scanner action', async () => {
- factory({
- mountFn: shallowMountExtended,
- propsData: {
- initAction: buildScannerAction({ scanner: 'sast' }),
- },
- stubs: { GenericBaseLayoutComponent },
- });
- await nextTick();
-
- expect(findSprintf().attributes('message')).toBe(SCANNER_HUMANIZED_TEMPLATE);
- });
-
- it('renders an additional action correctly', async () => {
+ it('renders an additional action with the action seperator', () => {
factory({ propsData: { actionIndex: 1 } });
- await nextTick();
-
expect(findActionSeperator().exists()).toBe(true);
});
it('emits the "changed" event with existing tags when an action scan type is changed', async () => {
factory({ propsData: { initAction: { ...DEFAULT_ACTION, tags: ['production'] } } });
- await nextTick();
-
expect(wrapper.emitted('changed')).toBe(undefined);
- findDropdown().vm.$emit('select', NEW_SCANNER);
- await nextTick();
-
+ await findDropdown().vm.$emit('select', NEW_SCANNER);
expect(wrapper.emitted('changed')).toStrictEqual([
[{ ...buildScannerAction({ scanner: NEW_SCANNER }), tags: ['production'] }],
]);
@@ -155,10 +126,7 @@ describe('PolicyActionBuilder', () => {
it('removes the variables when a action scan type is changed', async () => {
factory({ propsData: { initAction: { ...DEFAULT_ACTION, variables: { key: 'value' } } } });
- await nextTick();
-
- findDropdown().vm.$emit('select', NEW_SCANNER);
- await nextTick();
+ await findDropdown().vm.$emit('select', NEW_SCANNER);
expect(wrapper.emitted('changed')).toStrictEqual([
[buildScannerAction({ scanner: NEW_SCANNER })],
@@ -167,13 +135,9 @@ describe('PolicyActionBuilder', () => {
it('emits the "removed" event when an action is changed', async () => {
factory();
- await nextTick();
-
expect(wrapper.emitted('remove')).toBe(undefined);
- findGenericBaseLayoutComponent().vm.$emit('remove');
- await nextTick();
-
+ await findGenericBaseLayoutComponent().vm.$emit('remove');
expect(wrapper.emitted('remove')).toStrictEqual([[]]);
});
@@ -181,25 +145,22 @@ describe('PolicyActionBuilder', () => {
describe('runner tags filter', () => {
it('initially hides runner tags filter', () => {
factory();
+
expect(findTagsFilter().exists()).toBe(false);
});
it('emits the "changed" event when action tags are changed', async () => {
factory({ propsData: { initAction: { ...DEFAULT_ACTION, tags: ['staging'] } } });
- await nextTick();
-
expect(wrapper.emitted('changed')).toBe(undefined);
const NEW_TAGS = ['main', 'release'];
- findTagsFilter().vm.$emit('input', { tags: NEW_TAGS });
- await nextTick();
-
+ await findTagsFilter().vm.$emit('input', { tags: NEW_TAGS });
expect(wrapper.emitted('changed')).toStrictEqual([[{ ...DEFAULT_ACTION, tags: NEW_TAGS }]]);
});
- it('emits an error when tags parsing happens', () => {
+ it('emits an error when tags parsing happens', async () => {
factory({ propsData: { initAction: { ...DEFAULT_ACTION, tags: ['staging'] } } });
- findTagsFilter().vm.$emit('error');
+ await findTagsFilter().vm.$emit('error');
expect(wrapper.emitted('parsing-error')).toHaveLength(1);
});
@@ -208,6 +169,7 @@ describe('PolicyActionBuilder', () => {
describe('ci variable filter', () => {
it('initially hides ci variable filter', () => {
factory();
+
expect(findCiVariablesSelectors().exists()).toBe(false);
});
diff --git a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector_spec.js b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector_spec.js
similarity index 91%
rename from ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector_spec.js
rename to ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector_spec.js
index c38a7b2d8f31d617bf89ddbf5d87166e6c89f2c4..97fa2cfbb10e8ab0b02633fc5ad4182ab236d6f9 100644
--- a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector_spec.js
+++ b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector_spec.js
@@ -1,6 +1,7 @@
import { GlSprintf } from '@gitlab/ui';
-import GroupDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/group_dast_profile_selector.vue';
+import GroupDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/group_dast_profile_selector.vue';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import GenericBaseLayoutComponent from 'ee/security_orchestration/components/policy_editor/generic_base_layout_component.vue';
describe('GroupDastProfileSelector', () => {
let wrapper;
@@ -11,6 +12,7 @@ describe('GroupDastProfileSelector', () => {
...props,
},
stubs: {
+ GenericBaseLayoutComponent,
GlSprintf,
},
});
diff --git a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector_spec.js b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector_spec.js
similarity index 96%
rename from ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector_spec.js
rename to ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector_spec.js
index bc1c4ee203765710e12f746556cc94c2b1cf9f34..814e12da6b4b5da81e79ba46a5f18edce8426253 100644
--- a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector_spec.js
+++ b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector_spec.js
@@ -5,9 +5,10 @@ import { createMockApolloProvider } from 'ee_jest/security_configuration/dast_pr
import waitForPromises from 'helpers/wait_for_promises';
import DastProfilesDrawer from 'ee/security_configuration/dast_profiles/dast_profiles_drawer/dast_profiles_drawer.vue';
import DastProfilesDrawerHeader from 'ee/security_configuration/dast_profiles/dast_profiles_drawer/dast_profiles_drawer_header.vue';
-import ProjectDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/project_dast_profile_selector.vue';
+import ProjectDastProfileSelector from 'ee/security_orchestration/components/policy_editor/scan_execution_policy/scan_filters/project_dast_profile_selector.vue';
import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
import { SCANNER_TYPE, SITE_TYPE } from 'ee/on_demand_scans/constants';
+import GenericBaseLayoutComponent from 'ee/security_orchestration/components/policy_editor/generic_base_layout_component.vue';
describe('ProjectDastProfileSelector', () => {
let wrapper;
@@ -21,6 +22,7 @@ describe('ProjectDastProfileSelector', () => {
namespacePath: 'path/to/project',
},
stubs: {
+ GenericBaseLayoutComponent,
GlSprintf,
},
});
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 0448c36d5bdf9670932bb309db37f435a264f6e5..b344ef112eba697d69d9dcf7487408b2606e42e5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -40827,12 +40827,24 @@ msgstr ""
msgid "ScanExecutionPolicy|Conditions"
msgstr ""
+msgid "ScanExecutionPolicy|Create new scan profile"
+msgstr ""
+
+msgid "ScanExecutionPolicy|Create new site profile"
+msgstr ""
+
msgid "ScanExecutionPolicy|Customized CI variables:"
msgstr ""
msgid "ScanExecutionPolicy|Customized variables will overwrite ones defined in the project CI/CD file and settings"
msgstr ""
+msgid "ScanExecutionPolicy|DAST scan profiles"
+msgstr ""
+
+msgid "ScanExecutionPolicy|DAST site profiles"
+msgstr ""
+
msgid "ScanExecutionPolicy|Key"
msgstr ""
@@ -40848,9 +40860,6 @@ msgstr ""
msgid "ScanExecutionPolicy|Only one variable can be added at a time."
msgstr ""
-msgid "ScanExecutionPolicy|Run a %{scan} scan with %{dastProfiles} with the following options:"
-msgstr ""
-
msgid "ScanExecutionPolicy|Run a %{scan} scan with the following options:"
msgstr ""
@@ -40860,9 +40869,6 @@ msgstr ""
msgid "ScanExecutionPolicy|Runner tags:"
msgstr ""
-msgid "ScanExecutionPolicy|Scanner profile"
-msgstr ""
-
msgid "ScanExecutionPolicy|Schedule rule component"
msgstr ""
@@ -40893,9 +40899,6 @@ msgstr ""
msgid "ScanExecutionPolicy|Select timezone"
msgstr ""
-msgid "ScanExecutionPolicy|Site profile"
-msgstr ""
-
msgid "ScanExecutionPolicy|Tags"
msgstr ""
@@ -40926,9 +40929,6 @@ msgstr ""
msgid "ScanExecutionPolicy|on the Kubernetes agent pod"
msgstr ""
-msgid "ScanExecutionPolicy|scanner profile %{scannerProfile} and site profile %{siteProfile}"
-msgstr ""
-
msgid "ScanExecutionPolicy|selected automatically"
msgstr ""