diff options
Diffstat (limited to 'app/assets/javascripts/monitoring/components')
10 files changed, 10 insertions, 49 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/empty_chart.vue b/app/assets/javascripts/monitoring/components/charts/empty_chart.vue index ae079da0b0b..da4c92df711 100644 --- a/app/assets/javascripts/monitoring/components/charts/empty_chart.vue +++ b/app/assets/javascripts/monitoring/components/charts/empty_chart.vue @@ -1,11 +1,11 @@ <script> import chartEmptyStateIllustration from '@gitlab/svgs/dist/illustrations/chart-empty-state.svg'; -import { GlSafeHtmlDirective } from '@gitlab/ui'; +import SafeHtml from '~/vue_shared/directives/safe_html'; import { chartHeight } from '../../constants'; export default { directives: { - SafeHtml: GlSafeHtmlDirective, + SafeHtml, }, data() { return { diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index b6ad2d21757..2c185794d17 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -391,11 +391,7 @@ export default { }; </script> <template> - <div - class="prometheus-graphs" - data-qa-selector="prometheus_graphs_content" - data-testid="prometheus-graphs" - > + <div class="prometheus-graphs" data-testid="prometheus-graphs"> <div> <gl-alert v-if="!isDeprecationNoticeDismissed" diff --git a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue index 7f8fb3c223d..d67154b7697 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue @@ -146,7 +146,6 @@ export default { <gl-dropdown v-gl-tooltip data-testid="actions-menu" - data-qa-selector="actions_menu_dropdown" right no-caret toggle-class="gl-px-3!" @@ -223,7 +222,6 @@ export default { <gl-dropdown-item v-if="isMenuItemEnabled.editDashboard" :href="selectedDashboard ? selectedDashboard.project_blob_path : null" - data-qa-selector="edit_dashboard_button_enabled" data-testid="edit-dashboard-item-enabled" > {{ $options.i18n.editDashboard }} diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue index 90d2498ac19..7bb0d3874d1 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_header.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue @@ -173,7 +173,6 @@ export default { <div class="gl-mb-3 gl-mr-3 gl-display-flex gl-sm-display-block"> <dashboards-dropdown id="monitor-dashboards-dropdown" - data-qa-selector="dashboards_filter_dropdown" class="flex-grow-1" toggle-class="dropdown-menu-toggle" :default-branch="defaultBranch" @@ -188,7 +187,6 @@ export default { id="monitor-environments-dropdown" ref="monitorEnvironmentsDropdown" class="flex-grow-1" - data-qa-selector="environments_dropdown" data-testid="environments-dropdown" toggle-class="dropdown-menu-toggle" menu-class="monitor-environment-dropdown-menu" @@ -225,7 +223,6 @@ export default { <date-time-picker ref="dateTimePicker" class="flex-grow-1 show-last-dropdown" - data-qa-selector="range_picker_dropdown" :value="selectedTimeRange" :options="$options.timeRanges" :utc="displayUtc" diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue index 7e7dcef7639..9ad6da35d6b 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue @@ -292,11 +292,7 @@ export default { <div v-if="graphDataIsLoading" class="mx-1 mt-1"> <gl-loading-icon size="sm" /> </div> - <div - v-if="isContextualMenuShown" - ref="contextualMenu" - data-qa-selector="prometheus_graph_widgets" - > + <div v-if="isContextualMenuShown" ref="contextualMenu"> <div data-testid="dropdown-wrapper" class="d-flex align-items-center"> <!-- This component should be replaced with a variant developed @@ -310,7 +306,6 @@ export default { :text-sr-only="true" toggle-class="gl-px-3!" no-caret - data-qa-selector="prometheus_widgets_dropdown" right :title="__('More actions')" > @@ -339,7 +334,6 @@ export default { ref="copyChartLink" v-track-event="generateLinkToChartOptions(clipboardText)" :data-clipboard-text="clipboardText" - data-qa-selector="generate_chart_link_menu_item" @click="showToast(clipboardText)" > {{ __('Copy link to chart') }} diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue b/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue index 8efea2bfc3e..e8a9c24f5c2 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue @@ -100,7 +100,7 @@ export default { <gl-form-textarea id="panel-yml-input" v-model="yml" - class="gl-h-200! gl-font-monospace! gl-font-size-monospace!" + class="gl-h-200! gl-font-monospace!" /> </gl-form-group> <div class="gl-text-right"> diff --git a/app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue b/app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue index a63008aa382..9ad14b3d52e 100644 --- a/app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue +++ b/app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue @@ -104,13 +104,7 @@ export default { label-size="sm" label-for="fileName" > - <gl-form-input - id="fileName" - ref="fileName" - v-model="form.fileName" - data-qa-selector="duplicate_dashboard_filename_field" - :required="true" - /> + <gl-form-input id="fileName" ref="fileName" v-model="form.fileName" :required="true" /> </gl-form-group> <gl-form-group :label="__('Branch')" label-size="sm" label-for="branch"> <gl-form-radio-group diff --git a/app/assets/javascripts/monitoring/components/group_empty_state.vue b/app/assets/javascripts/monitoring/components/group_empty_state.vue index 0365fc66331..a67770b93be 100644 --- a/app/assets/javascripts/monitoring/components/group_empty_state.vue +++ b/app/assets/javascripts/monitoring/components/group_empty_state.vue @@ -1,5 +1,6 @@ <script> -import { GlEmptyState, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { GlEmptyState } from '@gitlab/ui'; +import SafeHtml from '~/vue_shared/directives/safe_html'; import { __, sprintf } from '~/locale'; import { metricStates } from '../constants'; diff --git a/app/assets/javascripts/monitoring/components/refresh_button.vue b/app/assets/javascripts/monitoring/components/refresh_button.vue index 544fe10f26e..55c602db33d 100644 --- a/app/assets/javascripts/monitoring/components/refresh_button.vue +++ b/app/assets/javascripts/monitoring/components/refresh_button.vue @@ -11,8 +11,6 @@ import Visibility from 'visibilityjs'; import { mapActions } from 'vuex'; import { n__, __, s__ } from '~/locale'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; - const makeInterval = (length = 0, unit = 's') => { const shortLabel = `${length}${unit}`; switch (unit) { @@ -58,7 +56,6 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, - mixins: [glFeatureFlagsMixin()], data() { return { refreshInterval: null, @@ -66,12 +63,6 @@ export default { }; }, computed: { - disableMetricDashboardRefreshRate() { - // Can refresh rates impact performance? - // Add "negative" feature flag called `disable_metric_dashboard_refresh_rate` - // See more at: https://gitlab.com/gitlab-org/gitlab/-/issues/229831 - return this.glFeatures.disableMetricDashboardRefreshRate; - }, dropdownText() { return this.refreshInterval?.shortLabel ?? __('Off'); }, @@ -156,12 +147,7 @@ export default { icon="retry" @click="refresh" /> - <gl-dropdown - v-if="!disableMetricDashboardRefreshRate" - v-gl-tooltip - :title="s__('Metrics|Set refresh rate')" - :text="dropdownText" - > + <gl-dropdown v-gl-tooltip :title="s__('Metrics|Set refresh rate')" :text="dropdownText"> <gl-dropdown-item is-check-item :is-checked="refreshInterval === null" diff --git a/app/assets/javascripts/monitoring/components/variables_section.vue b/app/assets/javascripts/monitoring/components/variables_section.vue index 493d37ce263..971f188e9f3 100644 --- a/app/assets/javascripts/monitoring/components/variables_section.vue +++ b/app/assets/javascripts/monitoring/components/variables_section.vue @@ -37,11 +37,7 @@ export default { }; </script> <template> - <div - ref="variablesSection" - class="d-sm-flex flex-sm-wrap pt-2 pr-1 pb-0 pl-2 variables-section" - data-qa-selector="variables_content" - > + <div ref="variablesSection" class="d-sm-flex flex-sm-wrap pt-2 pr-1 pb-0 pl-2 variables-section"> <div v-for="variable in variables" :key="variable.name" class="mb-1 pr-2 d-flex d-sm-block"> <component :is="variableField(variable.type)" @@ -50,7 +46,6 @@ export default { :value="variable.value" :name="variable.name" :options="variable.options" - data-qa-selector="variable_item" @input="refreshDashboard(variable, $event)" /> </div> |