@microsoft/omnichannel-chat-widget 0.1.0-main.488d6f1 → 0.1.0-main.63cfb47

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createActivityMiddleware = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _TelemetryConstants = require("../../../../../common/telemetry/TelemetryConstants");
 
 var _Constants = require("../../../../../common/Constants");
 
@@ -15,16 +15,16 @@ var _DirectLineSenderRole = require("../../enums/DirectLineSenderRole");
 
 var _MessageType = require("../../enums/MessageType");
 
+var _react = _interopRequireDefault(require("react"));
+
+var _TelemetryHelper = require("../../../../../common/telemetry/TelemetryHelper");
+
 var _defaultSystemMessageStyles = require("./defaultStyles/defaultSystemMessageStyles");
 
 var _defaultUserMessageStyles = require("./defaultStyles/defaultUserMessageStyles");
 
 var _utils = require("../../../../../common/utils");
 
-var _TelemetryHelper = require("../../../../../common/telemetry/TelemetryHelper");
-
-var _TelemetryConstants = require("../../../../../common/telemetry/TelemetryConstants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /******
@@ -34,49 +34,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * 1. Renders system messages differently, according to Microsoft LiveChatWidget styles
  * 2. Changes the font size of user messages
  * 3. Decodes certain html characters that came through from chat services
- * 4. Triggers end conversation sequence when the chat thread is deleted
  ******/
 const loggedSystemMessages = new Array(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-const handleThreadUpdate = channelData => {
-  var _channelData$properti, _channelData$properti2;
-
-  _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-    Event: _TelemetryConstants.TelemetryEvent.IC3ThreadUpdateEventReceived,
-    Description: "IC3 ThreadUpdateEvent Received"
-  });
-
-  const postConversationEndedAction = () => {
-    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-      Event: _TelemetryConstants.TelemetryEvent.ConversationEndedThreadEventReceived,
-      Description: "Conversation is ended by agent side or by timeout."
-    });
-  }; // If the Thread is deleted, then display post conversation survey if enabled.
-
-
-  const isThreadDeleted = (channelData === null || channelData === void 0 ? void 0 : (_channelData$properti = channelData.properties) === null || _channelData$properti === void 0 ? void 0 : (_channelData$properti2 = _channelData$properti.isdeleted) === null || _channelData$properti2 === void 0 ? void 0 : _channelData$properti2.toLowerCase()) === _Constants.Constants.true;
-
-  if (isThreadDeleted) {
-    postConversationEndedAction();
-    return;
-  } //check if customer is still in the thread
-
-
-  if (channelData.members && channelData.members.length > 0) {
-    for (let i = 0; i < channelData.members.length; i++) {
-      const id = channelData.members[i].id;
-      const tag = channelData.members[i].tag; // In case of ACS customer is not removed from thread and has "left" tag
-
-      if (id.startsWith(_Constants.Constants.visitorIdPrefix) && tag !== _Constants.Constants.left) {
-        return;
-      }
-    }
-  }
-
-  postConversationEndedAction();
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-
 const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
   var _card$activity, _card$activity$channe, _card$activity$channe2, _card$activity2, _card$activity2$chann, _card$activity3, _card$activity3$chann, _card$activity3$chann2, _card$activity4, _card$activity4$chann, _card$activity5, _card$activity5$chann, _card$nextVisibleActi, _card$nextVisibleActi2, _card$activity6, _card$activity6$chann, _card$activity7, _card$nextVisibleActi3, _card$activity8;
 
@@ -129,7 +89,10 @@ const createActivityMiddleware = (systemMessageStyleProps, userMessageStyleProps
       var _card$activity$channe3;
 
       if (((_card$activity$channe3 = card.activity.channelData) === null || _card$activity$channe3 === void 0 ? void 0 : _card$activity$channe3.type) === _MessageType.MessageTypes.Thread) {
-        handleThreadUpdate(card.activity.channelData);
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.IC3ThreadUpdateEventReceived,
+          Description: "IC3 ThreadUpdateEvent Received"
+        });
       }
 
       return () => false;

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware.js

