@microsoft/omnichannel-chat-widget 1.7.8-main.7a07fc5 → 1.7.8-main.8428c08

package/lib/cjs/components/livechatwidget/common/startChat.js

@@ -7,7 +7,6 @@ exports.setPreChatAndInitiateChat = exports.prepareStartChat = exports.initStart
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 var _Constants = require("../../../common/Constants");
 var _utils = require("../../../common/utils");
-var _authHelper = require("./authHelper");
 var _reconnectChatHelper = require("./reconnectChatHelper");
 var _startChatErrorHandler = require("./startChatErrorHandler");
 var _ActivityStreamHandler = require("./ActivityStreamHandler");
@@ -19,6 +18,7 @@ var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 var _endChat = require("./endChat");
 var _createAdapter = require("./createAdapter");
 var _newMessageEventHandler = require("../../../plugins/newMessageEventHandler");
+var _FirstMessageTrackerFromBot = require("../../../firstresponselatency/FirstMessageTrackerFromBot");
 var _liveChatConfigUtils = require("./liveChatConfigUtils");
 var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
 var _persistentChatHelper = require("./persistentChatHelper");
@@ -30,20 +30,6 @@ let widgetInstanceId;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let popoutWidgetInstanceId;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setAuthenticationIfApplicable = async (props, facadeChatSDK) => {
-  const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
-  const getAuthToken = props === null || props === void 0 ? void 0 : props.getAuthToken;
-  const authClientFunction = (0, _authHelper.getAuthClientFunction)(chatConfig);
-  if (getAuthToken && authClientFunction) {
-    // set auth token to chat sdk before start chat
-    const authSuccess = await (0, _authHelper.handleAuthentication)(facadeChatSDK.getChatSDK(), chatConfig, getAuthToken);
-    if (!authSuccess.result) {
-      throw new Error(_Constants.WidgetLoadCustomErrorString.AuthenticationFailedErrorString);
-    }
-  }
-};
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
   optionalParams = {}; //Resetting to ensure no stale values
@@ -71,11 +57,6 @@ const prepareStartChat = async (props, facadeChatSDK, state, dispatch, setAdapte
   const isProactiveChat = state.appStates.conversationState === _ConversationState.ConversationState.ProactiveChat;
   const isPreChatEnabledInProactiveChat = state.appStates.proactiveChatStates.proactiveChatEnablePrechat;
 
-  // Setting auth settings to OC API to retrieve existing persistent chat session before start chat if any
-  if ((0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
-    await setAuthenticationIfApplicable(props, facadeChatSDK);
-  }
-
   //Setting PreChat and intiate chat
   await setPreChatAndInitiateChat(facadeChatSDK, dispatch, setAdapter, isProactiveChat, isPreChatEnabledInProactiveChat, state, props);
 };
@@ -151,6 +132,7 @@ const setPreChatAndInitiateChat = async (facadeChatSDK, dispatch, setAdapter, is
   const optionalParams = {
     isProactiveChat
   };
+  (0, _FirstMessageTrackerFromBot.createTrackingForFirstMessage)();
   await initStartChat(facadeChatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 
@@ -174,14 +156,11 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
 
     //Start widget load timer
     _TelemetryManager.TelemetryTimers.WidgetLoadTimer = (0, _utils.createTimer)();
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.WidgetLoadStarted,
-      Description: "Widget loading started"
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.WidgetStartChatStarted,
+      Description: "Widget start chat started."
     });
 
-    // Auth token retrieval needs to happen during start chat to support pop-out chat
-    await setAuthenticationIfApplicable(props, facadeChatSDK);
-
     //Check if chat retrieved from cache
     if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
       var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4, _persistedState$domai5;

package/lib/cjs/components/livechatwidget/common/startChatErrorHandler.js

@@ -112,8 +112,9 @@ const logWidgetLoadFailed = ex => {
   if (ex !== null && ex !== void 0 && ex.httpResponseStatusCode) {
     exDetails.HttpResponseStatusCode = ex.httpResponseStatusCode;
   }
-  _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
-    Event: _TelemetryConstants.TelemetryEvent.WidgetLoadFailed,
+  _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.ERROR, {
+    Event: _TelemetryConstants.TelemetryEvent.WidgetStartChatFailed,
+    Description: "Widget load complete with error",
     ExceptionDetails: exDetails,
     ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers === null || _TelemetryManager.TelemetryTimers === void 0 ? void 0 : (_TelemetryTimers$Widg = _TelemetryManager.TelemetryTimers.WidgetLoadTimer) === null || _TelemetryTimers$Widg === void 0 ? void 0 : _TelemetryTimers$Widg.milliSecondsElapsed
   });
@@ -124,8 +125,8 @@ const logWidgetLoadComplete = additionalMessage => {
   if (additionalMessage) {
     descriptionString += `. ${additionalMessage}`;
   }
-  _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-    Event: _TelemetryConstants.TelemetryEvent.WidgetLoadComplete,
+  _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+    Event: _TelemetryConstants.TelemetryEvent.WidgetStartChatCompleted,
     Description: descriptionString,
     ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers === null || _TelemetryManager.TelemetryTimers === void 0 ? void 0 : (_TelemetryTimers$Widg2 = _TelemetryManager.TelemetryTimers.WidgetLoadTimer) === null || _TelemetryTimers$Widg2 === void 0 ? void 0 : _TelemetryTimers$Widg2.milliSecondsElapsed
   });
