@microsoft/omnichannel-chat-widget 1.6.4 → 1.6.5-main.cf61c9e

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

@@ -6,21 +6,27 @@ Object.defineProperty(exports, "__esModule", {
 exports.prepareEndChat = exports.endVoiceVideoCallIfOngoing = exports.endChatStateCleanUp = exports.endChat = exports.closeChatStateCleanUp = exports.chatSDKStateCleanUp = exports.callingStateCleanUp = void 0;
 var _Constants = require("../../../common/Constants");
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
-var _authHelper = require("./authHelper");
 var _utils = require("../../../common/utils");
 var _renderSurveyHelpers = require("./renderSurveyHelpers");
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _ConversationState = require("../../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
+var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
 var _WebChatStoreLoader = require("../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader");
 var _defaultWebChatContainerStatefulProps = require("../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps");
-var _TelemetryManager = require("../../../common/telemetry/TelemetryManager");
+var _createReducer = require("../../../contexts/createReducer");
+var _authHelper = require("./authHelper");
+var _reconnectChatHelper = require("./reconnectChatHelper");
 var _omnichannelChatSdk = require("@microsoft/omnichannel-chat-sdk");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter) => {
   try {
     var _conversationDetails$, _state$domainStates, _state$appStates3;
+    const {
+      chatConfig
+    } = props;
+
     // Use Case: If call is ongoing, end the call by simulating end call button click
     endVoiceVideoCallIfOngoing(chatSDK, dispatch);
     const conversationDetails = await (0, _utils.getConversationDetailsCall)(chatSDK);
@@ -80,12 +86,25 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
         Description: `${_Constants.PrepareEndChatDescriptionConstants.ConversationEndedByCustomerWithInvalidPostChat} ${state === null || state === void 0 ? void 0 : (_state$appStates4 = state.appStates) === null || _state$appStates4 === void 0 ? void 0 : _state$appStates4.conversationEndedBy}.`
       });
     }
-    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true);
+    const persistentEnabled = (0, _reconnectChatHelper.isPersistentEnabled)(chatConfig);
+    const {
+      appStates
+    } = (0, _createReducer.executeReducer)(state, {
+      type: _LiveChatWidgetActionType.LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
+      payload: undefined
+    });
+    const endedByCustomer = (appStates === null || appStates === void 0 ? void 0 : appStates.conversationEndedBy) === "Customer";
 
