@microsoft/omnichannel-chat-widget 0.1.0-main.fb426ed → 1.0.0

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

@@ -0,0 +1,83 @@
+import { WebChatActionType } from "../../enums/WebChatActionType";
+import { Constants } from "../../../../../common/Constants";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+const createMessageTimeStampMiddleware = _ref => {
+  let {
+    dispatch
+  } = _ref;
+  return next => action => {
+    if (isApplicable(action)) {
+      return next(evaluateTagsAndOverrideTimeStamp(action));
+    }
+    return next(action);
+  };
+};
+const isApplicable = action => {
+  return action.type === WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && isPVAConversation(action) && isPayloadValid(action) && isValidChannel(action);
+};
+const isPayloadValid = action => {
+  var _action$payload;
+  return action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.activity;
+};
+const isValidChannel = action => {
+  var _action$payload2, _action$payload2$acti;
+  return (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$acti.channelId) === Constants.acsChannel;
+};
+const isPVAConversation = action => {
+  return !isTagIncluded(action, Constants.systemMessageTag) && !isTagIncluded(action, Constants.publicMessageTag) && !isRoleUserOn(action);
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const isTagIncluded = (action, tag) => {
+  return isDataTagsPresent(action) && action.payload.activity.channelData.tags.includes(tag);
+};
+const isRoleUserOn = action => {
+  var _action$payload3, _action$payload3$acti, _action$payload3$acti2;
+  return (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.from) === null || _action$payload3$acti2 === void 0 ? void 0 : _action$payload3$acti2.role) === Constants.userMessageTag;
+};
+const overrideTimeStamp = (timestampOriginal, timeStampNew) => {
+  return isTimestampValid(timeStampNew) ? timeStampNew : timestampOriginal;
+};
+const isTimestampValid = timeStamp => {
+  const regex = /(\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])(T)(\d{2})(:{1})(\d{2})(:{1})(\d{2})(.\d+)([Z]{1}))/;
+  return regex.test(timeStamp);
+};
+const isDataTagsPresent = action => {
+  var _action$payload4, _action$payload4$acti, _action$payload4$acti2;
+  return (action === null || action === void 0 ? void 0 : (_action$payload4 = action.payload) === null || _action$payload4 === void 0 ? void 0 : (_action$payload4$acti = _action$payload4.activity) === null || _action$payload4$acti === void 0 ? void 0 : (_action$payload4$acti2 = _action$payload4$acti.channelData) === null || _action$payload4$acti2 === void 0 ? void 0 : _action$payload4$acti2.tags) && action.payload.activity.channelData.tags.length > 0;
+};
+const evaluateTagsAndOverrideTimeStamp = action => {
+  const tagValue = tagLookup(action, Constants.prefixTimestampTag);
+  if (tagValue) {
+    const newTimestamp = extractTimeStamp(tagValue);
+    action.payload.activity.timestamp = overrideTimeStamp(action.payload.activity.timestamp, newTimestamp);
+  }
+  return action;
+};
+const extractTimeStamp = timeStamp => {
+  if (timeStamp && timeStamp.length > 0) {
+    const ts = timeStamp.split(Constants.prefixTimestampTag);
+    if (ts && ts.length > 1) {
+      return ts[1];
+    }
+  }
+  return timeStamp;
+};
+const tagLookup = (action, tag) => {
+  if (!isDataTagsPresent(action)) {
+    return null;
+  }
+  const tags = action.payload.activity.channelData.tags;
+  let value;
+  if (tags && tags.length > 0) {
+    for (let i = 0; i < tags.length; i++) {
+      value = tags[i];
+      if (value && value.indexOf(tag) > -1) {
+        return value;
+      }
+    }
+  }
+  return null;
+};
+export default createMessageTimeStampMiddleware;

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

@@ -5,11 +5,10 @@ import { defaultMiddlewareLocalizedTexts } from "../../../../common/defaultProps
 import { defaultTimestampContentStyles } from "../defaultStyles/defaultTimestampContentStyles";
 import { getTimestampHourMinute } from "../../../../../../common/utils";
 import { useChatContextStore } from "../../../../../..";
-/* eslint @typescript-eslint/no-explicit-any: "off" */
 
