@microsoft/omnichannel-chat-widget 0.1.0-main.89c6531 → 0.1.0-main.ae3aa42

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

@@ -1,40 +1,30 @@
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
+import { ConfirmationPane } from "@microsoft/omnichannel-chat-components";
 import React, { useEffect } from "react";
 import { findAllFocusableElement, findParentFocusableElementsWithoutChildContainer, preventFocusToMoveOutOfElement, setFocusOnElement, setFocusOnSendBox, setTabIndices } from "../../common/utils";
-import { ConfirmationPane } from "@microsoft/omnichannel-chat-components";
-import { Constants } from "../../common/Constants";
-import { ConversationState } from "../../contexts/common/ConversationState";
 import { DimLayer } from "../dimlayer/DimLayer";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
 import { NotificationHandler } from "../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
 import { NotificationScenarios } from "../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
-import { PostChatSurveyMode } from "../postchatsurveypanestateful/enums/PostChatSurveyMode";
 import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import useChatAdapterStore from "../../hooks/useChatAdapterStore";
-import useChatContextStore from "../../hooks/useChatContextStore";
-import useChatSDKStore from "../../hooks/useChatSDKStore"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import useChatContextStore from "../../hooks/useChatContextStore"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 export const ConfirmationPaneStateful = props => {
-  var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4;
-
   const initialTabIndexMap = new Map();
   let elements = [];
   const [state, dispatch] = useChatContextStore();
   const {
-    setPostChatContext,
-    endChat
+    prepareEndChat
   } = props; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-  const chatSDK = useChatSDKStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
   const [adapter] = useChatAdapterStore();
-  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;
-  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode;
   const controlProps = {
     id: "oc-lcw-confirmation-pane",
     dir: state.domainStates.globalDir,
     onConfirm: async () => {
-      TelemetryHelper.logConfigDataEvent(LogLevel.INFO, {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.ConfirmationConfirmButtonClicked,
         Description: "Confirmation pane Confirm button clicked"
       });
@@ -44,40 +34,8 @@ export 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 
-
-        if (isPostChatEnabled === "true" && postChatSurveyMode === PostChatSurveyMode.Embed && conversationDetails.canRenderPostChat === Constants.truePascal) {
-          dispatch({
-            type: LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
-            payload: true
-          });
-          dispatch({
-            type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: ConversationState.Loading
-          });
-          await setPostChatContext();
-
-          if (state.domainStates.postChatContext) {
-            dispatch({
-              type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-              payload: ConversationState.Postchat
-            });
-          }
-        } else {
-          setTabIndices(elements, initialTabIndexMap, true);
-
-          try {
-            await endChat(adapter);
-          } catch (error) {
-            TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-              Event: TelemetryEvent.CloseChatMethodException,
-              ExceptionDetails: {
-                exception: `Failed to endChat: ${error}`
-              }
-            });
-          }
-        }
+        setTabIndices(elements, initialTabIndexMap, true);
+        await prepareEndChat(adapter, state);
       } catch (ex) {
         TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
           Event: TelemetryEvent.GetConversationDetailsCallFailed,
@@ -89,7 +47,7 @@ export const ConfirmationPaneStateful = props => {
       }
     },
     onCancel: () => {
-      TelemetryHelper.logConfigDataEvent(LogLevel.INFO, {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.ConfirmationCancelButtonClicked,
         Description: "Confirmation pane Cancel button clicked."
       });

package/lib/esm/components/emailtranscriptpanestateful/EmailTranscriptPaneStateful.js

@@ -68,8 +68,8 @@ export const EmailTranscriptPaneStateful = props => {
     },
     onCancel: () => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
-        Event: TelemetryEvent.EmailTranscriptButtonClicked,
-        Description: "Email Transcript button clicked."
+        Event: TelemetryEvent.EmailTranscriptCancelButtonClicked,
+        Description: "Email Transcript cancel button clicked."
       });
       closeEmailTranscriptPane();
     },

package/lib/esm/components/footerstateful/FooterStateful.js

@@ -4,13 +4,13 @@ import AudioNotificationStateful from "./audionotificationstateful/AudioNotifica
 import { Constants } from "../../common/Constants";
 import { Footer } from "@microsoft/omnichannel-chat-components";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
