diff options
Diffstat (limited to 'app/assets/javascripts/monitoring')
3 files changed, 23 insertions, 21 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index ca416650f34..0ddd690ce0c 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -1,6 +1,6 @@ <script> import { omit, throttle } from 'lodash'; -import { GlLink, GlButton, GlTooltip, GlResizeObserverDirective } from '@gitlab/ui'; +import { GlLink, GlDeprecatedButton, GlTooltip, GlResizeObserverDirective } from '@gitlab/ui'; import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import dateFormat from 'dateformat'; import { s__, __ } from '~/locale'; @@ -41,7 +41,7 @@ export default { GlAreaChart, GlLineChart, GlTooltip, - GlButton, + GlDeprecatedButton, GlChartSeriesLabel, GlLink, Icon, diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index cebe501139c..2229b6d8292 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -3,7 +3,7 @@ import { debounce, pickBy } from 'lodash'; import { mapActions, mapState, mapGetters } from 'vuex'; import VueDraggable from 'vuedraggable'; import { - GlButton, + GlDeprecatedButton, GlDropdown, GlDropdownItem, GlDropdownHeader, @@ -44,7 +44,7 @@ export default { VueDraggable, PanelType, Icon, - GlButton, + GlDeprecatedButton, GlDropdown, GlLoadingIcon, GlDropdownItem, @@ -471,7 +471,7 @@ export default { </gl-form-group> <gl-form-group class="col-sm-2 col-md-2 col-lg-1 refresh-dashboard-button"> - <gl-button + <gl-deprecated-button ref="refreshDashboardBtn" v-gl-tooltip variant="default" @@ -479,7 +479,7 @@ export default { @click="refreshDashboard" > <icon name="repeat" /> - </gl-button> + </gl-deprecated-button> </gl-form-group> <gl-form-group @@ -488,22 +488,22 @@ export default { class="dropdown-buttons col-md d-md-flex col-lg d-lg-flex align-items-end" > <div id="prometheus-graphs-dropdown-buttons"> - <gl-button + <gl-deprecated-button v-if="showRearrangePanelsBtn" :pressed="isRearrangingPanels" variant="default" class="mr-2 mt-1 js-rearrange-button" @click="toggleRearrangingPanels" - >{{ __('Arrange charts') }}</gl-button + >{{ __('Arrange charts') }}</gl-deprecated-button > - <gl-button + <gl-deprecated-button v-if="addingMetricsAvailable" ref="addMetricBtn" v-gl-modal="$options.addMetric.modalId" variant="outline-success" data-qa-selector="add_metric_button" class="mr-2 mt-1" - >{{ $options.addMetric.title }}</gl-button + >{{ $options.addMetric.title }}</gl-deprecated-button > <gl-modal v-if="addingMetricsAvailable" @@ -519,27 +519,29 @@ export default { /> </form> <div slot="modal-footer"> - <gl-button @click="hideAddMetricModal">{{ __('Cancel') }}</gl-button> - <gl-button + <gl-deprecated-button @click="hideAddMetricModal">{{ + __('Cancel') + }}</gl-deprecated-button> + <gl-deprecated-button ref="submitCustomMetricsFormBtn" v-track-event="getAddMetricTrackingOptions()" :disabled="!formIsValid" variant="success" @click="submitCustomMetricsForm" - >{{ __('Save changes') }}</gl-button + >{{ __('Save changes') }}</gl-deprecated-button > </div> </gl-modal> - <gl-button + <gl-deprecated-button v-if="selectedDashboard.can_edit" class="mt-1 js-edit-link" :href="selectedDashboard.project_blob_path" data-qa-selector="edit_dashboard_button" - >{{ __('Edit dashboard') }}</gl-button + >{{ __('Edit dashboard') }}</gl-deprecated-button > - <gl-button + <gl-deprecated-button v-if="externalDashboardUrl.length" class="mt-1 js-external-dashboard-link" variant="primary" @@ -549,7 +551,7 @@ export default { > {{ __('View full dashboard') }} <icon name="external-link" /> - </gl-button> + </gl-deprecated-button> </div> </gl-form-group> </div> diff --git a/app/assets/javascripts/monitoring/components/embeds/embed_group.vue b/app/assets/javascripts/monitoring/components/embeds/embed_group.vue index b8562afe441..b60c87fee82 100644 --- a/app/assets/javascripts/monitoring/components/embeds/embed_group.vue +++ b/app/assets/javascripts/monitoring/components/embeds/embed_group.vue @@ -1,14 +1,14 @@ <script> import { mapState, mapActions, mapGetters } from 'vuex'; import sum from 'lodash/sum'; -import { GlButton, GlCard, GlIcon } from '@gitlab/ui'; +import { GlDeprecatedButton, GlCard, GlIcon } from '@gitlab/ui'; import { n__ } from '~/locale'; import { monitoringDashboard } from '~/monitoring/stores'; import MetricEmbed from './metric_embed.vue'; export default { components: { - GlButton, + GlDeprecatedButton, GlCard, GlIcon, MetricEmbed, @@ -78,7 +78,7 @@ export default { :body-class="bodyClass" > <template #header> - <gl-button + <gl-deprecated-button class="collapsible-card-btn d-flex text-decoration-none" :aria-label="buttonLabel" variant="link" @@ -86,7 +86,7 @@ export default { > <gl-icon class="mr-1" :name="arrowIconName" /> {{ buttonLabel }} - </gl-button> + </gl-deprecated-button> </template> <div class="d-flex flex-wrap"> <metric-embed |