Merge branch '247272-move-dast-profiles-files' into 'master'

Move DAST profiles files

See merge request gitlab-org/gitlab!67597

ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue

@@ -14,7 +14,7 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
-import { SCAN_TYPE } from 'ee/security_configuration/dast_scanner_profiles/constants';
+import { SCAN_TYPE } from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/constants';
 import { DAST_SITE_VALIDATION_STATUS } from 'ee/security_configuration/dast_site_validation/constants';
 import { initFormField } from 'ee/security_configuration/utils';
 import { TYPE_SCANNER_PROFILE, TYPE_SITE_PROFILE } from '~/graphql_shared/constants';

ee/app/assets/javascripts/on_demand_scans/components/profile_selector/dast_profiles_selector.vue

 <script>
 import { GlCard, GlSkeletonLoader, GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
-import { SCAN_TYPE } from 'ee/security_configuration/dast_scanner_profiles/constants';
+import { SCAN_TYPE } from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/constants';
 import { DAST_SITE_VALIDATION_STATUS } from 'ee/security_configuration/dast_site_validation/constants';
 import { TYPE_SCANNER_PROFILE, TYPE_SITE_PROFILE } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';

ee/app/assets/javascripts/on_demand_scans/components/profile_selector/scanner_profile_summary.vue

 <script>
-import { SCAN_TYPE_LABEL } from 'ee/security_configuration/dast_scanner_profiles/constants';
+import { SCAN_TYPE_LABEL } from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/constants';
 import ProfileSelectorSummaryCell from './summary_cell.vue';
 
 export default {

ee/app/assets/javascripts/on_demand_scans/components/profile_selector/site_profile_summary.vue

@@ -2,7 +2,7 @@
 import {
   EXCLUDED_URLS_SEPARATOR,
   TARGET_TYPES,
-} from 'ee/security_configuration/dast_site_profiles_form/constants';
+} from 'ee/security_configuration/dast_profiles/dast_site_profiles/constants';
 import { DAST_SITE_VALIDATION_STATUS } from 'ee/security_configuration/dast_site_validation/constants';
 import { s__ } from '~/locale';
 import ProfileSelectorSummaryCell from './summary_cell.vue';

ee/app/assets/javascripts/pages/projects/security/dast_scanner_profiles/edit/index.js

-import initDastScannerProfileForm from 'ee/security_configuration/dast_scanner_profiles/dast_scanner_profiles_bundle';
+import initDastScannerProfileForm from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/dast_scanner_profiles_bundle';
 
 initDastScannerProfileForm();

ee/app/assets/javascripts/pages/projects/security/dast_scanner_profiles/new/index.js

-import initDastScannerProfileForm from 'ee/security_configuration/dast_scanner_profiles/dast_scanner_profiles_bundle';
+import initDastScannerProfileForm from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/dast_scanner_profiles_bundle';
 
 initDastScannerProfileForm();

ee/app/assets/javascripts/pages/projects/security/dast_site_profiles/edit/index.js

-import initDastSiteProfileForm from 'ee/security_configuration/dast_site_profiles_form';
+import initDastSiteProfileForm from 'ee/security_configuration/dast_profiles/dast_site_profiles/dast_site_profiles_bundle';
 
 initDastSiteProfileForm();

ee/app/assets/javascripts/pages/projects/security/dast_site_profiles/new/index.js

-import initDastSiteProfileForm from 'ee/security_configuration/dast_site_profiles_form';
+import initDastSiteProfileForm from 'ee/security_configuration/dast_profiles/dast_site_profiles/dast_site_profiles_bundle';
 
 initDastSiteProfileForm();

ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_scan_type_badge.vue

@@ -3,7 +3,7 @@ import { GlBadge } from '@gitlab/ui';
 import {
   SCAN_TYPE,
   SCAN_TYPE_LABEL,
-} from 'ee/security_configuration/dast_scanner_profiles/constants';
+} from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/constants';
 
 const scanTypeToBadgeVariantMap = {
   [SCAN_TYPE.ACTIVE]: 'warning',

ee/spec/frontend/security_configuration/dast_profiles/components/dast_failed_site_validations_spec.js

@@ -8,7 +8,7 @@ import dastFailedSiteValidationsQuery from 'ee/security_configuration/dast_profi
 import dastSiteValidationRevokeMutation from 'ee/security_configuration/dast_site_validation/graphql/dast_site_validation_revoke.mutation.graphql';
 import createApolloProvider from 'helpers/mock_apollo_helper';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
-import { dastSiteValidationRevoke as dastSiteValidationRevokeResponse } from '../../dast_site_validation/mock_data/apollo_mock';
+import { dastSiteValidationRevoke as dastSiteValidationRevokeResponse } from '../dast_site_validation/mock_data/apollo_mock';
 import { dastSiteValidations as dastSiteValidationsResponse } from '../mocks/apollo_mock';
 import { failedSiteValidations } from '../mocks/mock_data';
 

ee/spec/frontend/security_configuration/dast_profiles/components/dast_scan_type_badge_spec.js

 import { GlBadge } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import DastScanTypeBadge from 'ee/security_configuration/dast_profiles/components/dast_scan_type_badge.vue';
-import { SCAN_TYPE } from 'ee/security_configuration/dast_scanner_profiles/constants';
+import { SCAN_TYPE } from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/constants';
 
 describe('EE - DastScanTypeBadge', () => {
   let wrapper;

ee/spec/frontend/security_configuration/dast_scanner_profiles_form/components/dast_scanner_profiles_form_spec.js → ee/spec/frontend/security_configuration/dast_profiles/dast_scanner_profiles_form/components/dast_scanner_profiles_form_spec.js

@@ -2,10 +2,10 @@ import { GlForm, GlModal } from '@gitlab/ui';
 import { within } from '@testing-library/dom';
 import { mount, shallowMount } from '@vue/test-utils';
 import merge from 'lodash/merge';
-import DastScannerProfileForm from 'ee/security_configuration/dast_scanner_profiles/components/dast_scanner_profile_form.vue';
-import { SCAN_TYPE } from 'ee/security_configuration/dast_scanner_profiles/constants';
-import dastScannerProfileCreateMutation from 'ee/security_configuration/dast_scanner_profiles/graphql/dast_scanner_profile_create.mutation.graphql';
-import dastScannerProfileUpdateMutation from 'ee/security_configuration/dast_scanner_profiles/graphql/dast_scanner_profile_update.mutation.graphql';
+import DastScannerProfileForm from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/components/dast_scanner_profile_form.vue';
+import { SCAN_TYPE } from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/constants';
+import dastScannerProfileCreateMutation from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/graphql/dast_scanner_profile_create.mutation.graphql';
+import dastScannerProfileUpdateMutation from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/graphql/dast_scanner_profile_update.mutation.graphql';
 import { scannerProfiles, policyScannerProfile } from 'ee_jest/on_demand_scans/mocks/mock_data';
 import { TEST_HOST } from 'helpers/test_constants';
 

ee/spec/frontend/security_configuration/dast_scanner_profiles_form/components/tooltip_icon_spec.js → ee/spec/frontend/security_configuration/dast_profiles/dast_scanner_profiles_form/components/tooltip_icon_spec.js

 import { GlIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import TooltipIcon from 'ee/security_configuration/dast_scanner_profiles/components/tooltip_icon.vue';
+import TooltipIcon from 'ee/security_configuration/dast_profiles/dast_scanner_profiles/components/tooltip_icon.vue';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 
 describe('Tooltip Icon', () => {

ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_auth_section_spec.js → ee/spec/frontend/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_auth_section_spec.js

 import { GlFormCheckbox } from '@gitlab/ui';
 import { mount, shallowMount } from '@vue/test-utils';
-import DastSiteAuthSection from 'ee/security_configuration/dast_site_profiles_form/components/dast_site_auth_section.vue';
+import DastSiteAuthSection from 'ee/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_auth_section.vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('DastSiteAuthSection', () => {

ee/spec/frontend/security_configuration/dast_site_profiles_form/components/dast_site_profile_form_spec.js → ee/spec/frontend/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_profile_form_spec.js

@@ -4,12 +4,12 @@ import { createLocalVue, mount, shallowMount } from '@vue/test-utils';
 import merge from 'lodash/merge';
 import { createMockClient } from 'mock-apollo-client';
 import VueApollo from 'vue-apollo';
-import DastSiteAuthSection from 'ee/security_configuration/dast_site_profiles_form/components/dast_site_auth_section.vue';
-import DastSiteProfileForm from 'ee/security_configuration/dast_site_profiles_form/components/dast_site_profile_form.vue';
-import dastSiteProfileCreateMutation from 'ee/security_configuration/dast_site_profiles_form/graphql/dast_site_profile_create.mutation.graphql';
-import dastSiteProfileUpdateMutation from 'ee/security_configuration/dast_site_profiles_form/graphql/dast_site_profile_update.mutation.graphql';
+import DastSiteAuthSection from 'ee/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_auth_section.vue';
+import DastSiteProfileForm from 'ee/security_configuration/dast_profiles/dast_site_profiles/components/dast_site_profile_form.vue';
+import dastSiteProfileCreateMutation from 'ee/security_configuration/dast_profiles/dast_site_profiles/graphql/dast_site_profile_create.mutation.graphql';
+import dastSiteProfileUpdateMutation from 'ee/security_configuration/dast_profiles/dast_site_profiles/graphql/dast_site_profile_update.mutation.graphql';
 import { siteProfiles, policySiteProfile } from 'ee_jest/on_demand_scans/mocks/mock_data';
-import * as responses from 'ee_jest/security_configuration/dast_site_profiles_form/mock_data/apollo_mock';
+import * as responses from 'ee_jest/security_configuration/dast_profiles/dast_site_profiles/mock_data/apollo_mock';
 import { TEST_HOST } from 'helpers/test_constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';