+import { NewMessageNotificationSoundBase64 } from "../../assets/Audios";
 import { NotificationHandler } from "../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
 import { NotificationScenarios } from "../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
 import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import { downloadTranscript } from "./downloadtranscriptstateful/DownloadTranscriptStateful";
 import useChatContextStore from "../../hooks/useChatContextStore";
-import useChatSDKStore from "../../hooks/useChatSDKStore";
-import newMessageNotification from "../../assets/audios/newMessageNotification.mp3"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import useChatSDKStore from "../../hooks/useChatSDKStore"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 export const FooterStateful = props => {
   var _footerProps$controlP3, _footerProps$controlP4;
@@ -96,9 +96,8 @@ export const FooterStateful = props => {
     controlProps: controlProps,
     styleProps: footerProps === null || footerProps === void 0 ? void 0 : footerProps.styleProps
   }), /*#__PURE__*/React.createElement(AudioNotificationStateful, {
-    audioSrc: (audioNotificationProps === null || audioNotificationProps === void 0 ? void 0 : audioNotificationProps.audioSrc) ?? newMessageNotification,
-    hideAudioNotificationButton: (footerProps === null || footerProps === void 0 ? void 0 : (_footerProps$controlP4 = footerProps.controlProps) === null || _footerProps$controlP4 === void 0 ? void 0 : _footerProps$controlP4.hideAudioNotificationButton) ?? false,
-    isAudioMuted: state.appStates.isAudioMuted ?? false
+    audioSrc: (audioNotificationProps === null || audioNotificationProps === void 0 ? void 0 : audioNotificationProps.audioSrc) ?? NewMessageNotificationSoundBase64,
+    isAudioMuted: state.appStates.isAudioMuted === null ? (footerProps === null || footerProps === void 0 ? void 0 : (_footerProps$controlP4 = footerProps.controlProps) === null || _footerProps$controlP4 === void 0 ? void 0 : _footerProps$controlP4.hideAudioNotificationButton) ?? false : state.appStates.isAudioMuted ?? false
   }));
 };
 export default FooterStateful;

package/lib/esm/components/headerstateful/HeaderStateful.js

@@ -1,5 +1,5 @@
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { ConversationState } from "../../contexts/common/ConversationState";
 import { Header } from "@microsoft/omnichannel-chat-components";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
