@microsoft/omnichannel-chat-widget 1.2.1 → 1.2.2-main.9c5ff6c

package/lib/cjs/common/Constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WebChatMiddlewareConstants = exports.TranscriptConstants = exports.StorageType = exports.Regex = exports.ParticipantType = exports.MimeTypes = exports.LocaleConstants = exports.LiveWorkItemState = exports.HtmlIdNames = exports.HtmlElementSelectors = exports.HtmlClassNames = exports.HtmlAttributeNames = exports.EnvironmentVersion = exports.ElementType = exports.E2VVOptions = exports.ConversationEndEntity = exports.Constants = exports.ConfirmationState = exports.ChatSDKError = exports.AriaTelemetryConstants = exports.AMSConstants = void 0;
+exports.WebChatMiddlewareConstants = exports.TranscriptConstants = exports.StorageType = exports.Regex = exports.ParticipantType = exports.MimeTypes = exports.LocaleConstants = exports.LiveWorkItemState = exports.HtmlIdNames = exports.HtmlElementSelectors = exports.HtmlClassNames = exports.HtmlAttributeNames = exports.EnvironmentVersion = exports.ElementType = exports.E2VVOptions = exports.ConversationMode = exports.ConversationEndEntity = exports.Constants = exports.ConfirmationState = exports.ChatSDKError = exports.AriaTelemetryConstants = exports.AMSConstants = void 0;
 var _class;
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
@@ -208,6 +208,12 @@ exports.E2VVOptions = E2VVOptions;
   E2VVOptions["VideoAndVoiceCalling"] = "192350001";
   E2VVOptions["VoiceOnly"] = "192350002";
 })(E2VVOptions || (exports.E2VVOptions = E2VVOptions = {}));