@@ -140,8 +141,8 @@ const logWidgetLoadCompleteWithError = ex => {
   if (ex !== null && ex !== void 0 && ex.httpResponseStatusCode) {
     exDetails.HttpResponseStatusCode = ex.httpResponseStatusCode;
   }
-  _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.WARN, {
-    Event: _TelemetryConstants.TelemetryEvent.WidgetLoadComplete,
+  _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.ERROR, {
+    Event: _TelemetryConstants.TelemetryEvent.WidgetStartChatFailed,
     Description: "Widget load complete with error",
     ExceptionDetails: exDetails,
     ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers === null || _TelemetryManager.TelemetryTimers === void 0 ? void 0 : (_TelemetryTimers$Widg3 = _TelemetryManager.TelemetryTimers.WidgetLoadTimer) === null || _TelemetryTimers$Widg3 === void 0 ? void 0 : _TelemetryTimers$Widg3.milliSecondsElapsed

package/lib/cjs/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -64,11 +64,12 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 let uiTimer;
 const LiveChatWidgetStateful = props => {
-  var _props$webChatContain, _props$styleProps, _props$webChatContain2, _props$webChatContain3, _props$controlProps, _props$controlProps3, _state$appStates7, _props$webChatContain7, _state$appStates14, _props$webChatContain9, _props$webChatContain10, _props$controlProps12, _props$draggableChatW, _props$draggableChatW2, _props$draggableChatW3, _props$draggableChatW4, _props$draggableChatW5, _livechatProps$webCha, _props$webChatContain11, _props$webChatContain12, _props$webChatContain13, _props$webChatContain14, _livechatProps$styleP, _livechatProps$contro, _livechatProps$contro2, _livechatProps$compon, _livechatProps$contro3, _livechatProps$compon2, _livechatProps$contro4, _livechatProps$compon3, _livechatProps$contro5, _livechatProps$compon4, _livechatProps$contro6, _livechatProps$compon5, _livechatProps$contro7, _livechatProps$compon6, _livechatProps$contro8, _livechatProps$compon7, _livechatProps$contro9, _livechatProps$compon8, _livechatProps$contro10, _livechatProps$contro11, _livechatProps$compon9, _livechatProps$contro12, _livechatProps$compon10, _livechatProps$contro13, _livechatProps$compon11, _livechatProps$compon12, _livechatProps$compon13;
+  var _props$webChatContain, _props$styleProps, _props$webChatContain2, _props$webChatContain3, _props$controlProps, _props$controlProps3, _state$appStates7, _props$webChatContain7, _state$appStates14, _props$webChatContain9, _props$webChatContain10, _props$controlProps12, _props$draggableChatW, _props$draggableChatW2, _props$draggableChatW3, _props$draggableChatW4, _props$draggableChatW5, _livechatProps$webCha, _props$webChatContain11, _props$webChatContain12, _props$webChatContain13, _props$webChatContain14, _props$webChatContain15, _props$webChatContain16, _props$webChatContain17, _props$webChatContain18, _livechatProps$styleP, _livechatProps$contro, _livechatProps$contro2, _livechatProps$compon, _livechatProps$contro3, _livechatProps$compon2, _livechatProps$contro4, _livechatProps$compon3, _livechatProps$contro5, _livechatProps$compon4, _livechatProps$contro6, _livechatProps$compon5, _livechatProps$contro7, _livechatProps$compon6, _livechatProps$contro8, _livechatProps$compon7, _livechatProps$contro9, _livechatProps$compon8, _livechatProps$contro10, _livechatProps$contro11, _livechatProps$compon9, _livechatProps$contro12, _livechatProps$compon10, _livechatProps$contro13, _livechatProps$compon11, _livechatProps$compon12, _livechatProps$compon13;
   (0, _react2.useEffect)(() => {
     uiTimer = (0, _utils.createTimer)();
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXLivechatwidgetStart
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXLiveChatWidgetStart,
+      Description: "Live chat widget loading started."
     });
   }, []);
   const [state, dispatch] = (0, _useChatContextStore.default)();
@@ -319,7 +320,7 @@ const LiveChatWidgetStateful = props => {
       });
     });
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(_TelemetryConstants.BroadcastEvent.StartProactiveChat).subscribe(msg => {
-      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.StartProactiveChatEventReceived,
         Description: "Start proactive chat event received."
       });
