Commit 9d611315 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'cngo-move-code-to-issues' into 'master'

Move code to ~/issues

See merge request gitlab-org/gitlab!76264
parents 23230163 89457903
......@@ -5,7 +5,7 @@ import { formatDate } from '~/lib/utils/datetime_utility';
export default {
components: {
GlLink,
IncidentSla: () => import('ee_component/issue_show/components/incidents/incident_sla.vue'),
IncidentSla: () => import('ee_component/issues/show/components/incidents/incident_sla.vue'),
},
directives: {
GlTooltip: GlTooltipDirective,
......
......@@ -16,7 +16,7 @@ export default {
GlTab,
GlTabs,
HighlightBar,
MetricsTab: () => import('ee_component/issue_show/components/incidents/metrics_tab.vue'),
MetricsTab: () => import('ee_component/issues/show/components/incidents/metrics_tab.vue'),
},
inject: ['fullPath', 'iid', 'uploadMetricsFeatureAvailable'],
apollo: {
......
import Vue from 'vue';
import RelatedFeatureFlags from './components/related_feature_flags.vue';
export default function initRelatedFeatureFlags() {
export function initRelatedFeatureFlags() {
const el = document.querySelector('#js-related-feature-flags-root');
if (el) {
......
import initRelatedFeatureFlags from 'ee/related_feature_flags';
import { initRelatedFeatureFlags } from 'ee/issues';
import { store } from '~/notes/stores';
import initShow from '~/issues/show';
import initRelatedIssues from '~/related_issues';
......
import { GlLoadingIcon } from '@gitlab/ui';
import MockAdapter from 'axios-mock-adapter';
import { nextTick } from 'vue';
import RelatedFeatureFlags from 'ee/related_feature_flags/components/related_feature_flags.vue';
import RelatedFeatureFlags from 'ee/issues/components/related_feature_flags.vue';
import { TEST_HOST } from 'helpers/test_constants';
import { trimText } from 'helpers/text_helper';
import { mountExtended, extendedWrapper } from 'helpers/vue_test_utils_helper';
......@@ -38,7 +38,7 @@ const MOCK_DATA = [
},
];
describe('ee/related_feature_flags/components/related_feature_flags.vue', () => {
describe('ee/issues/components/related_feature_flags.vue', () => {
let mock;
let wrapper;
......
import { shallowMount } from '@vue/test-utils';
import { merge } from 'lodash';
import IncidentSla from 'ee/issue_show/components/incidents/incident_sla.vue';
import IncidentSla from 'ee/issues/show/components/incidents/incident_sla.vue';
import ServiceLevelAgreement from 'ee_component/vue_shared/components/incidents/service_level_agreement.vue';
jest.mock('~/lib/utils/datetime_utility');
......
......@@ -2,8 +2,8 @@ import { GlLink, GlModal } from '@gitlab/ui';
import { createLocalVue, shallowMount, mount } from '@vue/test-utils';
import merge from 'lodash/merge';
import Vuex from 'vuex';
import MetricsImage from 'ee/issue_show/components/incidents/metrics_image.vue';
import createStore from 'ee/issue_show/components/incidents/store';
import MetricsImage from 'ee/issues/show/components/incidents/metrics_image.vue';
import createStore from 'ee/issues/show/components/incidents/store';
import waitForPromises from 'helpers/wait_for_promises';
const defaultProps = {
......
......@@ -2,15 +2,15 @@ import { GlFormInput, GlModal } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import merge from 'lodash/merge';
import Vuex from 'vuex';
import MetricsImage from 'ee/issue_show/components/incidents/metrics_image.vue';
import MetricsTab from 'ee/issue_show/components/incidents/metrics_tab.vue';
import { getMetricImages } from 'ee/issue_show/components/incidents/service';
import createStore from 'ee/issue_show/components/incidents/store';
import MetricsImage from 'ee/issues/show/components/incidents/metrics_image.vue';
import MetricsTab from 'ee/issues/show/components/incidents/metrics_tab.vue';
import { getMetricImages } from 'ee/issues/show/components/incidents/service';
import createStore from 'ee/issues/show/components/incidents/store';
import waitForPromises from 'helpers/wait_for_promises';
import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
import { fileList, initialData } from './mock_data';
jest.mock('ee/issue_show/components/incidents/service', () => ({
jest.mock('ee/issues/show/components/incidents/service', () => ({
getMetricImages: jest.fn(),
}));
......
import Api from 'ee/api';
import { getMetricImages, uploadMetricImage } from 'ee/issue_show/components/incidents/service';
import { getMetricImages, uploadMetricImage } from 'ee/issues/show/components/incidents/service';
import { fileList, fileListRaw } from './mock_data';
jest.mock('ee/api', () => ({
......
......@@ -4,17 +4,17 @@ import {
getMetricImages,
uploadMetricImage,
deleteMetricImage,
} from 'ee/issue_show/components/incidents/service';
import createStore from 'ee/issue_show/components/incidents/store';
import * as actions from 'ee/issue_show/components/incidents/store/actions';
import * as types from 'ee/issue_show/components/incidents/store/mutation_types';
} from 'ee/issues/show/components/incidents/service';
import createStore from 'ee/issues/show/components/incidents/store';
import * as actions from 'ee/issues/show/components/incidents/store/actions';
import * as types from 'ee/issues/show/components/incidents/store/mutation_types';
import testAction from 'helpers/vuex_action_helper';
import createFlash from '~/flash';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { fileList, initialData } from '../mock_data';
jest.mock('~/flash');
jest.mock('ee/issue_show/components/incidents/service', () => ({
jest.mock('ee/issues/show/components/incidents/service', () => ({
getMetricImages: jest.fn(),
uploadMetricImage: jest.fn(),
deleteMetricImage: jest.fn(),
......
import { cloneDeep } from 'lodash';
import * as types from 'ee/issue_show/components/incidents/store/mutation_types';
import mutations from 'ee/issue_show/components/incidents/store/mutations';
import * as types from 'ee/issues/show/components/incidents/store/mutation_types';
import mutations from 'ee/issues/show/components/incidents/store/mutations';
import { initialData } from '../mock_data';
const defaultState = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment