@microsoft/omnichannel-chat-widget 0.1.0-main.7338c17 → 0.1.0-main.7b290a7

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

@@ -7,12 +7,12 @@ exports.default = exports.ConfirmationPaneStateful = void 0;
 
 var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("../../common/utils");
 
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 var _DimLayer = require("../dimlayer/DimLayer");
 
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
@@ -21,18 +21,12 @@ var _NotificationHandler = require("../webchatcontainerstateful/webchatcontrolle
 
 var _NotificationScenarios = require("../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios");
 
-var _PostChatSurveyMode = require("../postchatsurveypanestateful/enums/PostChatSurveyMode");
-
 var _TelemetryHelper = require("../../common/telemetry/TelemetryHelper");
 
 var _useChatAdapterStore = _interopRequireDefault(require("../../hooks/useChatAdapterStore"));
 
 var _useChatContextStore = _interopRequireDefault(require("../../hooks/useChatContextStore"));
 
-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); }
@@ -41,21 +35,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ConfirmationPaneStateful = props => {
-  var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4;
-
   const initialTabIndexMap = new Map();
-  let elements = []; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-  const chatSDK = (0, _useChatSDKStore.default)();
+  let elements = [];
   const [state, dispatch] = (0, _useChatContextStore.default)();
   const {
-    endChat
+    prepareEndChat
   } = props; // 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;
-  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,
@@ -71,29 +59,8 @@ const ConfirmationPaneStateful = props => {
       });
 
       try {
-        // check agent has joined conversation
-        const conversationDetails = await chatSDK.getConversationDetails();
-
-        if (isPostChatEnabled === "true" && postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed && conversationDetails.canRenderPostChat === _Constants.Constants.truePascal) {
-          const loadPostChatEvent = {
-            eventName: "LoadPostChatSurvey"
-          };
-
-          _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
-        } else {
-          (0, _utils.setTabIndices)(elements, initialTabIndexMap, true);
-
-          try {
-            await endChat(adapter);
-          } catch (error) {
-            _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-              Event: _TelemetryConstants.TelemetryEvent.CloseChatMethodException,
-              ExceptionDetails: {
-                exception: `Failed to endChat: ${error}`
-              }
-            });
-          }
-        }
+        (0, _utils.setTabIndices)(elements, initialTabIndexMap, true);
+        await prepareEndChat(adapter, state);
       } catch (ex) {
         _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
           Event: _TelemetryConstants.TelemetryEvent.GetConversationDetailsCallFailed,

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

@@ -17,6 +17,8 @@ var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components
 
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
 
+var _Audios = require("../../assets/Audios");
+
 var _NotificationHandler = require("../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
 
 var _NotificationScenarios = require("../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios");
@@ -29,8 +31,6 @@ var _useChatContextStore = _interopRequireDefault(require("../../hooks/useChatCo
 
 var _useChatSDKStore = _interopRequireDefault(require("../../hooks/useChatSDKStore"));
 
-var _newMessageNotification = _interopRequireDefault(require("../../assets/audios/newMessageNotification.mp3"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -122,9 +122,8 @@ const FooterStateful = props => {
     controlProps: controlProps,
     styleProps: footerProps === null || footerProps === void 0 ? void 0 : footerProps.styleProps
   }), /*#__PURE__*/_react.default.createElement(_AudioNotificationStateful.default, {
-    audioSrc: (audioNotificationProps === null || audioNotificationProps === void 0 ? void 0 : audioNotificationProps.audioSrc) ?? _newMessageNotification.default,
-    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) ?? _Audios.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
   }));
 };
 

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

@@ -43,6 +43,7 @@ const HeaderStateful = props => {
 
   const [outOfOperatingHours, setOutOfOperatingHours] = (0, _react.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.defaultOutOfOfficeHeaderStyleProps, outOfOfficeHeaderProps === null || outOfOfficeHeaderProps === void 0 ? void 0 : outOfOfficeHeaderProps.styleProps);
+  const conversationState = (0, _react.useRef)(state.appStates.conversationState);
   const controlProps = {
     id: "oc-lcw-header",
     dir: state.domainStates.globalDir,
@@ -63,17 +64,15 @@ const HeaderStateful = props => {
         Description: "Header Close button clicked."
       });
 
-      if (state.appStates.conversationState === _ConversationState.ConversationState.Active) {
+      if (conversationState.current === _ConversationState.ConversationState.Active) {
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOW_CONFIRMATION,
           payload: true
         });
-      } else if (state.appStates.conversationState === _ConversationState.ConversationState.Postchat) {
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
-          payload: false
-        });
-        await endChat(adapter);
+      } else {
+        const skipEndChatSDK = true;
+        const skipCloseChat = false;
+        await endChat(adapter, skipEndChatSDK, skipCloseChat);
       }
 
       dispatch({
@@ -105,7 +104,11 @@ const HeaderStateful = props => {
     if (state.appStates.outsideOperatingHours) {
       setOutOfOperatingHours(true);
     }
-  }, []);
+
+    if (state.appStates.conversationState) {
+      conversationState.current = state.appStates.conversationState;
+    }
+  }, [state.appStates]);
   return /*#__PURE__*/_react.default.createElement(_omnichannelChatComponents.Header, {
     componentOverrides: headerProps === null || headerProps === void 0 ? void 0 : headerProps.componentOverrides,
     controlProps: outOfOperatingHours || state.appStates.conversationState === _ConversationState.ConversationState.OutOfOffice ? outOfOfficeControlProps : controlProps,

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

@@ -7,8 +7,6 @@ exports.createMarkdown = void 0;
 
 var _markdownIt = _interopRequireDefault(require("markdown-it"));
 
-var _slackMarkdownIt = _interopRequireDefault(require("slack-markdown-it"));
-
 var _markdownItForInline = _interopRequireDefault(require("markdown-it-for-inline"));
 
 var _defaultMarkdownLocalizedTexts = require("../../webchatcontainerstateful/common/defaultProps/defaultMarkdownLocalizedTexts");
@@ -26,8 +24,9 @@ const createMarkdown = (disableMarkdownMessageFormatting, disableNewLineMarkdown
       html: true,
       linkify: true,
       breaks: !disableNewLineMarkdownSupport
-    });
-    markdown.use(_slackMarkdownIt.default); // 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.default, "url_new_win", "link_open", function (tokens, idx, env) {

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

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dummyDefaultProps = void 0;
 
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
 var _mockadapter = _interopRequireDefault(require("../../../webchatcontainerstateful/common/mockadapter"));
 
+var _Audios = require("../../../../assets/Audios");
+
 var _WebChatStoreLoader = require("../../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader");
 
 var _activityStatusMiddleware = require("../../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware");
@@ -23,13 +27,15 @@ var _groupActivitiesMiddleware = require("../../../webchatcontainerstateful/webc
 
 var _typingIndicatorMiddleware = require("../../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/typingIndicatorMiddleware");
 
+var _WebChatLogger = require("../../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const dummyDefaultProps = {
   audioNotificationProps: {
-    audioSrc: "assets/audios/newMessageNotification.mp3"
+    audioSrc: _Audios.NewMessageNotificationSoundBase64
   },
   callingContainerProps: {
     controlProps: {
@@ -268,18 +274,6 @@ const dummyDefaultProps = {
           width: "50px",
           fontSize: "18px"
         },
-        currentCallTimerStyleProps: {
-          borderRadius: "2px",
-          margin: "1px",
-          color: "#FFFFFF",
-          paddingTop: "18px",
-          fontSize: 12,
-          fontFamily: "Segoe UI, Arial, sans-serif",
-          backgroundColor: "darkgrey",
-          height: "45px",
-          width: "50px",
-          textAlign: "center"
-        },
         videoTileStyleProps: {
           width: "100%",
           marginLeft: "auto",
@@ -384,7 +378,7 @@ const dummyDefaultProps = {
         margin: "-2px -2px -2px -3px",
         justifyContent: "center",
         backgroundSize: "65% 65%",
-        backgroundImage: "assets/imgs/chat.svg",
+        backgroundImage: `url(${_omnichannelChatComponents.ModernChatIconBase64})`,
         display: "flex",
         backgroundRepeat: "no-repeat",
         backgroundPosition: "center"
@@ -905,7 +899,7 @@ const dummyDefaultProps = {
       },
       headerIconProps: {
         id: "oc-lcw-header-icon",
-        src: "assets/imgs/chatIcon.svg",
+        src: _omnichannelChatComponents.ModernChatIconBase64,
         alt: "Chat Icon",
         className: undefined
       },
@@ -1030,7 +1024,7 @@ 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",
@@ -1238,7 +1232,7 @@ const dummyDefaultProps = {
       },
       headerContainerStyleProps: {
         backgroundColor: "rgb(49, 95, 162)",
-        backgroundImage: "assets/imgs/Proactive_banner.png",
+        backgroundImage: `url(${_omnichannelChatComponents.ProactiveChatBannerBase64})`,
         backgroundPosition: "initial",
         backgroundRepeat: "no-repeat",
         borderTopLeftRadius: "inherit",
@@ -1266,7 +1260,7 @@ const dummyDefaultProps = {
         fontWeight: "600"
       },
       closeButtonStyleProps: {
-        backgroundImage: "assets/imgs/closeChatButton.svg",
+        backgroundImage: `url(${_omnichannelChatComponents.CloseChatButtonIconBase64})`,
         backgroundPosition: "center",
         backgroundRepeat: "no-repeat",
         color: "#605e5c",
@@ -1389,7 +1383,7 @@ const dummyDefaultProps = {
         lineHeight: "19px"
       },
       iconStyleProps: {
-        backgroundImage: "assets/imgs//ChatReconnectPopupIcon.png",
+        backgroundImage: `url(${_omnichannelChatComponents.ChatReconnectIconBase64})`,
         backgroundPosition: "center",
         backgroundRepeat: "no-repeat",
         backgroundSize: "200px",
@@ -1440,7 +1434,8 @@ const dummyDefaultProps = {
     },
     authClientFunction: undefined,
     isReconnectEnabled: undefined,
-    reconnectId: undefined
+    reconnectId: undefined,
+    redirectInSameWindow: undefined
   },
   styleProps: {
     generalStyles: {
@@ -1512,7 +1507,7 @@ const dummyDefaultProps = {
       internalErrorBoxClass: undefined,
       internalRenderErrorBox: undefined,
       locale: "en-US",
-      onTelemetry: undefined,
+      onTelemetry: (0, _WebChatLogger.createWebChatTelemetry)(),
       overrideLocalizedStrings: undefined,
       renderMarkdown: (0, _createMarkdown.createMarkdown)(false, false),
       scrollToEndButtonMiddleware: undefined,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.endChat = void 0;
+exports.prepareEndChat = exports.endChat = void 0;
 
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 
@@ -13,69 +13,114 @@ var _ConversationState = require("../../../contexts/common/ConversationState");
 
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
-var _NotificationHandler = require("../../webchatcontainerstateful/webchatcontroller/notification/NotificationHandler");
-
-var _NotificationScenarios = require("../../webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios");
-
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 
 var _WebChatStoreLoader = require("../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader");
 
 var _defaultWebChatContainerStatefulProps = require("../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps");
 
+var _PostChatSurveyMode = require("../../postchatsurveypanestateful/enums/PostChatSurveyMode");
+
+var _Constants = require("../../../common/Constants");
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter) => {
-  try {
-    var _props$webChatContain;
-
-    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.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.defaultWebChatContainerStatefulProps.webChatStyles,
-      ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
-    });
-    _WebChatStoreLoader.WebChatStoreLoader.store = null;
-    dispatch({
-      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
-    });
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
-      payload: null
-    });
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
-      payload: undefined
-    });
-    dispatch({
-      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-      payload: undefined
-    });
-
-    _omnichannelChatComponents.BroadcastService.postMessage({
-      eventName: "EndChat"
-    });
-  } catch (ex) {
-    _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
-      Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCallFailed,
-      ExceptionDetails: {
-        exception: ex
-      }
-    });
-
-    _NotificationHandler.NotificationHandler.notifyError(_NotificationScenarios.NotificationScenarios.Connection, "End Chat Call Failed: " + ex);
+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.Constants.truePascal) {
+    const skipEndChatSDK = false;
+    const skipCloseChat = true;
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
+
+    if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+      const loadPostChatEvent = {
+        eventName: _TelemetryConstants.BroadcastEvent.LoadPostChatSurvey
+      };
+
+      _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
+    } else if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Link) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+        payload: _ConversationState.ConversationState.InActive
+      });
+    }
+  } else {
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.prepareEndChat = prepareEndChat;
+
+const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat) => {
+  if (!skipEndChatSDK) {
+    try {
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCall
+      });
+
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat()); // Need to clear these states immediately when chat ended from OC.
+
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
+        payload: undefined
+      });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
+    } catch (ex) {
+      _TelemetryHelper.TelemetryHelper.logSDKEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.EndChatSDKCallFailed,
+        ExceptionDetails: {
+          exception: ex
+        }
+      });
+    }
+  }
+
+  if (!skipCloseChat) {
+    try {
+      var _props$webChatContain;
+
+      adapter === null || adapter === void 0 ? void 0 : adapter.end();
+      setAdapter(undefined);
+      setWebChatStyles({ ..._defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps.webChatStyles,
+        ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
+      });
+      _WebChatStoreLoader.WebChatStoreLoader.store = null;
+      dispatch({
+        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
+      });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
+        payload: null
+      });
+
+      _omnichannelChatComponents.BroadcastService.postMessage({
+        eventName: _TelemetryConstants.BroadcastEvent.EndChat
+      });
+    } catch (error) {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+        Event: _TelemetryConstants.TelemetryEvent.CloseChatMethodException,
+        ExceptionDetails: {
+          exception: `Failed to endChat: ${error}`
+        }
+      });
+    }
   }
 };
 

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

@@ -18,7 +18,7 @@ const initCallingSdk = async (chatSDK, setVoiceVideoCallingSDK) => {
       const callingSDK = await chatSDK.getVoiceVideoCalling();
       setVoiceVideoCallingSDK(callingSDK);
 
-      _TelemetryHelper.TelemetryHelper.logCallingEvent(_TelemetryConstants.LogLevel.ERROR, {
+      _TelemetryHelper.TelemetryHelper.logCallingEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.CallingSDKLoadSuccess
       });
 

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

@@ -5,12 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.initWebChatComposer = void 0;
 
+var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
+
 var _botframeworkWebchat = require("botframework-webchat");
 
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
+var _ConversationState = require("../../../contexts/common/ConversationState");
+
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 
 var _PostChatSurveyMode = require("../../postchatsurveypanestateful/enums/PostChatSurveyMode");
 
+var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
+
 var _WebChatStoreLoader = require("../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader");
 
 var _attachmentProcessingMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware"));
@@ -35,6 +43,8 @@ var _createMarkdown = require("./createMarkdown");
 
 var _maxMessageSizeValidator = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator"));
 
+var _WebChatLogger = require("../../webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger");
+
 var _defaultAttachmentProps = require("../../webchatcontainerstateful/common/defaultProps/defaultAttachmentProps");
 
 var _defaultMiddlewareLocalizedTexts = require("../../webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts");
@@ -53,8 +63,6 @@ var _preProcessingMiddleware = _interopRequireDefault(require("../../webchatcont
 
 var _sanitizationMiddleware = _interopRequireDefault(require("../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware"));
 
-var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -78,6 +86,11 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
     const conversationEndCallback = async () => {
       var _props$webChatContain4, _props$webChatContain5;
 
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.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,
@@ -86,12 +99,19 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
         });
       }
 
-      if (isPostChatEnabled === "true" && postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
-        const loadPostChatEvent = {
-          eventName: "LoadPostChatSurvey"
-        };
+      if (isPostChatEnabled === "true") {
+        if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Embed) {
+          const loadPostChatEvent = {
+            eventName: _TelemetryConstants.BroadcastEvent.LoadPostChatSurvey
+          };
 
-        _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
+          _omnichannelChatComponents.BroadcastService.postMessage(loadPostChatEvent);
+        } else if (postChatSurveyMode === _PostChatSurveyMode.PostChatSurveyMode.Link) {
+          dispatch({
+            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+            payload: _ConversationState.ConversationState.InActive
+          });
+        }
       } else {
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_ENDED_BY_AGENT,
@@ -103,6 +123,10 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
         type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CHAT_TOKEN,
         payload: undefined
       });
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     };
 
     webChatStore = (0, _botframeworkWebchat.createStore)({}, //initial state
@@ -123,6 +147,7 @@ const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatStyles)
     avatarMiddleware: (_props$webChatContain15 = props.webChatContainerProps) !== null && _props$webChatContain15 !== void 0 && (_props$webChatContain16 = _props$webChatContain15.renderingMiddlewareProps) !== null && _props$webChatContain16 !== void 0 && _props$webChatContain16.disableAvatarMiddleware ? undefined : (0, _avatarMiddleware.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.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.defaultWebChatContainerStatefulProps.webChatProps) === null || _defaultWebChatContai3 === void 0 ? void 0 : _defaultWebChatContai3.typingIndicatorMiddleware,
+    onTelemetry: (0, _WebChatLogger.createWebChatTelemetry)(),
     ...((_props$webChatContain21 = props.webChatContainerProps) === null || _props$webChatContain21 === void 0 ? void 0 : _props$webChatContain21.webChatProps)
   };
   return webChatProps;