+/* eslint @typescript-eslint/no-explicit-any: "off" */
 export const DeliveredTimestamp = _ref => {
   var _state$domainStates$r, _state$domainStates$r2, _state$domainStates$m;
-
   let {
     args,
     role,
@@ -17,7 +16,8 @@ export const DeliveredTimestamp = _ref => {
   } = _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 {
@@ -27,13 +27,12 @@ export const DeliveredTimestamp = _ref => {
   } = args;
   return /*#__PURE__*/React.createElement(Stack, {
     style: contentStyles,
+    dir: dir
+  }, role === DirectLineSenderRole.Bot && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     dir: dir,
-    horizontal: true
-  }, role === DirectLineSenderRole.Bot && /*#__PURE__*/React.createElement("span", {
     "aria-hidden": "false"
-  }, name), role === DirectLineSenderRole.Bot && /*#__PURE__*/React.createElement("span", null, " \xA0-\xA0 "), /*#__PURE__*/React.createElement("span", {
+  }, name, " - ", getTimestampHourMinute(timestamp))), role === DirectLineSenderRole.User && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+    "aria-hidden": "false",
     dir: dir
-  }, " ", getTimestampHourMinute(timestamp)), role === DirectLineSenderRole.User && /*#__PURE__*/React.createElement("span", null, " \xA0-\xA0 "), role === DirectLineSenderRole.User && /*#__PURE__*/React.createElement("span", {
-    "aria-hidden": "false"
-  }, ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_DELIVERED) ?? defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_DELIVERED));
+  }, " ", getTimestampHourMinute(timestamp), " - ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_DELIVERED) ?? defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_DELIVERED)));
 };

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

@@ -1,20 +1,22 @@
 /******
  * TypingIndicatorMiddleware
- * 
+ *
  * This middleware changes the component that shows who's actively typing. It uses the default Microsoft LiveChatWidget styles.
  ******/
-import React from "react";
+
+import React, { useCallback } from "react";
 import { DirectLineSenderRole } from "../../enums/DirectLineSenderRole";
+import { debounceLeading } from "../../../../../common/utils";
 import { defaultMiddlewareLocalizedTexts } from "../../../common/defaultProps/defaultMiddlewareLocalizedTexts";
 import { defaultTypingIndicatorBubbleStyles } from "./defaultStyles/defaultTypingIndicatorBubbleStyles";
 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 +24,38 @@ const TypingIndicator = _ref => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chatSDK = useChatSDKStore();
   const [state] = useChatContextStore();
-
+  const debounceTyping = useCallback(debounceLeading(() => chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.sendTypingEvent()), []);
   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();
+        debounceTyping();
         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 +97,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 +109,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 +122,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,36 +3,37 @@
  * 
  * Checks if the attachment being uploaded satisfies Omnichannel's requirement on file extensions and file size.
  ******/
+
+import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
 import { NotificationHandler } from "../../notification/NotificationHandler";
 import { NotificationScenarios } from "../../enums/NotificationScenarios";
 import { WebChatActionType } from "../../enums/WebChatActionType";
+import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper";
+import { AMSConstants } from "../../../../../common/Constants";
 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) => {
+const validateAttachment = (action, allowedFileExtensions, maxFileSizeSupportedByDynamics, 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 maxUploadFileSize = getMaxUploadFileSize(maxFileSizeSupportedByDynamics, attachments[i].contentType);
       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));
+        NotificationHandler.notifyError(NotificationScenarios.AttachmentError, buildErrorMessage(attachments[i].name, fileExtensionValid, fileSizeValid, fileIsEmpty, maxUploadFileSize.toString(), maxFileSizeSupportedByDynamics, localizedTexts));
         attachments.splice(i, 1);
         attachmentSizes.splice(i, 1);
         i--;
       }
     }
   }
-
   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,109 +42,149 @@ 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);
+  return maxUploadFileSize * MBtoBRatio > parseInt(attachmentSize);
 };
-
-const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize, fileIsEmpty, maxUploadFileSize, localizedTexts) => {
+const getMaxUploadFileSize = (maxFileSizeSupportedByDynamicsStr, contentType) => {
+  const maxFileSizeSupportedByDynamics = maxFileSizeSupportedByDynamicsStr && parseInt(maxFileSizeSupportedByDynamicsStr) ? parseInt(maxFileSizeSupportedByDynamicsStr) : AMSConstants.maxSupportedFileSize;
+  const amsAttachmentSizeLimit = isImage(contentType) ? AMSConstants.maxSupportedImageSize : AMSConstants.maxSupportedFileSize;
+  // Takes the smallest max file size configure betteween AMS and Dynamics Config
+  return maxFileSizeSupportedByDynamics < amsAttachmentSizeLimit ? maxFileSizeSupportedByDynamics : amsAttachmentSizeLimit;
+};
+const isImage = contentType => {
+  return AMSConstants.supportedImagesMimeTypes.includes(contentType);
+};
+const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize, fileIsEmpty, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
   let errorMessage = "";
-
   if (!fileName || !maxUploadFileSize) {
+    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+      Description: "Attachment validation failed",
+      ExceptionDetails: {
+        ErrorDetails: "File provided is null"
+      }
+    });
     return localizedTexts.MIDDLEWARE_BANNER_FILE_NULL_ERROR ?? "";
   }
