@microsoft/omnichannel-chat-widget 0.1.0-main.07f52ee → 0.1.0-main.20562ae

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

@@ -1,6 +1,10 @@
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { createStore } from "botframework-webchat";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import attachmentProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware";
 import { changeLanguageCodeFormatForWebChat } from "../../../common/utils";
@@ -21,9 +25,8 @@ import gifUploadMiddleware from "../../webchatcontainerstateful/webchatcontrolle
 import htmlPlayerMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlPlayerMiddleware";
 import htmlTextMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware";
 import preProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware";
-import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware";
-import { BroadcastService } from "@microsoft/omnichannel-chat-components";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles) => {
   var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4, _state$domainStates$l8, _state$domainStates$l9, _props$webChatContain7, _props$webChatContain8, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain11, _props$webChatContain12, _defaultWebChatContai, _props$webChatContain13, _props$webChatContain14, _props$webChatContain15, _props$webChatContain16, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain17, _props$webChatContain18, _defaultWebChatContai2, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai3, _props$webChatContain21;
 
@@ -44,6 +47,11 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
     const conversationEndCallback = async () => {
       var _props$webChatContain4, _props$webChatContain5;
 
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.ConversationEndedThreadEventReceived,
+        Description: "Conversation is ended by agent side or by timeout."
+      });
+
       if ((props === null || props === void 0 ? void 0 : (_props$webChatContain4 = props.webChatContainerProps) === null || _props$webChatContain4 === void 0 ? void 0 : (_props$webChatContain5 = _props$webChatContain4.renderingMiddlewareProps) === null || _props$webChatContain5 === void 0 ? void 0 : _props$webChatContain5.hideSendboxOnConversationEnd) !== false) {
         setWebChatStyles(styles => {
           return { ...styles,
@@ -52,11 +60,18 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
         });
       }
 
-      if (isPostChatEnabled === "true" && postChatSurveyMode === PostChatSurveyMode.Embed) {
-        const loadPostChatEvent = {
-          eventName: "LoadPostChatSurvey"
-        };
-        BroadcastService.postMessage(loadPostChatEvent);
+      if (isPostChatEnabled === "true") {
+        if (postChatSurveyMode === PostChatSurveyMode.Embed) {
+          const loadPostChatEvent = {
+            eventName: BroadcastEvent.LoadPostChatSurvey
+          };
+          BroadcastService.postMessage(loadPostChatEvent);
+        } else if (postChatSurveyMode === PostChatSurveyMode.Link) {
+          dispatch({
+            type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+            payload: ConversationState.InActive
+          });
+        }
       } else {
         dispatch({
           type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,

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

@@ -1,11 +1,11 @@
-import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { RegisterLoggers, TelemetryManager } from "../../../common/telemetry/TelemetryManager";
+import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { version as chatComponentVersion } from "@microsoft/omnichannel-chat-components/package.json";
+import { version as chatSdkVersion } from "@microsoft/omnichannel-chat-sdk/package.json";
 import { defaultAriaConfig } from "../../../common/telemetry/defaultConfigs/defaultAriaConfig";
 import { defaultInternalTelemetryData } from "../../../common/telemetry/defaultConfigs/defaultTelemetryInternalData";
 import { defaultTelemetryConfiguration } from "../../../common/telemetry/defaultConfigs/defaultTelemetryConfiguration";
-import { version as chatComponentVersion } from "@microsoft/omnichannel-chat-components/package.json";
-import { version as chatSdkVersion } from "@microsoft/omnichannel-chat-sdk/package.json";
 export const registerTelemetryLoggers = (props, dispatch) => {
   var _props$liveChatContex, _props$liveChatContex2;
 
@@ -44,6 +44,7 @@ export const registerTelemetryLoggers = (props, dispatch) => {
     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;
+    TelemetryManager.InternalTelemetryData = telemetryData;
     dispatch({
       type: LiveChatWidgetActionType.SET_TELEMETRY_DATA,
       payload: telemetryData

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

@@ -1,9 +1,9 @@
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
-import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { ConversationState } from "../../../contexts/common/ConversationState";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { ConversationState } from "../../../contexts/common/ConversationState";
+import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persistedChat) => {
   try {
     if (!persistedChat) {
@@ -25,7 +25,8 @@ export const setPostChatContextAndLoadSurvey = async (chatSDK, dispatch, persist
         exception: ex
       }
     });
-  }
+  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 
   BroadcastService.getMessageByEventName("LoadPostChatSurvey").subscribe(msg => {
     dispatch({

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

@@ -8,6 +8,7 @@ import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcon
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import { createAdapter } from "./createAdapter";
+import { createOnNewAdapterActivityHandler } from "../../../plugins/newMessageEventHandler";
 import { createTimer } from "../../../common/utils";
 import { getReconnectIdForAuthenticatedChat } from "./reconnectChatHelper";
 import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
@@ -55,7 +56,7 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
 
 const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedState) => {
   try {
-    var _TelemetryTimers$Widg;
+    var _newAdapter$activity$, _TelemetryTimers$Widg;
 
     try {
       TelemetryTimers.WidgetLoadTimer = createTimer();
@@ -74,6 +75,8 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
 
     const newAdapter = await createAdapter(chatSDK);
     setAdapter(newAdapter);
+    const chatToken = await chatSDK.getChatToken();
+    newAdapter === null || newAdapter === void 0 ? void 0 : (_newAdapter$activity$ = newAdapter.activity$) === null || _newAdapter$activity$ === void 0 ? void 0 : _newAdapter$activity$.subscribe(createOnNewAdapterActivityHandler(chatToken === null || chatToken === void 0 ? void 0 : chatToken.chatId, chatToken === null || chatToken === void 0 ? void 0 : chatToken.visitorId));
 
     if (!persistedState) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/esm/components/livechatwidget/common/startProactiveChat.js

@@ -2,14 +2,14 @@ import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryCon
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
-import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager"; // Defines startProactiveChat callback
-
-export const startProactiveChat = (dispatch, bodyTitle, showPrechat, inNewWindow) => {
+import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
+// Defines startProactiveChat callback
+export const startProactiveChat = (dispatch, notificationConfig, enablePreChat, inNewWindow) => {
   dispatch({
     type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
     payload: {
-      proactiveChatBodyTitle: bodyTitle ?? "",
-      proactiveChatEnablePrechat: showPrechat ?? false,
+      proactiveChatBodyTitle: notificationConfig && notificationConfig.message ? notificationConfig.message : "",
+      proactiveChatEnablePrechat: enablePreChat ?? false,
       proactiveChatInNewWindow: inNewWindow ?? false
     }
   });

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

@@ -1,5 +1,6 @@
 function _extends() { _extends = Object.assign || 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); }
 
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { BroadcastService, decodeComponentString } from "@microsoft/omnichannel-chat-components";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
@@ -12,6 +13,7 @@ import ChatButtonStateful from "../../chatbuttonstateful/ChatButtonStateful";
 import { Components } from "botframework-webchat";
 import ConfirmationPaneStateful from "../../confirmationpanestateful/ConfirmationPaneStateful";
 import { ConversationState } from "../../../contexts/common/ConversationState";
+import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { ElementType } from "@microsoft/omnichannel-chat-components";
 import EmailTranscriptPaneStateful from "../../emailtranscriptpanestateful/EmailTranscriptPaneStateful";
 import HeaderStateful from "../../headerstateful/HeaderStateful";
@@ -23,12 +25,14 @@ import PostChatSurveyPaneStateful from "../../postchatsurveypanestateful/PostCha
 import PreChatSurveyPaneStateful from "../../prechatsurveypanestateful/PreChatSurveyPaneStateful";
 import ProactiveChatPaneStateful from "../../proactivechatpanestateful/ProactiveChatPaneStateful";
 import ReconnectChatPaneStateful from "../../reconnectchatpanestateful/ReconnectChatPaneStateful";
+import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import WebChatContainerStateful from "../../webchatcontainerstateful/WebChatContainerStateful";
 import { createFooter } from "../common/createFooter";
 import { createInternetConnectionChangeHandler } from "../common/createInternetConnectionChangeHandler";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
-import { endChat } from "../common/endChat";
+import { disposeTelemetryLoggers } from "../common/disposeTelemetryLoggers";
+import { endChat, prepareEndChat } from "../common/endChat";
 import { getGeneralStylesForButton } from "../common/getGeneralStylesForButton";
 import { initCallingSdk } from "../common/initCallingSdk";
 import { initConfirmationPropsComposer } from "../common/initConfirmationPropsComposer";
@@ -39,11 +43,8 @@ import { startProactiveChat } from "../common/startProactiveChat";
 import useChatAdapterStore from "../../../hooks/useChatAdapterStore";
 import useChatContextStore from "../../../hooks/useChatContextStore";
 import useChatSDKStore from "../../../hooks/useChatSDKStore";
-import { TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { disposeTelemetryLoggers } from "../common/disposeTelemetryLoggers";
-import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 export const LiveChatWidgetStateful = props => {
-  var _props$webChatContain, _props$styleProps, _props$controlProps, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps5, _props$componentOverr, _props$controlProps6, _props$componentOverr2, _props$controlProps7, _props$componentOverr3, _props$controlProps8, _props$componentOverr4, _props$controlProps9, _props$componentOverr5, _props$controlProps10, _props$componentOverr6, _props$controlProps11, _props$controlProps12, _props$controlProps13, _props$componentOverr7, _props$controlProps14, _props$componentOverr8, _props$controlProps15, _props$componentOverr9, _props$componentOverr10, _props$componentOverr11;
+  var _props$webChatContain, _props$styleProps, _props$controlProps, _props$webChatContain3, _props$webChatContain4, _props$styleProps2, _props$controlProps5, _props$componentOverr, _props$controlProps6, _props$componentOverr2, _props$controlProps7, _props$componentOverr3, _props$controlProps8, _props$componentOverr4, _props$controlProps9, _props$componentOverr5, _props$controlProps10, _props$componentOverr6, _props$controlProps11, _props$componentOverr7, _props$controlProps12, _props$controlProps13, _props$componentOverr8, _props$controlProps14, _props$componentOverr9, _props$controlProps15, _props$componentOverr10, _props$componentOverr11, _props$componentOverr12;
 
   const [state, dispatch] = useChatContextStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -57,7 +58,8 @@ export const LiveChatWidgetStateful = props => {
   const {
     Composer
   } = Components;
-  const canStartProactiveChat = useRef(true); // Process general styles
+  const canStartProactiveChat = useRef(true);
+  const canEndChat = useRef(true); // Process general styles
 
   const generalStyles = {
     root: Object.assign({}, getGeneralStylesForButton(state), (_props$styleProps = props.styleProps) === null || _props$styleProps === void 0 ? void 0 : _props$styleProps.generalStyles)
@@ -142,13 +144,54 @@ export const LiveChatWidgetStateful = props => {
   }, [state.appStates.skipChatButtonRendering]);
   useEffect(() => {
     BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.StartProactiveChatEventReceived,
+        Description: "Start proactive chat event received."
+      });
+
       if (canStartProactiveChat.current) {
         var _msg$payload, _msg$payload2, _msg$payload3;
 
-        startProactiveChat(dispatch, msg === null || msg === void 0 ? void 0 : (_msg$payload = msg.payload) === null || _msg$payload === void 0 ? void 0 : _msg$payload.bodyTitle, msg === null || msg === void 0 ? void 0 : (_msg$payload2 = msg.payload) === null || _msg$payload2 === void 0 ? void 0 : _msg$payload2.showPrechat, msg === null || msg === void 0 ? void 0 : (_msg$payload3 = msg.payload) === null || _msg$payload3 === void 0 ? void 0 : _msg$payload3.inNewWindow);
+        startProactiveChat(dispatch, msg === null || msg === void 0 ? void 0 : (_msg$payload = msg.payload) === null || _msg$payload === void 0 ? void 0 : _msg$payload.notificationConfig, msg === null || msg === void 0 ? void 0 : (_msg$payload2 = msg.payload) === null || _msg$payload2 === void 0 ? void 0 : _msg$payload2.enablePreChat, msg === null || msg === void 0 ? void 0 : (_msg$payload3 = msg.payload) === null || _msg$payload3 === void 0 ? void 0 : _msg$payload3.inNewWindow);
+      } else {
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.ChatAlreadyTriggered,
+          Description: "Start proactive chat method called, when chat was already triggered."
+        });
+      }
+    }); // start chat from SDK Event
+
+    BroadcastService.getMessageByEventName("StartChat").subscribe(() => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.StartChatEventRecevied,
+        Description: "Start chat event received."
+      });
+
+      if (state.appStates.isMinimized) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+      } else {
+        prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
+      }
+    }); // end chat from SDK Event
+
+    BroadcastService.getMessageByEventName("EndChat").subscribe(async () => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.EndChatEventReceived,
+        Description: "End chat event received."
+      });
+
+      if (canEndChat.current) {
+        prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
+      } else {
+        const skipEndChatSDK = true;
+        const skipCloseChat = false;
+        endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
       }
     });
-    window.addEventListener("beforeunload", event => {
+    window.addEventListener("beforeunload", () => {
       disposeTelemetryLoggers();
     });
 
@@ -158,11 +201,12 @@ export const LiveChatWidgetStateful = props => {
   }, []);
   useEffect(() => {
     canStartProactiveChat.current = state.appStates.conversationState === ConversationState.Closed;
+    canEndChat.current = state.appStates.conversationState === ConversationState.Active;
 
     if (state.appStates.conversationState === ConversationState.Active) {
       chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.onNewMessage(() => {
         BroadcastService.postMessage({
-          eventName: "NewMessageNotification"
+          eventName: BroadcastEvent.NewMessageNotification
         });
       });
     } // Track the message count
@@ -187,7 +231,7 @@ export const LiveChatWidgetStateful = props => {
     });
     const customEvent = {
       elementType: ElementType.Custom,
-      eventName: "UnreadMessageCount",
+      eventName: BroadcastEvent.UnreadMessageCount,
       payload: 0
     };
     BroadcastService.postMessage(customEvent);
@@ -197,7 +241,7 @@ export const LiveChatWidgetStateful = props => {
     if (state.appStates.isMinimized && state.appStates.unreadMessageCount > 0) {
       const customEvent = {
         elementType: ElementType.Custom,
-        eventName: "UnreadMessageCount",
+        eventName: BroadcastEvent.UnreadMessageCount,
         payload: `${state.appStates.unreadMessageCount}`
       };
       BroadcastService.postMessage(customEvent);
@@ -212,9 +256,13 @@ export const LiveChatWidgetStateful = props => {
   }, [(_props$webChatContain3 = props.webChatContainerProps) === null || _props$webChatContain3 === void 0 ? void 0 : _props$webChatContain3.webChatStyles]);
   const webChatProps = initWebChatComposer(props, chatSDK, state, dispatch, setWebChatStyles);
 
-  const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch);
+  const setPostChatContextRelay = () => setPostChatContextAndLoadSurvey(chatSDK, dispatch); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 
-  const endChatRelay = () => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+  const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat) => endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+  const prepareEndChatRelay = (adapter, state) => prepareEndChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state);
 
   const prepareStartChatRelay = () => prepareStartChat(props, chatSDK, state, dispatch, setAdapter); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -225,7 +273,7 @@ export const LiveChatWidgetStateful = props => {
 
   useEffect(() => {
     const chatWidgetStateChangeEvent = {
-      eventName: TelemetryEvent.ChatWidgetStateChanged,
+      eventName: BroadcastEvent.ChatWidgetStateChanged,
       payload: { ...state
       }
     };
@@ -252,14 +300,14 @@ export const LiveChatWidgetStateful = props => {
   })), !((_props$controlProps8 = props.controlProps) !== null && _props$controlProps8 !== void 0 && _props$controlProps8.hideLoadingPane) && shouldShowLoadingPane(state) && (decodeComponentString((_props$componentOverr4 = props.componentOverrides) === null || _props$componentOverr4 === void 0 ? void 0 : _props$componentOverr4.loadingPane) || /*#__PURE__*/React.createElement(LoadingPaneStateful, props.loadingPaneProps)), !((_props$controlProps9 = props.controlProps) !== null && _props$controlProps9 !== void 0 && _props$controlProps9.hideOutOfOfficeHoursPane) && shouldShowOutOfOfficeHoursPane(state) && (decodeComponentString((_props$componentOverr5 = props.componentOverrides) === null || _props$componentOverr5 === void 0 ? void 0 : _props$componentOverr5.outOfOfficeHoursPane) || /*#__PURE__*/React.createElement(OutOfOfficeHoursPaneStateful, props.outOfOfficeHoursPaneProps)), !((_props$controlProps10 = props.controlProps) !== null && _props$controlProps10 !== void 0 && _props$controlProps10.hideReconnectChatPane) && shouldShowReconnectChatPane(state) && (decodeComponentString((_props$componentOverr6 = props.componentOverrides) === null || _props$componentOverr6 === void 0 ? void 0 : _props$componentOverr6.reconnectChatPane) || /*#__PURE__*/React.createElement(ReconnectChatPaneStateful, {
     reconnectChatProps: props.reconnectChatPaneProps,
     initStartChat: initStartChatRelay
-  })), !((_props$controlProps11 = props.controlProps) !== null && _props$controlProps11 !== void 0 && _props$controlProps11.hidePreChatSurveyPane) && shouldShowPreChatSurveyPane(state) && /*#__PURE__*/React.createElement(PreChatSurveyPaneStateful, {
+  })), !((_props$controlProps11 = props.controlProps) !== null && _props$controlProps11 !== void 0 && _props$controlProps11.hidePreChatSurveyPane) && shouldShowPreChatSurveyPane(state) && (decodeComponentString((_props$componentOverr7 = props.componentOverrides) === null || _props$componentOverr7 === void 0 ? void 0 : _props$componentOverr7.preChatSurveyPane) || /*#__PURE__*/React.createElement(PreChatSurveyPaneStateful, {
     surveyProps: props.preChatSurveyPaneProps,
     initStartChat: initStartChatRelay
-  }), !((_props$controlProps12 = props.controlProps) !== null && _props$controlProps12 !== void 0 && _props$controlProps12.hideCallingContainer) && shouldShowCallingContainer(state) && /*#__PURE__*/React.createElement(CallingContainerStateful, _extends({
+  })), !((_props$controlProps12 = props.controlProps) !== null && _props$controlProps12 !== void 0 && _props$controlProps12.hideCallingContainer) && shouldShowCallingContainer(state) && /*#__PURE__*/React.createElement(CallingContainerStateful, _extends({
     voiceVideoCallingSdk: voiceVideoCallingSDK
-  }, props.callingContainerProps)), !((_props$controlProps13 = props.controlProps) !== null && _props$controlProps13 !== void 0 && _props$controlProps13.hideWebChatContainer) && shouldShowWebChatContainer(state) && (decodeComponentString((_props$componentOverr7 = props.componentOverrides) === null || _props$componentOverr7 === void 0 ? void 0 : _props$componentOverr7.webChatContainer) || /*#__PURE__*/React.createElement(WebChatContainerStateful, props.webChatContainerProps)), !((_props$controlProps14 = props.controlProps) !== null && _props$controlProps14 !== void 0 && _props$controlProps14.hideConfirmationPane) && shouldShowConfirmationPane(state) && (decodeComponentString((_props$componentOverr8 = props.componentOverrides) === null || _props$componentOverr8 === void 0 ? void 0 : _props$componentOverr8.confirmationPane) || /*#__PURE__*/React.createElement(ConfirmationPaneStateful, _extends({}, confirmationPaneProps, {
+  }, props.callingContainerProps)), !((_props$controlProps13 = props.controlProps) !== null && _props$controlProps13 !== void 0 && _props$controlProps13.hideWebChatContainer) && shouldShowWebChatContainer(state) && (decodeComponentString((_props$componentOverr8 = props.componentOverrides) === null || _props$componentOverr8 === void 0 ? void 0 : _props$componentOverr8.webChatContainer) || /*#__PURE__*/React.createElement(WebChatContainerStateful, props.webChatContainerProps)), !((_props$controlProps14 = props.controlProps) !== null && _props$controlProps14 !== void 0 && _props$controlProps14.hideConfirmationPane) && shouldShowConfirmationPane(state) && (decodeComponentString((_props$componentOverr9 = props.componentOverrides) === null || _props$componentOverr9 === void 0 ? void 0 : _props$componentOverr9.confirmationPane) || /*#__PURE__*/React.createElement(ConfirmationPaneStateful, _extends({}, confirmationPaneProps, {
     setPostChatContext: setPostChatContextRelay,
-    endChat: endChatRelay
-  }))), !((_props$controlProps15 = props.controlProps) !== null && _props$controlProps15 !== void 0 && _props$controlProps15.hidePostChatLoadingPane) && shouldShowPostChatLoadingPane(state) && (decodeComponentString((_props$componentOverr9 = props.componentOverrides) === null || _props$componentOverr9 === void 0 ? void 0 : _props$componentOverr9.postChatLoadingPane) || /*#__PURE__*/React.createElement(PostChatLoadingPaneStateful, props.postChatLoadingPaneProps)), shouldShowPostChatSurveyPane(state) && (decodeComponentString((_props$componentOverr10 = props.componentOverrides) === null || _props$componentOverr10 === void 0 ? void 0 : _props$componentOverr10.postChatSurveyPane) || /*#__PURE__*/React.createElement(PostChatSurveyPaneStateful, _extends({}, props.postChatSurveyPaneProps, props.chatSDK))), createFooter(props, state), shouldShowEmailTranscriptPane(state) && (decodeComponentString((_props$componentOverr11 = props.componentOverrides) === null || _props$componentOverr11 === void 0 ? void 0 : _props$componentOverr11.emailTranscriptPane) || /*#__PURE__*/React.createElement(EmailTranscriptPaneStateful, props.emailTranscriptPane))));
+    prepareEndChat: prepareEndChatRelay
+  }))), !((_props$controlProps15 = props.controlProps) !== null && _props$controlProps15 !== void 0 && _props$controlProps15.hidePostChatLoadingPane) && shouldShowPostChatLoadingPane(state) && (decodeComponentString((_props$componentOverr10 = props.componentOverrides) === null || _props$componentOverr10 === void 0 ? void 0 : _props$componentOverr10.postChatLoadingPane) || /*#__PURE__*/React.createElement(PostChatLoadingPaneStateful, props.postChatLoadingPaneProps)), shouldShowPostChatSurveyPane(state) && (decodeComponentString((_props$componentOverr11 = props.componentOverrides) === null || _props$componentOverr11 === void 0 ? void 0 : _props$componentOverr11.postChatSurveyPane) || /*#__PURE__*/React.createElement(PostChatSurveyPaneStateful, _extends({}, props.postChatSurveyPaneProps, props.chatSDK))), createFooter(props, state), shouldShowEmailTranscriptPane(state) && (decodeComponentString((_props$componentOverr12 = props.componentOverrides) === null || _props$componentOverr12 === void 0 ? void 0 : _props$componentOverr12.emailTranscriptPane) || /*#__PURE__*/React.createElement(EmailTranscriptPaneStateful, props.emailTranscriptPane))));
 };
 export default LiveChatWidgetStateful;

