@microsoft/omnichannel-chat-widget 0.1.0-main.8b6c0d8 → 0.1.0-main.a60f242

package/lib/cjs/common/telemetry/TelemetryHelper.js

@@ -109,6 +109,8 @@ class TelemetryHelper {
   static conformToLoadContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
+      var _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13;
+
       event.Event = payload.Event;
       event.ResourcePath = payload.ResourcePath;
       event.WidgetState = payload.WidgetState;
@@ -116,16 +118,19 @@ class TelemetryHelper {
       event.ChatType = payload.ChatType;
       event.ElapsedTimeInMilliseconds = payload.ElapsedTimeInMilliseconds;
       event.ExceptionDetails = JSON.stringify(payload.ExceptionDetails);
+      event.OCChatSDKVersion = ((_TelemetryManager$Int11 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.OCChatSDKVersion) ?? "";
+      event.OCChatWidgetVersion = ((_TelemetryManager$Int12 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : _TelemetryManager$Int12.chatWidgetVersion) ?? "";
+      event.OCChatComponentsVersion = ((_TelemetryManager$Int13 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.chatComponentVersion) ?? "";
     });
   }
 
   static conformToIC3ClientContract(level, input) {
     const payload = input.payload;
     return TelemetryHelper.populate(level, payload, event => {
-      var _TelemetryManager$Int11;
+      var _TelemetryManager$Int14;
 
       event.Event = payload.Event;
-      event.IC3ClientVersion = (_TelemetryManager$Int11 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.IC3ClientVersion;
+      event.IC3ClientVersion = (_TelemetryManager$Int14 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : _TelemetryManager$Int14.IC3ClientVersion;
       event.SubscriptionId = payload.SubscriptionId;
       event.EndpointUrl = payload.EndpointUrl;
       event.EndpointId = payload.EndpointId;
@@ -249,14 +254,14 @@ _defineProperty(TelemetryHelper, "logActionEvent", (logLevel, payload) => {
 });
 
 _defineProperty(TelemetryHelper, "logSDKEvent", (logLevel, payload) => {
-  var _TelemetryManager$Int12;
+  var _TelemetryManager$Int15;
 
   const telemetryEvent = {
     eventName: (payload === null || payload === void 0 ? void 0 : payload.Event) ?? "",
     logLevel: logLevel,
     payload: { ...payload,
       TransactionId: (0, _utils.newGuid)(),
-      RequestId: (_TelemetryManager$Int12 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : _TelemetryManager$Int12.currentRequestId
+      RequestId: (_TelemetryManager$Int15 = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.currentRequestId
     }
   };
 
@@ -271,5 +276,18 @@ _defineProperty(TelemetryHelper, "logConfigDataEvent", (logLevel, payload) => {
     }
   };
 
+  _omnichannelChatComponents.BroadcastService.postMessage(telemetryEvent);
+});
+
+_defineProperty(TelemetryHelper, "logWebChatEvent", (logLevel, payload) => {
+  const telemetryEvent = {
+    eventName: _TelemetryConstants.TelemetryEvent.WebChatEvent,
+    logLevel: logLevel,
+    payload: { ...payload,
+      type: _TelemetryConstants.TelemetryEvent.WebChatEvent,
+      scenarioType: _TelemetryConstants.ScenarioType.WEBCHAT
+    }
+  };
+
   _omnichannelChatComponents.BroadcastService.postMessage(telemetryEvent);
 });

package/lib/cjs/common/telemetry/TelemetryManager.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TelemetryTimers = exports.TelemetryManager = exports.RegisterLoggers = void 0;
+exports.disposeLoggers = exports.TelemetryTimers = exports.TelemetryManager = exports.RegisterLoggers = void 0;
 
 var _TelemetryConstants = require("./TelemetryConstants");
 
@@ -13,6 +13,10 @@ var _ariaTelemetryLogger = require("./loggers/ariaTelemetryLogger");
 
 var _consoleLogger = require("./loggers/consoleLogger");
 
+var _defaultAriaConfig = require("./defaultConfigs/defaultAriaConfig");
+
+var _TelemetryHelper = require("./TelemetryHelper");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class TelemetryTimers {}
@@ -31,31 +35,39 @@ exports.TelemetryManager = TelemetryManager;
 
 _defineProperty(TelemetryManager, "InternalTelemetryData", void 0);
 
-const RegisterLoggers = () => {
-  const loggers = [];
+const loggers = [];
+
+const disposeLoggers = () => {
+  loggers.map(logger => {
+    logger.dispose();
+  });
+};
+
+exports.disposeLoggers = disposeLoggers;
 
+const RegisterLoggers = () => {
   const registerLoggers = () => {
     var _TelemetryManager$Int, _TelemetryManager$Int2, _TelemetryManager$Int3, _TelemetryManager$Int4, _TelemetryManager$Int5, _TelemetryManager$Int6, _TelemetryManager$Int7, _TelemetryManager$Int8;
 
-    if (!((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int !== void 0 && (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) !== null && _TelemetryManager$Int2 !== void 0 && _TelemetryManager$Int2.disableConsoleLog) || !((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int3 !== void 0 && (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) !== null && _TelemetryManager$Int4 !== void 0 && _TelemetryManager$Int4.telemetryDisabled)) {
+    if (((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : (_TelemetryManager$Int2 = _TelemetryManager$Int.telemetryConfig) === null || _TelemetryManager$Int2 === void 0 ? void 0 : _TelemetryManager$Int2.disableConsoleLog) === false || ((_TelemetryManager$Int3 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int3 === void 0 ? void 0 : (_TelemetryManager$Int4 = _TelemetryManager$Int3.telemetryConfig) === null || _TelemetryManager$Int4 === void 0 ? void 0 : _TelemetryManager$Int4.telemetryDisabled) === false) {
       _omnichannelChatComponents.BroadcastService.getAnyMessage().subscribe(event => {
-        if (event.payload) {
+        if (event.payload && event.eventName in _TelemetryConstants.TelemetryEvent) {
           logTelemetry(event);
         }
       });
     }
 
-    if (!((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int5 !== void 0 && (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) !== null && _TelemetryManager$Int6 !== void 0 && _TelemetryManager$Int6.disableConsoleLog)) {
+    if (((_TelemetryManager$Int5 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int5 === void 0 ? void 0 : (_TelemetryManager$Int6 = _TelemetryManager$Int5.telemetryConfig) === null || _TelemetryManager$Int6 === void 0 ? void 0 : _TelemetryManager$Int6.disableConsoleLog) === false) {
       loggers.push((0, _consoleLogger.consoleLogger)());
     }
 
-    if (!((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int7 !== void 0 && (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) !== null && _TelemetryManager$Int8 !== void 0 && _TelemetryManager$Int8.telemetryDisabled)) {
+    if (((_TelemetryManager$Int7 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int7 === void 0 ? void 0 : (_TelemetryManager$Int8 = _TelemetryManager$Int7.telemetryConfig) === null || _TelemetryManager$Int8 === void 0 ? void 0 : _TelemetryManager$Int8.telemetryDisabled) === false) {
       var _TelemetryManager$Int9, _TelemetryManager$Int18, _TelemetryManager$Int19;
 
       if ((_TelemetryManager$Int9 = TelemetryManager.InternalTelemetryData) !== null && _TelemetryManager$Int9 !== void 0 && _TelemetryManager$Int9.ariaConfig) {
         var _TelemetryManager$Int10, _TelemetryManager$Int11, _TelemetryManager$Int12, _TelemetryManager$Int13, _TelemetryManager$Int14, _TelemetryManager$Int15, _TelemetryManager$Int16, _TelemetryManager$Int17;
 
-        loggers.push((0, _ariaTelemetryLogger.ariaTelemetryLogger)(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? "", ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? false, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? "", ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? "OmniChannelProd_Web"));
+        loggers.push((0, _ariaTelemetryLogger.ariaTelemetryLogger)(((_TelemetryManager$Int10 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int10 === void 0 ? void 0 : (_TelemetryManager$Int11 = _TelemetryManager$Int10.ariaConfig) === null || _TelemetryManager$Int11 === void 0 ? void 0 : _TelemetryManager$Int11.ariaTelemetryKey) ?? _defaultAriaConfig.defaultAriaConfig.ariaTelemetryKey, ((_TelemetryManager$Int12 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int12 === void 0 ? void 0 : (_TelemetryManager$Int13 = _TelemetryManager$Int12.ariaConfig) === null || _TelemetryManager$Int13 === void 0 ? void 0 : _TelemetryManager$Int13.disableCookieUsage) ?? _defaultAriaConfig.defaultAriaConfig.disableCookieUsage, ((_TelemetryManager$Int14 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int14 === void 0 ? void 0 : (_TelemetryManager$Int15 = _TelemetryManager$Int14.ariaConfig) === null || _TelemetryManager$Int15 === void 0 ? void 0 : _TelemetryManager$Int15.collectorUriForTelemetry) ?? _defaultAriaConfig.defaultAriaConfig.collectorUriForTelemetry, ((_TelemetryManager$Int16 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int16 === void 0 ? void 0 : (_TelemetryManager$Int17 = _TelemetryManager$Int16.ariaConfig) === null || _TelemetryManager$Int17 === void 0 ? void 0 : _TelemetryManager$Int17.ariaTelemetryApplicationName) ?? _defaultAriaConfig.defaultAriaConfig.ariaTelemetryApplicationName));
       }
 
       const customLoggers = (_TelemetryManager$Int18 = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int18 === void 0 ? void 0 : (_TelemetryManager$Int19 = _TelemetryManager$Int18.telemetryConfig) === null || _TelemetryManager$Int19 === void 0 ? void 0 : _TelemetryManager$Int19.telemetryLoggers;
@@ -78,8 +90,15 @@ const RegisterLoggers = () => {
 
   const logTelemetry = telemetryEvent => {
     loggers.map(logger => {
+      var _payload;
+
       const logLevel = telemetryEvent.logLevel ?? _TelemetryConstants.LogLevel.INFO;
-      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload));
+      const scenarioType = ((_payload = telemetryEvent.payload) === null || _payload === void 0 ? void 0 : _payload.scenarioType) ?? _TelemetryConstants.ScenarioType.UNDEFINED;
+      const telemetryInput = parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType);
+      telemetryInput.telemetryInfo = {
+        telemetryInfo: _TelemetryHelper.TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput)
+      };
+      logger.log(logLevel, telemetryInput);
     });
   };
 

package/lib/cjs/common/telemetry/defaultConfigs/defaultAriaConfig.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultAriaConfig = void 0;
 const defaultAriaConfig = {
-  collectorUriForTelemetry: "https://browser.pipe.aria.microsoft.com/Collector/3.0/",
-  ariaTelemetryKey: "1574efd98545488983328fac0c9bcb59-45c2ff50-ebcc-473d-949d-e3134ef2189e-6906",
-  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Sandbox",
+  collectorUriForTelemetry: "",
+  ariaTelemetryKey: "c7655518acf1403f93ff6b9f77942f0a-d01a02fd-6b50-4de3-a566-62eda11f93bc-7083",
+  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Public_Prod",
   disableCookieUsage: true
 };
 exports.defaultAriaConfig = defaultAriaConfig;

package/lib/cjs/common/telemetry/defaultConfigs/defaultTelemetryConfiguration.js

@@ -11,6 +11,9 @@ const defaultTelemetryConfiguration = {
   telemetryDisabled: false,
   disableConsoleLog: false,
   telemetryLoggers: [],
-  ariaConfigurations: _defaultAriaConfig.defaultAriaConfig
+  ariaConfigurations: _defaultAriaConfig.defaultAriaConfig,
+  chatWidgetVersion: "0.0.0-0",
+  chatComponentVersion: "0.0.0-0",
+  OCChatSDKVersion: "0.0.0-0"
 };
 exports.defaultTelemetryConfiguration = defaultTelemetryConfiguration;

package/lib/cjs/common/telemetry/loggers/ariaTelemetryLogger.js

@@ -15,7 +15,7 @@ var _Enums = require("@microsoft/omnichannel-chat-sdk/lib/external/aria/common/E
 
 var _Constants = require("../../Constants");
 
-var _TelemetryHelper = require("../TelemetryHelper");
+var _TelemetryManager = require("../TelemetryManager");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -30,9 +30,32 @@ const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUr
 
       if (!(0, _utils.isNullOrEmptyString)(collectiorUriForTelemetry)) {
         configuration.collectorUri = collectiorUriForTelemetry;
+      } else {
+        if (_TelemetryManager.TelemetryManager.InternalTelemetryData.environmentVersion == _Constants.EnvironmentVersion.prod) {
+          var _TelemetryManager$Int;
+
+          const orgUrl = (_TelemetryManager$Int = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.orgUrl;
+
+          if (!(0, _utils.isNullOrUndefined)(orgUrl)) {
+            // If the given org is a Production EU org, modify the Aria collector uri
+            const region = (0, _utils.getDomain)(orgUrl);
+
+            if (region === _Constants.AriaTelemetryConstants.EU) {
+              configuration.collectorUri = _Constants.AriaTelemetryConstants.EUROPE_ENDPOINT;
+            }
+          }
+        }
       }
 
-      _logger = _AWTLogManager.default.initialize(ariaTelemetryKey, configuration);
+      try {
+        _logger = _AWTLogManager.default.initialize(ariaTelemetryKey, configuration);
+
+        if (_logger === undefined) {
+          _logger = _AWTLogManager.default.getLogger(ariaTelemetryKey);
+        }
+      } catch (error) {
+        console.log(error);
+      }
     }
 
     return _logger;
@@ -40,20 +63,30 @@ const ariaTelemetryLogger = (ariaTelemetryKey, disabledCookieUsage, collectiorUr
 
   const ariaLogger = {
     log: (logLevel, telemetryInput) => {
-      let property;
-      const eventProperties = new _AWTEventProperties.default();
-
-      const event = _TelemetryHelper.TelemetryHelper.buildTelemetryEvent(logLevel, telemetryInput);
-
-      eventProperties.setName(telemetryInput.scenarioType);
-
-      for (const key of Object.keys(event)) {
-        property = typeof event[key] === "object" ? JSON.stringify(event[key]) : event[key];
-        eventProperties.setProperty(key, property);
+      try {
+        let property;
+        const telemetryInfo = telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo;
+        const eventProperties = new _AWTEventProperties.default();
+        eventProperties.setName(telemetryInput.scenarioType);
+
+        if (telemetryInfo) {
+          for (const key of Object.keys(telemetryInfo)) {
+            property = typeof telemetryInfo[key] === "object" ? JSON.stringify(telemetryInfo[key]) : telemetryInfo[key];
+            eventProperties.setProperty(key, property);
+          }
+
+          eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, _Constants.Constants.LiveChatWidget, _Enums.AWTPiiKind.GenericData);
+        }
+
+        logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+      } catch (error) {
+        console.error("Error in logging telemetry to Aria logger:" + error);
       }
-
-      eventProperties.setPropertyWithPii(ariaTelemetryApplicationName, _Constants.Constants.LiveChatWidget, _Enums.AWTPiiKind.GenericData);
-      logger() ? logger().logEvent(eventProperties) : console.log("Unable to initialize aria logger");
+    },
+    dispose: () => {
+      _AWTLogManager.default.flush(function () {
+        console.log("Aria logger disposed");
+      });
     }
   };
   return ariaLogger;

package/lib/cjs/common/telemetry/loggers/consoleLogger.js

@@ -13,32 +13,36 @@ const consoleLogger = () => {
   const consoleLogger = {
     log: (logLevel, telemetryInput) => {
       const payload = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.payload && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.payload : "";
+      const telemetryInfo = telemetryInput !== null && telemetryInput !== void 0 && telemetryInput.telemetryInfo && Object.keys(telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo).length > 0 ? telemetryInput === null || telemetryInput === void 0 ? void 0 : telemetryInput.telemetryInfo : "";
 
       try {
         switch (logLevel) {
           case _TelemetryConstants.LogLevel.INFO:
-            console.info(_Constants.Constants.LiveChatWidget, payload);
+            console.info(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case _TelemetryConstants.LogLevel.DEBUG:
-            console.debug(_Constants.Constants.LiveChatWidget, payload);
+            console.debug(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case _TelemetryConstants.LogLevel.WARN:
-            console.warn(_Constants.Constants.LiveChatWidget, payload);
+            console.warn(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           case _TelemetryConstants.LogLevel.ERROR:
-            console.error(_Constants.Constants.LiveChatWidget, payload);
+            console.error(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
 
           default:
-            console.debug(_Constants.Constants.LiveChatWidget, payload);
+            console.debug(_Constants.Constants.LiveChatWidget, payload, telemetryInfo);
             break;
         }
       } catch (ex) {
         console.error("An unexpected error occurred in the Telemetry client: " + ex);
       }
+    },
+    dispose: () => {
+      console.log("disposing loggers");
     }
   };
   return consoleLogger;

package/lib/cjs/common/utils.js

@@ -3,12 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setTabIndices = exports.setFocusOnSendBox = exports.setFocusOnElement = exports.preventFocusToMoveOutOfElement = exports.parseAdaptiveCardPayload = exports.newGuid = exports.isNullOrUndefined = exports.isNullOrEmptyString = exports.getTimestampHourMinute = exports.getLocaleDirection = exports.getIconText = exports.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = void 0;
+exports.setTabIndices = exports.setFocusOnSendBox = exports.setFocusOnElement = exports.preventFocusToMoveOutOfElement = exports.parseAdaptiveCardPayload = exports.newGuid = exports.isUndefinedOrEmpty = exports.isNullOrUndefined = exports.isNullOrEmptyString = exports.getWidgetEndChatEventName = exports.getWidgetCacheId = exports.getTimestampHourMinute = exports.getStateFromCache = exports.getLocaleDirection = exports.getIconText = exports.getDomain = exports.findParentFocusableElementsWithoutChildContainer = exports.findAllFocusableElement = exports.extractPreChatSurveyResponseValues = exports.escapeHtml = exports.createTimer = exports.changeLanguageCodeFormatForWebChat = exports.addDelayInMs = void 0;
 
 var _Constants = require("./Constants");
 
+var _DataStoreManager = require("./contextDataStore/DataStoreManager");
+
 var _KeyCodes = require("./KeyCodes");
 
+var _TelemetryConstants = require("./telemetry/TelemetryConstants");
+
 const getElementBySelector = selector => {
   let element;
 
@@ -332,6 +336,76 @@ const createTimer = () => {
     }
 
   };
+}; // Returns the domain of the org
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.createTimer = createTimer;
+
+const getDomain = hostValue => {
+  for (let i = 0; i < _Constants.AriaTelemetryConstants.lcwEUDomainNames.length; i++) {
+    if (hostValue.endsWith(_Constants.AriaTelemetryConstants.lcwEUDomainNames[i])) {
+      return _Constants.AriaTelemetryConstants.EU;
+    }
+  }
+
+  return _Constants.AriaTelemetryConstants.Public;
+};
+
+exports.getDomain = getDomain;
+
+const getWidgetCacheId = (orgId, widgetId) => {
+  return `${_Constants.Constants.ChatWidgetStateChangedPrefix}_${orgId}_${widgetId}`;
+};
+
+exports.getWidgetCacheId = getWidgetCacheId;
+
+const getWidgetEndChatEventName = (orgId, widgetId) => {
+  return `${_TelemetryConstants.BroadcastEvent.ChatEnded}_${orgId}_${widgetId}`;
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.getWidgetEndChatEventName = getWidgetEndChatEventName;
+
+const getStateFromCache = (orgId, widgetId) => {
+  // Getting updated state from cache
+  try {
+    if (_DataStoreManager.DataStoreManager.clientDataStore) {
+      var _DataStoreManager$cli;
+
+      const widgetStateEventName = getWidgetCacheId(orgId, widgetId);
+      const widgetStateFromCache = (_DataStoreManager$cli = _DataStoreManager.DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
+      const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
+      return persistedState;
+    } else {
+      return null;
+    }
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.getStateFromCache = getStateFromCache;
+
+const isUndefinedOrEmpty = object => {
+  if (object) {
+    if (Object.keys(object).length === 0) {
+      return true;
+    }
+
+    return false;
+  } else {
+    return true;
+  }
+}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+
+exports.isUndefinedOrEmpty = isUndefinedOrEmpty;
+
+const addDelayInMs = ms => {
+  return new Promise(resolve => setTimeout(resolve, ms));
 };
 
-exports.createTimer = createTimer;
+exports.addDelayInMs = addDelayInMs;

package/lib/cjs/components/callingcontainerstateful/CallingContainerStateful.js

@@ -206,6 +206,20 @@ const CallingContainerStateful = props => {
         });
       }
     });
+    window.addEventListener("beforeunload", () => {
+      if (state.uiStates.isIncomingCall) {
+        voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.rejectCall();
+      } else {
+        voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.stopCall();
+      }
+
+      voiceVideoCallingSdk === null || voiceVideoCallingSdk === void 0 ? void 0 : voiceVideoCallingSdk.close();
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_E2VV_ENABLED,
+        payload: false
+      });
+      resetCallingStates(true);
+    });
   }, []);
   const controlProps = {
     id: "oc-lcw-callingcontainer",

package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js

@@ -34,7 +34,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 const ChatButtonStateful = props => {
-  var _state$domainStates$l, _state$domainStates$l2, _buttonProps$controlP;
+  var _state$domainStates$l, _state$domainStates$l2, _buttonProps$controlP, _props$buttonProps, _props$buttonProps$co, _props$buttonProps2, _props$buttonProps2$c, _props$buttonProps3, _props$buttonProps3$c;
 
   const [state, dispatch] = (0, _useChatContextStore.default)();
   const {
@@ -44,20 +44,27 @@ const ChatButtonStateful = props => {
   } = props; //Setting OutOfOperatingHours Flag
 
   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 proactiveChatInNewWindow = (0, _react.useRef)(state.appStates.proactiveChatStates.proactiveChatInNewWindow);
   const outOfOfficeStyleProps = Object.assign({}, _defaultOutOfOfficeChatButtonStyleProps.defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
   const controlProps = {
     id: "oc-lcw-chat-button",
     dir: state.domainStates.globalDir,
     titleText: "Let's Chat!",
     subtitleText: "We're online.",
-    hideNotificationBubble: !(state.appStates.isMinimized === true && state.appStates.unreadMessageCount > 0) || (buttonProps === null || buttonProps === void 0 ? void 0 : (_buttonProps$controlP = buttonProps.controlProps) === null || _buttonProps$controlP === void 0 ? void 0 : _buttonProps$controlP.hideNotificationBubble) === true,
-    unreadMessageCount: state.appStates.unreadMessageCount ? state.appStates.unreadMessageCount > _Constants.Constants.maximumUnreadMessageCount ? _Constants.Constants.maximumUnreadMessageCount.toString() + "+" : state.appStates.unreadMessageCount.toString() : "0",
+    hideNotificationBubble: (buttonProps === null || buttonProps === void 0 ? void 0 : (_buttonProps$controlP = buttonProps.controlProps) === null || _buttonProps$controlP === void 0 ? void 0 : _buttonProps$controlP.hideNotificationBubble) === true || state.appStates.isMinimized === false,
+    unreadMessageCount: state.appStates.unreadMessageCount ? state.appStates.unreadMessageCount > _Constants.Constants.maximumUnreadMessageCount ? (_props$buttonProps = props.buttonProps) === null || _props$buttonProps === void 0 ? void 0 : (_props$buttonProps$co = _props$buttonProps.controlProps) === null || _props$buttonProps$co === void 0 ? void 0 : _props$buttonProps$co.largeUnreadMessageString : state.appStates.unreadMessageCount.toString() : "0",
     onClick: async () => {
       _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked
       });
 
-      if (state.appStates.isMinimized) {
+      if (proactiveChatInNewWindow.current) {
+        const proactiveChatIsInPopoutModeEvent = {
+          eventName: _TelemetryConstants.BroadcastEvent.ProactiveChatIsInPopoutMode
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(proactiveChatIsInPopoutModeEvent);
+      } else if (state.appStates.isMinimized) {
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
           payload: false
@@ -66,6 +73,7 @@ const ChatButtonStateful = props => {
         await startChat();
       }
     },
+    unreadMessageString: (_props$buttonProps2 = props.buttonProps) === null || _props$buttonProps2 === void 0 ? void 0 : (_props$buttonProps2$c = _props$buttonProps2.controlProps) === null || _props$buttonProps2$c === void 0 ? void 0 : _props$buttonProps2$c.unreadMessageString,
     ...(buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.controlProps)
   };
   const outOfOfficeControlProps = {
@@ -74,6 +82,10 @@ const ChatButtonStateful = props => {
     titleText: "We're Offline",
     subtitleText: "No agents available",
     onClick: async () => {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+        Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked
+      });
+
       if (state.appStates.isMinimized) {
         dispatch({
           type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
@@ -86,6 +98,7 @@ const ChatButtonStateful = props => {
         });
       }
     },
+    unreadMessageString: (_props$buttonProps3 = props.buttonProps) === null || _props$buttonProps3 === void 0 ? void 0 : (_props$buttonProps3$c = _props$buttonProps3.controlProps) === null || _props$buttonProps3$c === void 0 ? void 0 : _props$buttonProps3$c.unreadMessageString,
     ...(outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.controlProps)
   };
   (0, _react.useEffect)(() => {
@@ -98,8 +111,18 @@ const ChatButtonStateful = props => {
       ElapsedTimeInMilliseconds: _TelemetryManager.TelemetryTimers.LcwLoadToChatButtonTimer.milliSecondsElapsed
     });
 
-    (0, _utils.setFocusOnElement)(document.getElementById((controlProps === null || controlProps === void 0 ? void 0 : controlProps.id) ?? "oc-lcw-chat-button"));
+    if (state.uiStates.focusChatButton) {
+      (0, _utils.setFocusOnElement)(document.getElementById((controlProps === null || controlProps === void 0 ? void 0 : controlProps.id) ?? "oc-lcw-chat-button"));
+    } else {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_FOCUS_CHAT_BUTTON,
+        payload: true
+      });
+    }
   }, []);
+  (0, _react.useEffect)(() => {
+    proactiveChatInNewWindow.current = state.appStates.proactiveChatStates.proactiveChatInNewWindow;
+  }, [state.appStates.proactiveChatStates.proactiveChatInNewWindow]);
   return /*#__PURE__*/_react.default.createElement(_omnichannelChatComponents.ChatButton, {
     componentOverrides: buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.componentOverrides,
     controlProps: outOfOperatingHours ? outOfOfficeControlProps : controlProps,

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

@@ -7,15 +7,11 @@ exports.default = exports.ConfirmationPaneStateful = void 0;
 
 var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _utils = require("../../common/utils");
-
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
-var _Constants = require("../../common/Constants");
+var _react = _interopRequireWildcard(require("react"));
 
-var _ConversationState = require("../../contexts/common/ConversationState");
+var _utils = require("../../common/utils");
 
 var _DimLayer = require("../dimlayer/DimLayer");
 
@@ -25,16 +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"));
-
 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); }
@@ -43,26 +35,19 @@ 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 = [];
   const [state, dispatch] = (0, _useChatContextStore.default)();
   const {
-    setPostChatContext,
-    endChat
+    prepareEndChat
   } = props; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  const chatSDK = (0, _useChatSDKStore.default)(); // 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,
     onConfirm: async () => {
-      _TelemetryHelper.TelemetryHelper.logConfigDataEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.ConfirmationConfirmButtonClicked,
         Description: "Confirmation pane Confirm button clicked"
       });
@@ -73,40 +58,8 @@ 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.PostChatSurveyMode.Embed && conversationDetails.canRenderPostChat === _Constants.Constants.truePascal) {
-          dispatch({
-            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT,
-            payload: true
-          });
-          dispatch({
-            type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-            payload: _ConversationState.ConversationState.Loading
-          });
-          await setPostChatContext();
-
-          if (state.domainStates.postChatContext) {
-            dispatch({
-              type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-              payload: _ConversationState.ConversationState.Postchat
-            });
-          }
-        } 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,
@@ -119,7 +72,7 @@ const ConfirmationPaneStateful = props => {
       }
     },
     onCancel: () => {
-      _TelemetryHelper.TelemetryHelper.logConfigDataEvent(_TelemetryConstants.LogLevel.INFO, {
+      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
         Event: _TelemetryConstants.TelemetryEvent.ConfirmationCancelButtonClicked,
         Description: "Confirmation pane Cancel button clicked."
       });

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

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