@@ -11,6 +11,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _FileAttachmentIconManager = require("../../../common/utils/FileAttachmentIconManager");
 
+var _TelemetryConstants = require("../../../../../common/telemetry/TelemetryConstants");
+
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 
 var _WebChatActionType = require("../../enums/WebChatActionType");
@@ -211,7 +213,7 @@ const createAttachmentMiddleware = enableInlinePlaying => {
         const errorData = "Unable to parse the adaptive card format";
 
         _omnichannelChatComponents.BroadcastService.postMessage({
-          eventName: "InvalidAdaptiveCardFormat",
+          eventName: _TelemetryConstants.BroadcastEvent.InvalidAdaptiveCardFormat,
           payload: {
             Message: errorData,
             ExceptionDetails: e

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/conversationEndMiddleware.js

@@ -28,22 +28,22 @@ const createConversationEndMiddleware = conversationEndCallback => _ref => {
     var _action$payload;
 
     if ((action === null || action === void 0 ? void 0 : action.type) == _WebChatActionType.WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && (_action$payload = action.payload) !== null && _action$payload !== void 0 && _action$payload.activity) {
-      var _activity$from, _activity$from2, _activity$channelData5, _activity$channelData6;
+      var _activity$from, _activity$from2, _activity$channelData7, _activity$channelData8;
 
       const activity = action.payload.activity;
 
       if (((_activity$from = activity.from) === null || _activity$from === void 0 ? void 0 : _activity$from.role) === _DirectLineSenderRole.DirectLineSenderRole.Bot && activity.channelId === "ACS_CHANNEL") {
-        var _activity$channelData, _activity$channelData2, _activity$channelData3, _activity$channelData4;
+        var _activity$channelData, _activity$channelData2, _activity$channelData3, _activity$channelData4, _activity$channelData5, _activity$channelData6;
 
         // ACS
-        if ((_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(_Constants.Constants.systemMessageTag) && (_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(_Constants.Constants.agentEndConversationMessageTag)) {
+        if ((_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(_Constants.Constants.systemMessageTag) && ((_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(_Constants.Constants.agentEndConversationMessageTag) || (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(_Constants.Constants.supervisorForceCloseMessageTag))) {
           conversationEndCallback();
         }
-      } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === _DirectLineSenderRole.DirectLineSenderRole.Channel && ((_activity$channelData5 = activity.channelData) === null || _activity$channelData5 === void 0 ? void 0 : _activity$channelData5.type) === _MessageType.MessageTypes.Thread && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.properties) {
-        var _activity$channelData7, _activity$channelData8, _activity$channelData9, _activity$channelData10;
+      } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === _DirectLineSenderRole.DirectLineSenderRole.Channel && ((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : _activity$channelData7.type) === _MessageType.MessageTypes.Thread && (_activity$channelData8 = activity.channelData) !== null && _activity$channelData8 !== void 0 && _activity$channelData8.properties) {
+        var _activity$channelData9, _activity$channelData10, _activity$channelData11, _activity$channelData12;
 
         // IC3
-        if (((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.properties) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.isdeleted) === _Constants.Constants.truePascal || !((_activity$channelData9 = activity.channelData) !== null && _activity$channelData9 !== void 0 && (_activity$channelData10 = _activity$channelData9.properties) !== null && _activity$channelData10 !== void 0 && _activity$channelData10.containsExternalEntitiesListeningAll)) {
+        if (((_activity$channelData9 = activity.channelData) === null || _activity$channelData9 === void 0 ? void 0 : (_activity$channelData10 = _activity$channelData9.properties) === null || _activity$channelData10 === void 0 ? void 0 : _activity$channelData10.isdeleted) === _Constants.Constants.truePascal || !((_activity$channelData11 = activity.channelData) !== null && _activity$channelData11 !== void 0 && (_activity$channelData12 = _activity$channelData11.properties) !== null && _activity$channelData12 !== void 0 && _activity$channelData12.containsExternalEntitiesListeningAll)) {
           conversationEndCallback();
         }
       }

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createWebChatTelemetry = createWebChatTelemetry;
+
+var _TelemetryConstants = require("../../../../common/telemetry/TelemetryConstants");
+
+var _TelemetryHelper = require("../../../../common/telemetry/TelemetryHelper");
+
+function createWebChatTelemetry() {
+  const handleTelemetry = event => {
+    const {
+      level
+    } = event;
+    const loglevel = level ? level.toUpperCase() : "";
+
+    switch (loglevel) {
+      case _TelemetryConstants.LogLevel.DEBUG:
+        _TelemetryHelper.TelemetryHelper.logWebChatEvent(_TelemetryConstants.LogLevel.DEBUG, event);
+
+        break;
+
+      case _TelemetryConstants.LogLevel.WARN:
+        _TelemetryHelper.TelemetryHelper.logWebChatEvent(_TelemetryConstants.LogLevel.WARN, event);
+
+        break;
+
+      case _TelemetryConstants.LogLevel.ERROR:
+        _TelemetryHelper.TelemetryHelper.logWebChatEvent(_TelemetryConstants.LogLevel.ERROR, event);
+
+        break;
+
+      case _TelemetryConstants.LogLevel.INFO:
+      default:
+        _TelemetryHelper.TelemetryHelper.logWebChatEvent(_TelemetryConstants.LogLevel.INFO, event);
+
+        break;
+    }
+  };
+
+  return handleTelemetry;
+}

package/lib/cjs/contexts/common/LiveChatWidgetActionType.js

@@ -23,20 +23,19 @@ exports.LiveChatWidgetActionType = LiveChatWidgetActionType;
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_AUDIO_NOTIFICATION"] = 12] = "SET_AUDIO_NOTIFICATION";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_E2VV_ENABLED"] = 13] = "SET_E2VV_ENABLED";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_POST_CHAT_CONTEXT"] = 14] = "SET_POST_CHAT_CONTEXT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOULD_SHOW_POST_CHAT"] = 15] = "SET_SHOULD_SHOW_POST_CHAT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SHOW_CALLING_CONTAINER"] = 16] = "SHOW_CALLING_CONTAINER";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_INCOMING_CALL"] = 17] = "SET_INCOMING_CALL";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_VIDEO_CALL"] = 18] = "DISABLE_VIDEO_CALL";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_LOCAL_VIDEO"] = 19] = "DISABLE_LOCAL_VIDEO";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_REMOTE_VIDEO"] = 20] = "DISABLE_REMOTE_VIDEO";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CHAT_TOKEN"] = 21] = "SET_CHAT_TOKEN";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SKIP_CHAT_BUTTON_RENDERING"] = 22] = "SET_SKIP_CHAT_BUTTON_RENDERING";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PROACTIVE_CHAT_PARAMS"] = 23] = "SET_PROACTIVE_CHAT_PARAMS";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_TELEMETRY_DATA"] = 24] = "SET_TELEMETRY_DATA";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_RECONNECT_ID"] = 25] = "SET_RECONNECT_ID";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_UNREAD_MESSAGE_COUNT"] = 26] = "SET_UNREAD_MESSAGE_COUNT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_FOCUS_CHAT_BUTTON"] = 27] = "SET_FOCUS_CHAT_BUTTON";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CONVERSATION_ENDED_BY_AGENT"] = 28] = "SET_CONVERSATION_ENDED_BY_AGENT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_STATE"] = 29] = "SET_WIDGET_STATE";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 30] = "SET_LIVE_CHAT_CONTEXT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SHOW_CALLING_CONTAINER"] = 15] = "SHOW_CALLING_CONTAINER";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_INCOMING_CALL"] = 16] = "SET_INCOMING_CALL";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_VIDEO_CALL"] = 17] = "DISABLE_VIDEO_CALL";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_LOCAL_VIDEO"] = 18] = "DISABLE_LOCAL_VIDEO";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_REMOTE_VIDEO"] = 19] = "DISABLE_REMOTE_VIDEO";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CHAT_TOKEN"] = 20] = "SET_CHAT_TOKEN";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SKIP_CHAT_BUTTON_RENDERING"] = 21] = "SET_SKIP_CHAT_BUTTON_RENDERING";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PROACTIVE_CHAT_PARAMS"] = 22] = "SET_PROACTIVE_CHAT_PARAMS";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_TELEMETRY_DATA"] = 23] = "SET_TELEMETRY_DATA";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_RECONNECT_ID"] = 24] = "SET_RECONNECT_ID";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_UNREAD_MESSAGE_COUNT"] = 25] = "SET_UNREAD_MESSAGE_COUNT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_FOCUS_CHAT_BUTTON"] = 26] = "SET_FOCUS_CHAT_BUTTON";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CONVERSATION_ENDED_BY_AGENT"] = 27] = "SET_CONVERSATION_ENDED_BY_AGENT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_STATE"] = 28] = "SET_WIDGET_STATE";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 29] = "SET_LIVE_CHAT_CONTEXT";
 })(LiveChatWidgetActionType || (exports.LiveChatWidgetActionType = LiveChatWidgetActionType = {}));

