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

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

@@ -4,27 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DeliveredTimestamp = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _DirectLineSenderRole = require("../../../enums/DirectLineSenderRole");
-
 var _react2 = require("@fluentui/react");
-
 var _defaultMiddlewareLocalizedTexts = require("../../../../common/defaultProps/defaultMiddlewareLocalizedTexts");
-
 var _defaultTimestampContentStyles = require("../defaultStyles/defaultTimestampContentStyles");
-
 var _utils = require("../../../../../../common/utils");
-
 var _ = require("../../../../../..");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint @typescript-eslint/no-explicit-any: "off" */
 const DeliveredTimestamp = _ref => {
   var _state$domainStates$r, _state$domainStates$r2, _state$domainStates$m;
-
   let {
     args,
     role,
@@ -32,7 +22,8 @@ const DeliveredTimestamp = _ref => {
   } = _ref;
   const [state] = (0, _.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.defaultTimestampContentStyles,
+  const contentStyles = {
+    ..._defaultTimestampContentStyles.defaultTimestampContentStyles,
     ...((_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.timestampContentStyleProps)
   };
   const {
@@ -42,15 +33,13 @@ const DeliveredTimestamp = _ref => {
   } = args;
   return /*#__PURE__*/_react.default.createElement(_react2.Stack, {
     style: contentStyles,
+    dir: dir
+  }, role === _DirectLineSenderRole.DirectLineSenderRole.Bot && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     dir: dir,
-    horizontal: true
-  }, role === _DirectLineSenderRole.DirectLineSenderRole.Bot && /*#__PURE__*/_react.default.createElement("span", {
     "aria-hidden": "false"
-  }, name), role === _DirectLineSenderRole.DirectLineSenderRole.Bot && /*#__PURE__*/_react.default.createElement("span", null, " \xA0-\xA0 "), /*#__PURE__*/_react.default.createElement("span", {
+  }, name, " - ", (0, _utils.getTimestampHourMinute)(timestamp))), role === _DirectLineSenderRole.DirectLineSenderRole.User && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+    "aria-hidden": "false",
     dir: dir
-  }, " ", (0, _utils.getTimestampHourMinute)(timestamp)), role === _DirectLineSenderRole.DirectLineSenderRole.User && /*#__PURE__*/_react.default.createElement("span", null, " \xA0-\xA0 "), role === _DirectLineSenderRole.DirectLineSenderRole.User && /*#__PURE__*/_react.default.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.defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_DELIVERED));
+  }, " ", (0, _utils.getTimestampHourMinute)(timestamp), " - ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_DELIVERED) ?? _defaultMiddlewareLocalizedTexts.defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_DELIVERED)));
 };
-
 exports.DeliveredTimestamp = DeliveredTimestamp;

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

@@ -4,37 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NotDeliveredTimestamp = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
-var _Constants = require("../../../../../../common/Constants");
-
 var _KeyCodes = require("../../../../../../common/KeyCodes");
-
 var _react2 = require("@fluentui/react");
-
 var _defaultMiddlewareLocalizedTexts = require("../../../../common/defaultProps/defaultMiddlewareLocalizedTexts");
-
 var _defaultTimestampContentStyles = require("../defaultStyles/defaultTimestampContentStyles");
-
 var _defaultTimestampFailedStyles = require("../defaultStyles/defaultTimestampFailedStyles");
-
 var _defaultTimestampRetryStyles = require("../defaultStyles/defaultTimestampRetryStyles");
-
 var _utils = require("../../../../../../common/utils");
-
 var _botframeworkWebchat = require("botframework-webchat");
-
 var _ = require("../../../../../..");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /* eslint @typescript-eslint/no-explicit-any: "off" */
 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;