+let ConversationMode;
+exports.ConversationMode = ConversationMode;
+(function (ConversationMode) {
+  ConversationMode["Regular"] = "192350000";
+  ConversationMode["Persistent"] = "192350001";
+})(ConversationMode || (exports.ConversationMode = ConversationMode = {}));
 let LiveWorkItemState;
 exports.LiveWorkItemState = LiveWorkItemState;
 (function (LiveWorkItemState) {

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

@@ -3,19 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isReconnectEnabled = exports.handleChatReconnect = exports.getChatReconnectContext = void 0;
+exports.isReconnectEnabled = exports.isPersistentEnabled = exports.handleChatReconnect = exports.getChatReconnectContext = void 0;
 require("regenerator-runtime/runtime");
 var _TelemetryConstants = require("../../../common/telemetry/TelemetryConstants");
 var _utils = require("../../../common/utils");
 var _authHelper = require("./authHelper");
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+var _Constants = require("../../../common/Constants");
 var _ConversationState = require("../../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../../common/telemetry/TelemetryHelper");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
   var _props$chatConfig, _props$chatConfig$Liv;
-  if (!isReconnectEnabled(props.chatConfig)) return;
+  if (!isReconnectEnabled(props.chatConfig) || isPersistentEnabled(props.chatConfig)) return;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
@@ -128,6 +129,15 @@ const isReconnectEnabled = chatConfig => {
   return false;
 };
 exports.isReconnectEnabled = isReconnectEnabled;
+const isPersistentEnabled = chatConfig => {
+  if (chatConfig) {
+    var _chatConfig$LiveWSAnd3, _chatConfig$LiveWSAnd4;
+    const persistentEnabled = ((_chatConfig$LiveWSAnd3 = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd3 === void 0 ? void 0 : (_chatConfig$LiveWSAnd4 = _chatConfig$LiveWSAnd3.msdyn_conversationmode) === null || _chatConfig$LiveWSAnd4 === void 0 ? void 0 : _chatConfig$LiveWSAnd4.toLowerCase()) === _Constants.ConversationMode.Persistent;
+    return persistentEnabled;
+  }
+  return false;
+};
+exports.isPersistentEnabled = isPersistentEnabled;
 const hasReconnectId = reconnectAvailabilityResponse => {
   return reconnectAvailabilityResponse && !(0, _utils.isNullOrUndefined)(reconnectAvailabilityResponse.reconnectId);
 };

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

@@ -131,7 +131,7 @@ const LiveChatWidgetStateful = props => {
       isChatValid = await (0, _startChat.checkIfConversationStillValid)(chatSDK, dispatch, state);
       if (isChatValid === true) {
         //Check if reconnect enabled
-        if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true) {
+        if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
           await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, _startChat.initStartChat, state);
           // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
           if (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat) {
@@ -145,7 +145,7 @@ const LiveChatWidgetStateful = props => {
     if (isChatValid === false) {
       if (localState) {
         // adding the reconnect logic for the case when customer tries to reconnect from a new browser or InPrivate browser
-        if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true) {
+        if ((0, _reconnectChatHelper.isReconnectEnabled)(props.chatConfig) === true && !(0, _reconnectChatHelper.isPersistentEnabled)(props.chatConfig)) {
           await (0, _reconnectChatHelper.handleChatReconnect)(chatSDK, props, dispatch, setAdapter, _startChat.initStartChat, state);
           // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
           if (state.appStates.conversationState === _ConversationState.ConversationState.Active || state.appStates.conversationState === _ConversationState.ConversationState.ReconnectChat) {
@@ -529,14 +529,14 @@ const LiveChatWidgetStateful = props => {
     }
 
     // If start chat failed, and C2 is trying to close chat widget
-    if (state !== null && state !== void 0 && (_state$appStates9 = state.appStates) !== null && _state$appStates9 !== void 0 && _state$appStates9.startChatFailed) {
+    if (state !== null && state !== void 0 && (_state$appStates9 = state.appStates) !== null && _state$appStates9 !== void 0 && _state$appStates9.startChatFailed || (state === null || state === void 0 ? void 0 : (_state$appStates10 = state.appStates) === null || _state$appStates10 === void 0 ? void 0 : _state$appStates10.conversationState) === _ConversationState.ConversationState.Postchat) {
       (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true, uwid.current);
       return;
     }
 
     // Scenario -> Chat was InActive and closing the chat (Refresh scenario on post chat)
-    if ((state === null || state === void 0 ? void 0 : (_state$appStates10 = state.appStates) === null || _state$appStates10 === void 0 ? void 0 : _state$appStates10.conversationState) === _ConversationState.ConversationState.Postchat || (state === null || state === void 0 ? void 0 : (_state$appStates11 = state.appStates) === null || _state$appStates11 === void 0 ? void 0 : _state$appStates11.conversationState) === _ConversationState.ConversationState.InActive) {
-      (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true, uwid.current);
+    if ((state === null || state === void 0 ? void 0 : (_state$appStates11 = state.appStates) === null || _state$appStates11 === void 0 ? void 0 : _state$appStates11.conversationState) === _ConversationState.ConversationState.InActive) {
+      (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid.current);
       return;
     }
     if ((state === null || state === void 0 ? void 0 : (_state$appStates12 = state.appStates) === null || _state$appStates12 === void 0 ? void 0 : _state$appStates12.conversationEndedBy) === _Constants.ConversationEndEntity.Agent || (state === null || state === void 0 ? void 0 : (_state$appStates13 = state.appStates) === null || _state$appStates13 === void 0 ? void 0 : _state$appStates13.conversationEndedBy) === _Constants.ConversationEndEntity.Bot) {

package/lib/esm/common/Constants.js

@@ -188,6 +188,11 @@ export let E2VVOptions;
   E2VVOptions["VideoAndVoiceCalling"] = "192350001";
   E2VVOptions["VoiceOnly"] = "192350002";
 })(E2VVOptions || (E2VVOptions = {}));
+export let ConversationMode;
+(function (ConversationMode) {
+  ConversationMode["Regular"] = "192350000";
+  ConversationMode["Persistent"] = "192350001";
+})(ConversationMode || (ConversationMode = {}));
 export let LiveWorkItemState;
 (function (LiveWorkItemState) {
   LiveWorkItemState["Active"] = "Active";

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

@@ -3,6 +3,7 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/teleme
 import { checkContactIdError, isNullOrEmptyString, isNullOrUndefined } from "../../../common/utils";
 import { handleAuthentication, removeAuthTokenProvider } from "./authHelper";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
+import { ConversationMode } from "../../../common/Constants";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
@@ -10,7 +11,7 @@ import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const handleChatReconnect = async (chatSDK, props, dispatch, setAdapter, initStartChat, state) => {
   var _props$chatConfig, _props$chatConfig$Liv;
-  if (!isReconnectEnabled(props.chatConfig)) return;
+  if (!isReconnectEnabled(props.chatConfig) || isPersistentEnabled(props.chatConfig)) return;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
@@ -120,7 +121,15 @@ const isReconnectEnabled = chatConfig => {
   }
   return false;
 };
+const isPersistentEnabled = chatConfig => {
+  if (chatConfig) {
+    var _chatConfig$LiveWSAnd3, _chatConfig$LiveWSAnd4;
+    const persistentEnabled = ((_chatConfig$LiveWSAnd3 = chatConfig.LiveWSAndLiveChatEngJoin) === null || _chatConfig$LiveWSAnd3 === void 0 ? void 0 : (_chatConfig$LiveWSAnd4 = _chatConfig$LiveWSAnd3.msdyn_conversationmode) === null || _chatConfig$LiveWSAnd4 === void 0 ? void 0 : _chatConfig$LiveWSAnd4.toLowerCase()) === ConversationMode.Persistent;
+    return persistentEnabled;
+  }
+  return false;
+};
 const hasReconnectId = reconnectAvailabilityResponse => {
   return reconnectAvailabilityResponse && !isNullOrUndefined(reconnectAvailabilityResponse.reconnectId);
 };
-export { handleChatReconnect, isReconnectEnabled, getChatReconnectContext };
+export { handleChatReconnect, isReconnectEnabled, isPersistentEnabled, getChatReconnectContext };

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

@@ -9,7 +9,7 @@ import { checkIfConversationStillValid, initStartChat, prepareStartChat, setPreC
 import { createTimer, getBroadcastChannelName, getConversationDetailsCall, getLocaleDirection, getStateFromCache, getWidgetCacheIdfromProps, getWidgetEndChatEventName, isNullOrEmptyString, isUndefinedOrEmpty, newGuid } from "../../../common/utils";
 import { defaultClientDataStoreProvider, isCookieAllowed } from "../../../common/storage/default/defaultClientDataStoreProvider";
 import { endChat, prepareEndChat } from "../common/endChat";
-import { handleChatReconnect, isReconnectEnabled } from "../common/reconnectChatHelper";
+import { handleChatReconnect, isPersistentEnabled, isReconnectEnabled } from "../common/reconnectChatHelper";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
 import { ActivityStreamHandler } from "../common/ActivityStreamHandler";
 import CallingContainerStateful from "../../callingcontainerstateful/CallingContainerStateful";
@@ -123,7 +123,7 @@ export const LiveChatWidgetStateful = props => {
       isChatValid = await checkIfConversationStillValid(chatSDK, dispatch, state);
       if (isChatValid === true) {
         //Check if reconnect enabled
-        if (isReconnectEnabled(props.chatConfig) === true) {
+        if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
           await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
           // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
           if (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat) {
@@ -137,7 +137,7 @@ export const LiveChatWidgetStateful = props => {
     if (isChatValid === false) {
       if (localState) {
         // adding the reconnect logic for the case when customer tries to reconnect from a new browser or InPrivate browser
-        if (isReconnectEnabled(props.chatConfig) === true) {
+        if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
           await handleChatReconnect(chatSDK, props, dispatch, setAdapter, initStartChat, state);
           // If chat reconnect has kicked in chat state will become Active or Reconnect. So just exit, else go next
           if (state.appStates.conversationState === ConversationState.Active || state.appStates.conversationState === ConversationState.ReconnectChat) {
@@ -521,14 +521,14 @@ export const LiveChatWidgetStateful = props => {
     }
 
     // If start chat failed, and C2 is trying to close chat widget
-    if (state !== null && state !== void 0 && (_state$appStates9 = state.appStates) !== null && _state$appStates9 !== void 0 && _state$appStates9.startChatFailed) {
+    if (state !== null && state !== void 0 && (_state$appStates9 = state.appStates) !== null && _state$appStates9 !== void 0 && _state$appStates9.startChatFailed || (state === null || state === void 0 ? void 0 : (_state$appStates10 = state.appStates) === null || _state$appStates10 === void 0 ? void 0 : _state$appStates10.conversationState) === ConversationState.Postchat) {
       endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true, uwid.current);
       return;
     }
 
     // Scenario -> Chat was InActive and closing the chat (Refresh scenario on post chat)
-    if ((state === null || state === void 0 ? void 0 : (_state$appStates10 = state.appStates) === null || _state$appStates10 === void 0 ? void 0 : _state$appStates10.conversationState) === ConversationState.Postchat || (state === null || state === void 0 ? void 0 : (_state$appStates11 = state.appStates) === null || _state$appStates11 === void 0 ? void 0 : _state$appStates11.conversationState) === ConversationState.InActive) {
-      endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, true, false, true, uwid.current);
+    if ((state === null || state === void 0 ? void 0 : (_state$appStates11 = state.appStates) === null || _state$appStates11 === void 0 ? void 0 : _state$appStates11.conversationState) === ConversationState.InActive) {
+      endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, false, false, true, uwid.current);
       return;
     }
     if ((state === null || state === void 0 ? void 0 : (_state$appStates12 = state.appStates) === null || _state$appStates12 === void 0 ? void 0 : _state$appStates12.conversationEndedBy) === ConversationEndEntity.Agent || (state === null || state === void 0 ? void 0 : (_state$appStates13 = state.appStates) === null || _state$appStates13 === void 0 ? void 0 : _state$appStates13.conversationEndedBy) === ConversationEndEntity.Bot) {

package/lib/types/common/Constants.d.ts

@@ -171,6 +171,10 @@ export declare enum E2VVOptions {
     VideoAndVoiceCalling = "192350001",
     VoiceOnly = "192350002"
 }
+export declare enum ConversationMode {
+    Regular = "192350000",
+    Persistent = "192350001"
+}
 export declare enum LiveWorkItemState {
     Active = "Active",
     Closed = "Closed",

package/lib/types/components/livechatwidget/common/reconnectChatHelper.d.ts

@@ -6,4 +6,5 @@ import { ILiveChatWidgetContext } from "../../../contexts/common/ILiveChatWidget
 declare const handleChatReconnect: (chatSDK: any, props: any, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, initStartChat: any, state: ILiveChatWidgetContext) => Promise<void>;
 declare const getChatReconnectContext: (chatSDK: any, chatConfig: ChatConfig, props: any, isAuthenticatedChat: boolean) => Promise<any>;
 declare const isReconnectEnabled: (chatConfig?: ChatConfig | undefined) => boolean;
-export { handleChatReconnect, isReconnectEnabled, getChatReconnectContext };
+declare const isPersistentEnabled: (chatConfig?: ChatConfig | undefined) => boolean;
+export { handleChatReconnect, isReconnectEnabled, isPersistentEnabled, getChatReconnectContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.2.1",
+  "version": "1.2.2-main.9c5ff6c",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "@microsoft/omnichannel-chat-components": "^1.0.5",
-    "@microsoft/omnichannel-chat-sdk": "1.4.4",
+    "@microsoft/omnichannel-chat-sdk": "1.4.5",
     "abort-controller-es5": "^2.0.1",
     "dompurify": "^2.3.4",
     "markdown-it": "^12.3.2",