Add latest changes from gitlab-org/gitlab@master

8 files changed, 14 insertions, 8 deletions

diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue
index 77f9b07f66c..2d2f649f651 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_multi_actions.vue
@@ -65,7 +65,7 @@ export default {
     fetchArtifacts() {
       // refactor tracking based on action once this dropdown supports
       // actions other than artifacts
-      this.track('click_artifacts_dropdown', { label: TRACKING_CATEGORIES.index });
+      this.track('click_artifacts_dropdown', { label: TRACKING_CATEGORIES.table });
 
       this.isLoading = true;
       // Replace the placeholder with the ID of the pipeline we are viewing
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue
index 5d5eb98f0db..dd62ffb27f7 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue
@@ -66,7 +66,7 @@ export default {
       eventHub.$emit('retryPipeline', this.pipeline.retry_path);
     },
     trackClick(action) {
-      this.track(action, { label: TRACKING_CATEGORIES.index });
+      this.track(action, { label: TRACKING_CATEGORIES.table });
     },
   },
 };
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
index bdfa754cecd..39d41415456 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
@@ -118,7 +118,7 @@ export default {
   },
   methods: {
     trackClick(action) {
-      this.track(action, { label: TRACKING_CATEGORIES.index });
+      this.track(action, { label: TRACKING_CATEGORIES.table });
     },
   },
 };
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
index 485e338f639..f9022be888a 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines.vue
@@ -4,6 +4,7 @@ import { isEqual } from 'lodash';
 import createFlash from '~/flash';
 import { getParameterByName } from '~/lib/utils/url_utility';
 import { __, s__ } from '~/locale';
+import Tracking from '~/tracking';
 import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue';
 import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
 import {
@@ -11,6 +12,7 @@ import {
   RAW_TEXT_WARNING,
   FILTER_TAG_IDENTIFIER,
   PipelineKeyOptions,
+  TRACKING_CATEGORIES,
 } from '../../constants';
 import PipelinesMixin from '../../mixins/pipelines_mixin';
 import PipelinesService from '../../services/pipelines_service';
@@ -35,7 +37,7 @@ export default {
     PipelinesTableComponent,
     TablePagination,
   },
-  mixins: [PipelinesMixin],
+  mixins: [PipelinesMixin, Tracking.mixin()],
   props: {
     store: {
       type: Object,
@@ -246,6 +248,8 @@ export default {
       params = this.onChangeWithFilter(params);
 
       this.updateContent(params);
+
+      this.track('click_filter_tabs', { label: TRACKING_CATEGORIES.tabs });
     },
     successCallback(resp) {
       // Because we are polling & the user is interacting verify if the response received
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue
index 1b9c6a59935..af089aebbbe 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_filtered_search.vue
@@ -113,7 +113,7 @@ export default {
   },
   methods: {
     onSubmit(filters) {
-      this.track('click_filtered_search', { label: TRACKING_CATEGORIES.index });
+      this.track('click_filtered_search', { label: TRACKING_CATEGORIES.search });
       this.$emit('filterPipelines', filters);
     },
   },
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue
index e1c8fc902fa..16a747f6165 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_manual_actions.vue
@@ -77,7 +77,7 @@ export default {
       return !action.playable;
     },
     trackClick() {
-      this.track('click_manual_actions', { label: TRACKING_CATEGORIES.index });
+      this.track('click_manual_actions', { label: TRACKING_CATEGORIES.table });
     },
   },
 };
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue
index 69a3851043d..936ae4da1ec 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_status_badge.vue
@@ -30,7 +30,7 @@ export default {
   },
   methods: {
     trackClick() {
-      this.track('click_ci_status_badge', { label: TRACKING_CATEGORIES.index });
+      this.track('click_ci_status_badge', { label: TRACKING_CATEGORIES.table });
     },
   },
 };
diff --git a/app/assets/javascripts/pipelines/constants.js b/app/assets/javascripts/pipelines/constants.js
index 1c9d14dcba6..327633dcb1a 100644
--- a/app/assets/javascripts/pipelines/constants.js
+++ b/app/assets/javascripts/pipelines/constants.js
@@ -111,5 +111,7 @@ export const DEFAULT_FIELDS = [
 ];
 
 export const TRACKING_CATEGORIES = {
-  index: 'pipelines_table_component',
+  table: 'pipelines_table_component',
+  tabs: 'pipelines_filter_tabs',
+  search: 'pipelines_filtered_search',
 };