@@ -53,54 +37,37 @@ const NotDeliveredTimestamp = _ref => {
   } = activity;
   const [state] = (0, _.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.defaultTimestampContentStyles,
+  const contentStyles = {
+    ..._defaultTimestampContentStyles.defaultTimestampContentStyles,
     ...((_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.timestampContentStyleProps)
   };
-  const failedTextStyles = { ..._defaultTimestampFailedStyles.defaultTimestampFailedStyles,
+  const failedTextStyles = {
+    ..._defaultTimestampFailedStyles.defaultTimestampFailedStyles,
     ...((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 ? void 0 : _state$domainStates$r3.timestampFailedTextStyleProps)
   };
-  const retryTextStyles = { ..._defaultTimestampRetryStyles.defaultTimestampRetryStyles,
+  const retryTextStyles = {
+    ..._defaultTimestampRetryStyles.defaultTimestampRetryStyles,
     ...((_state$domainStates$r4 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r4 === void 0 ? void 0 : _state$domainStates$r4.timestampRetryTextStyleProps)
   };
   (0, _react.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 = (0, _utils.getTimestampHourMinute)(timestamp);
     }
   }, [timestampRef]);
-  const onRetryClick = (0, _react.useCallback)(async event => {
+  const onRetryClick = (0, _react.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.KeyCodes.ENTER) {
       event.preventDefault();
-      onRetryClick(event);
+      onRetryClick();
     }
   };
-
-  const removeNotDeliveredTimestamp = event => {
-    let parent = event.target.parentElement;
-
-    while (parent.tagName !== _Constants.HtmlAttributeNames.listItem) {
-      parent = parent.parentElement;
-
-      if (parent.tagName === _Constants.HtmlAttributeNames.unorderedList) {
-        return;
-      }
-    }
-
-    parent.parentNode.removeChild(parent);
-  };
-
   return /*#__PURE__*/_react.default.createElement(_react2.Stack, {
     style: contentStyles,
     dir: dir,
@@ -114,5 +81,4 @@ const NotDeliveredTimestamp = _ref => {
     tabIndex: 0
   }, " ", ((_state$domainStates$m2 = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m2 === void 0 ? void 0 : _state$domainStates$m2.MIDDLEWARE_MESSAGE_RETRY) ?? _defaultMiddlewareLocalizedTexts.defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_RETRY, " "));
 };
-
 exports.NotDeliveredTimestamp = NotDeliveredTimestamp;

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

@@ -4,43 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SendingTimestamp = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _react2 = require("@fluentui/react");
-
 var _defaultMiddlewareLocalizedTexts = require("../../../../common/defaultProps/defaultMiddlewareLocalizedTexts");
-
 var _defaultTimestampContentStyles = require("../defaultStyles/defaultTimestampContentStyles");
-
-var _utils = require("../../../../../../common/utils");
-
 var _ = require("../../../../../..");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint @typescript-eslint/no-explicit-any: "off" */
-const SendingTimestamp = _ref => {
+const SendingTimestamp = () => {
   var _state$domainStates$r, _state$domainStates$r2, _state$domainStates$m;
-
-  let {
-    args
-  } = _ref;
   const [state] = (0, _.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.defaultTimestampContentStyles,
+  const contentStyles = {
+    ..._defaultTimestampContentStyles.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.default.createElement(_react2.Stack, {
     style: contentStyles,
     dir: dir,
     horizontal: true
-  }, /*#__PURE__*/_react.default.createElement("span", null, " ", (0, _utils.getTimestampHourMinute)(timestamp)), /*#__PURE__*/_react.default.createElement("span", null, " \xA0-\xA0 "), /*#__PURE__*/_react.default.createElement("span", null, " ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_SENDING) ?? _defaultMiddlewareLocalizedTexts.defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_SENDING, " "));
+  }, /*#__PURE__*/_react.default.createElement("span", null, " ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_SENDING) ?? _defaultMiddlewareLocalizedTexts.defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_SENDING, " "));
 };
-
 exports.SendingTimestamp = SendingTimestamp;

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

@@ -4,34 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.typingIndicatorMiddleware = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
+var _react = _interopRequireWildcard(require("react"));
 var _DirectLineSenderRole = require("../../enums/DirectLineSenderRole");
-
+var _utils = require("../../../../../common/utils");
 var _defaultMiddlewareLocalizedTexts = require("../../../common/defaultProps/defaultMiddlewareLocalizedTexts");
-
 var _defaultTypingIndicatorBubbleStyles = require("./defaultStyles/defaultTypingIndicatorBubbleStyles");
-
 var _defaultTypingIndicatorContainerStyles = require("./defaultStyles/defaultTypingIndicatorContainerStyles");
-
 var _defaultTypingIndicatorMessageStyles = require("./defaultStyles/defaultTypingIndicatorMessageStyles");
-
 var _ = require("../../../../..");
-
 var _useChatSDKStore = _interopRequireDefault(require("../../../../../hooks/useChatSDKStore"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /******
  * TypingIndicatorMiddleware
- * 
+ *
  * This middleware changes the component that shows who's actively typing. It uses the default Microsoft LiveChatWidget styles.
  ******/
+
 // 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
@@ -39,39 +32,38 @@ const TypingIndicator = _ref => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const chatSDK = (0, _useChatSDKStore.default)();
   const [state] = (0, _.useChatContextStore)();
-
+  const debounceTyping = (0, _react.useCallback)((0, _utils.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.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.defaultMiddlewareLocalizedTexts,
+  const localizedTexts = {
+    ..._defaultMiddlewareLocalizedTexts.defaultMiddlewareLocalizedTexts,
     ...state.domainStates.middlewareLocalizedTexts
   };
   const message = getTypingIndicatorMessage(activeTyping, localizedTexts);
-  const typingIndicatorStyles = { ..._defaultTypingIndicatorContainerStyles.defaultTypingIndicatorContainerStyles,
+  const typingIndicatorStyles = {
+    ..._defaultTypingIndicatorContainerStyles.defaultTypingIndicatorContainerStyles,
     ...((_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : _state$domainStates$r.typingIndicatorStyleProps)
   };
-  const typingIndicatorBubbleStyles = { ..._defaultTypingIndicatorBubbleStyles.defaultTypingIndicatorBubbleStyles,
+  const typingIndicatorBubbleStyles = {
+    ..._defaultTypingIndicatorBubbleStyles.defaultTypingIndicatorBubbleStyles,
     ...((_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.typingIndicatorBubbleStyleProps)
   };
-  const typingIndicatorMessageStyles = { ..._defaultTypingIndicatorMessageStyles.defaultTypingIndicatorMessageStyles,
+  const typingIndicatorMessageStyles = {
+    ..._defaultTypingIndicatorMessageStyles.defaultTypingIndicatorMessageStyles,
     ...((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 ? void 0 : _state$domainStates$r3.typingIndicatorMessageStyleProps)
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("style", null, `
@@ -113,9 +105,9 @@ const TypingIndicator = _ref => {
   }), /*#__PURE__*/_react.default.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
 const typingIndicatorMiddleware = () => next => args => {
   const {
     activeTyping,
@@ -125,11 +117,10 @@ 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
 exports.typingIndicatorMiddleware = typingIndicatorMiddleware;
-
 const getTypingIndicatorMessage = (activeTyping, localizedTexts) => {
   if (!activeTyping || activeTyping.length === 0) {
     return "";
@@ -140,19 +131,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/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware.js

@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _WebChatActionType = require("../../enums/WebChatActionType");
-
 /******
  * AttachmentProcessingMiddleware
  * 
  * Handles attachment sending.
  ******/
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const createSendFileAction = files => {
   return {
@@ -20,32 +19,27 @@ const createSendFileAction = files => {
     },
     type: _WebChatActionType.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.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);
   };
 };
-
 var _default = attachmentProcessingMiddleware;
 exports.default = _default;

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

@@ -4,46 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
+var _TelemetryConstants = require("../../../../../common/telemetry/TelemetryConstants");
 var _NotificationHandler = require("../../notification/NotificationHandler");
-
 var _NotificationScenarios = require("../../enums/NotificationScenarios");
-
 var _WebChatActionType = require("../../enums/WebChatActionType");
-
+var _TelemetryHelper = require("../../../../../common/telemetry/TelemetryHelper");
+var _Constants = require("../../../../../common/Constants");
 /******
  * AttachmentUploadValidatorMiddleware
  * 
  * Checks if the attachment being uploaded satisfies Omnichannel's requirement on file extensions and file size.
  ******/
+
 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.NotificationHandler.notifyError(_NotificationScenarios.NotificationScenarios.AttachmentError, buildErrorMessage(attachments[i].name, fileExtensionValid, fileSizeValid, fileIsEmpty, maxUploadFileSize, localizedTexts));
-
+        _NotificationHandler.NotificationHandler.notifyError(_NotificationScenarios.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 {
@@ -52,110 +48,150 @@ 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) : _Constants.AMSConstants.maxSupportedFileSize;
+  const amsAttachmentSizeLimit = isImage(contentType) ? _Constants.AMSConstants.maxSupportedImageSize : _Constants.AMSConstants.maxSupportedFileSize;
+  // Takes the smallest max file size configure betteween AMS and Dynamics Config
+  return maxFileSizeSupportedByDynamics < amsAttachmentSizeLimit ? maxFileSizeSupportedByDynamics : amsAttachmentSizeLimit;
+};
+const isImage = contentType => {
+  return _Constants.AMSConstants.supportedImagesMimeTypes.includes(contentType);
+};
+const buildErrorMessage = (fileName, supportedFileExtension, supportedFileSize, fileIsEmpty, maxUploadFileSize, maxFileSizeSupportedByDynamics, localizedTexts) => {
   let errorMessage = "";
-
   if (!fileName || !maxUploadFileSize) {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+      Description: "Attachment validation failed",
+      ExceptionDetails: {
+        ErrorDetails: "File provided is empty"
+      }
+    });
     errorMessage = localizedTexts.MIDDLEWARE_BANNER_FILE_IS_EMPTY_ERROR ?? "";
   } else {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+    Event: _TelemetryConstants.TelemetryEvent.AttachmentUploadValidatorMiddlewareFailed,
+    Description: "Attachment validation failed",
+    ExceptionDetails: {
+      ErrorDetails: `${exceptionDetails} Dynamics file size limit=${maxFileSizeSupportedByDynamics} AMS image size limit=${_Constants.AMSConstants.maxSupportedImageSize} AMS file size limit=${_Constants.AMSConstants.maxSupportedFileSize}`
+    }
+  });
   return errorMessage ? errorMessage.includes("{0}") ? errorMessage.replace("{0}", maxUploadFileSize) : errorMessage : "";
 };
-
 const getFileExtensionErrorMessage = (fileName, localizedTexts) => {
   const index = fileName.lastIndexOf(".");
-
   if (index < 0) {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+      Event: _TelemetryConstants.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.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.ERROR, {
+    Event: _TelemetryConstants.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=${_Constants.AMSConstants.maxSupportedImageSize} AMS file size limit=${_Constants.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.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);
   };
 };
-
 var _default = createAttachmentUploadValidatorMiddleware;
 exports.default = _default;