-
   if (!supportedFileExtension && !supportedFileSize) {
-    errorMessage = getFileSizeAndFileExtensionErrorMessage(fileName, maxUploadFileSize, localizedTexts);
+    errorMessage = getFileSizeAndFileExtensionErrorMessage(fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
   } else if (!supportedFileSize) {
-    errorMessage = getFileSizeErrorMessage(maxUploadFileSize, localizedTexts);
+    errorMessage = getFileSizeErrorMessage(maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts);
   } else if (!supportedFileExtension) {
     errorMessage = getFileExtensionErrorMessage(fileName, localizedTexts);
   } else if (fileIsEmpty) {
+    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+      Description: "Attachment validation failed",
+      ExceptionDetails: {
+        ErrorDetails: "File provided is empty"
+      }
+    });
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR ?? "";
   } else {
+    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+      Description: "Attachment validation failed",
+      ExceptionDetails: {
+        ErrorDetails: `Unexpected error: supportedFileExtension=${supportedFileExtension} supportedFileSize=${supportedFileSize} fileIsEmpty=${!fileIsEmpty}`
+      }
+    });
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_ERROR_MESSAGE ?? "";
   }
-
   return errorMessage;
 };
-
-const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, localizedTexts) => {
+const getFileSizeAndFileExtensionErrorMessage = (fileName, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
-  let errorMessage;
-
+  let errorMessage, exceptionDetails;
   if (index < 0) {
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_WITHOUT_EXTENSION_ERROR;
+    exceptionDetails = `File exceeded the allowed limit of ${maxUploadFileSize} MB and File provided without file extension`;
   } else {
     var _errorMessage;
-
     const fileExtension = fileName.substring(index);
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_SIZE_EXTENSION_ERROR;
-
+    exceptionDetails = `File exceeds the allowed limit of ${maxUploadFileSize} MB and ${fileExtension} files are not supported`;
     if ((_errorMessage = errorMessage) !== null && _errorMessage !== void 0 && _errorMessage.includes("{1}")) {
       errorMessage = errorMessage.replace("{1}", fileExtension);
     }
   }
-
+  TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+    Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+    Description: "Attachment validation failed",
+    ExceptionDetails: {
+      ErrorDetails: `${exceptionDetails} Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${AMSConstants.maxSupportedImageSize} AMS file size limit=${AMSConstants.maxSupportedFileSize}`
+    }
+  });
   return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
 };
-
 const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
-
   if (index < 0) {
+    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+      Description: "Attachment validation failed",
+      ExceptionDetails: {
+        ErrorDetails: "File provided without file extension"
+      }
+    });
     return localizedTexts.MIDDLEWARE_BANNER_FILE_WITHOUT_EXTENSION ?? "";
   } else {
     const fileExtension = fileName.substring(index);
+    TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+      Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+      Description: "Attachment validation failed",
+      ExceptionDetails: {
+        ErrorDetails: `${fileExtension} files extension is not supported.`
+      }
+    });
     const errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_EXTENSION_ERROR;
     return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", fileExtension) : errorMessage : "";
   }
 };
-
-const getFileSizeErrorMessage = (maxUploadFileSize, localizedTexts) => {
+const getFileSizeErrorMessage = (maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
+  TelemetryHelper.logActionEvent(LogLevel.ERROR, {
+    Event: TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+    Description: "Attachment validation failed",
+    ExceptionDetails: {
+      ErrorDetails: `File exceeds the allowed limit of ${maxUploadFileSize}MB. Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${AMSConstants.maxSupportedImageSize} AMS file size limit=${AMSConstants.maxSupportedFileSize}`
+    }
+  });
   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
-
+};
 
-const createAttachmentUploadValidatorMiddleware = (allowedFileExtensions, maxUploadFileSize, localizedTexts) => _ref => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+const createAttachmentUploadValidatorMiddleware = (allowedFileExtensions, maxFileSizeSupportedByDynamics, localizedTexts) => _ref => {
   let {
     dispatch
   } = _ref;
   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(validateAttachment(action, allowedFileExtensions, maxFileSizeSupportedByDynamics, localizedTexts));
       }
     }
-
     return next(action);
   };
 };
-
 export default createAttachmentUploadValidatorMiddleware;