-    // Initiate post chat render
-    if (postchatContext) {
-      await (0, _renderSurveyHelpers.initiatePostChat)(props, conversationDetails, state, dispatch, postchatContext);
-      return;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const commonParams = [props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter];
+    if (persistentEnabled && endedByCustomer) {
+      await endChat(...commonParams, true, false, true);
+    } else {
+      await endChat(...commonParams, false, true, true);
+      if (postchatContext) {
+        await (0, _renderSurveyHelpers.initiatePostChat)(props, conversationDetails, state, dispatch, postchatContext);
+        return;
+      }
     }
   } catch (error) {
     var _props$controlProps;

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

@@ -40,7 +40,7 @@ var _toastMiddleware = _interopRequireDefault(require("../../webchatcontainersta
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
-  var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4, _state$domainStates$c, _state$domainStates$l4, _state$domainStates$l5, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain11, _props$webChatContain12, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain13, _props$webChatContain14, _defaultWebChatContai, _props$webChatContain15, _props$webChatContain16, _props$webChatContain17, _props$webChatContain18, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai2, _props$webChatContain21, _props$webChatContain22, _defaultWebChatContai3, _props$webChatContain23, _props$webChatContain24;
+  var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4, _state$domainStates$l4, _state$domainStates$l5, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain11, _props$webChatContain12, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain13, _props$webChatContain14, _defaultWebChatContai, _props$webChatContain15, _props$webChatContain16, _props$webChatContain17, _props$webChatContain18, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai2, _props$webChatContain21, _props$webChatContain22, _defaultWebChatContai3, _props$webChatContain23, _props$webChatContain24;
   // Add a hook to make all links open a new window
   postDomPurifyActivities();
   const localizedTexts = {
@@ -120,7 +120,6 @@ const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
   // Initialize the remaining Web Chat props
   const webChatProps = {
     ..._defaultWebChatContainerStatefulProps.defaultWebChatContainerStatefulProps.webChatProps,
-    userID: ((_state$domainStates$c = state.domainStates.chatToken) === null || _state$domainStates$c === void 0 ? void 0 : _state$domainStates$c.visitorId) || "teamsvisitor",
     dir: state.domainStates.globalDir,
     locale: (0, _utils.changeLanguageCodeFormatForWebChat)((0, _omnichannelChatSdk.getLocaleStringFromId)((_state$domainStates$l4 = state.domainStates.liveChatConfig) === null || _state$domainStates$l4 === void 0 ? void 0 : (_state$domainStates$l5 = _state$domainStates$l4.ChatWidgetLanguage) === null || _state$domainStates$l5 === void 0 ? void 0 : _state$domainStates$l5.msdyn_localeid)),
     store: webChatStore,

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

@@ -358,7 +358,19 @@ const LiveChatWidgetStateful = props => {
 
     // Start chat from SDK Event
     _omnichannelChatComponents.BroadcastService.getMessageByEventName(_TelemetryConstants.BroadcastEvent.StartChat).subscribe(msg => {
-      var _msg$payload5, _msg$payload6, _msg$payload7, _msg$payload9, _inMemoryState$appSta, _inMemoryState$appSta2, _inMemoryState$appSta3, _inMemoryState$appSta4;
+      var _props$chatConfig4, _props$chatConfig4$Li, _msg$payload5, _msg$payload6, _msg$payload7, _msg$payload9, _inMemoryState$appSta, _inMemoryState$appSta2, _inMemoryState$appSta3, _inMemoryState$appSta4;
+      // If chat is out of operating hours chat widget sets the conversation state to OutOfOffice.
+      if ((props === null || props === void 0 ? void 0 : (_props$chatConfig4 = props.chatConfig) === null || _props$chatConfig4 === void 0 ? void 0 : (_props$chatConfig4$Li = _props$chatConfig4.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig4$Li === void 0 ? void 0 : _props$chatConfig4$Li.OutOfOperatingHours.toLowerCase()) === "true") {
+        (state === null || state === void 0 ? void 0 : state.appStates.isMinimized) && dispatch({
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+        dispatch({
+          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: _ConversationState.ConversationState.OutOfOffice
+        });
+        return;
+      }
       // If the startChat event is not initiated by the same tab. Ignore the call
       if (!(0, _utils.isNullOrUndefined)(msg === null || msg === void 0 ? void 0 : (_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.runtimeId) && (msg === null || msg === void 0 ? void 0 : (_msg$payload6 = msg.payload) === null || _msg$payload6 === void 0 ? void 0 : _msg$payload6.runtimeId) !== _TelemetryManager.TelemetryManager.InternalTelemetryData.lcwRuntimeId) {
         return;

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

@@ -1,21 +1,27 @@
 import { ConfirmationState, Constants, ConversationEndEntity, ParticipantType, PrepareEndChatDescriptionConstants } from "../../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
-import { handleAuthentication } from "./authHelper";
 import { getConversationDetailsCall, getWidgetEndChatEventName } from "../../../common/utils";
 import { getPostChatContext, initiatePostChat } from "./renderSurveyHelpers";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
+import { TelemetryManager } from "../../../common/telemetry/TelemetryManager";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
-import { TelemetryManager } from "../../../common/telemetry/TelemetryManager";
+import { executeReducer } from "../../../contexts/createReducer";
+import { handleAuthentication } from "./authHelper";
+import { isPersistentEnabled } from "./reconnectChatHelper";
 import { uuidv4 } from "@microsoft/omnichannel-chat-sdk";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter) => {
   try {
     var _conversationDetails$, _state$domainStates, _state$appStates3;
+    const {
+      chatConfig
+    } = props;
+
     // Use Case: If call is ongoing, end the call by simulating end call button click
     endVoiceVideoCallIfOngoing(chatSDK, dispatch);
     const conversationDetails = await getConversationDetailsCall(chatSDK);
@@ -75,12 +81,25 @@ const prepareEndChat = async (props, chatSDK, state, dispatch, setAdapter, setWe
         Description: `${PrepareEndChatDescriptionConstants.ConversationEndedByCustomerWithInvalidPostChat} ${state === null || state === void 0 ? void 0 : (_state$appStates4 = state.appStates) === null || _state$appStates4 === void 0 ? void 0 : _state$appStates4.conversationEndedBy}.`
       });
     }
-    endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, true, true);
+    const persistentEnabled = isPersistentEnabled(chatConfig);
+    const {
+      appStates
+    } = executeReducer(state, {
+      type: LiveChatWidgetActionType.GET_IN_MEMORY_STATE,
+      payload: undefined
+    });
+    const endedByCustomer = (appStates === null || appStates === void 0 ? void 0 : appStates.conversationEndedBy) === "Customer";
 
-    // Initiate post chat render
-    if (postchatContext) {
-      await initiatePostChat(props, conversationDetails, state, dispatch, postchatContext);
-      return;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const commonParams = [props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter];
+    if (persistentEnabled && endedByCustomer) {
+      await endChat(...commonParams, true, false, true);
+    } else {
+      await endChat(...commonParams, false, true, true);
+      if (postchatContext) {
+        await initiatePostChat(props, conversationDetails, state, dispatch, postchatContext);
+        return;
+      }
     }
   } catch (error) {
     var _props$controlProps;

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

@@ -34,7 +34,7 @@ import createToastMiddleware from "../../webchatcontainerstateful/webchatcontrol
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) => {
-  var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4, _state$domainStates$c, _state$domainStates$l4, _state$domainStates$l5, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain11, _props$webChatContain12, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain13, _props$webChatContain14, _defaultWebChatContai, _props$webChatContain15, _props$webChatContain16, _props$webChatContain17, _props$webChatContain18, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai2, _props$webChatContain21, _props$webChatContain22, _defaultWebChatContai3, _props$webChatContain23, _props$webChatContain24;
+  var _props$webChatContain, _props$webChatContain2, _props$webChatContain3, _props$webChatContain4, _state$domainStates$l4, _state$domainStates$l5, _props$webChatContain9, _props$webChatContain10, _state$domainStates$r, _state$domainStates$r2, _props$webChatContain11, _props$webChatContain12, _state$domainStates$r3, _state$domainStates$r4, _props$webChatContain13, _props$webChatContain14, _defaultWebChatContai, _props$webChatContain15, _props$webChatContain16, _props$webChatContain17, _props$webChatContain18, _state$domainStates$r5, _state$domainStates$r6, _props$webChatContain19, _props$webChatContain20, _defaultWebChatContai2, _props$webChatContain21, _props$webChatContain22, _defaultWebChatContai3, _props$webChatContain23, _props$webChatContain24;
   // Add a hook to make all links open a new window
   postDomPurifyActivities();
   const localizedTexts = {
@@ -114,7 +114,6 @@ export const initWebChatComposer = (props, state, dispatch, chatSDK, endChat) =>
   // Initialize the remaining Web Chat props
   const webChatProps = {
     ...defaultWebChatContainerStatefulProps.webChatProps,
-    userID: ((_state$domainStates$c = state.domainStates.chatToken) === null || _state$domainStates$c === void 0 ? void 0 : _state$domainStates$c.visitorId) || "teamsvisitor",
     dir: state.domainStates.globalDir,
     locale: changeLanguageCodeFormatForWebChat(getLocaleStringFromId((_state$domainStates$l4 = state.domainStates.liveChatConfig) === null || _state$domainStates$l4 === void 0 ? void 0 : (_state$domainStates$l5 = _state$domainStates$l4.ChatWidgetLanguage) === null || _state$domainStates$l5 === void 0 ? void 0 : _state$domainStates$l5.msdyn_localeid)),
     store: webChatStore,

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

@@ -350,7 +350,19 @@ export const LiveChatWidgetStateful = props => {
 
     // Start chat from SDK Event
     BroadcastService.getMessageByEventName(BroadcastEvent.StartChat).subscribe(msg => {
-      var _msg$payload5, _msg$payload6, _msg$payload7, _msg$payload9, _inMemoryState$appSta, _inMemoryState$appSta2, _inMemoryState$appSta3, _inMemoryState$appSta4;
+      var _props$chatConfig4, _props$chatConfig4$Li, _msg$payload5, _msg$payload6, _msg$payload7, _msg$payload9, _inMemoryState$appSta, _inMemoryState$appSta2, _inMemoryState$appSta3, _inMemoryState$appSta4;
+      // If chat is out of operating hours chat widget sets the conversation state to OutOfOffice.
+      if ((props === null || props === void 0 ? void 0 : (_props$chatConfig4 = props.chatConfig) === null || _props$chatConfig4 === void 0 ? void 0 : (_props$chatConfig4$Li = _props$chatConfig4.LiveWSAndLiveChatEngJoin) === null || _props$chatConfig4$Li === void 0 ? void 0 : _props$chatConfig4$Li.OutOfOperatingHours.toLowerCase()) === "true") {
+        (state === null || state === void 0 ? void 0 : state.appStates.isMinimized) && dispatch({
+          type: LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.OutOfOffice
+        });
+        return;
+      }
       // If the startChat event is not initiated by the same tab. Ignore the call
       if (!isNullOrUndefined(msg === null || msg === void 0 ? void 0 : (_msg$payload5 = msg.payload) === null || _msg$payload5 === void 0 ? void 0 : _msg$payload5.runtimeId) && (msg === null || msg === void 0 ? void 0 : (_msg$payload6 = msg.payload) === null || _msg$payload6 === void 0 ? void 0 : _msg$payload6.runtimeId) !== TelemetryManager.InternalTelemetryData.lcwRuntimeId) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.6.4",
+  "version": "1.6.5-main.cf61c9e",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -86,7 +86,7 @@
     "p-defer-es5": "^2.0.1",
     "sanitize-html": "2.12.1",
     "slack-markdown-it": "^1.0.5",
-    "simple-update-in":"2.2.0"
+    "simple-update-in": "2.2.0"
   },
   "scripts": {
     "storybook": "start-storybook -p 6006",