package/lib/cjs/contexts/common/LiveChatWidgetContextInitialState.js

@@ -12,6 +12,10 @@ var _defaultMiddlewareLocalizedTexts = require("../../components/webchatcontaine
 const getLiveChatWidgetContextInitialState = props => {
   var _props$webChatContain;
 
+  if (props !== null && props !== void 0 && props.liveChatContextFromCache) {
+    return props === null || props === void 0 ? void 0 : props.liveChatContextFromCache;
+  }
+
   const LiveChatWidgetContextInitialState = {
     domainStates: {
       liveChatConfig: props.chatConfig,
@@ -56,7 +60,7 @@ const getLiveChatWidgetContextInitialState = props => {
       focusChatButton: false
     }
   };
-  return props.liveChatContextFromCache ?? LiveChatWidgetContextInitialState;
+  return LiveChatWidgetContextInitialState;
 };
 
 exports.getLiveChatWidgetContextInitialState = getLiveChatWidgetContextInitialState;

package/lib/cjs/contexts/createReducer.js

@@ -7,8 +7,6 @@ exports.createReducer = void 0;
 
 var _LiveChatWidgetActionType = require("./common/LiveChatWidgetActionType");
 
-var _TelemetryManager = require("../common/telemetry/TelemetryManager");
-
 /* eslint-disable indent */
 const createReducer = () => {
   const reducer = (state, action) => {
@@ -93,13 +91,6 @@ const createReducer = () => {
           }
         };
 
-      case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_SHOULD_SHOW_POST_CHAT:
-        return { ...state,
-          appStates: { ...state.appStates,
-            shouldShowPostChat: action.payload
-          }
-        };
-
       case _LiveChatWidgetActionType.LiveChatWidgetActionType.SHOW_CALLING_CONTAINER:
         return { ...state,
           uiStates: { ...state.uiStates,
@@ -197,7 +188,6 @@ const createReducer = () => {
         };
 
       case _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_TELEMETRY_DATA:
-        _TelemetryManager.TelemetryManager.InternalTelemetryData = action.payload;
         return { ...state,
           domainStates: { ...state.domainStates,
             telemetryInternalData: action.payload

package/lib/cjs/plugins/newMessageEventHandler.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createOnNewAdapterActivityHandler = void 0;
+
+var _TelemetryConstants = require("../common/telemetry/TelemetryConstants");
+
+var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
+
+var _Constants = require("../common/Constants");
+
+var _TelemetryHelper = require("../common/telemetry/TelemetryHelper");
+
+var _TelemetryManager = require("../common/telemetry/TelemetryManager");
+
+const createOnNewAdapterActivityHandler = (chatId, userId) => {
+  const onNewAdapterActivityHandler = activity => {
+    var _activity$channelData, _activity$channelData2, _activity$channelData3;
+
+    const isActivityMessage = (activity === null || activity === void 0 ? void 0 : activity.type) === _Constants.Constants.message;
+    const isNotHistoryMessage = isActivityMessage && !(activity !== null && activity !== void 0 && (_activity$channelData = activity.channelData) !== null && _activity$channelData !== void 0 && (_activity$channelData2 = _activity$channelData.tags) !== null && _activity$channelData2 !== void 0 && _activity$channelData2.includes(_Constants.Constants.historyMessageTag)) && !(activity !== null && activity !== void 0 && (_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && _activity$channelData3.fromList);
+
+    if (isNotHistoryMessage) {
+      raiseMessageEvent(activity);
+    }
+  };
+
+  const raiseMessageEvent = activity => {
+    if ((activity === null || activity === void 0 ? void 0 : activity.type) === _Constants.Constants.message) {
+      var _TelemetryManager$Int, _activity$from;
+
+      const payload = {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        text: activity === null || activity === void 0 ? void 0 : activity.text,
+        id: activity === null || activity === void 0 ? void 0 : activity.id,
+        type: activity === null || activity === void 0 ? void 0 : activity.type,
+        timestamp: activity === null || activity === void 0 ? void 0 : activity.timestamp,
+        chatId: chatId,
+        userId: userId,
+        conversationId: ((_TelemetryManager$Int = _TelemetryManager.TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.conversationId) ?? "",
+        channelData: activity === null || activity === void 0 ? void 0 : activity.channelData,
+        messageType: ""
+      };
+
+      if ((activity === null || activity === void 0 ? void 0 : (_activity$from = activity.from) === null || _activity$from === void 0 ? void 0 : _activity$from.role) === _Constants.Constants.userMessageTag) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        payload.messageType = _Constants.Constants.userMessageTag;
+        const newMessageSentEvent = {
+          eventName: _TelemetryConstants.BroadcastEvent.NewMessageSent,
+          payload: payload
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(newMessageSentEvent);
+
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.MessageSent,
+          Description: "New message sent"
+        });
+      } else {
+        var _activity$channelData4, _activity$channelData5;
+
+        if (activity !== null && activity !== void 0 && (_activity$channelData4 = activity.channelData) !== null && _activity$channelData4 !== void 0 && (_activity$channelData5 = _activity$channelData4.tags) !== null && _activity$channelData5 !== void 0 && _activity$channelData5.includes(_Constants.Constants.systemMessageTag)) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          payload.messageType = _Constants.Constants.systemMessageTag;
+        } else {
+          var _activity$channelData6, _activity$channelData7, _activity$channelData8;
+
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const messageHasNoText = !(activity !== null && activity !== void 0 && activity.text); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.tags) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+          const messageHasNoAttachments = !(activity !== null && activity !== void 0 && activity.attachments) || (activity === null || activity === void 0 ? void 0 : activity.attachments.length) === 0;
+
+          if (messageHasNoTags && messageHasNoText && messageHasNoAttachments) {
+            return;
+          }
+
+          payload.messageType = _Constants.Constants.userMessageTag;
+        }
+
+        const newMessageReceivedEvent = {
+          eventName: _TelemetryConstants.BroadcastEvent.NewMessageReceived,
+          payload: payload
+        };
+
+        _omnichannelChatComponents.BroadcastService.postMessage(newMessageReceivedEvent);
+
+        _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+          Event: _TelemetryConstants.TelemetryEvent.MessageReceived,
+          Description: "New message received"
+        });
+      }
+    }
+  };
+
+  return onNewAdapterActivityHandler;
+};
+
+exports.createOnNewAdapterActivityHandler = createOnNewAdapterActivityHandler;

package/lib/esm/common/Constants.js

@@ -8,8 +8,12 @@ _defineProperty(Constants, "systemMessageTag", "system");
 
 _defineProperty(Constants, "userMessageTag", "user");
 
+_defineProperty(Constants, "historyMessageTag", "history");
+
 _defineProperty(Constants, "agentEndConversationMessageTag", "agentendconversation");
 
+_defineProperty(Constants, "supervisorForceCloseMessageTag", "supervisorforceclosedconversation");
+
 _defineProperty(Constants, "receivedMessageClassName", "ms_lcw_webchat_received_message");
 
 _defineProperty(Constants, "sentMessageClassName", "ms_lcw_webchat_sent_message");
@@ -118,8 +122,6 @@ _defineProperty(Constants, "InputSubmit", "InputSubmit");
 
 _defineProperty(Constants, "ReconnectIdAttributeName", "oc.reconnectid");
 
-_defineProperty(Constants, "redirectPageRequest", "redirectPageRequest");
-
 _defineProperty(Constants, "LiveChatWidget", "LiveChatWidgetNew");
 
 _defineProperty(Constants, "GuidPattern", "xx-x-4m-ym-xxx");

package/lib/esm/common/telemetry/TelemetryConstants.js

@@ -13,7 +13,7 @@ export let ScenarioType;
   ScenarioType["ACS_ADAPTER"] = "LCW_ACSAdapterEvents";
 })(ScenarioType || (ScenarioType = {}));
 
-export let LogLevel;
+export let LogLevel; // Events used in certain functionalities that are not being logged
 
 (function (LogLevel) {
   LogLevel["INFO"] = "INFO";
@@ -22,6 +22,24 @@ export let LogLevel;
   LogLevel["ERROR"] = "ERROR";
 })(LogLevel || (LogLevel = {}));
 
+export let BroadcastEvent; // Events being logged
+
+(function (BroadcastEvent) {
+  BroadcastEvent["LoadPostChatSurvey"] = "LoadPostChatSurvey";
+  BroadcastEvent["EndChat"] = "ChatEnded";
+  BroadcastEvent["NewMessageNotification"] = "NewMessageNotification";
+  BroadcastEvent["UnreadMessageCount"] = "UnreadMessageCount";
+  BroadcastEvent["ChatWidgetStateChanged"] = "ChatWidgetStateChanged";
+  BroadcastEvent["ProactiveChatStartChat"] = "ProactiveChatStartChat";
+  BroadcastEvent["ProactiveChatStartPopoutChat"] = "ProactiveChatStartPopoutChat";
+  BroadcastEvent["InvalidAdaptiveCardFormat"] = "InvalidAdaptiveCardFormat";
+  BroadcastEvent["NewMessageSent"] = "NewMessageSent";
+  BroadcastEvent["NewMessageReceived"] = "NewMessageReceived";
+  BroadcastEvent["RedirectPageRequest"] = "RedirectPageRequest";
+  BroadcastEvent["StartChatSkippingChatButtonRendering"] = "StartChatSkippingChatButtonRendering";
+  BroadcastEvent["StartUnauthenticatedReconnectChat"] = "StartUnauthenticatedReconnectChat";
+})(BroadcastEvent || (BroadcastEvent = {}));
+
 export let TelemetryEvent;
 
 (function (TelemetryEvent) {
@@ -70,7 +88,9 @@ export let TelemetryEvent;
   TelemetryEvent["PrechatSurveyLoaded"] = "PrechatSurveyLoaded";
   TelemetryEvent["PrechatSubmitted"] = "PrechatSubmitted";
   TelemetryEvent["StartChatSDKCall"] = "StartChatCall";
+  TelemetryEvent["StartChatEventRecevied"] = "StartChatEventReceived";
   TelemetryEvent["EndChatSDKCall"] = "EndChatCall";
+  TelemetryEvent["EndChatEventReceived"] = "EndChatEventReceived";
   TelemetryEvent["OnNewMessageFailed"] = "OnNewMessageFailed";
   TelemetryEvent["OnNewMessageAudioNotificationFailed"] = "OnNewMessageAudioNotificationFailed";
   TelemetryEvent["DownloadTranscriptResponseNullOrUndefined"] = "DownloadTranscriptResponseNullOrUndefined";
@@ -84,6 +104,7 @@ export let TelemetryEvent;
   TelemetryEvent["LoadingPaneLoaded"] = "LoadingPaneLoaded";
   TelemetryEvent["EmailTranscriptLoaded"] = "EmailTranscriptLoaded";
   TelemetryEvent["OutOfOfficePaneLoaded"] = "OutOfOfficePaneLoaded";
+  TelemetryEvent["PostChatSurveyLoadingPaneLoaded"] = "PostChatSurveyLoadingPaneLoaded";
   TelemetryEvent["PostChatSurveyLoaded"] = "PostChatSurveyLoaded";
   TelemetryEvent["ConfirmationPaneLoaded"] = "ConfirmationPaneLoaded";
   TelemetryEvent["ProactiveChatPaneLoaded"] = "ProactiveChatPaneLoaded";
@@ -105,6 +126,7 @@ export let TelemetryEvent;
   TelemetryEvent["InvalidConfiguration"] = "InvalidConfiguration";
   TelemetryEvent["SendTypingIndicatorSucceeded"] = "SendTypingIndicatorSucceeded";
   TelemetryEvent["SendTypingIndicatorFailed"] = "SendTypingIndicatorFailed";
+  TelemetryEvent["WebChatEvent"] = "WebChatEvent";
   TelemetryEvent["PreChatSurveyStartChatMethodFailed"] = "PreChatSurveyStartChatMethodFailed";
   TelemetryEvent["ChatAlreadyTriggered"] = "ChatAlreadyTriggered";
   TelemetryEvent["StartProactiveChatEventReceived"] = "StartProactiveChatEventReceived";
@@ -113,12 +135,11 @@ export let TelemetryEvent;
   TelemetryEvent["ProactiveChatRejected"] = "ProactiveChatRejected";
   TelemetryEvent["IncomingProactiveChatScreenLoaded"] = "IncomingProactiveChatScreenLoaded";
   TelemetryEvent["ProactiveChatClosed"] = "ProactiveChatClosed";
-  TelemetryEvent["ProactiveChatStartChat"] = "ProactiveChatStartChat";
-  TelemetryEvent["ProactiveChatStartPopoutChat"] = "ProactiveChatStartPopoutChat";
   TelemetryEvent["ReconnectChatContinueConversation"] = "ReconnectChatContinueConversation";
   TelemetryEvent["ReconnectChatStartNewConversation"] = "ReconnectChatStartNewConversation";
   TelemetryEvent["ReconnectChatMinimize"] = "ReconnectChatMinimize";
-  TelemetryEvent["ChatWidgetStateChanged"] = "ChatWidgetStateChanged";
+  TelemetryEvent["MessageSent"] = "MessageSent";
+  TelemetryEvent["MessageReceived"] = "MessageReceived";
 })(TelemetryEvent || (TelemetryEvent = {}));
 
 export class TelemetryConstants {
@@ -134,6 +155,7 @@ export class TelemetryConstants {
       case TelemetryEvent.LCWChatButtonShow:
       case TelemetryEvent.PrechatSurveyLoaded:
       case TelemetryEvent.LoadingPaneLoaded:
+      case TelemetryEvent.PostChatSurveyLoadingPaneLoaded:
       case TelemetryEvent.PostChatSurveyLoaded:
       case TelemetryEvent.EmailTranscriptLoaded:
       case TelemetryEvent.OutOfOfficePaneLoaded:
@@ -163,12 +185,16 @@ export class TelemetryConstants {
         return ScenarioType.ACTIONS;
 
       case TelemetryEvent.StartChatSDKCall:
+      case TelemetryEvent.StartChatEventRecevied:
       case TelemetryEvent.StartChatMethodException:
       case TelemetryEvent.CloseChatMethodException:
+      case TelemetryEvent.StartProactiveChatEventReceived:
       case TelemetryEvent.StartProactiveChatMethodFailed:
       case TelemetryEvent.OnNewMessageFailed:
       case TelemetryEvent.OnNewMessageAudioNotificationFailed:
       case TelemetryEvent.GetConversationDetailsCallFailed:
+      case TelemetryEvent.EndChatSDKCall:
+      case TelemetryEvent.EndChatEventReceived:
       case TelemetryEvent.EndChatSDKCallFailed:
       case TelemetryEvent.PostChatContextCallFailed:
       case TelemetryEvent.PostChatContextCallSucceed:

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

@@ -1,6 +1,6 @@
 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; }
 
-import { ScenarioType } from "./TelemetryConstants";
+import { ScenarioType, TelemetryEvent } from "./TelemetryConstants";
 import { newGuid } from "../utils";
 import { TelemetryManager } from "./TelemetryManager";
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
@@ -259,4 +259,16 @@ _defineProperty(TelemetryHelper, "logConfigDataEvent", (logLevel, payload) => {
     }
   };
   BroadcastService.postMessage(telemetryEvent);
+});
+
+_defineProperty(TelemetryHelper, "logWebChatEvent", (logLevel, payload) => {
+  const telemetryEvent = {
+    eventName: TelemetryEvent.WebChatEvent,
+    logLevel: logLevel,
+    payload: { ...payload,
+      type: TelemetryEvent.WebChatEvent,
+      scenarioType: ScenarioType.WEBCHAT
+    }
+  };
+  BroadcastService.postMessage(telemetryEvent);
 });

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

@@ -4,6 +4,7 @@ import { LogLevel, ScenarioType, TelemetryConstants, TelemetryEvent } from "./Te
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { ariaTelemetryLogger } from "./loggers/ariaTelemetryLogger";
 import { consoleLogger } from "./loggers/consoleLogger";
+import { defaultAriaConfig } from "./defaultConfigs/defaultAriaConfig";
 export class TelemetryTimers {}
 
 _defineProperty(TelemetryTimers, "LcwLoadToChatButtonTimer", void 0);
@@ -26,25 +27,25 @@ export 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) {
       BroadcastService.getAnyMessage().subscribe(event => {
-        if (event.payload && event.eventName !== TelemetryEvent.ChatWidgetStateChanged) {
+        if (event.payload && event.eventName in 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(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(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(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.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.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.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.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;
@@ -67,8 +68,11 @@ export const RegisterLoggers = () => {
 
   const logTelemetry = telemetryEvent => {
     loggers.map(logger => {
+      var _payload;
+
       const logLevel = telemetryEvent.logLevel ?? 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) ?? ScenarioType.UNDEFINED;
+      logger.log(logLevel, parseInput(telemetryEvent === null || telemetryEvent === void 0 ? void 0 : telemetryEvent.payload, scenarioType));
     });
   };
 

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

@@ -1,6 +1,6 @@
 export const defaultAriaConfig = {
   collectorUriForTelemetry: "",
   ariaTelemetryKey: "c7655518acf1403f93ff6b9f77942f0a-d01a02fd-6b50-4de3-a566-62eda11f93bc-7083",
-  ariaTelemetryApplicationName: "",
+  ariaTelemetryApplicationName: "D365_Omnichannel_Client_Public_Prod",
   disableCookieUsage: true
 };