Merge branch 'move-last-ee-specific-js-files-to-ee' into 'master'

Move the remaining EE-specific JS files to ee/

See merge request gitlab-org/gitlab-ee!4751

app/assets/javascripts/ide/components/ide_context_bar.vue

 <script>
   import { mapState, mapActions } from 'vuex';
+  import icon from '~/vue_shared/components/icon.vue';
+  import panelResizer from '~/vue_shared/components/panel_resizer.vue';
   import repoCommitSection from './repo_commit_section.vue';
-  import icon from '../../vue_shared/components/icon.vue';
-  import panelResizer from '../../vue_shared/components/panel_resizer.vue';
 
   export default {
     components: {

app/assets/javascripts/ide/components/ide_project_branches_tree.vue

 <script>
+import icon from '~/vue_shared/components/icon.vue';
 import repoTree from './ide_repo_tree.vue';
-import icon from '../../vue_shared/components/icon.vue';
 import newDropdown from './new_dropdown/index.vue';
 
 export default {

app/assets/javascripts/ide/components/ide_project_tree.vue

 <script>
+import projectAvatarImage from '~/vue_shared/components/project_avatar/image.vue';
 import branchesTree from './ide_project_branches_tree.vue';
-import projectAvatarImage from '../../vue_shared/components/project_avatar/image.vue';
 
 export default {
   components: {

app/assets/javascripts/ide/components/ide_repo_tree.vue

 <script>
 import { mapState } from 'vuex';
+import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
 import repoPreviousDirectory from './repo_prev_directory.vue';
 import repoFile from './repo_file.vue';
-import skeletonLoadingContainer from '../../vue_shared/components/skeleton_loading_container.vue';
 import { treeList } from '../stores/utils';
 
 export default {

app/assets/javascripts/ide/components/ide_side_bar.vue

 <script>
   import { mapState, mapActions } from 'vuex';
+  import icon from '~/vue_shared/components/icon.vue';
+  import panelResizer from '~/vue_shared/components/panel_resizer.vue';
+  import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
   import projectTree from './ide_project_tree.vue';
-  import icon from '../../vue_shared/components/icon.vue';
-  import panelResizer from '../../vue_shared/components/panel_resizer.vue';
-  import skeletonLoadingContainer from '../../vue_shared/components/skeleton_loading_container.vue';
 
   export default {
     components: {

app/assets/javascripts/ide/components/ide_status_bar.vue

 <script>
   import { mapState } from 'vuex';
-  import icon from '../../vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
-  import timeAgoMixin from '../../vue_shared/mixins/timeago';
+  import icon from '~/vue_shared/components/icon.vue';
+  import tooltip from '~/vue_shared/directives/tooltip';
+  import timeAgoMixin from '~/vue_shared/mixins/timeago';
 
   export default {
     components: {

app/assets/javascripts/ide/components/new_branch_form.vue

 <script>
   import { mapState, mapActions } from 'vuex';
-  import flash, { hideFlash } from '../../flash';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+  import flash, { hideFlash } from '~/flash';
+  import loadingIcon from '~/vue_shared/components/loading_icon.vue';
 
   export default {
     components: {

app/assets/javascripts/ide/components/repo_commit_section.vue

 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
-import * as consts from '../stores/modules/commit/constants';
-import tooltip from '../../vue_shared/directives/tooltip';
-import icon from '../../vue_shared/components/icon.vue';
-import modal from '../../vue_shared/components/modal.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
+import icon from '~/vue_shared/components/icon.vue';
+import modal from '~/vue_shared/components/modal.vue';
+import LoadingButton from '~/vue_shared/components/loading_button.vue';
 import commitFilesList from './commit_sidebar/list.vue';
-import Actions from './commit_sidebar/actions.vue';
-import LoadingButton from '../../vue_shared/components/loading_button.vue';
+
+import * as consts from 'ee/ide/stores/modules/commit/constants'; // eslint-disable-line import/first
+import Actions from 'ee/ide/components/commit_sidebar/actions.vue'; // eslint-disable-line import/first
 
 export default {
   components: {

app/assets/javascripts/ide/components/repo_edit_button.vue

 <script>
 import { mapGetters, mapActions, mapState } from 'vuex';
-import modal from '../../vue_shared/components/modal.vue';
+import modal from '~/vue_shared/components/modal.vue';
 
 export default {
   components: {

app/assets/javascripts/ide/components/repo_editor.vue

 <script>
 /* global monaco */
 import { mapState, mapGetters, mapActions } from 'vuex';
-import flash from '../../flash';
+import flash from '~/flash';
 import monacoLoader from '../monaco_loader';
 import Editor from '../lib/editor';
 

app/assets/javascripts/ide/components/repo_loading_file.vue

 <script>
   import { mapState } from 'vuex';
-  import skeletonLoadingContainer from '../../vue_shared/components/skeleton_loading_container.vue';
+  import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
 
   export default {
     components: {

app/assets/javascripts/ide/components/repo_preview.vue

 <script>
   import { mapGetters } from 'vuex';
-  import LineHighlighter from '../../line_highlighter';
-  import syntaxHighlight from '../../syntax_highlight';
+  import LineHighlighter from '~/line_highlighter';
+  import syntaxHighlight from '~/syntax_highlight';
 
   export default {
     computed: {

app/assets/javascripts/ide/lib/common/model.js

 /* global monaco */
 import Disposable from './disposable';
-import eventHub from '../../eventhub';
+
+import eventHub from 'ee/ide/eventhub'; // eslint-disable-line import/first
 
 export default class Model {
   constructor(monaco, file) {

app/assets/javascripts/ide/stores/actions.js

 import Vue from 'vue';
-import { visitUrl } from '../../lib/utils/url_utility';
+import { visitUrl } from '~/lib/utils/url_utility';
 import * as types from './mutation_types';
 
 export const redirectToUrl = (_, url) => visitUrl(url);

app/assets/javascripts/ide/stores/index.js

@@ -4,7 +4,8 @@ import state from './state';
 import * as actions from './actions';
 import * as getters from './getters';
 import mutations from './mutations';
-import commitModule from './modules/commit';
+
+import commitModule from 'ee/ide/stores/modules/commit'; // eslint-disable-line import/first
 
 Vue.use(Vuex);
 

app/assets/javascripts/pages/dashboard/todos/index/todos.js

@@ -2,9 +2,9 @@
 import { visitUrl } from '~/lib/utils/url_utility';
 import UsersSelect from '~/users_select';
 import { isMetaClick } from '~/lib/utils/common_utils';
-import { __ } from '../../../../locale';
-import flash from '../../../../flash';
-import axios from '../../../../lib/utils/axios_utils';
+import { __ } from '~/locale';
+import flash from '~/flash';
+import axios from '~/lib/utils/axios_utils';
 
 export default class Todos {
   constructor() {

app/assets/javascripts/pipelines/pipeline_details_bundle.js

@@ -6,8 +6,9 @@ import PipelinesMediator from './pipeline_details_mediator';
 import pipelineGraph from './components/graph/graph_component.vue';
 import pipelineHeader from './components/header_component.vue';
 import eventHub from './event_hub';
-import SecurityReportApp from './components/security_reports/security_report_app.vue';
-import SastSummaryWidget from './components/security_reports/sast_report_summary_widget.vue';
+
+import SecurityReportApp from 'ee/pipelines/components/security_reports/security_report_app.vue'; // eslint-disable-line import/first
+import SastSummaryWidget from 'ee/pipelines/components/security_reports/sast_report_summary_widget.vue'; // eslint-disable-line import/first
 
 Vue.use(Translate);
 

app/assets/javascripts/ide/components/commit_sidebar/actions.vue → ee/app/assets/javascripts/ide/components/commit_sidebar/actions.vue

 <script>
   import { mapState } from 'vuex';
-  import { sprintf, __ } from '../../../locale';
-  import * as consts from '../../stores/modules/commit/constants';
+  import { sprintf, __ } from '~/locale';
+  import * as consts from 'ee/ide/stores/modules/commit/constants';
   import RadioGroup from './radio_group.vue';
 
   export default {

app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue → ee/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue

 <script>
   import { mapActions, mapState, mapGetters } from 'vuex';
-  import tooltip from '../../../vue_shared/directives/tooltip';
+  import tooltip from '~/vue_shared/directives/tooltip';
 
   export default {
     directives: {

app/assets/javascripts/ide/stores/modules/commit/actions.js → ee/app/assets/javascripts/ide/stores/modules/commit/actions.js

-import { sprintf, __ } from '../../../../locale';
+import { sprintf, __ } from '~/locale';
+import * as rootTypes from '~/ide/stores/mutation_types';
+import { createCommitPayload, createNewMergeRequestUrl } from '~/ide/stores/utils';
+import router from '~/ide/ide_router';
+import service from '~/ide/services';
+import flash from '~/flash';
+import { stripHtml } from '~/lib/utils/text_utility';
 import * as types from './mutation_types';
 import * as consts from './constants';
-import * as rootTypes from '../../mutation_types';
-import { createCommitPayload, createNewMergeRequestUrl } from '../../utils';
-import router from '../../../ide_router';
-import service from '../../../services';
-import flash from '../../../../flash';
-import { stripHtml } from '../../../../lib/utils/text_utility';
-import eventHub from '../../../eventhub';
+
+import eventHub from 'ee/ide/eventhub'; // eslint-disable-line import/first
 
 export const updateCommitMessage = ({ commit }, message) => {
   commit(types.UPDATE_COMMIT_MESSAGE, message);

app/assets/javascripts/pages/projects/pipelines/security/index.js → ee/app/assets/javascripts/pages/projects/pipelines/security/index.js

-import initPipelines from '../init_pipelines';
+import initPipelines from '~/pages/projects/pipelines/init_pipelines';
 
 document.addEventListener('DOMContentLoaded', initPipelines);

app/assets/javascripts/pipelines/components/security_reports/security_report_app.vue → ee/app/assets/javascripts/pipelines/components/security_reports/security_report_app.vue

 <script>
   import ReportSection from 'ee/vue_shared/security_reports/components/report_section.vue';
   import securityMixin from 'ee/vue_shared/security_reports/mixins/security_report_mixin';
-  import LoadingIcon from '../../../vue_shared/components/loading_icon.vue';
+  import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
 
   export default {
     name: 'SecurityReportTab',

scripts/ee-files-location-check

@@ -2,7 +2,6 @@
 
 WHITELIST = [
   'CHANGELOG-EE.md',
-  'app/assets/javascripts/**/*', # https://gitlab.com/gitlab-org/gitlab-ee/issues/4536
   'config/**/*', # https://gitlab.com/gitlab-org/gitlab-ee/issues/4946
   'doc/**/*', # https://gitlab.com/gitlab-org/gitlab-ee/issues/4948#note_59945483
   'qa/**/*', # https://gitlab.com/gitlab-org/gitlab-ee/issues/4997#note_59764702

spec/javascripts/pipelines/security_reports/sast_report_summary_widget_spec.js

 import Vue from 'vue';
-import reportSummary from '~/pipelines/components/security_reports/sast_report_summary_widget.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
-import { parsedSastIssuesHead } from '../../vue_shared/security_reports/mock_data';
+import reportSummary from 'ee/pipelines/components/security_reports/sast_report_summary_widget.vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import { parsedSastIssuesHead } from 'spec/vue_shared/security_reports/mock_data';
 
 describe('SAST report summary widget', () => {
   let vm;

spec/javascripts/pipelines/security_reports/security_report_app_spec.js

 import Vue from 'vue';
-import securityReportApp from '~/pipelines/components/security_reports/security_report_app.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
-import { parsedSastIssuesHead } from '../../vue_shared/security_reports/mock_data';
+import securityReportApp from 'ee/pipelines/components/security_reports/security_report_app.vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import { parsedSastIssuesHead } from 'spec/vue_shared/security_reports/mock_data';
 
 describe('Security Report App', () => {
   let vm;

spec/javascripts/repo/components/commit_sidebar/actions_spec.js

 import Vue from 'vue';
 import store from '~/ide/stores';
-import commitActions from '~/ide/components/commit_sidebar/actions.vue';
-import { createComponentWithStore } from '../../../helpers/vue_mount_component_helper';
-import { resetStore } from '../../helpers';
+import commitActions from 'ee/ide/components/commit_sidebar/actions.vue';
+import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import { resetStore } from 'spec/repo/helpers';
 
 describe('IDE commit sidebar actions', () => {
   let vm;

spec/javascripts/repo/components/commit_sidebar/radio_group_spec.js

 import Vue from 'vue';
 import store from '~/ide/stores';
-import radioGroup from '~/ide/components/commit_sidebar/radio_group.vue';
-import { createComponentWithStore } from '../../../helpers/vue_mount_component_helper';
-import { resetStore } from '../../helpers';
+import radioGroup from 'ee/ide/components/commit_sidebar/radio_group.vue';
+import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import { resetStore } from 'spec/repo/helpers';
 
 describe('IDE commit sidebar radio group', () => {
   let vm;

spec/javascripts/repo/helpers.js

 import { decorateData } from '~/ide/stores/utils';
 import state from '~/ide/stores/state';
-import commitState from '~/ide/stores/modules/commit/state';
+import commitState from 'ee/ide/stores/modules/commit/state';
 
 export const resetStore = (store) => {
   const newState = {

spec/javascripts/repo/stores/modules/commit/actions_spec.js

 import store from '~/ide/stores';
 import service from '~/ide/services';
 import router from '~/ide/ide_router';
-import eventHub from '~/ide/eventhub';
-import * as consts from '~/ide/stores/modules/commit/constants';
 import * as urlUtils from '~/lib/utils/url_utility';
-import { resetStore, file } from '../../../helpers';
+import eventHub from 'ee/ide/eventhub';
+import * as consts from 'ee/ide/stores/modules/commit/constants';
+import { resetStore, file } from 'spec/repo/helpers';
 
 describe('IDE commit module actions', () => {
   afterEach(() => {

spec/javascripts/repo/stores/modules/commit/getters_spec.js

-import commitState from '~/ide/stores/modules/commit/state';
-import * as consts from '~/ide/stores/modules/commit/constants';
-import * as getters from '~/ide/stores/modules/commit/getters';
+import commitState from 'ee/ide/stores/modules/commit/state';
+import * as consts from 'ee/ide/stores/modules/commit/constants';
+import * as getters from 'ee/ide/stores/modules/commit/getters';
 
 describe('IDE commit module getters', () => {
   let state;

spec/javascripts/repo/stores/modules/commit/mutations_spec.js

-import commitState from '~/ide/stores/modules/commit/state';
-import mutations from '~/ide/stores/modules/commit/mutations';
+import commitState from 'ee/ide/stores/modules/commit/state';
+import mutations from 'ee/ide/stores/modules/commit/mutations';
 
 describe('IDE commit module mutations', () => {
   let state;