From 419c53ec62de6e97a517abd5fdd4cbde3a942a34 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Oct 2023 12:57:54 +0000
Subject: Add latest changes from gitlab-org/gitlab@16-5-stable-ee

---
 app/assets/javascripts/tracking/constants.js       |  1 -
 app/assets/javascripts/tracking/internal_events.js | 35 ++++++++++++----------
 2 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'app/assets/javascripts/tracking')

diff --git a/app/assets/javascripts/tracking/constants.js b/app/assets/javascripts/tracking/constants.js
index 88b7f6d3532..46278152879 100644
--- a/app/assets/javascripts/tracking/constants.js
+++ b/app/assets/javascripts/tracking/constants.js
@@ -36,4 +36,3 @@ export const SERVICE_PING_SECURITY_CONFIGURATION_THREAT_MANAGEMENT_VISIT =
   'users_visiting_security_configuration_threat_management';
 
 export const SERVICE_PING_PIPELINE_SECURITY_VISIT = 'users_visiting_pipeline_security';
-export const USER_CONTEXT_SCHEMA = 'iglu:com.gitlab/user_context/jsonschema/1-0-0';
diff --git a/app/assets/javascripts/tracking/internal_events.js b/app/assets/javascripts/tracking/internal_events.js
index 9bd0200cad1..d5bc428934c 100644
--- a/app/assets/javascripts/tracking/internal_events.js
+++ b/app/assets/javascripts/tracking/internal_events.js
@@ -1,12 +1,10 @@
 import API from '~/api';
-import getStandardContext from './get_standard_context';
 
 import Tracking from './tracking';
 import {
   GITLAB_INTERNAL_EVENT_CATEGORY,
   LOAD_INTERNAL_EVENTS_SELECTOR,
   SERVICE_PING_SCHEMA,
-  USER_CONTEXT_SCHEMA,
 } from './constants';
 import { Tracker } from './tracker';
 import { InternalEventHandler, createInternalEventPayload } from './utils';
@@ -17,7 +15,7 @@ const InternalEvents = {
    * @param {string} event
    * @param {object} data
    */
-  track_event(event, data = {}) {
+  trackEvent(event, data = {}) {
     const { context, ...rest } = data;
 
     const defaultContext = {
@@ -34,6 +32,7 @@ const InternalEvents = {
       context: mergedContext,
       ...rest,
     });
+    this.trackBrowserSDK(event);
   },
   /**
    * Returns an implementation of this class in the form of
@@ -42,8 +41,8 @@ const InternalEvents = {
   mixin() {
     return {
       methods: {
-        track_event(event, data = {}) {
-          InternalEvents.track_event(event, data);
+        trackEvent(event, data = {}) {
+          InternalEvents.trackEvent(event, data);
         },
       },
     };
@@ -62,7 +61,10 @@ const InternalEvents = {
     // eslint-disable-next-line no-param-reassign
     parent.internalEventsTrackingBound = true;
 
-    const handler = { name: 'click', func: (e) => InternalEventHandler(e, this.track_event) };
+    const handler = {
+      name: 'click',
+      func: (e) => InternalEventHandler(e, this.trackEvent.bind(this)),
+    };
     parent.addEventListener(handler.name, handler.func);
     return handler;
   },
@@ -81,7 +83,7 @@ const InternalEvents = {
     loadEvents.forEach((element) => {
       const action = createInternalEventPayload(element);
       if (action) {
-        this.track_event(action);
+        this.trackEvent(action);
       }
     });
 
@@ -91,21 +93,24 @@ const InternalEvents = {
    * Initialize browser sdk for product analytics
    */
   initBrowserSDK() {
-    const standardContext = getStandardContext();
-
     if (window.glClient) {
       window.glClient.setDocumentTitle('GitLab');
       window.glClient.page({
         title: 'GitLab',
-        context: [
-          {
-            schema: USER_CONTEXT_SCHEMA,
-            data: standardContext?.data || {},
-          },
-        ],
       });
     }
   },
+  /**
+   * track events for Product Analytics
+   * @param {string} event
+   */
+  trackBrowserSDK(event) {
+    if (!Tracker.enabled()) {
+      return;
+    }
+
+    window.glClient?.track(event);
+  },
 };
 
 export default InternalEvents;
-- 
cgit v1.2.3