diff options
Diffstat (limited to 'app/assets/javascripts/monitoring')
5 files changed, 12 insertions, 7 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 250d4b3c55f..e3fcdf716d4 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -391,7 +391,11 @@ export default { }; </script> <template> - <div class="prometheus-graphs" data-qa-selector="prometheus_graphs"> + <div + class="prometheus-graphs" + data-qa-selector="prometheus_graphs_content" + data-testid="prometheus-graphs" + > <div> <gl-alert v-if="!isDeprecationNoticeDismissed" diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue index 3338635bf96..90d2498ac19 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_header.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue @@ -189,6 +189,7 @@ export default { 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" :text="environmentDropdownText" @@ -202,7 +203,7 @@ export default { <gl-dropdown-item v-for="environment in filteredEnvironments" :key="environment.id" - :is-check-item="true" + is-check-item :is-checked="environment.name === currentEnvironmentName" :href="getEnvironmentPath(environment.id)" > diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue index 568c66cf152..7fae684315c 100644 --- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue +++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue @@ -86,7 +86,7 @@ export default { <gl-dropdown-item v-for="dashboard in starredDashboards" :key="dashboard.path" - :is-check-item="true" + is-check-item :is-checked="dashboard.path === selectedDashboardPath" @click="selectDashboard(dashboard)" > @@ -105,7 +105,7 @@ export default { <gl-dropdown-item v-for="dashboard in nonStarredDashboards" :key="dashboard.path" - :is-check-item="true" + is-check-item :is-checked="dashboard.path === selectedDashboardPath" @click="selectDashboard(dashboard)" > diff --git a/app/assets/javascripts/monitoring/components/refresh_button.vue b/app/assets/javascripts/monitoring/components/refresh_button.vue index 0b80043a92c..544fe10f26e 100644 --- a/app/assets/javascripts/monitoring/components/refresh_button.vue +++ b/app/assets/javascripts/monitoring/components/refresh_button.vue @@ -163,7 +163,7 @@ export default { :text="dropdownText" > <gl-dropdown-item - :is-check-item="true" + is-check-item :is-checked="refreshInterval === null" @click="removeRefreshInterval()" >{{ __('Off') }}</gl-dropdown-item @@ -172,7 +172,7 @@ export default { <gl-dropdown-item v-for="(option, i) in $options.refreshIntervals" :key="i" - :is-check-item="true" + is-check-item :is-checked="isChecked(option)" @click="setRefreshInterval(option)" >{{ option.label }}</gl-dropdown-item diff --git a/app/assets/javascripts/monitoring/format_date.js b/app/assets/javascripts/monitoring/format_date.js index c7bc626eb11..f20fea48084 100644 --- a/app/assets/javascripts/monitoring/format_date.js +++ b/app/assets/javascripts/monitoring/format_date.js @@ -1,4 +1,4 @@ -import dateFormat from 'dateformat'; +import dateFormat from '~/lib/dateformat'; export const timezones = { /** |