package/lib/esm/components/postchatloadingpanestateful/PostChatLoadingPaneStateful.js

@@ -3,6 +3,8 @@ import { LoadingPane } from "@microsoft/omnichannel-chat-components";
 import { defaultGeneralPostChatLoadingPaneStyleProps } from "./common/defaultgeneralPostChatLoadingPaneStyleProps";
 import { findAllFocusableElement } from "../../common/utils";
 import useChatContextStore from "../../hooks/useChatContextStore";
+import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
+import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 export const PostChatLoadingPaneStateful = props => {
   var _props$styleProps;
 
@@ -28,6 +30,10 @@ export const PostChatLoadingPaneStateful = props => {
     if (firstElement && firstElement[0]) {
       firstElement[0].focus();
     }
+
+    TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.PostChatSurveyLoadingPaneLoaded
+    });
   }, []);
   return /*#__PURE__*/React.createElement(LoadingPane, {
     componentOverrides: props.componentOverrides,

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

@@ -1,4 +1,4 @@
-import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect, useState } from "react";
 import { createTimer, setFocusOnElement } from "../../common/utils";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -51,12 +51,12 @@ export const ProactiveChatPaneStateful = props => {
       if (state.appStates.proactiveChatStates.proactiveChatInNewWindow) {
         // TODO: BroadcastService: replace with the sdk broadcast service, when in place
         const startPopoutChatEvent = {
-          eventName: "StartPopoutChat"
+          eventName: BroadcastEvent.ProactiveChatStartPopoutChat
         };
         BroadcastService.postMessage(startPopoutChatEvent);
         dispatch({
-          type: LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
-          payload: true
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.Closed
         });
       } else if (((_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.OutOfOperatingHours) === "True") {
         dispatch({
@@ -68,6 +68,10 @@ export const ProactiveChatPaneStateful = props => {
           payload: ConversationState.OutOfOffice
         });
       } else {
+        const proactiveChatStarted = {
+          eventName: BroadcastEvent.ProactiveChatStartChat
+        };
+        BroadcastService.postMessage(proactiveChatStarted);
         await startChat();
       }
     },

package/lib/esm/components/proactivechatpanestateful/interfaces/IProactiveChatNotificationConfig.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/components/webchatcontainerstateful/common/mockchatsdk.js

@@ -14,6 +14,10 @@ export class MockChatSDK {
     return null;
   }
 
+  getChatToken() {
+    return null;
+  }
+
   createChatAdapter() {
     return new MockAdapter();
   } // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/lib/esm/components/webchatcontainerstateful/common/utils/FileAttachmentIconManager.js

@@ -1,16 +1,6 @@
-import { BrowserVendor } from "../../webchatcontroller/enums/BrowserVendor";
+import { ArchiveIcon, AudioIcon, BlankIcon, ExcelIcon, ImageIcon, OneNoteIcon, PDFIcon, PowerpointIcon, VideoIcon, VisioIcon, WordIcon } from "../../../../assets/Icons";
 import { getBrowserName, isChromiumEdge } from "./BrowserInfo";
-import ArchiveIcon from "../../../../assets/icons/archiveIcon.svg";
-import AudioIcon from "../../../../assets/icons/audioIcon.svg";
-import BlankIcon from "../../../../assets/icons/blankIcon.svg";
-import VideoIcon from "../../../../assets/icons/videoIcon.svg";
-import ImageIcon from "../../../../assets/icons/imageIcon.svg";
-import WordIcon from "../../../../assets/icons/wordIcon.svg";
-import OneNoteIcon from "../../../../assets/icons/oneNoteIcon.svg";
-import PowerpointIcon from "../../../../assets/icons/powerpointIcon.svg";
-import VisioIcon from "../../../../assets/icons/visioIcon.svg";
-import PDFIcon from "../../../../assets/icons/pdfIcon.svg";
-import ExcelIcon from "../../../../assets/icons/excelIcon.svg";
+import { BrowserVendor } from "../../webchatcontroller/enums/BrowserVendor";
 import { Constants } from "../../../../common/Constants";
 const FileAttachmentIconMap = {
   "aac": AudioIcon,

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.js

@@ -5,59 +5,19 @@
  * 1. Renders system messages differently, according to Microsoft LiveChatWidget styles
  * 2. Changes the font size of user messages
  * 3. Decodes certain html characters that came through from chat services
- * 4. Triggers end conversation sequence when the chat thread is deleted
  ******/
-import React from "react";
+import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
 import { Constants } from "../../../../../common/Constants";
 import { DirectLineActivityType } from "../../enums/DirectLineActivityType";
 import { DirectLineSenderRole } from "../../enums/DirectLineSenderRole";
 import { MessageTypes } from "../../enums/MessageType";
+import React from "react";
+import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
 import { defaultSystemMessageStyles } from "./defaultStyles/defaultSystemMessageStyles";
 import { defaultUserMessageStyles } from "./defaultStyles/defaultUserMessageStyles";
 import { escapeHtml } from "../../../../../common/utils";
-import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
-import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
 const loggedSystemMessages = new Array(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-const handleThreadUpdate = channelData => {
-  var _channelData$properti, _channelData$properti2;
-
-  TelemetryHelper.logActionEvent(LogLevel.INFO, {
-    Event: TelemetryEvent.IC3ThreadUpdateEventReceived,
-    Description: "IC3 ThreadUpdateEvent Received"
-  });
-
-  const postConversationEndedAction = () => {
-    TelemetryHelper.logActionEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.ConversationEndedThreadEventReceived,
-      Description: "Conversation is ended by agent side or by timeout."
-    });
-  }; // If the Thread is deleted, then display post conversation survey if enabled.
-
-
-  const isThreadDeleted = (channelData === null || channelData === void 0 ? void 0 : (_channelData$properti = channelData.properties) === null || _channelData$properti === void 0 ? void 0 : (_channelData$properti2 = _channelData$properti.isdeleted) === null || _channelData$properti2 === void 0 ? void 0 : _channelData$properti2.toLowerCase()) === Constants.true;
-
-  if (isThreadDeleted) {
-    postConversationEndedAction();
-    return;
-  } //check if customer is still in the thread
-
-
-  if (channelData.members && channelData.members.length > 0) {
-    for (let i = 0; i < channelData.members.length; i++) {
-      const id = channelData.members[i].id;
-      const tag = channelData.members[i].tag; // In case of ACS customer is not removed from thread and has "left" tag
-
-      if (id.startsWith(Constants.visitorIdPrefix) && tag !== Constants.left) {
-        return;
-      }
-    }
-  }
-
-  postConversationEndedAction();
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
 const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
   var _card$activity, _card$activity$channe, _card$activity$channe2, _card$activity2, _card$activity2$chann, _card$activity3, _card$activity3$chann, _card$activity3$chann2, _card$activity4, _card$activity4$chann, _card$activity5, _card$activity5$chann, _card$nextVisibleActi, _card$nextVisibleActi2, _card$activity6, _card$activity6$chann, _card$activity7, _card$nextVisibleActi3, _card$activity8;
 
@@ -108,7 +68,10 @@ export const createActivityMiddleware = (systemMessageStyleProps, userMessageSty
       var _card$activity$channe3;
 
       if (((_card$activity$channe3 = card.activity.channelData) === null || _card$activity$channe3 === void 0 ? void 0 : _card$activity$channe3.type) === MessageTypes.Thread) {
-        handleThreadUpdate(card.activity.channelData);
+        TelemetryHelper.logActionEvent(LogLevel.INFO, {
+          Event: TelemetryEvent.IC3ThreadUpdateEventReceived,
+          Description: "IC3 ThreadUpdateEvent Received"
+        });
       }
 
       return () => false;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware.js

@@ -8,6 +8,7 @@
 import { Constants, MimeTypes, WebChatMiddlewareConstants } from "../../../../../common/Constants";
 import React from "react";
 import { getFileAttachmentIconData, isInlineMediaSupported } from "../../../common/utils/FileAttachmentIconManager";
+import { BroadcastEvent } from "../../../../../common/telemetry/TelemetryConstants";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { WebChatActionType } from "../../enums/WebChatActionType";
 import { defaultAttachmentAdaptiveCardStyles } from "./defaultStyles/defaultAtttachmentAdaptiveCardStyles";
@@ -187,7 +188,7 @@ const createAttachmentMiddleware = enableInlinePlaying => {
       } catch (e) {
         const errorData = "Unable to parse the adaptive card format";
         BroadcastService.postMessage({
-          eventName: "InvalidAdaptiveCardFormat",
+          eventName: BroadcastEvent.InvalidAdaptiveCardFormat,
           payload: {
             Message: errorData,
             ExceptionDetails: e

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/conversationEndMiddleware.js

@@ -17,22 +17,22 @@ const createConversationEndMiddleware = conversationEndCallback => _ref => {
     var _action$payload;
 
     if ((action === null || action === void 0 ? void 0 : action.type) == WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && (_action$payload = action.payload) !== null && _action$payload !== void 0 && _action$payload.activity) {
-      var _activity$from, _activity$from2, _activity$channelData5, _activity$channelData6;
+      var _activity$from, _activity$from2, _activity$channelData7, _activity$channelData8;
 
       const activity = action.payload.activity;
 
       if (((_activity$from = activity.from) === null || _activity$from === void 0 ? void 0 : _activity$from.role) === DirectLineSenderRole.Bot && activity.channelId === "ACS_CHANNEL") {
-        var _activity$channelData, _activity$channelData2, _activity$channelData3, _activity$channelData4;
+        var _activity$channelData, _activity$channelData2, _activity$channelData3, _activity$channelData4, _activity$channelData5, _activity$channelData6;
 
         // ACS
-        if ((_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(Constants.systemMessageTag) && (_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(Constants.agentEndConversationMessageTag)) {
+        if ((_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(Constants.systemMessageTag) && ((_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(Constants.agentEndConversationMessageTag) || (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(Constants.supervisorForceCloseMessageTag))) {
           conversationEndCallback();
         }
-      } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === DirectLineSenderRole.Channel && ((_activity$channelData5 = activity.channelData) === null || _activity$channelData5 === void 0 ? void 0 : _activity$channelData5.type) === MessageTypes.Thread && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.properties) {
-        var _activity$channelData7, _activity$channelData8, _activity$channelData9, _activity$channelData10;
+      } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === DirectLineSenderRole.Channel && ((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : _activity$channelData7.type) === MessageTypes.Thread && (_activity$channelData8 = activity.channelData) !== null && _activity$channelData8 !== void 0 && _activity$channelData8.properties) {
+        var _activity$channelData9, _activity$channelData10, _activity$channelData11, _activity$channelData12;
 
         // IC3
-        if (((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.properties) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.isdeleted) === Constants.truePascal || !((_activity$channelData9 = activity.channelData) !== null && _activity$channelData9 !== void 0 && (_activity$channelData10 = _activity$channelData9.properties) !== null && _activity$channelData10 !== void 0 && _activity$channelData10.containsExternalEntitiesListeningAll)) {
+        if (((_activity$channelData9 = activity.channelData) === null || _activity$channelData9 === void 0 ? void 0 : (_activity$channelData10 = _activity$channelData9.properties) === null || _activity$channelData10 === void 0 ? void 0 : _activity$channelData10.isdeleted) === Constants.truePascal || !((_activity$channelData11 = activity.channelData) !== null && _activity$channelData11 !== void 0 && (_activity$channelData12 = _activity$channelData11.properties) !== null && _activity$channelData12 !== void 0 && _activity$channelData12.containsExternalEntitiesListeningAll)) {
           conversationEndCallback();
         }
       }

package/lib/esm/contexts/common/ConversationState.js

@@ -7,6 +7,7 @@ export let ConversationState;
   ConversationState[ConversationState["OutOfOffice"] = 3] = "OutOfOffice";
   ConversationState[ConversationState["ProactiveChat"] = 4] = "ProactiveChat";
   ConversationState[ConversationState["Active"] = 5] = "Active";
-  ConversationState[ConversationState["Postchat"] = 6] = "Postchat";
-  ConversationState[ConversationState["Closed"] = 7] = "Closed";
+  ConversationState[ConversationState["InActive"] = 6] = "InActive";
+  ConversationState[ConversationState["Postchat"] = 7] = "Postchat";
+  ConversationState[ConversationState["Closed"] = 8] = "Closed";
 })(ConversationState || (ConversationState = {}));