Add latest changes from gitlab-org/gitlab@master

5 files changed, 15 insertions, 15 deletions

diff --git a/app/assets/javascripts/monitoring/components/charts/bar.vue b/app/assets/javascripts/monitoring/components/charts/bar.vue
index 1e0f4b10297..df91bd078d1 100644
--- a/app/assets/javascripts/monitoring/components/charts/bar.vue
+++ b/app/assets/javascripts/monitoring/components/charts/bar.vue
@@ -36,12 +36,12 @@ export default {
       return xLabel;
     },
     yAxisTitle() {
-      const { y_label = '' } = this.graphData;
-      return y_label; // eslint-disable-line babel/camelcase
+      const { y_label: yLabel = '' } = this.graphData;
+      return yLabel;
     },
     xAxisType() {
-      const { x_type = 'value' } = this.graphData;
-      return x_type; // eslint-disable-line babel/camelcase
+      const { x_type: xType = 'value' } = this.graphData;
+      return xType;
     },
     dataZoomConfig() {
       const handleIcon = this.svgs['scroll-handle'];
diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
index 1238996154d..568c66cf152 100644
--- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
+++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
@@ -48,8 +48,8 @@ export default {
     },
 
     filteredDashboards() {
-      return this.allDashboards.filter(({ display_name = '' }) =>
-        display_name.toLowerCase().includes(this.searchTerm.toLowerCase()),
+      return this.allDashboards.filter(({ display_name: displayName = '' }) =>
+        displayName.toLowerCase().includes(this.searchTerm.toLowerCase()),
       );
     },
     shouldShowNoMsgContainer() {
diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js
index 7b9680aece1..5c99dbc0d98 100644
--- a/app/assets/javascripts/monitoring/stores/actions.js
+++ b/app/assets/javascripts/monitoring/stores/actions.js
@@ -2,8 +2,8 @@ import * as Sentry from '@sentry/browser';
 import createFlash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import { convertToFixedRange } from '~/lib/utils/datetime_range';
-import { convertObjectPropsToCamelCase } from '../../lib/utils/common_utils';
-import { s__, sprintf } from '../../locale';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import { s__, sprintf } from '~/locale';
 import { ENVIRONMENT_AVAILABLE_STATE, OVERVIEW_DASHBOARD_PATH, VARIABLE_TYPES } from '../constants';
 import trackDashboardLoad from '../monitoring_tracking_helper';
 import getAnnotations from '../queries/get_annotations.query.graphql';
diff --git a/app/assets/javascripts/monitoring/stores/utils.js b/app/assets/javascripts/monitoring/stores/utils.js
index 20f7c5cdb60..c425c819c65 100644
--- a/app/assets/javascripts/monitoring/stores/utils.js
+++ b/app/assets/javascripts/monitoring/stores/utils.js
@@ -29,7 +29,7 @@ export const gqClient = createGqClient(
  * @param {String} metric.id - User-defined identifier
  * @returns {Object} - normalized metric with a uniqueID
  */
-// eslint-disable-next-line babel/camelcase
+// eslint-disable-next-line camelcase
 export const uniqMetricsId = ({ metric_id, id }) => `${metric_id || NOT_IN_DB_PREFIX}_${id}`;
 
 /**
@@ -169,10 +169,10 @@ export const mapPanelToViewModel = ({
   id = null,
   title = '',
   type,
-  x_axis = {},
+  x_axis = {}, // eslint-disable-line camelcase
   x_label,
   y_label,
-  y_axis = {},
+  y_axis = {}, // eslint-disable-line camelcase
   field,
   metrics = [],
   links = [],
@@ -184,11 +184,11 @@ export const mapPanelToViewModel = ({
 }) => {
   // Both `x_axis.name` and `x_label` are supported for now
   // https://gitlab.com/gitlab-org/gitlab/issues/210521
-  const xAxis = mapXAxisToViewModel({ name: x_label, ...x_axis }); // eslint-disable-line babel/camelcase
+  const xAxis = mapXAxisToViewModel({ name: x_label, ...x_axis }); // eslint-disable-line camelcase
 
   // Both `y_axis.name` and `y_label` are supported for now
   // https://gitlab.com/gitlab-org/gitlab/issues/208385
-  const yAxis = mapYAxisToViewModel({ name: y_label, ...y_axis }); // eslint-disable-line babel/camelcase
+  const yAxis = mapYAxisToViewModel({ name: y_label, ...y_axis }); // eslint-disable-line camelcase
 
   return {
     id,
@@ -295,7 +295,7 @@ export const mapToDashboardViewModel = ({
   dashboard = '',
   templating = {},
   links = [],
-  panel_groups = [],
+  panel_groups = [], // eslint-disable-line camelcase
 }) => {
   return {
     dashboard,
diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js
index 336b613b620..221f28e923b 100644
--- a/app/assets/javascripts/monitoring/utils.js
+++ b/app/assets/javascripts/monitoring/utils.js
@@ -294,7 +294,7 @@ export const expandedPanelPayloadFromUrl = (dashboard, search = window.location.
   if (params.group || params.title || params.y_label) {
     const panelGroup = dashboard.panelGroups.find(({ group }) => params.group === group);
     const panel = panelGroup.panels.find(
-      // eslint-disable-next-line babel/camelcase
+      // eslint-disable-next-line camelcase
       ({ y_label, title }) => y_label === params.y_label && title === params.title,
     );