@microsoft/omnichannel-chat-widget 0.1.0-main.86df755 → 0.1.0-main.cf54410

package/lib/cjs/common/Constants.js

@@ -41,6 +41,8 @@ _defineProperty(Constants, "false", "false");
 
 _defineProperty(Constants, "maximumUnreadMessageCount", 99);
 
+_defineProperty(Constants, "widgetStateDataKey", "LcwChatWidgetState");
+
 _defineProperty(Constants, "channelIdKey", "ChannelId-");
 
 _defineProperty(Constants, "ChannelId", "lcw");

package/lib/cjs/common/contextDataStore/DataStoreManager.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DataStoreManager = void 0;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+class DataStoreManager {}
+
+exports.DataStoreManager = DataStoreManager;
+
+_defineProperty(DataStoreManager, "clientDataStore", void 0);

package/lib/cjs/common/interfaces/IContextDataStore.js

@@ -0,0 +1 @@
+"use strict";

package/lib/cjs/common/telemetry/TelemetryConstants.js

@@ -123,6 +123,7 @@ exports.TelemetryEvent = TelemetryEvent;
   TelemetryEvent["ReconnectChatContinueConversation"] = "ReconnectChatContinueConversation";
   TelemetryEvent["ReconnectChatStartNewConversation"] = "ReconnectChatStartNewConversation";
   TelemetryEvent["ReconnectChatMinimize"] = "ReconnectChatMinimize";