@@ -417,7 +418,7 @@ const LiveChatWidgetStateful = props => {
 
     // Start chat from SDK Event
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(_TelemetryConstants.BroadcastEvent.StartChat).subscribe(msg => {
-      var _props$chatConfig5, _props$chatConfig5$Li, _props$chatConfig6, _props$chatConfig6$Li, _msg$payload5, _msg$payload6, _msg$payload7, _msg$payload9, _inMemoryState$appSta2, _inMemoryState$appSta3, _inMemoryState$appSta4, _inMemoryState$appSta5;
+      var _props$chatConfig5, _props$chatConfig5$Li, _props$chatConfig6, _props$chatConfig6$Li, _msg$payload5, _msg$payload6, _msg$payload7, _msg$payload9, _inMemoryState$appSta2, _inMemoryState$appSta3;
       // If chat is out of operating hours chat widget sets the conversation state to OutOfOffice.
       if (typeof (props === null || props === void 0 ? void 0 : (_props$chatConfig5 = props.chatConfig) === null || _props$chatConfig5 === void 0 ? void 0 : (_props$chatConfig5$Li = _props$chatConfig5.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig5$Li === void 0 ? void 0 : _props$chatConfig5$Li.OutOfOperatingHours) === "string" && (props === null || props === void 0 ? void 0 : (_props$chatConfig6 = props.chatConfig) === null || _props$chatConfig6 === void 0 ? void 0 : (_props$chatConfig6$Li = _props$chatConfig6.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig6$Li === void 0 ? void 0 : _props$chatConfig6$Li.OutOfOperatingHours.toLowerCase()) === "true") {
         (state === null || state === void 0 ? void 0 : state.appStates.isMinimized) && dispatch({
@@ -436,7 +437,7 @@ const LiveChatWidgetStateful = props => {
       }
       if (msg !== null && msg !== void 0 && (_msg$payload7 = msg.payload) !== null && _msg$payload7 !== void 0 && _msg$payload7.customContext) {
         var _msg$payload8;
-        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+        _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
           Event: _TelemetryConstants.TelemetryEvent.CustomContextReceived,
           Description: "CustomContext received through startChat event."
         });
@@ -445,8 +446,8 @@ const LiveChatWidgetStateful = props => {
           payload: msg === null || msg === void 0 ? void 0 : (_msg$payload8 = msg.payload) === null || _msg$payload8 === void 0 ? void 0 : _msg$payload8.customContext
         });
       }
-      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-        Event: _TelemetryConstants.TelemetryEvent.StartChatEventRecevied,
+      _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.StartChatEventReceived,
         Description: "Start chat event received."
       });
       const inMemoryState = (0, _createReducer.executeReducer)(state, {
@@ -455,8 +456,14 @@ const LiveChatWidgetStateful = props => {
       });
       inMemoryState.domainStates.customContext = msg === null || msg === void 0 ? void 0 : (_msg$payload9 = msg.payload) === null || _msg$payload9 === void 0 ? void 0 : _msg$payload9.customContext;
 
-      // Only initiate new chat if widget runtime state is one of the followings
-      if (((_inMemoryState$appSta2 = inMemoryState.appStates) === null || _inMemoryState$appSta2 === void 0 ? void 0 : _inMemoryState$appSta2.conversationState) === _ConversationState.ConversationState.Closed || ((_inMemoryState$appSta3 = inMemoryState.appStates) === null || _inMemoryState$appSta3 === void 0 ? void 0 : _inMemoryState$appSta3.conversationState) === _ConversationState.ConversationState.InActive || ((_inMemoryState$appSta4 = inMemoryState.appStates) === null || _inMemoryState$appSta4 === void 0 ? void 0 : _inMemoryState$appSta4.conversationState) === _ConversationState.ConversationState.Postchat) {
+      /*
+      * If the conversation is in closed state then we start a new chat, 
+      * else if the conversation is in active state then we maximize the chat
+      *  If the conversation is in inactive or postchat state then we maximize the chat.
+      * 
+      * To start a new chat, it needs to be called via the close button or close chat via SDK.
+      **/
+      if (((_inMemoryState$appSta2 = inMemoryState.appStates) === null || _inMemoryState$appSta2 === void 0 ? void 0 : _inMemoryState$appSta2.conversationState) === _ConversationState.ConversationState.Closed) {
         _omnichannelChatComponents.BroadcastService.postMessage({
           eventName: _TelemetryConstants.BroadcastEvent.ChatInitiated
         });
@@ -465,7 +472,7 @@ const LiveChatWidgetStateful = props => {
       }
 
       // If minimized, maximize the chat
-      if ((inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta5 = inMemoryState.appStates) === null || _inMemoryState$appSta5 === void 0 ? void 0 : _inMemoryState$appSta5.isMinimized) === true) {
+      if ((inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta3 = inMemoryState.appStates) === null || _inMemoryState$appSta3 === void 0 ? void 0 : _inMemoryState$appSta3.isMinimized) === true) {
         var _inMemoryState$domain, _inMemoryState$domain2, _inMemoryState$domain3, _inMemoryState$domain4;
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
@@ -484,7 +491,7 @@ const LiveChatWidgetStateful = props => {
 
     // End chat
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(_TelemetryConstants.BroadcastEvent.InitiateEndChat).subscribe(async () => {
-      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryHelper.TelemetryHelper.logSDKEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.EndChatEventReceived,
         Description: "Received InitiateEndChat BroadcastEvent."
       });
@@ -593,12 +600,12 @@ const LiveChatWidgetStateful = props => {
         disablePolling: true
       });
       facadeChatSDK === null || facadeChatSDK === void 0 ? void 0 : facadeChatSDK.onAgentEndSession(event => {
-        var _inMemoryState$appSta6;
+        var _inMemoryState$appSta4;
         const inMemoryState = (0, _createReducer.executeReducer)(state, {
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
           payload: null
         });
-        if ("participantsRemoved" in event && (inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta6 = inMemoryState.appStates) === null || _inMemoryState$appSta6 === void 0 ? void 0 : _inMemoryState$appSta6.conversationState) === _ConversationState.ConversationState.Active) {
+        if ("participantsRemoved" in event && (inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta4 = inMemoryState.appStates) === null || _inMemoryState$appSta4 === void 0 ? void 0 : _inMemoryState$appSta4.conversationState) === _ConversationState.ConversationState.Active) {
           setWebChatStyles(styles => {
             return {
               ...styles,
@@ -741,13 +748,13 @@ const LiveChatWidgetStateful = props => {
 
   // Handle Chat disconnect cases
   (0, _react2.useEffect)(() => {
-    var _inMemoryState$appSta7;
+    var _inMemoryState$appSta5;
     const inMemoryState = (0, _createReducer.executeReducer)(state, {
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
       payload: null
     });
     (0, _chatDisconnectHelper.handleChatDisconnect)(props, inMemoryState, setWebChatStyles);
-    const chatDisconnectState = inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta7 = inMemoryState.appStates) === null || _inMemoryState$appSta7 === void 0 ? void 0 : _inMemoryState$appSta7.chatDisconnectEventReceived;
+    const chatDisconnectState = inMemoryState === null || inMemoryState === void 0 ? void 0 : (_inMemoryState$appSta5 = inMemoryState.appStates) === null || _inMemoryState$appSta5 === void 0 ? void 0 : _inMemoryState$appSta5.chatDisconnectEventReceived;
     if (chatDisconnectState && adapter) {
       try {
         adapter.end();
@@ -770,8 +777,9 @@ const LiveChatWidgetStateful = props => {
     });
   }, [(_props$webChatContain9 = props.webChatContainerProps) === null || _props$webChatContain9 === void 0 ? void 0 : _props$webChatContain9.renderingMiddlewareProps]);
   (0, _react2.useEffect)(() => {
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXLivechatwidgetCompleted,
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXLiveChatWidgetCompleted,
+      Description: "Live chat widget loading completed.",
       ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
     });
   }, []);
@@ -876,8 +884,8 @@ const LiveChatWidgetStateful = props => {
     userID: userID,
     styleOptions: {
       ...webChatStyles,
-      bubbleBackground: ((_props$webChatContain11 = props.webChatContainerProps) === null || _props$webChatContain11 === void 0 ? void 0 : (_props$webChatContain12 = _props$webChatContain11.adaptiveCardStyles) === null || _props$webChatContain12 === void 0 ? void 0 : _props$webChatContain12.background) ?? _defaultAdaptiveCardStyles.defaultAdaptiveCardStyles.background,
-      bubbleTextColor: ((_props$webChatContain13 = props.webChatContainerProps) === null || _props$webChatContain13 === void 0 ? void 0 : (_props$webChatContain14 = _props$webChatContain13.adaptiveCardStyles) === null || _props$webChatContain14 === void 0 ? void 0 : _props$webChatContain14.color) ?? _defaultAdaptiveCardStyles.defaultAdaptiveCardStyles.color
+      bubbleBackground: ((_props$webChatContain11 = props.webChatContainerProps) === null || _props$webChatContain11 === void 0 ? void 0 : (_props$webChatContain12 = _props$webChatContain11.webChatStyles) === null || _props$webChatContain12 === void 0 ? void 0 : _props$webChatContain12.bubbleBackground) ?? ((_props$webChatContain13 = props.webChatContainerProps) === null || _props$webChatContain13 === void 0 ? void 0 : (_props$webChatContain14 = _props$webChatContain13.adaptiveCardStyles) === null || _props$webChatContain14 === void 0 ? void 0 : _props$webChatContain14.background) ?? _defaultAdaptiveCardStyles.defaultAdaptiveCardStyles.background,
+      bubbleTextColor: ((_props$webChatContain15 = props.webChatContainerProps) === null || _props$webChatContain15 === void 0 ? void 0 : (_props$webChatContain16 = _props$webChatContain15.webChatStyles) === null || _props$webChatContain16 === void 0 ? void 0 : _props$webChatContain16.bubbleTextColor) ?? ((_props$webChatContain17 = props.webChatContainerProps) === null || _props$webChatContain17 === void 0 ? void 0 : (_props$webChatContain18 = _props$webChatContain17.adaptiveCardStyles) === null || _props$webChatContain18 === void 0 ? void 0 : _props$webChatContain18.color) ?? _defaultAdaptiveCardStyles.defaultAdaptiveCardStyles.color
     },
     directLine: directLine
   }), /*#__PURE__*/_react2.default.createElement(_react.Stack, {

package/lib/cjs/components/ooohpanestateful/OOOHPaneStateful.js

@@ -7,11 +7,11 @@ exports.default = exports.OutOfOfficeHoursPaneStateful = void 0;
 var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../../common/utils");
+var _dompurify = _interopRequireDefault(require("dompurify"));
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _TelemetryHelper = require("../../common/telemetry/TelemetryHelper");
 var _defaultgeneralOOOHPaneStyleProps = require("./common/defaultStyleProps/defaultgeneralOOOHPaneStyleProps");
 var _useChatContextStore = _interopRequireDefault(require("../../hooks/useChatContextStore"));
-var _dompurify = _interopRequireDefault(require("dompurify"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -20,8 +20,9 @@ const OutOfOfficeHoursPaneStateful = props => {
   var _props$styleProps;
   (0, _react.useEffect)(() => {
     uiTimer = (0, _utils.createTimer)();
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXOOHPaneStart
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXOutOfOfficeHoursPaneStart,
+      Description: "Out of office hours pane loading started."
     });
   }, []);
   const [state] = (0, _useChatContextStore.default)();
@@ -38,15 +39,18 @@ const OutOfOfficeHoursPaneStateful = props => {
 
   // Move focus to the first button
   (0, _react.useEffect)(() => {
-    const firstElement = (0, _utils.findAllFocusableElement)(`#${state.domainStates.widgetElementId}`);
-    if (firstElement && firstElement[0]) {
-      firstElement[0].focus();
+    if (state.domainStates.widgetElementId !== null && state.domainStates.widgetElementId !== undefined && state.domainStates.widgetElementId.trim() !== "") {
+      const firstElement = (0, _utils.findAllFocusableElement)(`#${state.domainStates.widgetElementId}`);
+      if (firstElement && firstElement[0]) {
+        firstElement[0].focus();
+      }
     }
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.OutOfOfficePaneLoaded
     });
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXOOHPaneCompleted,
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXOutOfOfficeHoursPaneCompleted,
+      Description: "Out of office hours pane loading completed.",
       ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
     });
   }, []);

package/lib/cjs/components/postchatsurveypanestateful/PostChatSurveyPaneStateful.js

@@ -14,17 +14,19 @@ var _TelemetryHelper = require("../../common/telemetry/TelemetryHelper");
 var _defaultgeneralPostChatSurveyPaneStyleProps = require("./common/defaultStyleProps/defaultgeneralPostChatSurveyPaneStyleProps");
 var _utils = require("../../common/utils");
 var _useChatContextStore = _interopRequireDefault(require("../../hooks/useChatContextStore"));
+var _isValidSurveyUrl = _interopRequireDefault(require("./common/isValidSurveyUrl"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const generateSurveyInviteLink = function (surveyInviteLink, isEmbed, locale, compact) {
   let showMultiLingual = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  const surveyLink = `${surveyInviteLink}
-            &embed=${isEmbed.toString()}
-            &compact=${compact.toString() ?? "true"}
-            &lang=${locale ?? "en-us"}
-            &showmultilingual=${showMultiLingual.toString() ?? "false"}`;
-  return surveyLink;
+  const surveyLinkParams = new URLSearchParams({
+    embed: isEmbed.toString(),
+    compact: (compact ?? true).toString(),
+    lang: locale ?? "en-us",
+    showmultilingual: (showMultiLingual ?? false).toString()
+  });
+  return `${surveyInviteLink}&${surveyLinkParams.toString()}`;
 };
 const PostChatSurveyPaneStateful = props => {
   var _props$styleProps, _state$appStates, _props$controlProps;
@@ -54,6 +56,20 @@ const PostChatSurveyPaneStateful = props => {
     surveyURL: ((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.surveyURL) ?? surveyInviteLink,
     ...props.controlProps
   };
+  if (controlProps.surveyURL) {
+    if (!(0, _isValidSurveyUrl.default)(controlProps.surveyURL)) {
+      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.PostChatSurveyUrlValidationFailed,
+        Description: `${controlProps.surveyURL} is not a valid Survey URL`
+      });
+      controlProps.surveyURL = "";
+    } else {
+      _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.PostChatSurveyUrlValidationCompleted,
+        Description: `${controlProps.surveyURL} is a valid Survey URL`
+      });
+    }
+  }
 
   // Move focus to the first button
   (0, _react.useEffect)(() => {
@@ -77,12 +93,17 @@ const PostChatSurveyPaneStateful = props => {
           Event: _TelemetryConstants.TelemetryEvent.CustomerVoiceResponsePageLoaded
         });
       } else if (data === _CustomerVoiceEvents.CustomerVoiceEvents.FormResponseSubmitted) {
-        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-          Event: _TelemetryConstants.TelemetryEvent.CustomerVoiceFormResponseSubmitted
+        _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.CustomerVoiceFormResponseSubmitted,
+          Description: "Customer Voice form response submitted."
         });
       } else if (data === _CustomerVoiceEvents.CustomerVoiceEvents.FormResponseError) {
-        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
-          Event: _TelemetryConstants.TelemetryEvent.CustomerVoiceFormResponseError
+        _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.ERROR, {
+          Event: _TelemetryConstants.TelemetryEvent.CustomerVoiceFormResponseError,
+          Description: "Customer Voice form response error.",
+          ExceptionDetails: {
+            message: "Customer Voice form response error."
+          }
         });
       }
     });

package/lib/cjs/components/postchatsurveypanestateful/common/isValidSurveyUrl.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _utils = require("../../../common/utils");
+const validRootDomains = ["microsoft.com", "microsoft.us", "appsplatform.us", "powervirtualagents.cn"];
+const isValidSurveyUrl = url => {
+  if ((0, _utils.isNullOrEmptyString)(url)) {
+    return false;
+  }
+  try {
+    const objectUrl = new URL(url);
+    if (!objectUrl.origin || objectUrl.origin === "null") {
+      return false;
+    }
+    const validDomain = validRootDomains.find(domain => objectUrl.origin.endsWith(domain));
+    if (validDomain) {
+      return true;
+    }
+  } catch (error) {
+    return false;
+  }
+  return false;
+};
+var _default = isValidSurveyUrl;
+exports.default = _default;

package/lib/cjs/components/prechatsurveypanestateful/PreChatSurveyPaneStateful.js

@@ -26,8 +26,9 @@ const PreChatSurveyPaneStateful = props => {
   var _surveyProps$stylePro, _props$surveyProps, _props$surveyProps$co;
   (0, _react.useEffect)(() => {
     uiTimer = (0, _utils.createTimer)();
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXPrechatPaneStart
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXPrechatPaneStart,
+      Description: "Prechat survey pane loading started."
     });
   }, []);
 
@@ -76,8 +77,9 @@ const PreChatSurveyPaneStateful = props => {
     payload: getAdaptiveCardPayload(state.domainStates.preChatSurveyResponse, requiredFieldMissingMessage),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     onSubmit: async values => {
-      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-        Event: _TelemetryConstants.TelemetryEvent.PrechatSubmitted
+      _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.PrechatSubmitCompleted,
+        Description: "Prechat survey submitted."
       });
       dispatch({
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
@@ -148,9 +150,10 @@ const PreChatSurveyPaneStateful = props => {
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.PrechatSurveyLoaded
     });
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.UXPrechatPaneCompleted,
-      ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
+      ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed,
+      Description: "Prechat survey pane loading completed."
     });
   }, []);
 

package/lib/cjs/components/proactivechatpanestateful/ProactiveChatPaneStateful.js

@@ -24,8 +24,9 @@ const ProactiveChatPaneStateful = props => {
   var _proactiveChatProps$c;
   (0, _react.useEffect)(() => {
     uiTimer = (0, _utils.createTimer)();
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXProactiveChatPaneStart
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXProactiveChatPaneStart,
+      Description: "Proactive chat pane loading started."
     });
   }, []);
   const [state, dispatch] = (0, _useChatContextStore.default)();
