diff options
Diffstat (limited to 'app/assets/javascripts/monitoring/components/dashboard.vue')
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 05e7fb7a3e9..be9f104b81e 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -3,7 +3,7 @@ import { GlButton, GlModalDirective, GlTooltipDirective, GlIcon } from '@gitlab/ import Mousetrap from 'mousetrap'; import VueDraggable from 'vuedraggable'; import { mapActions, mapState, mapGetters } from 'vuex'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash from '~/flash'; import invalidUrl from '~/lib/utils/invalid_url'; import { ESC_KEY } from '~/lib/utils/keys'; import { mergeUrlParams, updateHistory } from '~/lib/utils/url_utility'; @@ -11,6 +11,7 @@ import { s__ } from '~/locale'; import AlertsDeprecationWarning from '~/vue_shared/components/alerts_deprecation_warning.vue'; import { defaultTimeRange } from '~/vue_shared/constants'; import TrackEventDirective from '~/vue_shared/directives/track_event'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { metricStates, keyboardShortcutKeys } from '../constants'; import { timeRangeFromUrl, @@ -46,6 +47,7 @@ export default { GlTooltip: GlTooltipDirective, TrackEvent: TrackEventDirective, }, + mixins: [glFeatureFlagMixin()], props: { hasMetrics: { type: Boolean, @@ -176,11 +178,11 @@ export default { this.setExpandedPanel(expandedPanel); } } catch { - createFlash( - s__( + createFlash({ + message: s__( 'Metrics|Link contains invalid chart information, please verify the link to see the expanded panel.', ), - ); + }); } }, expandedPanel: { @@ -201,12 +203,13 @@ export default { * This watcher is set for future SPA behaviour of the dashboard */ if (hasWarnings) { - createFlash( - s__( + createFlash({ + message: s__( 'Metrics|Your dashboard schema is invalid. Edit the dashboard to correct the YAML schema.', ), - 'warning', - ); + + type: 'warning', + }); } }, }, @@ -318,11 +321,11 @@ export default { this.isRearrangingPanels = isRearrangingPanels; }, onDateTimePickerInvalid() { - createFlash( - s__( + createFlash({ + message: s__( 'Metrics|Link contains an invalid time window, please verify the link to see the requested time range.', ), - ); + }); // As a fallback, switch to default time range instead this.selectedTimeRange = defaultTimeRange; }, @@ -396,7 +399,7 @@ export default { <template> <div class="prometheus-graphs" data-qa-selector="prometheus_graphs"> - <alerts-deprecation-warning /> + <alerts-deprecation-warning v-if="!glFeatures.managedAlertsDeprecation" /> <dashboard-header v-if="showHeader" |