@microsoft/omnichannel-chat-widget 0.1.0-main.dbc1afa → 0.1.0-main.dee03a3

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/NotDeliveredTimestamp.js

@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useRef } from "react";
-import { HtmlAttributeNames } from "../../../../../../common/Constants";
 import { KeyCodes } from "../../../../../../common/KeyCodes";
 import { Stack } from "@fluentui/react";
 import { defaultMiddlewareLocalizedTexts } from "../../../../common/defaultProps/defaultMiddlewareLocalizedTexts";
@@ -9,11 +8,10 @@ import { defaultTimestampRetryStyles } from "../defaultStyles/defaultTimestampRe
 import { getTimestampHourMinute } from "../../../../../../common/utils";
 import { hooks } from "botframework-webchat";
 import { useChatContextStore } from "../../../../../..";
-/* eslint @typescript-eslint/no-explicit-any: "off" */
 
+/* eslint @typescript-eslint/no-explicit-any: "off" */
 export const NotDeliveredTimestamp = _ref => {
   var _state$domainStates$r, _state$domainStates$r2, _state$domainStates$r3, _state$domainStates$r4, _state$domainStates$m, _state$domainStates$m2;
-
   let {
     args
   } = _ref;
@@ -32,54 +30,37 @@ export const NotDeliveredTimestamp = _ref => {
   } = activity;
   const [state] = useChatContextStore();
   const dir = ((_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : _state$domainStates$r.timestampDir) ?? state.domainStates.globalDir;
-  const contentStyles = { ...defaultTimestampContentStyles,
+  const contentStyles = {
+    ...defaultTimestampContentStyles,
     ...((_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.timestampContentStyleProps)
   };
-  const failedTextStyles = { ...defaultTimestampFailedStyles,
+  const failedTextStyles = {
+    ...defaultTimestampFailedStyles,
     ...((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 ? void 0 : _state$domainStates$r3.timestampFailedTextStyleProps)
   };
-  const retryTextStyles = { ...defaultTimestampRetryStyles,
+  const retryTextStyles = {
+    ...defaultTimestampRetryStyles,
     ...((_state$domainStates$r4 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r4 === void 0 ? void 0 : _state$domainStates$r4.timestampRetryTextStyleProps)
   };
   useEffect(() => {
     var _timestampRef$current;
-
     const timestampWebChatNodes = timestampRef === null || timestampRef === void 0 ? void 0 : (_timestampRef$current = timestampRef.current) === null || _timestampRef$current === void 0 ? void 0 : _timestampRef$current.childNodes;
-
     if ((timestampWebChatNodes === null || timestampWebChatNodes === void 0 ? void 0 : timestampWebChatNodes.length) > 1) {
       timestampWebChatNodes[1].innerText = getTimestampHourMinute(timestamp);
     }
   }, [timestampRef]);
-  const onRetryClick = useCallback(async event => {
+  const onRetryClick = useCallback(async () => {
     var _activity$channelData;
-
-    removeNotDeliveredTimestamp(event);
     activity.previousClientActivityID = (_activity$channelData = activity.channelData) === null || _activity$channelData === void 0 ? void 0 : _activity$channelData.clientActivityID;
     await postActivity(activity);
     focus("sendBox");
   }, [activity, focus, postActivity]);
-
   const onRetryKeyEnter = event => {
     if (event.code === KeyCodes.ENTER) {
       event.preventDefault();
-      onRetryClick(event);
+      onRetryClick();
     }
   };
-
-  const removeNotDeliveredTimestamp = event => {
-    let parent = event.target.parentElement;
-
-    while (parent.tagName !== HtmlAttributeNames.listItem) {
-      parent = parent.parentElement;
-
-      if (parent.tagName === HtmlAttributeNames.unorderedList) {
-        return;
-      }
-    }
-
-    parent.parentNode.removeChild(parent);
-  };
-
   return /*#__PURE__*/React.createElement(Stack, {
     style: contentStyles,
     dir: dir,

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/SendingTimestamp.js

@@ -2,29 +2,20 @@ import React from "react";
 import { Stack } from "@fluentui/react";
 import { defaultMiddlewareLocalizedTexts } from "../../../../common/defaultProps/defaultMiddlewareLocalizedTexts";
 import { defaultTimestampContentStyles } from "../defaultStyles/defaultTimestampContentStyles";
-import { getTimestampHourMinute } from "../../../../../../common/utils";
 import { useChatContextStore } from "../../../../../..";
-/* eslint @typescript-eslint/no-explicit-any: "off" */
 
-export const SendingTimestamp = _ref => {
+/* eslint @typescript-eslint/no-explicit-any: "off" */
+export const SendingTimestamp = () => {
   var _state$domainStates$r, _state$domainStates$r2, _state$domainStates$m;
-
-  let {
-    args
-  } = _ref;
   const [state] = useChatContextStore();
   const dir = ((_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : _state$domainStates$r.timestampDir) ?? state.domainStates.globalDir;
-  const contentStyles = { ...defaultTimestampContentStyles,
+  const contentStyles = {
+    ...defaultTimestampContentStyles,
     ...((_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.timestampContentStyleProps)
   };
-  const {
-    activity: {
-      timestamp
-    }
-  } = args;
   return /*#__PURE__*/React.createElement(Stack, {
     style: contentStyles,
     dir: dir,
     horizontal: true
-  }, /*#__PURE__*/React.createElement("span", null, " ", getTimestampHourMinute(timestamp)), /*#__PURE__*/React.createElement("span", null, " \xA0-\xA0 "), /*#__PURE__*/React.createElement("span", null, " ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_SENDING) ?? defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_SENDING, " "));
+  }, /*#__PURE__*/React.createElement("span", null, " ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_SENDING) ?? defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_SENDING, " "));
 };

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/typingIndicatorMiddleware.js

@@ -3,6 +3,7 @@
  * 
  * This middleware changes the component that shows who's actively typing. It uses the default Microsoft LiveChatWidget styles.
  ******/
+
 import React from "react";
 import { DirectLineSenderRole } from "../../enums/DirectLineSenderRole";
 import { defaultMiddlewareLocalizedTexts } from "../../../common/defaultProps/defaultMiddlewareLocalizedTexts";
@@ -10,11 +11,11 @@ import { defaultTypingIndicatorBubbleStyles } from "./defaultStyles/defaultTypin
 import { defaultTypingIndicatorContainerStyles } from "./defaultStyles/defaultTypingIndicatorContainerStyles";
 import { defaultTypingIndicatorMessageStyles } from "./defaultStyles/defaultTypingIndicatorMessageStyles";
 import { useChatContextStore } from "../../../../..";
-import useChatSDKStore from "../../../../../hooks/useChatSDKStore"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import useChatSDKStore from "../../../../../hooks/useChatSDKStore";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const TypingIndicator = _ref => {
   var _state$domainStates$l, _state$domainStates$r, _state$domainStates$r2, _state$domainStates$r3;
-
   let {
     activeTyping,
     visible
@@ -22,39 +23,37 @@ const TypingIndicator = _ref => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chatSDK = useChatSDKStore();
   const [state] = useChatContextStore();
-
   if (!activeTyping || Object.keys(activeTyping).length === 0 || ((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.LiveChatVersion) === 1 && !visible) {
     return null;
   }
-
   activeTyping = Object.keys(activeTyping).map(key => activeTyping[key]);
-
   for (let i = 0; i < activeTyping.length; i++) {
     if (activeTyping[i].role && activeTyping[i].role === DirectLineSenderRole.User) {
       var _state$domainStates$l2;
-
       //visible is set to false if the current user is typing, in which case, we just send typing indicator to OC
       if (((_state$domainStates$l2 = state.domainStates.liveChatConfig) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.LiveChatVersion) === 2 && !visible) {
         chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.sendTypingEvent();
         return null;
       }
-
       activeTyping.splice(i, 1);
       i--;
     }
   }
-
-  const localizedTexts = { ...defaultMiddlewareLocalizedTexts,
+  const localizedTexts = {
+    ...defaultMiddlewareLocalizedTexts,
     ...state.domainStates.middlewareLocalizedTexts
   };
   const message = getTypingIndicatorMessage(activeTyping, localizedTexts);
-  const typingIndicatorStyles = { ...defaultTypingIndicatorContainerStyles,
+  const typingIndicatorStyles = {
+    ...defaultTypingIndicatorContainerStyles,
     ...((_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : _state$domainStates$r.typingIndicatorStyleProps)
   };
-  const typingIndicatorBubbleStyles = { ...defaultTypingIndicatorBubbleStyles,
+  const typingIndicatorBubbleStyles = {
+    ...defaultTypingIndicatorBubbleStyles,
     ...((_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.typingIndicatorBubbleStyleProps)
   };
-  const typingIndicatorMessageStyles = { ...defaultTypingIndicatorMessageStyles,
+  const typingIndicatorMessageStyles = {
+    ...defaultTypingIndicatorMessageStyles,
     ...((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 ? void 0 : _state$domainStates$r3.typingIndicatorMessageStyleProps)
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("style", null, `
@@ -96,9 +95,9 @@ const TypingIndicator = _ref => {
   }), /*#__PURE__*/React.createElement("div", {
     style: typingIndicatorMessageStyles
   }, " ", message, " ")));
-}; // eslint-disable-next-line react/display-name, @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line react/display-name, @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
 export const typingIndicatorMiddleware = () => next => args => {
   const {
     activeTyping,
@@ -108,8 +107,9 @@ export const typingIndicatorMiddleware = () => next => args => {
     activeTyping: activeTyping,
     visible: visible
   });
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getTypingIndicatorMessage = (activeTyping, localizedTexts) => {
   if (!activeTyping || activeTyping.length === 0) {
     return "";
@@ -120,19 +120,15 @@ const getTypingIndicatorMessage = (activeTyping, localizedTexts) => {
     const firstMember = activeTyping[0].name;
     const lastMember = activeTyping[1].name;
     let message = localizedTexts.MIDDLEWARE_TYPING_INDICATOR_TWO;
-
     if (!message) {
       return "";
     }
-
     if (message.includes("{0}")) {
       message = message.replace("{0}", firstMember);
     }
-
     if (message.includes("{1}")) {
       message = message.replace("{1}", lastMember);
     }
-
     return message;
   } else {
     const message = localizedTexts.MIDDLEWARE_TYPING_INDICATOR_MULTIPLE;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware.js

@@ -3,8 +3,10 @@
  * 
  * Handles attachment sending.
  ******/
-import { WebChatActionType } from "../../enums/WebChatActionType"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
+import { WebChatActionType } from "../../enums/WebChatActionType";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const createSendFileAction = files => {
   return {
     payload: {
@@ -12,31 +14,26 @@ const createSendFileAction = files => {
     },
     type: WebChatActionType.WEB_CHAT_SEND_FILES
   };
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const attachmentProcessingMiddleware = _ref => {
   let {
     dispatch
   } = _ref;
   return next => async action => {
     var _action$payload, _action$payload$files;
-
     if ((action === null || action === void 0 ? void 0 : action.type) === WebChatActionType.WEB_CHAT_SEND_FILES && (action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : (_action$payload$files = _action$payload.files) === null || _action$payload$files === void 0 ? void 0 : _action$payload$files.length) > 0) {
       const files = action.payload.files;
-
       if (files.length === 1) {
         return next(action);
       }
-
       const dispatchAction = createSendFileAction(files.slice(0, files.length - 1));
       const nextAction = createSendFileAction([files[files.length - 1]]);
       await dispatch(dispatchAction);
       return next(nextAction);
     }
-
     return next(action);
   };
 };
-
 export default attachmentProcessingMiddleware;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js

@@ -3,27 +3,25 @@
  * 
  * Checks if the attachment being uploaded satisfies Omnichannel's requirement on file extensions and file size.
  ******/
+
 import { NotificationHandler } from "../../notification/NotificationHandler";
 import { NotificationScenarios } from "../../enums/NotificationScenarios";
 import { WebChatActionType } from "../../enums/WebChatActionType";
 const MBtoBRatio = 1000000;
+
 /*
 * If an attachment is invalid, delete this attachment from the attachments list
 * If the result attachment list is empty, return a dummy action
 */
-
 const validateAttachment = (action, allowedFileExtensions, maxUploadFileSize, localizedTexts) => {
   var _action$payload, _action$payload$activ, _action$payload2, _action$payload2$acti, _action$payload2$acti2, _action$payload3, _action$payload3$acti, _action$payload3$acti2;
-
   const attachments = action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : (_action$payload$activ = _action$payload.activity) === null || _action$payload$activ === void 0 ? void 0 : _action$payload$activ.attachments;
   const attachmentSizes = action === null || action === void 0 ? void 0 : (_action$payload2 = action.payload) === null || _action$payload2 === void 0 ? void 0 : (_action$payload2$acti = _action$payload2.activity) === null || _action$payload2$acti === void 0 ? void 0 : (_action$payload2$acti2 = _action$payload2$acti.channelData) === null || _action$payload2$acti2 === void 0 ? void 0 : _action$payload2$acti2.attachmentSizes;
-
   if (attachments) {
     for (let i = 0; i < attachments.length; i++) {
       const fileExtensionValid = validateFileExtension(attachments[i], allowedFileExtensions);
       const fileSizeValid = validateFileSize(attachmentSizes[i], maxUploadFileSize);
       const fileIsEmpty = parseInt(attachmentSizes[i]) == 0;
-
       if (!fileExtensionValid || !fileSizeValid || fileIsEmpty) {
         NotificationHandler.notifyError(NotificationScenarios.AttachmentError, buildErrorMessage(attachments[i].name, fileExtensionValid, fileSizeValid, fileIsEmpty, maxUploadFileSize, localizedTexts));
         attachments.splice(i, 1);
@@ -32,7 +30,6 @@ const validateAttachment = (action, allowedFileExtensions, maxUploadFileSize, lo
       }
     }
   }
-
   if ((action === null || action === void 0 ? void 0 : (_action$payload3 = action.payload) === null || _action$payload3 === void 0 ? void 0 : (_action$payload3$acti = _action$payload3.activity) === null || _action$payload3$acti === void 0 ? void 0 : (_action$payload3$acti2 = _action$payload3$acti.attachments) === null || _action$payload3$acti2 === void 0 ? void 0 : _action$payload3$acti2.length) > 0) {
     return action;
   } else {
@@ -41,37 +38,30 @@ const validateAttachment = (action, allowedFileExtensions, maxUploadFileSize, lo
       payload: null
     };
   }
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const validateFileExtension = (attachment, allowedFileExtensions) => {
   if (!allowedFileExtensions) {
     return true;
   }
-
   const fileName = attachment.name.toLowerCase();
   const index = fileName.lastIndexOf(".");
-
   if (!index) {
     return false;
   }
-
   const fileExtension = fileName.substring(index);
   const allExtensions = allowedFileExtensions === null || allowedFileExtensions === void 0 ? void 0 : allowedFileExtensions.toLowerCase().split(",");
   return allExtensions.indexOf(fileExtension) > -1;
 };
-
 const validateFileSize = (attachmentSize, maxUploadFileSize) => {
   return (maxUploadFileSize && parseInt(maxUploadFileSize) * MBtoBRatio) > parseInt(attachmentSize);
 };
-
 const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize, fileIsEmpty, maxUploadFileSize, localizedTexts) => {
   let errorMessage = "";
-
   if (!fileName || !maxUploadFileSize) {
     return localizedTexts.MIDDLEWARE_BANNER_FILE_NULL_ERROR ?? "";
   }
-
   if (!supportedFileExtension && !supportedFileSize) {
     errorMessage = getFileSizeAndFileExtensionErrorMessage(fileName, maxUploadFileSize, localizedTexts);
   } else if (!supportedFileSize) {
@@ -83,33 +73,25 @@ const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize,
   } else {
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_ERROR_MESSAGE ?? "";
   }
-
   return errorMessage;
 };
-
 const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
   let errorMessage;
-
   if (index < 0) {
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR;
   } else {
     var _errorMessage;
-
     const fileExtension = fileName.substring(index);
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR;
-
     if ((_errorMessage = errorMessage) !== null && _errorMessage !== void 0 && _errorMessage.includes("{1}")) {
       errorMessage = errorMessage.replace("{1}", fileExtension);
     }
   }
-
   return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
 };
-
 const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
-
   if (index < 0) {
     return localizedTexts.MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION ?? "";
   } else {
@@ -118,13 +100,12 @@ const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
     return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", fileExtension) : errorMessage : "";
   }
 };
-
 const getFileSizeErrorMessage = (maxUploadFileSize, localizedTexts) => {
   const errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_ERROR;
   return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 const createAttachmentUploadValidatorMiddleware = (allowedFileExtensions, maxUploadFileSize, localizedTexts) => _ref => {
   let {
     dispatch
@@ -132,18 +113,14 @@ const createAttachmentUploadValidatorMiddleware = (allowedFileExtensions, maxUpl
   return next => action => {
     if (action.type === WebChatActionType.DIRECT_LINE_POST_ACTIVITY) {
       var _payload$activity, _payload$activity2, _payload$activity2$ch, _payload$activity3, _payload$activity3$at, _payload$activity4, _payload$activity4$ch, _payload$activity4$ch2;
-
       const {
         payload
       } = action;
-
       if (payload !== null && payload !== void 0 && (_payload$activity = payload.activity) !== null && _payload$activity !== void 0 && _payload$activity.attachments && payload !== null && payload !== void 0 && (_payload$activity2 = payload.activity) !== null && _payload$activity2 !== void 0 && (_payload$activity2$ch = _payload$activity2.channelData) !== null && _payload$activity2$ch !== void 0 && _payload$activity2$ch.attachmentSizes && (payload === null || payload === void 0 ? void 0 : (_payload$activity3 = payload.activity) === null || _payload$activity3 === void 0 ? void 0 : (_payload$activity3$at = _payload$activity3.attachments) === null || _payload$activity3$at === void 0 ? void 0 : _payload$activity3$at.length) === (payload === null || payload === void 0 ? void 0 : (_payload$activity4 = payload.activity) === null || _payload$activity4 === void 0 ? void 0 : (_payload$activity4$ch = _payload$activity4.channelData) === null || _payload$activity4$ch === void 0 ? void 0 : (_payload$activity4$ch2 = _payload$activity4$ch.attachmentSizes) === null || _payload$activity4$ch2 === void 0 ? void 0 : _payload$activity4$ch2.length)) {
         return next(validateAttachment(action, allowedFileExtensions, maxUploadFileSize, localizedTexts));
       }
     }
-
     return next(action);
   };
 };
-
 export default createAttachmentUploadValidatorMiddleware;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/channelDataMiddleware.js

@@ -3,26 +3,25 @@
  * 
  * Adds necessary tags if not present so that the rendering middlewares can process them later.
  ******/
+
 import { Constants } from "../../../../../common/Constants";
 import { DeliveryMode } from "@microsoft/omnichannel-chat-sdk";
-import { WebChatActionType } from "../../enums/WebChatActionType"; // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+import { WebChatActionType } from "../../enums/WebChatActionType";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 const channelDataMiddleware = _ref => {
   let {
     dispatch
   } = _ref;
   return next => action => {
     var _action$payload, _action$payload$activ;
-
     if ((action === null || action === void 0 ? void 0 : action.type) === WebChatActionType.DIRECT_LINE_POST_ACTIVITY_PENDING && action !== null && action !== void 0 && (_action$payload = action.payload) !== null && _action$payload !== void 0 && (_action$payload$activ = _action$payload.activity) !== null && _action$payload$activ !== void 0 && _action$payload$activ.channelData) {
       const channelIdTag = `${Constants.channelIdKey}${Constants.ChannelId}`;
       const customerMessageTag = `${Constants.CustomerTag}`;
-
       if (action.payload.activity.channelData.tags) {
         if (!action.payload.activity.channelData.tags.includes(channelIdTag)) {
           action.payload.activity.channelData.tags.push(channelIdTag);
         }
-
         if (!action.payload.activity.channelData.tags.includes(customerMessageTag)) {
           action.payload.activity.channelData.tags.push(customerMessageTag);
         }
@@ -30,14 +29,11 @@ const channelDataMiddleware = _ref => {
         action.payload.activity.channelData.tags = [channelIdTag];
         action.payload.activity.channelData.tags.push(customerMessageTag);
       }
-
       action.payload.activity.channelData.metadata = {
         deliveryMode: DeliveryMode.Bridged
       };
     }
-
     return next(action);
   };
 };
-
 export default channelDataMiddleware;

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

@@ -4,42 +4,37 @@
  * This middleware is invoked when the conversation is ended by the agent/bot.
  * The callback is then invoked to hide the send box (by default).
  ******/
+
 import { Constants } from "../../../../../common/Constants";
 import { DirectLineSenderRole } from "../../enums/DirectLineSenderRole";
 import { MessageTypes } from "../../enums/MessageType";
-import { WebChatActionType } from "../../enums/WebChatActionType"; // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+import { WebChatActionType } from "../../enums/WebChatActionType";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 const createConversationEndMiddleware = conversationEndCallback => _ref => {
   let {
     dispatch
   } = _ref;
   return next => action => {
     var _action$payload;
-
     if ((action === null || action === void 0 ? void 0 : action.type) == WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && (_action$payload = action.payload) !== null && _action$payload !== void 0 && _action$payload.activity) {
       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.Bot && activity.channelId === "ACS_CHANNEL") {
         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.systemMessageTag) && ((_activity$channelData3 = activity.channelData) !== null && _activity$channelData3 !== void 0 && (_activity$channelData4 = _activity$channelData3.tags) !== null && _activity$channelData4 !== void 0 && _activity$channelData4.includes(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.supervisorForceCloseMessageTag))) {
           conversationEndCallback();
         }
       } else if (((_activity$from2 = activity.from) === null || _activity$from2 === void 0 ? void 0 : _activity$from2.role) === DirectLineSenderRole.Channel && ((_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : _activity$channelData7.type) === 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$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.truePascal || !((_activity$channelData11 = activity.channelData) !== null && _activity$channelData11 !== void 0 && (_activity$channelData12 = _activity$channelData11.properties) !== null && _activity$channelData12 !== void 0 && _activity$channelData12.containsExternalEntitiesListeningAll)) {
           conversationEndCallback();
         }
       }
     }
-
     return next(action);
   };
 };
-
 export default createConversationEndMiddleware;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware.js

@@ -3,18 +3,16 @@
  *
  * Applies data masking rules that Omnichannel Admin has configured.
  ******/
+
 import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
 import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
 import { WebChatActionType } from "../../enums/WebChatActionType";
 import { isMaskingforCustomer } from "../../../common/utils/isMaskingFromCustomer";
-
 const applyDataMasking = (action, regexCollection) => {
   const maskedChar = "#"; //to do: load from env once OC SDK supporting.
-
   let {
     text
   } = action.payload;
-
   if (!regexCollection) {
     TelemetryHelper.logActionEvent(LogLevel.ERROR, {
       Event: TelemetryEvent.InvalidConfiguration,
@@ -24,22 +22,26 @@ const applyDataMasking = (action, regexCollection) => {
     });
     return action;
   }
-
+  let isRuleMatched = false;
   for (const ruleId of Object.keys(regexCollection)) {
     const item = regexCollection[ruleId];
-
     if (item) {
       try {
         const regex = new RegExp(item, "gi");
-        let match; // eslint-disable-next-line no-cond-assign
-
+        let match;
+        // eslint-disable-next-line no-cond-assign
         while (match = regex.exec(text)) {
           const replaceStr = match[0].replace(/./gi, maskedChar);
           text = text.replace(match[0], replaceStr);
+          TelemetryHelper.logActionEvent(LogLevel.INFO, {
+            Event: TelemetryEvent.DataMaskingRuleApplied,
+            Description: `Data Masking Rule Id: ${ruleId} applied.`
+          });
+          isRuleMatched = true;
         }
       } catch (err) {
         TelemetryHelper.logActionEvent(LogLevel.ERROR, {
-          Event: TelemetryEvent.DataMaskingRuleApplied,
+          Event: TelemetryEvent.DataMaskingRuleApplyFailed,
           ExceptionDetails: {
             RuleId: ruleId,
             Exception: err
@@ -47,27 +49,28 @@ const applyDataMasking = (action, regexCollection) => {
         });
       }
     }
-  }
 
+    // Exit if rule matched
+    if (isRuleMatched === true) {
+      break;
+    }
+  }
   action.payload.text = text;
   return action;
-}; // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
-
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 const createDataMaskingMiddleware = dataMaskingInfo => _ref => {
   let {
     dispatch
   } = _ref;
   return next => action => {
     var _action$payload;
-
     if (isMaskingforCustomer(dataMaskingInfo) && (_action$payload = action.payload) !== null && _action$payload !== void 0 && _action$payload.text && action.type === WebChatActionType.WEB_CHAT_SEND_MESSAGE) {
       const regexCollection = dataMaskingInfo === null || dataMaskingInfo === void 0 ? void 0 : dataMaskingInfo.dataMaskingRules;
       return next(applyDataMasking(action, regexCollection));
     }
-
     return next(action);
   };
 };
-
 export default createDataMaskingMiddleware;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/gifUploadMiddleware.js

@@ -3,9 +3,11 @@
  * 
  * Ensures that GIF are properly uploaded.
  ******/
+
 import { Constants } from "../../../../../common/Constants";
-import { WebChatActionType } from "../../enums/WebChatActionType"; // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+import { WebChatActionType } from "../../enums/WebChatActionType";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
 const gifUploadMiddleware = _ref => {
   let {
     dispatch
@@ -13,16 +15,13 @@ const gifUploadMiddleware = _ref => {
   return next => action => {
     if (action.type === WebChatActionType.DIRECT_LINE_POST_ACTIVITY) {
       var _activity$attachments, _activity$channelData, _activity$channelData2;
-
       const {
         payload: {
           activity
         }
       } = action;
-
       if ((activity === null || activity === void 0 ? void 0 : (_activity$attachments = activity.attachments) === null || _activity$attachments === void 0 ? void 0 : _activity$attachments.length) === (activity === null || activity === void 0 ? void 0 : (_activity$channelData = activity.channelData) === null || _activity$channelData === void 0 ? void 0 : (_activity$channelData2 = _activity$channelData.attachmentSizes) === null || _activity$channelData2 === void 0 ? void 0 : _activity$channelData2.length)) {
         var _activity$attachments2;
-
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         activity === null || activity === void 0 ? void 0 : (_activity$attachments2 = activity.attachments) === null || _activity$attachments2 === void 0 ? void 0 : _activity$attachments2.forEach(attachment => {
           const {
@@ -30,16 +29,13 @@ const gifUploadMiddleware = _ref => {
             contentUrl,
             contentType
           } = attachment;
-
           if (contentType === Constants.GifContentType && thumbnailUrl !== contentUrl) {
             attachment.thumbnailUrl = contentUrl;
           }
         });
       }
     }
-
     return next(action);
   };
 };
-
 export default gifUploadMiddleware;