@@ -50,8 +51,8 @@ const ProactiveChatPaneStateful = props => {
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: _ConversationState.ConversationState.Closed
       });
-      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-        Event: _TelemetryConstants.TelemetryEvent.ProactiveChatRejected,
+      _TelemetryHelper.TelemetryHelper.logActionEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.ProactiveChatTimeOutCompleted,
         ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers.LcwLoadToChatButtonTimer.milliSecondsElapsed,
         Description: "Proactive chat invitation timed out."
       });
@@ -129,9 +130,10 @@ const ProactiveChatPaneStateful = props => {
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
       Event: _TelemetryConstants.TelemetryEvent.ProactiveChatPaneLoaded
     });
-    _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.UXProactiveChatCompleted,
-      ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
+    _TelemetryHelper.TelemetryHelper.logLoadingEventToAllTelemetry(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.UXProactiveChatPaneCompleted,
+      ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed,
+      Description: "Proactive chat pane loading completed."
     });
     return () => {
       clearTimeout(timeoutEvent);

package/lib/cjs/components/webchatcontainerstateful/WebChatContainerStateful.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.WebChatContainerStateful = void 0;
+var _Constants = require("../../common/Constants");
 var _react = require("@fluentui/react");
 var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 var _react2 = _interopRequireWildcard(require("react"));
 var _utils = require("../../common/utils");
 var _BotMagicCodeStore = require("./webchatcontroller/BotMagicCodeStore");
 var _botframeworkWebchat = require("botframework-webchat");
-var _Constants = require("../../common/Constants");
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
 var _NotificationHandler = require("./webchatcontroller/notification/NotificationHandler");
 var _NotificationScenarios = require("./webchatcontroller/enums/NotificationScenarios");
@@ -56,7 +56,7 @@ const createMagicCodeSuccessResponse = signin => {
   };
 };
 const WebChatContainerStateful = props => {
-  var _webChatContainerProp, _webChatContainerProp2, _webChatContainerProp3, _webChatContainerProp4, _webChatContainerProp5, _webChatContainerProp6, _webChatContainerProp7, _props$webChatContain5, _props$webChatContain6, _defaultWebChatContai, _props$webChatContain7, _props$webChatContain8, _defaultWebChatContai2, _webChatContainerProp8, _webChatContainerProp9, _webChatContainerProp10, _webChatContainerProp11, _webChatContainerProp12, _webChatContainerProp13, _webChatContainerProp14, _webChatContainerProp15, _props$webChatContain9, _props$webChatContain10;
+  var _webChatContainerProp, _webChatContainerProp2, _webChatContainerProp3, _webChatContainerProp4, _webChatContainerProp5, _webChatContainerProp6, _webChatContainerProp7, _props$webChatContain5, _props$webChatContain6, _defaultWebChatContai, _props$webChatContain7, _props$webChatContain8, _defaultWebChatContai2, _webChatContainerProp8, _webChatContainerProp9, _webChatContainerProp10, _webChatContainerProp11, _webChatContainerProp12, _webChatContainerProp13, _webChatContainerProp14, _webChatContainerProp15, _webChatContainerProp16, _props$webChatContain9, _props$webChatContain10;
   (0, _react2.useEffect)(() => {
     uiTimer = (0, _utils.createTimer)();
     _TelemetryHelper.TelemetryHelper.logLoadingEvent(_TelemetryConstants.LogLevel.INFO, {
@@ -241,8 +241,9 @@ const WebChatContainerStateful = props => {
             color: ${(webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : (_webChatContainerProp14 = webChatContainerProps.renderingMiddlewareProps) === null || _webChatContainerProp14 === void 0 ? void 0 : (_webChatContainerProp15 = _webChatContainerProp14.sentMessageAnchorStyles) === null || _webChatContainerProp15 === void 0 ? void 0 : _webChatContainerProp15.color) ?? (_defaultSentMessageAnchorStyles.defaultSentMessageAnchorStyles === null || _defaultSentMessageAnchorStyles.defaultSentMessageAnchorStyles === void 0 ? void 0 : _defaultSentMessageAnchorStyles.defaultSentMessageAnchorStyles.color)};
         }
 
+        // we had a nasty bug long time ago with crashing borders messing with the sendbox, so if customer adds this value, they need to deal with that
         .webchat__bubble:not(.webchat__bubble--from-user) .webchat__bubble__content {
-            border-radius: 0 !important; /* Override border-radius */
+            border-radius: ${(webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : (_webChatContainerProp16 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp16 === void 0 ? void 0 : _webChatContainerProp16.bubbleBorderRadius) ?? 0} !important; /* Override border-radius */
         }
 
         .webchat__stacked-layout_container>div {