+  TelemetryEvent["ChatWidgetStateChanged"] = "ChatWidgetStateChanged";
 })(TelemetryEvent || (exports.TelemetryEvent = TelemetryEvent = {}));
 
 class TelemetryConstants {

package/lib/cjs/common/telemetry/TelemetryHelper.js

@@ -109,6 +109,8 @@ class TelemetryHelper {
   static conformToLoadContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
+      var _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13;
+
       event.Event = payload.Event;
       event.ResourcePath = payload.ResourcePath;
       event.WidgetState = payload.WidgetState;
@@ -116,16 +118,19 @@ class TelemetryHelper {
       event.ChatType = payload.ChatType;
       event.ElapsedTimeInMilliseconds = payload.ElapsedTimeInMilliseconds;
       event.ExceptionDetails = JSON.stringify(payload.ExceptionDetails);
+      event.OCChatSDKVersion = ((_TelemetryManager$Int11 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.OCChatSDKVersion) ?? "";
+      event.OCChatWidgetVersion = ((_TelemetryManager$Int12 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : _TelemetryManager$Int12.chatWidgetVersion) ?? "";
+      event.OCChatComponentsVersion = ((_TelemetryManager$Int13 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.chatComponentVersion) ?? "";
     });
   }
 
   static conformToIC3ClientContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
-      var _TelemetryManager$Int11;
+      var _TelemetryManager$Int14;
 
       event.Event = payload.Event;
-      event.IC3ClientVersion = (_TelemetryManager$Int11 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.IC3ClientVersion;
+      event.IC3ClientVersion = (_TelemetryManager$Int14 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : _TelemetryManager$Int14.IC3ClientVersion;
       event.SubscriptionId = payload.SubscriptionId;
       event.EndpointUrl = payload.EndpointUrl;
       event.EndpointId = payload.EndpointId;
@@ -249,14 +254,14 @@ _defineProperty(TelemetryHelper, "logActionEvent", (logLevel, payload) => {
 });
 
 _defineProperty(TelemetryHelper, "logSDKEvent", (logLevel, payload) => {
-  var _TelemetryManager$Int12;
+  var _TelemetryManager$Int15;
 
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
     payload: { ...payload,
       TransactionId: (0, _utils.newGuid)(),
-      RequestId: (_TelemetryManager$Int12 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : _TelemetryManager$Int12.currentRequestId
+      RequestId: (_TelemetryManager$Int15 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.currentRequestId
     }
   };
 

package/lib/cjs/common/telemetry/TelemetryManager.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TelemetryTimers = exports.TelemetryManager = exports.RegisterLoggers = void 0;
+exports.disposeLoggers = exports.TelemetryTimers = exports.TelemetryManager = exports.RegisterLoggers = void 0;
 
 var _TelemetryConstants = require("./TelemetryConstants");
 
@@ -31,15 +31,23 @@ exports.TelemetryManager = TelemetryManager;
 
 _defineProperty(TelemetryManager, "InternalTelemetryData", void 0);
 
-const RegisterLoggers = () => {
-  const loggers = [];
+const loggers = [];
+
+const disposeLoggers = () => {
+  loggers.map(logger => {
+    logger.dispose();
+  });
+};
 
+exports.disposeLoggers = disposeLoggers;
+
+const RegisterLoggers = () => {
   const registerLoggers = () => {
     var _TelemetryManager$Int, _TelemetryManager$Int2, _TelemetryManager$Int3, _TelemetryManager$Int4, _TelemetryManager$Int5, _TelemetryManager$Int6, _TelemetryManager$Int7, _TelemetryManager$Int8;
 
     if (!((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int !== void 0 && (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) !== null && _TelemetryManager$Int2 !== void 0 && _TelemetryManager$Int2.disableConsoleLog) || !((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int3 !== void 0 && (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) !== null && _TelemetryManager$Int4 !== void 0 && _TelemetryManager$Int4.telemetryDisabled)) {
       _omnichannelChatComponents.BroadcastService.getAnyMessage().subscribe(event => {
-        if (event.payload) {
+        if (event.payload && event.eventName !== _TelemetryConstants.TelemetryEvent.ChatWidgetStateChanged) {
           logTelemetry(event);
         }
       });

package/lib/cjs/common/telemetry/defaultConfigs/defaultAriaConfig.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultAriaConfig = void 0;
 const defaultAriaConfig = {
-  collectorUriForTelemetry: "https://browser.pipe.aria.microsoft.com/Collector/3.0/",
-  ariaTelemetryKey: "1574efd98545488983328fac0c9bcb59-45c2ff50-ebcc-473d-949d-e3134ef2189e-6906",
-  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Sandbox",
+  collectorUriForTelemetry: "",
+  ariaTelemetryKey: "c7655518acf1403f93ff6b9f77942f0a-d01a02fd-6b50-4de3-a566-62eda11f93bc-7083",
+  ariaTelemetryApplicationName: "",
   disableCookieUsage: true
 };
 exports.defaultAriaConfig = defaultAriaConfig;

package/lib/cjs/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -32,7 +32,15 @@ const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUr
         configuration.collectorUri = collectiorUriForTelemetry;
       }
 
-      _logger = _AWTLogManager.default.initialize(ariaTelemetryKey, configuration);
+      try {
+        _logger = _AWTLogManager.default.initialize(ariaTelemetryKey, configuration);
+
+        if (_logger === undefined) {
+          _logger = _AWTLogManager.default.getLogger(ariaTelemetryKey);
+        }
+      } catch (error) {
+        console.log(error);
+      }
     }
 
     return _logger;
@@ -54,6 +62,11 @@ const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUr
 
       eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, _Constants.Constants.LiveChatWidget, _Enums.AWTPiiKind.GenericData);
       logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+    },
+    dispose: () => {
+      _AWTLogManager.default.flush(function () {
+        console.log("Aria logger disposed");
+      });
     }
   };
   return ariaLogger;

package/lib/cjs/common/telemetry/loggers/consoleLogger.js

@@ -39,6 +39,9 @@ const consoleLogger = () => {
       } catch (ex) {
         console.error("An unexpected error occurred in the Telemetry client: " + ex);
       }
+    },
+    dispose: () => {
+      console.log("disposing loggers");
     }
   };
   return consoleLogger;

package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js

@@ -98,7 +98,14 @@ const ChatButtonStateful = props => {
       ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers.LcwLoadToChatButtonTimer.milliSecondsElapsed
     });
 
-    (0, _utils.setFocusOnElement)(document.getElementById((controlProps === null || controlProps === void 0 ? void 0 : controlProps.id) ?? "oc-lcw-chat-button"));
+    if (state.uiStates.focusChatButton) {
+      (0, _utils.setFocusOnElement)(document.getElementById((controlProps === null || controlProps === void 0 ? void 0 : controlProps.id) ?? "oc-lcw-chat-button"));
+    } else {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_FOCUS_CHAT_BUTTON,
+        payload: true
+      });
+    }
   }, []);
   return /*#__PURE__*/_react.default.createElement(_omnichannelChatComponents.ChatButton, {
     componentOverrides: buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.componentOverrides,

package/lib/cjs/components/confirmationpanestateful/ConfirmationPaneStateful.js

@@ -13,10 +13,6 @@ var _utils = require("../../common/utils");
 
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
-var _Constants = require("../../common/Constants");
-
-var _ConversationState = require("../../contexts/common/ConversationState");
-
 var _DimLayer = require("../dimlayer/DimLayer");
 
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
@@ -35,6 +31,8 @@ var _useChatContextStore = _interopRequireDefault(require("../../hooks/useChatCo
 
 var _useChatSDKStore = _interopRequireDefault(require("../../hooks/useChatSDKStore"));
 
+var _Constants = require("../../common/Constants");
+
 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); }
@@ -46,14 +44,14 @@ const ConfirmationPaneStateful = props => {
   var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4;
 
   const initialTabIndexMap = new Map();
-  let elements = [];
+  let elements = []; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+  const chatSDK = (0, _useChatSDKStore.default)();
   const [state, dispatch] = (0, _useChatContextStore.default)();
   const {
-    setPostChatContext,
     endChat
   } = props; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-  const chatSDK = (0, _useChatSDKStore.default)(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
   const [adapter] = (0, _useChatAdapterStore.default)();
   const isPostChatEnabled = (_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.msdyn_postconversationsurveyenable;
@@ -73,26 +71,15 @@ const ConfirmationPaneStateful = props => {
       });
 
       try {
-        //ToDo: End Chat before PostChat Context and conversation Details is set once the getPostChatContext request ID fetch issue is fixed
-        const conversationDetails = await chatSDK.getConversationDetails(); // ToDo: Replace with CanRenderPostChat once available in conversationDetails API response 
+        // check agent has joined conversation
+        const conversationDetails = await chatSDK.getConversationDetails();
 
         if (isPostChatEnabled === "true" && postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed && conversationDetails.canRenderPostChat === _Constants.Constants.truePascal) {
-          dispatch({
-            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
-            payload: true
-          });
-          dispatch({
-            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: _ConversationState.ConversationState.Loading
-          });
-          await setPostChatContext();
-
-          if (state.domainStates.postChatContext) {
-            dispatch({
-              type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-              payload: _ConversationState.ConversationState.Postchat
-            });
-          }
+          const loadPostChatEvent = {
+            eventName: "LoadPostChatSurvey"
+          };
+
+          _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
         } else {
           (0, _utils.setTabIndices)(elements, initialTabIndexMap, true);
 

package/lib/cjs/components/livechatwidget/common/defaultProps/dummyDefaultProps.js

@@ -150,7 +150,7 @@ const dummyDefaultProps = {
           id: "oc-lcw-CurrentCall-timer",
           showHours: false,
           timerStyles: {
-            color: "white",
+            color: "#FFFFFF",
             textAlign: "center",
             backgroundColor: "#3d3c3c",
             height: "45px",
@@ -181,8 +181,8 @@ const dummyDefaultProps = {
         },
         audioCallButtonStyleProps: {
           borderRadius: "50%",
-          color: "white",
-          backgroundColor: "green",
+          color: "#FFFFFF",
+          backgroundColor: "#008000",
           lineHeight: "40px",
           height: "40px",
           width: "40px",
@@ -193,8 +193,8 @@ const dummyDefaultProps = {
         },
         videoCallButtonStyleProps: {
           borderRadius: "50%",
-          color: "white",
-          backgroundColor: "green",
+          color: "#FFFFFF",
+          backgroundColor: "#008000",
           lineHeight: "40px",
           height: "40px",
           width: "40px",
@@ -209,8 +209,8 @@ const dummyDefaultProps = {
         },
         declineCallButtonStyleProps: {
           borderRadius: "50%",
-          color: "white",
-          backgroundColor: "red",
+          color: "#FFFFFF",
+          backgroundColor: "#DC0000",
           lineHeight: "40px",
           height: "40px",
           width: "40px",
@@ -219,12 +219,12 @@ const dummyDefaultProps = {
         },
         incomingCallTitleStyleProps: {
           margin: "0 5px",
-          color: "white",
+          color: "#FFFFFF",
           fontSize: 12,
           fontFamily: "Segoe UI, Arial, sans-serif"
         },
         itemFocusStyleProps: {
-          outline: "2px solid white"
+          outline: "2px solid #FFFFFF"
         }
       },
       currentCallStyleProps: {
@@ -236,7 +236,7 @@ const dummyDefaultProps = {
         },
         micButtonStyleProps: {
           borderRadius: "2px",
-          color: "white",
+          color: "#FFFFFF",
           backgroundColor: "#3d3c3c",
           height: "45px",
           width: "50px",
@@ -247,7 +247,7 @@ const dummyDefaultProps = {
         },
         videoOffButtonStyleProps: {
           borderRadius: "2px",
-          color: "white",
+          color: "#FFFFFF",
           backgroundColor: "#3d3c3c",
           height: "45px",
           width: "50px",
@@ -261,8 +261,8 @@ const dummyDefaultProps = {
         },
         endCallButtonStyleProps: {
           borderRadius: "2px",
-          color: "white",
-          backgroundColor: "red",
+          color: "#FFFFFF",
+          backgroundColor: "#DC0000",
           lineHeight: "50px",
           height: "45px",
           width: "50px",
@@ -271,7 +271,7 @@ const dummyDefaultProps = {
         currentCallTimerStyleProps: {
           borderRadius: "2px",
           margin: "1px",
-          color: "white",
+          color: "#FFFFFF",
           paddingTop: "18px",
           fontSize: 12,
           fontFamily: "Segoe UI, Arial, sans-serif",
@@ -493,7 +493,7 @@ const dummyDefaultProps = {
     },
     styleProps: {
       generalStyleProps: {
-        backgroundColor: "white",
+        backgroundColor: "#FFFFFF",
         borderRadius: "2px",
         color: "black",
         fontFamily: "Segoe UI, Arial, sans-serif",
@@ -535,7 +535,7 @@ const dummyDefaultProps = {
       },
       confirmButtonStyleProps: {
         backgroundColor: "rgba(9,72,159,1)",
-        color: "white",
+        color: "#FFFFFF",
         fontFamily: "Segoe UI, Arial, sans-serif",
         fontSize: "14px",
         fontWeight: "500",
@@ -549,7 +549,7 @@ const dummyDefaultProps = {
         border: "2px dotted #000"
       },
       cancelButtonStyleProps: {
-        backgroundColor: "white",
+        backgroundColor: "#FFFFFF",
         fontFamily: "Segoe UI, Arial, sans-serif",
         fontSize: "14px",
         fontWeight: "500",
@@ -934,16 +934,16 @@ const dummyDefaultProps = {
         fontSize: 16,
         fontFamily: "Segoe UI, Arial, sans-serif",
         fontWeight: "450",
-        color: "white",
+        color: "#FFFFFF",
         padding: "3px 0"
       },
       minimizeButtonStyleProps: {
-        color: "white",
+        color: "#FFFFFF",
         margin: "5px 0",
         fontSize: "12px"
       },
       closeButtonStyleProps: {
-        color: "white",
+        color: "#FFFFFF",
         margin: "5px 0",
         fontSize: "12px"
       },
@@ -1105,7 +1105,7 @@ const dummyDefaultProps = {
       titleStyleProps: {
         // ...[Existing chat button title style props]
         margin: "0 0 0 10px",
-        color: "White"
+        color: "#FFFFFF"
       }
     }
   },
@@ -1471,7 +1471,7 @@ const dummyDefaultProps = {
       bubbleBackground: "#315FA2",
       bubbleBorderRadius: 4,
       bubbleBorderWidth: 0,
-      bubbleFromUserBackground: "White",
+      bubbleFromUserBackground: "#FFFFFF",
       bubbleFromUserBorderRadius: 4,
       bubbleFromUserBorderWidth: 1,
       bubbleFromUserTextColor: "Black",
@@ -1479,7 +1479,7 @@ const dummyDefaultProps = {
       bubbleMaxWidth: 250,
       bubbleMinHeight: 34,
       bubbleMinWidth: 20,
-      bubbleTextColor: "White",
+      bubbleTextColor: "#FFFFFF",
       hideSendBox: false,
       hideUploadButton: true,
       primaryFont: "Segoe UI, Arial, sans-serif",
@@ -1488,7 +1488,7 @@ const dummyDefaultProps = {
       sendBoxTextWrap: true,
       sendBoxHeight: 60,
       sendBoxMaxHeight: 96,
-      sendBoxBackground: "White",
+      sendBoxBackground: "#FFFFFF",
       showAvatarInGroup: true,
       suggestedActionsStackedHeight: 125,
       suggestedActionsStackedOverflow: "scroll",
@@ -1599,7 +1599,7 @@ const dummyDefaultProps = {
         fontWeight: 600,
         fontSize: "13px",
         lineHeight: "18px",
-        color: "white",
+        color: "#FFFFFF",
         paddingTop: "7px",
         WebkitUserSelect: "none",
         MozUserSelect: "none",
@@ -1703,6 +1703,7 @@ const dummyDefaultProps = {
       PRECHAT_REQUIRED_FIELD_MISSING_MESSAGE: "{0} field is required",
       MARKDOWN_EXTERNAL_LINK_ALT: "Opens in a new window; external."
     }
-  }
+  },
+  telemetryConfig: undefined
 };
 exports.dummyDefaultProps = dummyDefaultProps;

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.disposeTelemetryLoggers = void 0;
+
+var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
+
+const disposeTelemetryLoggers = () => {
+  (0, _TelemetryManager.disposeLoggers)();
+};
+
+exports.disposeTelemetryLoggers = disposeTelemetryLoggers;

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

@@ -43,6 +43,10 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Closed
     });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
+      payload: false
+    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_RECONNECT_ID,
       payload: undefined
@@ -55,6 +59,10 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
       payload: undefined
     });
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+      payload: undefined
+    });
 
     _omnichannelChatComponents.BroadcastService.postMessage({
       eventName: "EndChat"

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

@@ -7,8 +7,6 @@ exports.initWebChatComposer = void 0;
 
 var _botframeworkWebchat = require("botframework-webchat");
 
-var _ConversationState = require("../../../contexts/common/ConversationState");
-
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
 var _PostChatSurveyMode = require("../../postchatsurveypanestateful/enums/PostChatSurveyMode");
@@ -55,7 +53,7 @@ var _preProcessingMiddleware = _interopRequireDefault(require("../../webchatcont
 
 var _sanitizationMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware"));
 
-var _setPostChatContextAndLoadSurvey = require("./setPostChatContextAndLoadSurvey");
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -89,15 +87,16 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
       }
 
       if (isPostChatEnabled === "true" && postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+        const loadPostChatEvent = {
+          eventName: "LoadPostChatSurvey"
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
+      } else {
         dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
           payload: true
         });
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: _ConversationState.ConversationState.Loading
-        });
-        await (0, _setPostChatContextAndLoadSurvey.setPostChatContextAndLoadSurvey)(chatSDK, dispatch, true);
       }
 
       dispatch({

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

@@ -17,13 +17,21 @@ var _defaultTelemetryInternalData = require("../../../common/telemetry/defaultCo
 
 var _defaultTelemetryConfiguration = require("../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration");
 
-var _package = _interopRequireDefault(require("@microsoft/omnichannel-chat-sdk/package.json"));
+var _package = require("@microsoft/omnichannel-chat-components/package.json");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _package2 = require("@microsoft/omnichannel-chat-sdk/package.json");
 
 const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
 
+  let widgetPackageInfo;
+
+  try {
+    widgetPackageInfo = require("@microsoft/omnichannel-chat-widget/package.json");
+  } catch (error) {
+    widgetPackageInfo = "0.0.0-0";
+  }
+
   const telemetryConfig = { ..._defaultTelemetryConfiguration.defaultTelemetryConfiguration,
     ...props.telemetryConfig
   };
@@ -33,6 +41,8 @@ const registerTelemetryLoggers = (props, dispatch) => {
 
     _TelemetryManager.TelemetryManager.InternalTelemetryData = (_props$liveChatContex3 = props.liveChatContextFromCache) === null || _props$liveChatContex3 === void 0 ? void 0 : (_props$liveChatContex4 = _props$liveChatContex3.domainStates) === null || _props$liveChatContex4 === void 0 ? void 0 : _props$liveChatContex4.telemetryInternalData;
   } else {
+    var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic, _props$chatSDK3, _props$chatSDK3$omnic;
+
     let telemetryData = { ..._defaultTelemetryInternalData.defaultInternalTelemetryData,
       telemetryConfig: Object.assign({}, _defaultTelemetryConfiguration.defaultTelemetryConfiguration, telemetryConfig),
       ariaConfig: Object.assign({}, _defaultAriaConfig.defaultAriaConfig, telemetryConfig === null || telemetryConfig === void 0 ? void 0 : telemetryConfig.ariaConfigurations)
@@ -43,7 +53,12 @@ const registerTelemetryLoggers = (props, dispatch) => {
     }
 
     telemetryData = _TelemetryHelper.TelemetryHelper.addWidgetDataToTelemetry(telemetryConfig, telemetryData);
-    telemetryData.OCChatSDKVersion = _package.default.version;
+    telemetryData.OCChatSDKVersion = _package2.version;
+    telemetryData.chatComponentVersion = _package.version;
+    telemetryData.chatWidgetVersion = widgetPackageInfo;
+    telemetryData.orgId = (_props$chatSDK = props.chatSDK) === null || _props$chatSDK === void 0 ? void 0 : (_props$chatSDK$omnich = _props$chatSDK.omnichannelConfig) === null || _props$chatSDK$omnich === void 0 ? void 0 : _props$chatSDK$omnich.orgId;
+    telemetryData.widgetId = (_props$chatSDK2 = props.chatSDK) === null || _props$chatSDK2 === void 0 ? void 0 : (_props$chatSDK2$omnic = _props$chatSDK2.omnichannelConfig) === null || _props$chatSDK2$omnic === void 0 ? void 0 : _props$chatSDK2$omnic.widgetId;
+    telemetryData.orgUrl = (_props$chatSDK3 = props.chatSDK) === null || _props$chatSDK3 === void 0 ? void 0 : (_props$chatSDK3$omnic = _props$chatSDK3.omnichannelConfig) === null || _props$chatSDK3$omnic === void 0 ? void 0 : _props$chatSDK3$omnic.orgUrl;
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData

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

@@ -13,21 +13,25 @@ var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 
 var _ConversationState = require("../../../contexts/common/ConversationState");
 
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) => {
+const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const context = await chatSDK.getPostChatSurveyContext();
-
-    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallSucceed,
-      Description: "Postchat context call succeed."
-    });
-
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
-      payload: context
-    });
+    if (!persistedChat) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const context = await chatSDK.getPostChatSurveyContext();
+
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallSucceed,
+        Description: "Postchat context call succeed."
+      });
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_POST_CHAT_CONTEXT,
+        payload: context
+      });
+    }
   } catch (ex) {
     _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
       Event: _TelemetryConstants.TelemetryEvent.PostChatContextCallFailed,
@@ -36,20 +40,17 @@ const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, loadSurvey) =>
       }
     });
   }
-  /* -true:   setPostChatContextAndLoadSurvey is called after passing all checks from ConfirmationPane and endChatMiddleware in usual scenario.
-     -false:  Below if condition is needed for multi-tab scenarios. So when agent ends a chat and customer has opened chat in multiple tabs,  
-              all tabs should show post chat survey as per existing functionality. But when an agent end a conversation, Omnichannel SDK 
-              getPostChatSurveyContext returns as invalid conversation. To avoid that, caching the survey url is needed after chat starts and 
-              in this case loadSurvey is false 
-  */
 
-
-  if (loadSurvey) {
+  _omnichannelChatComponents.BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
+    dispatch({
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+      payload: _ConversationState.ConversationState.Loading
+    });
     dispatch({
       type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: _ConversationState.ConversationState.Postchat
     });
-  }
+  });
 };
 
 exports.setPostChatContextAndLoadSurvey = setPostChatContextAndLoadSurvey;