Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 13 insertions, 14 deletions

diff --git a/app/assets/javascripts/experimentation/utils.js b/app/assets/javascripts/experimentation/utils.js
index dcb6a8e20a3..69fa7adc653 100644
--- a/app/assets/javascripts/experimentation/utils.js
+++ b/app/assets/javascripts/experimentation/utils.js
@@ -1,5 +1,5 @@
-// This file only applies to use of experiments through https://gitlab.com/gitlab-org/gitlab-experiment
-import { get } from 'lodash';
+// This file only applies to use of experiments through https://gitlab.com/gitlab-org/ruby/gems/gitlab-experiment
+import { get, mapValues, pick } from 'lodash';
 import { DEFAULT_VARIANT, CANDIDATE_VARIANT, TRACKING_CONTEXT_SCHEMA } from './constants';
 
 function getExperimentsData() {
@@ -8,19 +8,18 @@ function getExperimentsData() {
   // Pull from preferred window.gl.experiments
   const experimentsFromGl = get(window, ['gl', 'experiments'], {});
 
-  return { ...experimentsFromGon, ...experimentsFromGl };
-}
-
-function convertExperimentDataToExperimentContext(experimentData) {
-  // Bandaid to allow-list only the properties which the current gitlab_experiment context schema suppports.
+  // Bandaid to allow-list only the properties which the current gitlab_experiment
+  // context schema suppports, since we most often use this data to create that
+  // Snowplow context.
   // See TRACKING_CONTEXT_SCHEMA for current version (1-0-0)
   // https://gitlab.com/gitlab-org/iglu/-/blob/master/public/schemas/com.gitlab/gitlab_experiment/jsonschema/1-0-0
-  const { experiment: experimentName, key, variant, migration_keys } = experimentData;
+  return mapValues({ ...experimentsFromGon, ...experimentsFromGl }, (xp) => {
+    return pick(xp, ['experiment', 'key', 'variant', 'migration_keys']);
+  });
+}
 
-  return {
-    schema: TRACKING_CONTEXT_SCHEMA,
-    data: { experiment: experimentName, key, variant, migration_keys },
-  };
+function createGitlabExperimentContext(experimentData) {
+  return { schema: TRACKING_CONTEXT_SCHEMA, data: experimentData };
 }
 
 export function getExperimentData(experimentName) {
@@ -28,10 +27,10 @@ export function getExperimentData(experimentName) {
 }
 
 export function getAllExperimentContexts() {
-  return Object.values(getExperimentsData()).map(convertExperimentDataToExperimentContext);
+  return Object.values(getExperimentsData()).map(createGitlabExperimentContext);
 }
 
-export function isExperimentVariant(experimentName, variantName) {
+export function isExperimentVariant(experimentName, variantName = CANDIDATE_VARIANT) {
   return getExperimentData(experimentName)?.variant === variantName;
 }