Merge branch 'master' into junaed/fssdk-11529-update-impression-event

Author: junaed-optimizely

lib/core/bucketer/index.ts

@@ -56,6 +56,7 @@ export const bucket = function(bucketerParams: BucketerParams): DecisionResponse
   const decideReasons: DecisionReason[] = [];
   // Check if user is in a random group; if so, check if user is bucketed into a specific experiment
   const experiment = bucketerParams.experimentIdMap[bucketerParams.experimentId];
+  // Optional chaining skips groupId check for holdout experiments; Holdout experimentId is not in experimentIdMap
   const groupId = experiment?.['groupId'];
   if (groupId) {
     const group = bucketerParams.groupIdMap[groupId];

lib/core/decision_service/index.ts

@@ -23,7 +23,6 @@ import {
 } from '../../utils/enums';
 import {
   getAudiencesById,
-  getExperimentAudienceConditions,
   getExperimentFromId,
   getExperimentFromKey,
   getFlagVariationByKey,
@@ -32,7 +31,6 @@ import {
   getVariationKeyFromId,
   isActive,
   ProjectConfig,
-  getTrafficAllocation,
   getHoldoutsForFlag,
 } from '../../project_config/project_config';
 import { AudienceEvaluator, createAudienceEvaluator } from '../audience_evaluator';
@@ -47,7 +45,6 @@ import {
   Holdout,
   OptimizelyDecideOption,
   OptimizelyUserContext,
-  TrafficAllocation,
   UserAttributes,
   UserProfile,
   UserProfileService,
@@ -123,7 +120,7 @@ export const USER_BUCKETED_INTO_HOLDOUT_VARIATION = 'User %s is in variation %s
 export const USER_NOT_BUCKETED_INTO_HOLDOUT_VARIATION = 'User %s is in no holdout variation.';
 
 export interface DecisionObj {
-  experiment: ExperimentCore | null;
+  experiment: Experiment | Holdout | null;
   variation: Variation | null;
   decisionSource: DecisionSource;
   cmabUuid?: string;

lib/notification_center/type.ts

@@ -15,7 +15,15 @@
  */
 
 import { LogEvent } from '../event_processor/event_dispatcher/event_dispatcher';
-import { EventTags, ExperimentCore, FeatureVariableValue, UserAttributes, VariableType, Variation } from '../shared_types';
+import {
+  EventTags,
+  Experiment,
+  FeatureVariableValue,
+  Holdout,
+  UserAttributes,
+  VariableType,
+  Variation,
+} from '../shared_types';
 import { DecisionSource } from '../utils/enums';
 import { Nullable } from '../utils/type';
 
@@ -25,7 +33,7 @@ export type UserEventListenerPayload = {
 }
 
 export type ActivateListenerPayload = UserEventListenerPayload & {
-  experiment: ExperimentCore | null;
+  experiment: Experiment | Holdout | null;
   variation: Variation | null;
   logEvent: LogEvent;
 }