@@ -21,6 +21,7 @@ export const HeaderStateful = props => {
 
   const [outOfOperatingHours, setOutOfOperatingHours] = useState(((_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");
   const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeHeaderStyleProps, outOfOfficeHeaderProps === null || outOfOfficeHeaderProps === void 0 ? void 0 : outOfOfficeHeaderProps.styleProps);
+  const conversationState = useRef(state.appStates.conversationState);
   const controlProps = {
     id: "oc-lcw-header",
     dir: state.domainStates.globalDir,
@@ -40,17 +41,15 @@ export const HeaderStateful = props => {
         Description: "Header Close button clicked."
       });
 
-      if (state.appStates.conversationState === ConversationState.Active) {
+      if (conversationState.current === ConversationState.Active) {
         dispatch({
           type: LiveChatWidgetActionType.SET_SHOW_CONFIRMATION,
           payload: true
         });
-      } else if (state.appStates.conversationState === ConversationState.Postchat) {
-        dispatch({
-          type: LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
-          payload: false
-        });
-        await endChat(adapter);
+      } else {
+        const skipEndChatSDK = true;
+        const skipCloseChat = false;
+        await endChat(adapter, skipEndChatSDK, skipCloseChat);
       }
 
       dispatch({
@@ -82,7 +81,11 @@ export const HeaderStateful = props => {
     if (state.appStates.outsideOperatingHours) {
       setOutOfOperatingHours(true);
     }
-  }, []);
+
+    if (state.appStates.conversationState) {
+      conversationState.current = state.appStates.conversationState;
+    }
+  }, [state.appStates]);
   return /*#__PURE__*/React.createElement(Header, {
     componentOverrides: headerProps === null || headerProps === void 0 ? void 0 : headerProps.componentOverrides,
     controlProps: outOfOperatingHours || state.appStates.conversationState === ConversationState.OutOfOffice ? outOfOfficeControlProps : controlProps,

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

@@ -1,5 +1,4 @@
 import MarkdownIt from "markdown-it";
-import MarkdownSlack from "slack-markdown-it";
 import MarkdownItForInline from "markdown-it-for-inline";
 import { defaultMarkdownLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMarkdownLocalizedTexts";
 import { Constants } from "../../../common/Constants"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -12,8 +11,9 @@ export const createMarkdown = (disableMarkdownMessageFormatting, disableNewLineM
       html: true,
       linkify: true,
       breaks: !disableNewLineMarkdownSupport
-    });
-    markdown.use(MarkdownSlack); // Markdown override for open link in new tab
+    }); // ToDo: Commenting below usage of plugin until deferred bug is resolved: https://github.com/mayashavin/markdown-it-slack/issues/1
+    // markdown.use(MarkdownSlack);
+    // Markdown override for open link in new tab
     // eslint-disable-next-line @typescript-eslint/no-explicit-any, quotes
 
     markdown.use(MarkdownItForInline, "url_new_win", "link_open", function (tokens, idx, env) {

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

@@ -1,5 +1,7 @@
 /* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-explicit-any */
+import { ChatReconnectIconBase64, CloseChatButtonIconBase64, ModernChatIconBase64, ProactiveChatBannerBase64 } from "@microsoft/omnichannel-chat-components";
 import MockAdapter from "../../../webchatcontainerstateful/common/mockadapter";
+import { NewMessageNotificationSoundBase64 } from "../../../../assets/Audios";
 import { WebChatStoreLoader } from "../../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { activityStatusMiddleware } from "../../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware";
 import { createActivityMiddleware } from "../../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware";
@@ -8,10 +10,11 @@ import { createAvatarMiddleware } from "../../../webchatcontainerstateful/webcha
 import { createMarkdown } from "../createMarkdown";
 import { groupActivitiesMiddleware } from "../../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/groupActivitiesMiddleware";
 import { typingIndicatorMiddleware } from "../../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/typingIndicatorMiddleware";
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { createWebChatTelemetry } from "../../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger"; // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 export const dummyDefaultProps = {
   audioNotificationProps: {
-    audioSrc: "assets/audios/newMessageNotification.mp3"
+    audioSrc: NewMessageNotificationSoundBase64
   },
   callingContainerProps: {
     controlProps: {
@@ -366,7 +369,7 @@ export const dummyDefaultProps = {
         margin: "-2px -2px -2px -3px",
         justifyContent: "center",
         backgroundSize: "65% 65%",
-        backgroundImage: "assets/imgs/chat.svg",
+        backgroundImage: `url(${ModernChatIconBase64})`,
         display: "flex",
         backgroundRepeat: "no-repeat",
         backgroundPosition: "center"
@@ -887,7 +890,7 @@ export const dummyDefaultProps = {
       },
       headerIconProps: {
         id: "oc-lcw-header-icon",
-        src: "assets/imgs/chatIcon.svg",
+        src: ModernChatIconBase64,
         alt: "Chat Icon",
         className: undefined
       },
@@ -1012,7 +1015,7 @@ export const dummyDefaultProps = {
         alignSelf: "auto"
       },
       iconImageProps: {
-        src: "assets/imgs/chat.svg",
+        src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHZpZXdCb3g9IjAgMCA0MCA0MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2lpKSI+DQo8cGF0aCBkPSJNMTUuMTk3MSAxNi4yNzI1VjI1Ljg1MjRDMTUuMTk3MSAyNy4zODExIDE1Ljg0MDEgMjcuNTIwMSAxNi45ODMyIDI3LjUyMDFMMjYuNzA4NCAyNy41NjQ5TDMxLjAwMzkgMzIuMzEyM1YyNy41NjQ5SDMxLjg5N0MzMi4xNzQzIDI3LjU2MzcgMzIuNDQ4NyAyNy41MDc3IDMyLjcwNDUgMjcuNDAwMUMzMi45NjAzIDI3LjI5MjQgMzMuMTkyNSAyNy4xMzUzIDMzLjM4NzggMjYuOTM3NUMzMy41ODMxIDI2LjczOTggMzMuNzM3NyAyNi41MDU0IDMzLjg0MjcgMjYuMjQ3N0MzMy45NDc4IDI1Ljk5IDM0LjAwMTMgMjUuNzE0IDM0LjAwMDEgMjUuNDM1NVYxNi4zMDM4QzM0LjAwMTMgMTYuMDI1NCAzMy45NDc4IDE1Ljc0OTQgMzMuODQyNyAxNS40OTE3QzMzLjczNzcgMTUuMjM0IDMzLjU4MzEgMTQuOTk5NiAzMy4zODc4IDE0LjgwMThDMzMuMTkyNSAxNC42MDQxIDMyLjk2MDMgMTQuNDQ2OSAzMi43MDQ1IDE0LjMzOTNDMzIuNDQ4NyAxNC4yMzE2IDMyLjE3NDMgMTQuMTc1NiAzMS44OTcgMTQuMTc0NEwxNy4zMDQ3IDE0LjE0MzFDMTcuMDI2OSAxNC4xNDM3IDE2Ljc1MiAxNC4xOTkyIDE2LjQ5NTcgMTQuMzA2NkMxNi4yMzk0IDE0LjQxNCAxNi4wMDY3IDE0LjU3MTEgMTUuODEwOSAxNC43Njg5QzE1LjYxNTIgMTQuOTY2NyAxNS40NjAyIDE1LjIwMTMgMTUuMzU0OCAxNS40NTkzQzE1LjI0OTUgMTUuNzE3MyAxNS4xOTU5IDE1Ljk5MzYgMTUuMTk3MSAxNi4yNzI1WiIgZmlsbD0iI0Q2RDZENiIvPg0KPC9nPg0KPGcgZmlsdGVyPSJ1cmwoI2ZpbHRlcjFfZGlpKSI+DQo8cGF0aCBkPSJNMjcuODczNSA2LjY5ODg3VjE4Ljg0MDlDMjcuODczNSAyMC43Nzg1IDI3LjA1NzIgMjAuOTU0NiAyNS42MDU4IDIwLjk1NDZMMTMuMjU4IDIxLjAxMTRMNy44MDQxNCAyNy4wMjg1VjIxLjAxMTRINi42NzAyN0M2LjMxODEyIDIxLjAwOTkgNS45Njk3MSAyMC45Mzg5IDUuNjQ0OTMgMjAuODAyNUM1LjMyMDE2IDIwLjY2NjEgNS4wMjUzOCAyMC40NjY4IDQuNzc3NDIgMjAuMjE2MkM0LjUyOTQ2IDE5Ljk2NTYgNC4zMzMxOSAxOS42Njg1IDQuMTk5OCAxOS4zNDE5QzQuMDY2NDIgMTkuMDE1MiAzLjk5ODUzIDE4LjY2NTUgNC4wMDAwMiAxOC4zMTI1VjYuNzM4NjRDMy45OTg1MyA2LjM4NTcxIDQuMDY2NDIgNi4wMzU5NSA0LjE5OTggNS43MDkzMUM0LjMzMzE5IDUuMzgyNjcgNC41Mjk0NiA1LjA4NTU3IDQuNzc3NDIgNC44MzQ5NUM1LjAyNTM4IDQuNTg0MzQgNS4zMjAxNiA0LjM4NTEzIDUuNjQ0OTMgNC4yNDg2OUM1Ljk2OTcxIDQuMTEyMjUgNi4zMTgxMiA0LjA0MTI2IDYuNjcwMjcgNC4wMzk3N0wyNS4xOTc2IDRDMjUuNTUwMiA0LjAwMDc0IDI1Ljg5OTMgNC4wNzExOCAyNi4yMjQ3IDQuMjA3MjlDMjYuNTUwMSA0LjM0MzM5IDI2Ljg0NTYgNC41NDI0OSAyNy4wOTQxIDQuNzkzMThDMjcuMzQyNyA1LjA0Mzg2IDI3LjUzOTUgNS4zNDEyMiAyNy42NzMyIDUuNjY4MjNDMjcuODA3IDUuOTk1MjMgMjcuODc1IDYuMzQ1NDYgMjcuODczNSA2LjY5ODg3WiIgZmlsbD0idXJsKCNwYWludDBfbGluZWFyKSIvPg0KPC9nPg0KPGRlZnM+DQo8ZmlsdGVyIGlkPSJmaWx0ZXIwX2lpIiB4PSIxNS4xOTcxIiB5PSIxNC4xNDMxIiB3aWR0aD0iMTguODAzMSIgaGVpZ2h0PSIxOC4xNjkzIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+DQo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPg0KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0ic2hhcGUiLz4NCjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPg0KPGZlT2Zmc2V0IGR4PSItMC4yIiBkeT0iLTAuMiIvPg0KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0iYXJpdGhtZXRpYyIgazI9Ii0xIiBrMz0iMSIvPg0KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMSAwIDAgMCAwIDEgMCAwIDAgMCAxIDAgMCAwIDAuMTcgMCIvPg0KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9InNoYXBlIiByZXN1bHQ9ImVmZmVjdDFfaW5uZXJTaGFkb3ciLz4NCjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPg0KPGZlT2Zmc2V0IGR4PSItMC41IiBkeT0iLTAuNSIvPg0KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0iYXJpdGhtZXRpYyIgazI9Ii0xIiBrMz0iMSIvPg0KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMSAwIDAgMCAwIDEgMCAwIDAgMCAxIDAgMCAwIDAuMTYgMCIvPg0KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9ImVmZmVjdDFfaW5uZXJTaGFkb3ciIHJlc3VsdD0iZWZmZWN0Ml9pbm5lclNoYWRvdyIvPg0KPC9maWx0ZXI+DQo8ZmlsdGVyIGlkPSJmaWx0ZXIxX2RpaSIgeD0iMCIgeT0iMCIgd2lkdGg9IjM5Ljg3MzYiIGhlaWdodD0iMzkuMDI4NSIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPg0KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4NCjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIi8+DQo8ZmVPZmZzZXQgZHg9IjQiIGR5PSI0Ii8+DQo8ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSI0Ii8+DQo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4yNSAwIi8+DQo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9ImVmZmVjdDFfZHJvcFNoYWRvdyIvPg0KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJlZmZlY3QxX2Ryb3BTaGFkb3ciIHJlc3VsdD0ic2hhcGUiLz4NCjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPg0KPGZlT2Zmc2V0IGR4PSItMiIgZHk9Ii0yIi8+DQo8ZmVDb21wb3NpdGUgaW4yPSJoYXJkQWxwaGEiIG9wZXJhdG9yPSJhcml0aG1ldGljIiBrMj0iLTEiIGszPSIxIi8+DQo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAxIDAgMCAwIDAgMSAwIDAgMCAwIDEgMCAwIDAgMC4xNyAwIi8+DQo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0ic2hhcGUiIHJlc3VsdD0iZWZmZWN0Ml9pbm5lclNoYWRvdyIvPg0KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+DQo8ZmVPZmZzZXQgZHg9Ii0xIiBkeT0iLTEiLz4NCjxmZUNvbXBvc2l0ZSBpbjI9ImhhcmRBbHBoYSIgb3BlcmF0b3I9ImFyaXRobWV0aWMiIGsyPSItMSIgazM9IjEiLz4NCjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDEgMCAwIDAgMCAxIDAgMCAwIDAgMSAwIDAgMCAwLjE2IDAiLz4NCjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW4yPSJlZmZlY3QyX2lubmVyU2hhZG93IiByZXN1bHQ9ImVmZmVjdDNfaW5uZXJTaGFkb3ciLz4NCjwvZmlsdGVyPg0KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyIiB4MT0iLTAuMzk1MDAxIiB5MT0iMjMuMTI4MiIgeDI9IjIwLjEwNTgiIHkyPSIzNy44NDc0IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQo8c3RvcCBzdG9wLWNvbG9yPSIjRUZFRkVGIi8+DQo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IndoaXRlIi8+DQo8L2xpbmVhckdyYWRpZW50Pg0KPC9kZWZzPg0KPC9zdmc+DQo=",
         imageFit: 0,
         width: "86px",
         height: "86px",
@@ -1220,7 +1223,7 @@ export const dummyDefaultProps = {
       },
       headerContainerStyleProps: {
         backgroundColor: "rgb(49, 95, 162)",
-        backgroundImage: "assets/imgs/Proactive_banner.png",
+        backgroundImage: `url(${ProactiveChatBannerBase64})`,
         backgroundPosition: "initial",
         backgroundRepeat: "no-repeat",
         borderTopLeftRadius: "inherit",
@@ -1248,7 +1251,7 @@ export const dummyDefaultProps = {
         fontWeight: "600"
       },
       closeButtonStyleProps: {
-        backgroundImage: "assets/imgs/closeChatButton.svg",
+        backgroundImage: `url(${CloseChatButtonIconBase64})`,
         backgroundPosition: "center",
         backgroundRepeat: "no-repeat",
         color: "#605e5c",
@@ -1371,7 +1374,7 @@ export const dummyDefaultProps = {
         lineHeight: "19px"
       },
       iconStyleProps: {
-        backgroundImage: "assets/imgs//ChatReconnectPopupIcon.png",
+        backgroundImage: `url(${ChatReconnectIconBase64})`,
         backgroundPosition: "center",
         backgroundRepeat: "no-repeat",
         backgroundSize: "200px",
@@ -1422,7 +1425,8 @@ export const dummyDefaultProps = {
     },
     authClientFunction: undefined,
     isReconnectEnabled: undefined,
-    reconnectId: undefined
+    reconnectId: undefined,
+    redirectInSameWindow: undefined
   },
   styleProps: {
     generalStyles: {
@@ -1494,7 +1498,7 @@ export const dummyDefaultProps = {
       internalErrorBoxClass: undefined,
       internalRenderErrorBox: undefined,
       locale: "en-US",
-      onTelemetry: undefined,
+      onTelemetry: createWebChatTelemetry(),
       overrideLocalizedStrings: undefined,
       renderMarkdown: createMarkdown(false, false),
       scrollToEndButtonMiddleware: undefined,

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

@@ -1,53 +1,106 @@
-import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
-import { NotificationHandler } from "../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler";
-import { NotificationScenarios } from "../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
-import { BroadcastService } from "@microsoft/omnichannel-chat-components"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-export const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter) => {
-  try {
-    var _props$webChatContain;
-
-    TelemetryHelper.logConfigDataEvent(LogLevel.INFO, {
-      Event: TelemetryEvent.EndChatSDKCall
-    });
-    await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
-    adapter === null || adapter === void 0 ? void 0 : adapter.end();
-    setAdapter(undefined);
-    setWebChatStyles({ ...defaultWebChatContainerStatefulProps.webChatStyles,
-      ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
-    });
-    WebChatStoreLoader.store = null;
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-      payload: ConversationState.Closed
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_RECONNECT_ID,
-      payload: undefined
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
-      payload: null
-    });
-    dispatch({
-      type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-      payload: undefined
-    });
-    BroadcastService.postMessage({
-      eventName: "EndChat"
-    });
-  } catch (ex) {
-    TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
-      Event: TelemetryEvent.EndChatSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
-      }
-    });
-    NotificationHandler.notifyError(NotificationScenarios.Connection, "End Chat Call Failed: " + ex);
+import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
+import { Constants } from "../../../common/Constants";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
+  var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4;
+
+  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;
+  const postChatSurveyMode = (_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : (_state$domainStates$l4 = _state$domainStates$l3.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l4 === void 0 ? void 0 : _state$domainStates$l4.msdyn_postconversationsurveymode;
+  const conversationDetails = await chatSDK.getConversationDetails();
+
+  if (isPostChatEnabled === "true" && (conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.canRenderPostChat) === Constants.truePascal) {
+    const skipEndChatSDK = false;
+    const skipCloseChat = true;
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
+
+    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 {
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
   }
-};
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat) => {
+  if (!skipEndChatSDK) {
+    try {
+      TelemetryHelper.logSDKEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.EndChatSDKCall
+      });
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
+    } catch (ex) {
+      TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
+        Event: TelemetryEvent.EndChatSDKCallFailed,
+        ExceptionDetails: {
+          exception: ex
+        }
+      });
+    }
+  }
+
+  if (!skipCloseChat) {
+    try {
+      var _props$webChatContain;
+
+      adapter === null || adapter === void 0 ? void 0 : adapter.end();
+      setAdapter(undefined);
+      setWebChatStyles({ ...defaultWebChatContainerStatefulProps.webChatStyles,
+        ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
+      });
+      WebChatStoreLoader.store = null;
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: ConversationState.Closed
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
+        payload: false
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_RECONNECT_ID,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
+        payload: null
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.EndChat
+      });
+    } catch (error) {
+      TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+        Event: TelemetryEvent.CloseChatMethodException,
+        ExceptionDetails: {
+          exception: `Failed to endChat: ${error}`
+        }
+      });
+    }
+  }
+};
+
+export { prepareEndChat, endChat };

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

@@ -8,6 +8,9 @@ export const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const callingSDK = await chatSDK.getVoiceVideoCalling();
       setVoiceVideoCallingSDK(callingSDK);
+      TelemetryHelper.logCallingEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CallingSDKLoadSuccess
+      });
       return true;
     }
 

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

