Add actions dropdown to metrics charts
Added as EE backport
This commit is contained in:
parent
d1ea2aba59
commit
a579bba2f3
3 changed files with 79 additions and 19 deletions
|
@ -1,5 +1,12 @@
|
|||
<script>
|
||||
import { GlButton, GlDropdown, GlDropdownItem, GlModal, GlModalDirective } from '@gitlab/ui';
|
||||
import {
|
||||
GlButton,
|
||||
GlDropdown,
|
||||
GlDropdownItem,
|
||||
GlModal,
|
||||
GlModalDirective,
|
||||
GlTooltipDirective,
|
||||
} from '@gitlab/ui';
|
||||
import _ from 'underscore';
|
||||
import { mapActions, mapState } from 'vuex';
|
||||
import { s__ } from '~/locale';
|
||||
|
@ -30,7 +37,8 @@ export default {
|
|||
GlModal,
|
||||
},
|
||||
directives: {
|
||||
GlModalDirective,
|
||||
GlModal: GlModalDirective,
|
||||
GlTooltip: GlTooltipDirective,
|
||||
},
|
||||
props: {
|
||||
externalDashboardUrl: {
|
||||
|
@ -328,7 +336,7 @@ export default {
|
|||
<div class="d-flex">
|
||||
<div v-if="addingMetricsAvailable">
|
||||
<gl-button
|
||||
v-gl-modal-directive="$options.addMetric.modalId"
|
||||
v-gl-modal="$options.addMetric.modalId"
|
||||
class="js-add-metric-button text-success border-success"
|
||||
>{{ $options.addMetric.title }}</gl-button
|
||||
>
|
||||
|
@ -395,14 +403,35 @@ export default {
|
|||
:project-path="projectPath"
|
||||
group-id="monitor-area-chart"
|
||||
>
|
||||
<alert-widget
|
||||
v-if="alertWidgetAvailable && graphData"
|
||||
:alerts-endpoint="alertsEndpoint"
|
||||
:relevant-queries="graphData.queries"
|
||||
:alerts-to-manage="getGraphAlerts(graphData.queries)"
|
||||
:modal-id="`alert-modal-${index}-${graphIndex}`"
|
||||
@setAlerts="setAlerts"
|
||||
/>
|
||||
<div class="d-flex align-items-center">
|
||||
<alert-widget
|
||||
v-if="alertWidgetAvailable && graphData"
|
||||
:modal-id="`alert-modal-${index}-${graphIndex}`"
|
||||
:alerts-endpoint="alertsEndpoint"
|
||||
:relevant-queries="graphData.queries"
|
||||
:alerts-to-manage="getGraphAlerts(graphData.queries)"
|
||||
@setAlerts="setAlerts"
|
||||
/>
|
||||
<gl-dropdown
|
||||
v-if="alertWidgetAvailable"
|
||||
v-gl-tooltip
|
||||
class="mx-2"
|
||||
toggle-class="btn btn-transparent border-0"
|
||||
:right="true"
|
||||
:no-caret="true"
|
||||
:title="__('More actions')"
|
||||
>
|
||||
<template slot="button-content">
|
||||
<icon name="ellipsis_v" class="text-secondary" />
|
||||
</template>
|
||||
<gl-dropdown-item
|
||||
v-if="alertWidgetAvailable"
|
||||
v-gl-modal="`alert-modal-${index}-${graphIndex}`"
|
||||
>
|
||||
{{ __('Alerts') }}
|
||||
</gl-dropdown-item>
|
||||
</gl-dropdown>
|
||||
</div>
|
||||
</monitor-area-chart>
|
||||
</template>
|
||||
</graph-group>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<script>
|
||||
import { mapState } from 'vuex';
|
||||
import _ from 'underscore';
|
||||
import { GlDropdown, GlDropdownItem, GlModal, GlModalDirective } from '@gitlab/ui';
|
||||
import MonitorAreaChart from './charts/area.vue';
|
||||
import MonitorSingleStatChart from './charts/single_stat.vue';
|
||||
import MonitorEmptyChart from './charts/empty_chart.vue';
|
||||
|
@ -10,6 +11,12 @@ export default {
|
|||
MonitorAreaChart,
|
||||
MonitorSingleStatChart,
|
||||
MonitorEmptyChart,
|
||||
GlDropdown,
|
||||
GlDropdownItem,
|
||||
GlModal,
|
||||
},
|
||||
directives: {
|
||||
GlModal: GlModalDirective,
|
||||
},
|
||||
props: {
|
||||
graphData: {
|
||||
|
@ -64,14 +71,32 @@ export default {
|
|||
:container-width="dashboardWidth"
|
||||
group-id="monitor-area-chart"
|
||||
>
|
||||
<alert-widget
|
||||
v-if="alertWidgetAvailable"
|
||||
:alerts-endpoint="alertsEndpoint"
|
||||
:relevant-queries="graphData.queries"
|
||||
:alerts-to-manage="getGraphAlerts(graphData.queries)"
|
||||
:modal-id="`alert-modal-${index}`"
|
||||
@setAlerts="setAlerts"
|
||||
/>
|
||||
<div class="d-flex align-items-center">
|
||||
<alert-widget
|
||||
v-if="alertWidgetAvailable && graphData"
|
||||
:modal-id="`alert-modal-${index}`"
|
||||
:alerts-endpoint="alertsEndpoint"
|
||||
:relevant-queries="graphData.queries"
|
||||
:alerts-to-manage="getGraphAlerts(graphData.queries)"
|
||||
@setAlerts="setAlerts"
|
||||
/>
|
||||
<gl-dropdown
|
||||
v-if="alertWidgetAvailable"
|
||||
v-gl-tooltip
|
||||
class="mx-2"
|
||||
toggle-class="btn btn-transparent border-0"
|
||||
:right="true"
|
||||
:no-caret="true"
|
||||
:title="__('More actions')"
|
||||
>
|
||||
<template slot="button-content">
|
||||
<icon name="ellipsis_v" class="text-secondary" />
|
||||
</template>
|
||||
<gl-dropdown-item v-if="alertWidgetAvailable" v-gl-modal="`alert-modal-${index}`">
|
||||
{{ __('Alerts') }}
|
||||
</gl-dropdown-item>
|
||||
</gl-dropdown>
|
||||
</div>
|
||||
</monitor-area-chart>
|
||||
<monitor-empty-chart v-else :graph-title="graphData.title" />
|
||||
</template>
|
||||
|
|
|
@ -900,6 +900,9 @@ msgstr ""
|
|||
msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
|
||||
msgstr ""
|
||||
|
||||
msgid "Alerts"
|
||||
msgstr ""
|
||||
|
||||
msgid "All"
|
||||
msgstr ""
|
||||
|
||||
|
@ -6868,6 +6871,9 @@ msgstr ""
|
|||
msgid "More"
|
||||
msgstr ""
|
||||
|
||||
msgid "More actions"
|
||||
msgstr ""
|
||||
|
||||
msgid "More information"
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in a new issue