Commit f9706f86 authored by Nathan Friend's avatar Nathan Friend

Merge branch '42639-move-custom-metrics-vue' into 'master'

Move custom metrics vue files out of EE

See merge request gitlab-org/gitlab!28906
parents 8d0e0d19 ab4f061d
<script>
import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue';
import CeDashboard from '~/monitoring/components/dashboard.vue';
import AlertWidget from './alert_widget.vue';
......
<script>
import { mapGetters } from 'vuex';
import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue';
import CePanelType from '~/monitoring/components/panel_type.vue';
import AlertWidget from './alert_widget.vue';
......
import customMetrics from 'ee/custom_metrics';
import customMetrics from '~/custom_metrics';
document.addEventListener('DOMContentLoaded', customMetrics);
import customMetrics from 'ee/custom_metrics';
import customMetrics from '~/custom_metrics';
document.addEventListener('DOMContentLoaded', customMetrics);
......@@ -9,7 +9,7 @@ import {
} from '../../../../../spec/frontend/monitoring/mock_data';
import { getJSONFixture } from '../../../../../spec/frontend/helpers/fixtures';
import { propsData } from '../../../../../spec/frontend/monitoring/init_utils';
import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue';
import Tracking from '~/tracking';
import { createStore } from '~/monitoring/stores';
import axios from '~/lib/utils/axios_utils';
......
......@@ -22,7 +22,7 @@ module QA
element :add_metric_button
end
view 'ee/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue' do
view 'app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue' do
element :custom_metric_prometheus_title_field
element :custom_metric_prometheus_query_field
element :custom_metric_prometheus_y_label_field
......
......@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
import MockAdapter from 'axios-mock-adapter';
import { TEST_HOST } from 'helpers/test_constants';
import waitForPromises from 'helpers/wait_for_promises';
import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue';
import axios from '~/lib/utils/axios_utils';
const { CancelToken } = axios;
......
import { shallowMount } from '@vue/test-utils';
import CustomMetricsForm from 'ee/custom_metrics/components/custom_metrics_form.vue';
import CustomMetricsForm from '~/custom_metrics/components/custom_metrics_form.vue';
describe('CustomMetricsForm', () => {
let wrapper;
......
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