Commit b79e05ac authored by Miguel Rincon's avatar Miguel Rincon Committed by Filipa Lacerda

Use EE panel type when needed to show alert menu

- Import EE panel types component using ee_else_ce
- Move required props to CE dashboard component to prevent errors
parent 459a5055
...@@ -14,9 +14,9 @@ import { __, s__ } from '~/locale'; ...@@ -14,9 +14,9 @@ import { __, s__ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility'; import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility';
import invalidUrl from '~/lib/utils/invalid_url'; import invalidUrl from '~/lib/utils/invalid_url';
import PanelType from 'ee_else_ce/monitoring/components/panel_type.vue';
import MonitorAreaChart from './charts/area.vue'; import MonitorAreaChart from './charts/area.vue';
import MonitorSingleStatChart from './charts/single_stat.vue'; import MonitorSingleStatChart from './charts/single_stat.vue';
import PanelType from './panel_type.vue';
import GraphGroup from './graph_group.vue'; import GraphGroup from './graph_group.vue';
import EmptyState from './empty_state.vue'; import EmptyState from './empty_state.vue';
import { sidebarAnimationDuration, timeWindows } from '../constants'; import { sidebarAnimationDuration, timeWindows } from '../constants';
...@@ -141,6 +141,16 @@ export default { ...@@ -141,6 +141,16 @@ export default {
required: false, required: false,
default: false, default: false,
}, },
alertsEndpoint: {
type: String,
required: false,
default: null,
},
prometheusAlertsAvailable: {
type: Boolean,
required: false,
default: false,
},
}, },
data() { data() {
return { return {
...@@ -449,6 +459,8 @@ export default { ...@@ -449,6 +459,8 @@ export default {
:clipboard-text="generateLink(groupData.group, graphData.title, graphData.y_label)" :clipboard-text="generateLink(groupData.group, graphData.title, graphData.y_label)"
:graph-data="graphData" :graph-data="graphData"
:dashboard-width="elWidth" :dashboard-width="elWidth"
:alerts-endpoint="alertsEndpoint"
:prometheus-alerts-available="prometheusAlertsAvailable"
:index="`${index}-${graphIndex}`" :index="`${index}-${graphIndex}`"
/> />
</template> </template>
......
...@@ -9,18 +9,6 @@ export default { ...@@ -9,18 +9,6 @@ export default {
CustomMetricsFormFields, CustomMetricsFormFields,
}, },
extends: CeDashboard, extends: CeDashboard,
props: {
alertsEndpoint: {
type: String,
required: false,
default: null,
},
prometheusAlertsAvailable: {
type: Boolean,
required: false,
default: false,
},
},
data() { data() {
return { return {
allAlerts: {}, allAlerts: {},
......
---
title: Fix bug to display alert menu correctly in dashboards
merge_request: 15261
author:
type: fixed
...@@ -5,7 +5,7 @@ import Dashboard from 'ee/monitoring/components/dashboard.vue'; ...@@ -5,7 +5,7 @@ import Dashboard from 'ee/monitoring/components/dashboard.vue';
import { createStore } from '~/monitoring/stores'; import { createStore } from '~/monitoring/stores';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { metricsGroupsAPIResponse, mockApiEndpoint } from 'spec/monitoring/mock_data'; import { metricsGroupsAPIResponse, mockApiEndpoint } from 'spec/monitoring/mock_data';
import propsData from 'spec/monitoring/dashboard_spec'; import propsData from 'spec/monitoring/components/dashboard_spec';
import AlertWidget from 'ee/monitoring/components/alert_widget.vue'; import AlertWidget from 'ee/monitoring/components/alert_widget.vue';
import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue'; import CustomMetricsFormFields from 'ee/custom_metrics/components/custom_metrics_form_fields.vue';
......
...@@ -13,7 +13,7 @@ import MonitoringMock, { ...@@ -13,7 +13,7 @@ import MonitoringMock, {
environmentData, environmentData,
singleGroupResponse, singleGroupResponse,
dashboardGitResponse, dashboardGitResponse,
} from './mock_data'; } from '../mock_data';
const localVue = createLocalVue(); const localVue = createLocalVue();
const propsData = { const propsData = {
......
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