Merge branch 'cngo-shorten-ee-paths' into 'master'

Shorten JS import paths

See merge request gitlab-org/gitlab!84660

ee/app/assets/javascripts/boards/components/epic_lane.vue

@@ -4,7 +4,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { __, n__, sprintf } from '~/locale';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
-import { statusType } from '../../epic/constants';
+import { statusType } from 'ee/epic/constants';
 import IssuesLaneList from './issues_lane_list.vue';
 
 export default {

ee/app/assets/javascripts/compliance_dashboard/components/drawer.vue

 <script>
 import { GlDrawer } from '@gitlab/ui';
 import { DRAWER_Z_INDEX } from '~/lib/utils/constants';
+import { getContentWrapperHeight } from 'ee/threat_monitoring/utils';
 import { COMPLIANCE_DRAWER_CONTAINER_CLASS } from '../constants';
-import { getContentWrapperHeight } from '../../threat_monitoring/utils';
 import BranchPath from './drawer_sections/branch_path.vue';
 import Committers from './drawer_sections/committers.vue';
 import MergedBy from './drawer_sections/merged_by.vue';

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

@@ -26,6 +26,7 @@ import RefSelector from '~/ref/components/ref_selector.vue';
 import { REF_TYPE_BRANCHES } from '~/ref/constants';
 import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 import validation from '~/vue_shared/directives/validation';
+import { HELP_PAGE_PATH } from 'ee/on_demand_scans/constants';
 import dastProfileCreateMutation from '../graphql/dast_profile_create.mutation.graphql';
 import dastProfileUpdateMutation from '../graphql/dast_profile_update.mutation.graphql';
 import {
@@ -36,7 +37,6 @@ import {
   SCANNER_PROFILES_QUERY,
   SITE_PROFILES_QUERY,
 } from '../settings';
-import { HELP_PAGE_PATH } from '../../on_demand_scans/constants';
 import ProfileConflictAlert from './profile_selector/profile_conflict_alert.vue';
 import ScannerProfileSelector from './profile_selector/scanner_profile_selector.vue';
 import SiteProfileSelector from './profile_selector/site_profile_selector.vue';

ee/app/assets/javascripts/related_items_tree/components/related_items_tree_actions.vue

@@ -2,8 +2,8 @@
 import { GlButtonGroup, GlButton } from '@gitlab/ui';
 import { mapState } from 'vuex';
 
+import ToggleLabels from 'ee/boards/components/toggle_labels.vue';
 import { ITEM_TABS } from '../constants';
-import ToggleLabels from '../../boards/components/toggle_labels.vue';
 
 export default {
   ITEM_TABS,

ee/app/assets/javascripts/vue_merge_request_widget/components/status_check_issue_body.vue

 <script>
 import SummaryRow from '~/reports/components/summary_row.vue';
 import { ICON_SUCCESS, ICON_PENDING, ICON_FAILED } from '~/reports/constants';
-import { PASSED, APPROVED, FAILED } from '../../reports/status_checks_report/constants';
+import { PASSED, APPROVED, FAILED } from 'ee/reports/status_checks_report/constants';
 
 export default {
   name: 'StatusCheckIssueBody',

ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue

@@ -5,7 +5,7 @@ import { LICENSE_MANAGEMENT } from 'ee/vue_shared/license_compliance/store/const
 import { s__ } from '~/locale';
 import PaginatedList from '~/vue_shared/components/paginated_list.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import LicenseApprovals from '../../approvals/components/license_compliance/index.vue';
+import LicenseApprovals from 'ee/approvals/components/license_compliance/index.vue';
 import AddLicenseForm from './components/add_license_form.vue';
 import AdminLicenseManagementRow from './components/admin_license_management_row.vue';
 import DeleteConfirmationModal from './components/delete_confirmation_modal.vue';

ee/spec/frontend/dependencies/components/dependency_vulnerabilities_spec.js

@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import { MAX_DISPLAYED_VULNERABILITIES_PER_DEPENDENCY } from 'ee/dependencies/components/constants';
 import DependencyVulnerabilities from 'ee/dependencies/components/dependency_vulnerabilities.vue';
 import DependencyVulnerability from 'ee/dependencies/components/dependency_vulnerability.vue';
-import mockDataVulnerabilities from '../../security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities';
+import mockDataVulnerabilities from 'ee_jest/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities';
 
 describe('DependencVulnerabilities component', () => {
   let wrapper;

ee/spec/frontend/dependencies/components/dependency_vulnerability_spec.js

@@ -3,7 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import DependencyVulnerability from 'ee/dependencies/components/dependency_vulnerability.vue';
 import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
-import mockDataVulnerabilities from '../../security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities';
+import mockDataVulnerabilities from 'ee_jest/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities';
 
 describe('DependencyVulnerability component', () => {
   let wrapper;

ee/spec/frontend/status_checks/components/form_spec.js

@@ -5,7 +5,7 @@ import { NAME_TAKEN_SERVER_ERROR, URL_TAKEN_SERVER_ERROR } from 'ee/status_check
 import ProtectedBranchesSelector from 'ee/vue_shared/components/branches_selector/protected_branches_selector.vue';
 import { stubComponent } from 'helpers/stub_component';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import { TEST_PROTECTED_BRANCHES } from '../../vue_shared/components/branches_selector/mock_data';
+import { TEST_PROTECTED_BRANCHES } from 'ee_jest/vue_shared/components/branches_selector/mock_data';
 
 const projectId = '1';
 const statusCheck = {

ee/spec/frontend/status_checks/components/modal_update_spec.js

@@ -3,7 +3,7 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import ModalUpdate from 'ee/status_checks/components/modal_update.vue';
 import SharedModal from 'ee/status_checks/components/shared_modal.vue';
-import { TEST_PROTECTED_BRANCHES } from '../../vue_shared/components/branches_selector/mock_data';
+import { TEST_PROTECTED_BRANCHES } from 'ee_jest/vue_shared/components/branches_selector/mock_data';
 
 Vue.use(Vuex);
 

ee/spec/frontend/status_checks/components/shared_modal_spec.js

@@ -7,7 +7,7 @@ import { EMPTY_STATUS_CHECK } from 'ee/status_checks/constants';
 import { stubComponent } from 'helpers/stub_component';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import { TEST_PROTECTED_BRANCHES } from '../../vue_shared/components/branches_selector/mock_data';
+import { TEST_PROTECTED_BRANCHES } from 'ee_jest/vue_shared/components/branches_selector/mock_data';
 
 Vue.use(Vuex);
 

ee/spec/frontend/trials/components/country_or_region_selector_spec.js

@@ -8,7 +8,7 @@ import {
   STATES,
   COUNTRY_WITH_STATES,
   STATE,
-} from '../../hand_raise_leads/components/mock_data';
+} from 'ee_jest/hand_raise_leads/components/mock_data';
 
 Vue.use(VueApollo);
 

ee/spec/frontend/vue_mr_widget/components/status_check_issue_body_spec.js

 import { mount } from '@vue/test-utils';
 import component from 'ee/vue_merge_request_widget/components/status_check_issue_body.vue';
 import SummaryRow from '~/reports/components/summary_row.vue';
-import { approvedChecks } from '../../reports/status_checks_report/mock_data';
+import { approvedChecks } from 'ee_jest/reports/status_checks_report/mock_data';
 
 describe('status check issue body', () => {
   let wrapper;

spec/frontend/diffs/components/diff_line_note_form_spec.js

@@ -4,7 +4,7 @@ import DiffLineNoteForm from '~/diffs/components/diff_line_note_form.vue';
 import { createStore } from '~/mr_notes/stores';
 import NoteForm from '~/notes/components/note_form.vue';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
-import { noteableDataMock } from '../../notes/mock_data';
+import { noteableDataMock } from 'jest/notes/mock_data';
 import diffFileMockData from '../mock_data/diff_file';
 
 jest.mock('~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal', () => {

spec/frontend/diffs/store/utils_spec.js

@@ -13,7 +13,7 @@ import {
 } from '~/diffs/constants';
 import * as utils from '~/diffs/store/utils';
 import { MERGE_REQUEST_NOTEABLE_TYPE } from '~/notes/constants';
-import { noteableDataMock } from '../../notes/mock_data';
+import { noteableDataMock } from 'jest/notes/mock_data';
 import diffFileMockData from '../mock_data/diff_file';
 import { diffMetadata } from '../mock_data/diff_metadata';
 

spec/frontend/notes/components/diff_discussion_header_spec.js

@@ -4,7 +4,7 @@ import { nextTick } from 'vue';
 import diffDiscussionHeader from '~/notes/components/diff_discussion_header.vue';
 import createStore from '~/notes/stores';
 
-import mockDiffFile from '../../diffs/mock_data/diff_discussions';
+import mockDiffFile from 'jest/diffs/mock_data/diff_discussions';
 import { discussionMock } from '../mock_data';
 
 describe('diff_discussion_header component', () => {

spec/frontend/user_lists/components/edit_user_list_spec.js

@@ -8,7 +8,7 @@ import { redirectTo } from '~/lib/utils/url_utility';
 import EditUserList from '~/user_lists/components/edit_user_list.vue';
 import UserListForm from '~/user_lists/components/user_list_form.vue';
 import createStore from '~/user_lists/store/edit';
-import { userList } from '../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api');
 jest.mock('~/lib/utils/url_utility');

spec/frontend/user_lists/components/new_user_list_spec.js

@@ -7,7 +7,7 @@ import Api from '~/api';
 import { redirectTo } from '~/lib/utils/url_utility';
 import NewUserList from '~/user_lists/components/new_user_list.vue';
 import createStore from '~/user_lists/store/new';
-import { userList } from '../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api');
 jest.mock('~/lib/utils/url_utility');

spec/frontend/user_lists/components/user_list_form_spec.js

 import { mount } from '@vue/test-utils';
 import Form from '~/user_lists/components/user_list_form.vue';
-import { userList } from '../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 describe('user_lists/components/user_list_form', () => {
   let wrapper;

spec/frontend/user_lists/components/user_list_spec.js

@@ -7,7 +7,7 @@ import Api from '~/api';
 import UserList from '~/user_lists/components/user_list.vue';
 import createStore from '~/user_lists/store/show';
 import { parseUserIds, stringifyUserIds } from '~/user_lists/store/utils';
-import { userList } from '../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api');
 

spec/frontend/user_lists/components/user_lists_spec.js

@@ -9,7 +9,7 @@ import UserListsComponent from '~/user_lists/components/user_lists.vue';
 import UserListsTable from '~/user_lists/components/user_lists_table.vue';
 import createStore from '~/user_lists/store/index';
 import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
-import { userList } from '../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('~/api');
 

spec/frontend/user_lists/components/user_lists_table_spec.js

@@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils';
 import * as timeago from 'timeago.js';
 import { nextTick } from 'vue';
 import UserListsTable from '~/user_lists/components/user_lists_table.vue';
-import { userList } from '../../feature_flags/mock_data';
+import { userList } from 'jest/feature_flags/mock_data';
 
 jest.mock('timeago.js', () => ({
   format: jest.fn().mockReturnValue('2 weeks ago'),

spec/frontend/vue_shared/components/user_select_spec.js

@@ -16,7 +16,7 @@ import {
   searchResponseOnMR,
   projectMembersResponse,
   participantsQueryResponse,
-} from '../../sidebar/mock_data';
+} from 'jest/sidebar/mock_data';
 
 const assignee = {
   id: 'gid://gitlab/User/4',