@@ -1,7 +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";
@@ -14,6 +17,7 @@ import createConversationEndMiddleware from "../../webchatcontainerstateful/webc
 import createDataMaskingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware";
 import { createMarkdown } from "./createMarkdown";
 import createMaxMessageSizeValidator from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator";
+import { createWebChatTelemetry } from "../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger";
 import { defaultAttachmentProps } from "../../webchatcontainerstateful/common/defaultProps/defaultAttachmentProps";
 import { defaultMiddlewareLocalizedTexts } from "../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
@@ -22,8 +26,7 @@ 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 { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey"; // 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;
@@ -45,6 +48,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,
@@ -53,16 +61,23 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
         });
       }
 
-      if (isPostChatEnabled === "true" && postChatSurveyMode === PostChatSurveyMode.Embed) {
+      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_SHOULD_SHOW_POST_CHAT,
+          type: LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
           payload: true
         });
-        dispatch({
-          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-          payload: ConversationState.Loading
-        });
-        await setPostChatContextAndLoadSurvey(chatSDK, dispatch, true);
       }
 
       dispatch({
@@ -89,6 +104,7 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
     avatarMiddleware: (_props$webChatContain15 = props.webChatContainerProps) !== null && _props$webChatContain15 !== void 0 && (_props$webChatContain16 = _props$webChatContain15.renderingMiddlewareProps) !== null && _props$webChatContain16 !== void 0 && _props$webChatContain16.disableAvatarMiddleware ? undefined : createAvatarMiddleware((_state$domainStates$r5 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r5 === void 0 ? void 0 : _state$domainStates$r5.avatarStyleProps, (_state$domainStates$r6 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r6 === void 0 ? void 0 : _state$domainStates$r6.avatarTextStyleProps),
     groupActivitiesMiddleware: (_props$webChatContain17 = props.webChatContainerProps) !== null && _props$webChatContain17 !== void 0 && (_props$webChatContain18 = _props$webChatContain17.renderingMiddlewareProps) !== null && _props$webChatContain18 !== void 0 && _props$webChatContain18.disableGroupActivitiesMiddleware ? undefined : (_defaultWebChatContai2 = defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai2 === void 0 ? void 0 : _defaultWebChatContai2.groupActivitiesMiddleware,
     typingIndicatorMiddleware: (_props$webChatContain19 = props.webChatContainerProps) !== null && _props$webChatContain19 !== void 0 && (_props$webChatContain20 = _props$webChatContain19.renderingMiddlewareProps) !== null && _props$webChatContain20 !== void 0 && _props$webChatContain20.disableTypingIndicatorMiddleware ? undefined : (_defaultWebChatContai3 = defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai3 === void 0 ? void 0 : _defaultWebChatContai3.typingIndicatorMiddleware,
+    onTelemetry: createWebChatTelemetry(),
     ...((_props$webChatContain21 = props.webChatContainerProps) === null || _props$webChatContain21 === void 0 ? void 0 : _props$webChatContain21.webChatProps)
   };
   return webChatProps;