@microsoft/omnichannel-chat-widget 0.1.0-main.c461296 → 0.1.0-main.c881067
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +35 -11
- package/lib/cjs/assets/Icons.js +4 -2
- package/lib/cjs/common/Constants.js +50 -155
- package/lib/cjs/common/KeyCodes.js +3 -4
- package/lib/cjs/common/contextDataStore/DataStoreManager.js +3 -5
- package/lib/cjs/common/storage/default/defaultCacheManager.js +26 -0
- package/lib/cjs/common/storage/default/defaultClientDataStoreProvider.js +107 -0
- package/lib/cjs/common/storage/default/defaultInMemoryDataStore.js +78 -0
- package/lib/cjs/common/telemetry/TelemetryConstants.js +65 -25
- package/lib/cjs/common/telemetry/TelemetryHelper.js +31 -56
- package/lib/cjs/common/telemetry/TelemetryManager.js +16 -34
- package/lib/cjs/common/telemetry/defaultConfigs/defaultAriaConfig.js +1 -1
- package/lib/cjs/common/telemetry/defaultConfigs/defaultTelemetryConfiguration.js +4 -3
- package/lib/cjs/common/telemetry/loggers/ariaTelemetryLogger.js +49 -35
- package/lib/cjs/common/telemetry/loggers/consoleLogger.js +6 -14
- package/lib/cjs/common/utils.js +80 -80
- package/lib/cjs/components/callingcontainerstateful/CallingContainerStateful.js +21 -45
- package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js +20 -26
- package/lib/cjs/components/chatbuttonstateful/common/styleProps/defaultOutOfOfficeChatButtonStyleProps.js +3 -0
- package/lib/cjs/components/confirmationpanestateful/ConfirmationPaneStateful.js +12 -72
- package/lib/cjs/components/dimlayer/DimLayer.js +0 -4
- package/lib/cjs/components/emailtranscriptpanestateful/EmailTranscriptPaneStateful.js +9 -37
- package/lib/cjs/components/emailtranscriptpanestateful/EmailTranscriptPaneStateful.spec.js +6 -8
- package/lib/cjs/components/footerstateful/FooterStateful.js +12 -44
- package/lib/cjs/components/footerstateful/audionotificationstateful/AudioNotificationStateful.js +0 -6
- package/lib/cjs/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.js +15 -44
- package/lib/cjs/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.spec.js +6 -8
- package/lib/cjs/components/headerstateful/HeaderStateful.js +21 -39
- package/lib/cjs/components/livechatwidget/LiveChatWidget.js +2 -14
- package/lib/cjs/components/livechatwidget/common/ActivityStreamHandler.js +39 -0
- package/lib/cjs/components/livechatwidget/common/ActivitySubscriber/DefaultActivitySubscriber.js +20 -0
- package/lib/cjs/components/livechatwidget/common/ActivitySubscriber/IActivitySubscriber.js +1 -0
- package/lib/cjs/components/livechatwidget/common/ActivitySubscriber/PauseActivitySubscriber.js +34 -0
- package/lib/cjs/components/livechatwidget/common/ChatAdapterShim.js +64 -0
- package/lib/cjs/components/livechatwidget/common/Deferred.js +37 -0
- package/lib/cjs/components/livechatwidget/common/authHelper.js +50 -0
- package/lib/cjs/components/livechatwidget/common/createAdapter.js +10 -9
- package/lib/cjs/components/livechatwidget/common/createFooter.js +4 -23
- package/lib/cjs/components/livechatwidget/common/createInternetConnectionChangeHandler.js +10 -10
- package/lib/cjs/components/livechatwidget/common/createMarkdown.js +36 -43
- package/lib/cjs/components/livechatwidget/common/defaultProps/defaultScrollBarProps.js +14 -0
- package/lib/cjs/components/livechatwidget/common/defaultProps/dummyDefaultProps.js +131 -61
- package/lib/cjs/components/livechatwidget/common/disposeTelemetryLoggers.js +0 -3
- package/lib/cjs/components/livechatwidget/common/endChat.js +121 -23
- package/lib/cjs/components/livechatwidget/common/getGeneralStylesForButton.js +0 -6
- package/lib/cjs/components/livechatwidget/common/initCallingSdk.js +8 -17
- package/lib/cjs/components/livechatwidget/common/initConfirmationPropsComposer.js +4 -8
- package/lib/cjs/components/livechatwidget/common/initWebChatComposer.js +38 -52
- package/lib/cjs/components/livechatwidget/common/reconnectChatHelper.js +98 -66
- package/lib/cjs/components/livechatwidget/common/registerTelemetryLoggers.js +9 -33
- package/lib/cjs/components/livechatwidget/common/setPostChatContextAndLoadSurvey.js +2 -15
- package/lib/cjs/components/livechatwidget/common/shareObservable.js +41 -0
- package/lib/cjs/components/livechatwidget/common/startChat.js +246 -92
- package/lib/cjs/components/livechatwidget/common/startProactiveChat.js +0 -8
- package/lib/cjs/components/livechatwidget/common/updateSessionDataForTelemetry.js +2 -11
- package/lib/cjs/components/livechatwidget/interfaces/IScrollBarProps.js +1 -0
- package/lib/cjs/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js +347 -165
- package/lib/cjs/components/loadingpanestateful/LoadingPaneStateful.js +19 -19
- package/lib/cjs/components/loadingpanestateful/common/errorUIStyleProps/errorUILoadingPaneStyleProps.js +57 -0
- package/lib/cjs/components/ooohpanestateful/OOOHPaneStateful.js +4 -17
- package/lib/cjs/components/postchatloadingpanestateful/PostChatLoadingPaneStateful.js +9 -14
- package/lib/cjs/components/postchatsurveypanestateful/PostChatSurveyPaneStateful.js +32 -23
- package/lib/cjs/components/postchatsurveypanestateful/common/defaultStyleProps/defaultgeneralPostChatSurveyPaneStyleProps.js +1 -1
- package/lib/cjs/components/postchatsurveypanestateful/enums/CustomerVoiceEvents.js +13 -0
- package/lib/cjs/components/postchatsurveypanestateful/enums/PostChatSurveyMode.js +0 -1
- package/lib/cjs/components/postchatsurveypanestateful/interfaces/IPostChatSurveyPaneStatefulProps.js +1 -0
- package/lib/cjs/components/prechatsurveypanestateful/PreChatSurveyPaneStateful.js +11 -44
- package/lib/cjs/components/proactivechatpanestateful/ProactiveChatPaneStateful.js +19 -33
- package/lib/cjs/components/reconnectchatpanestateful/ReconnectChatPaneStateful.js +6 -24
- package/lib/cjs/components/webchatcontainerstateful/WebChatContainerStateful.js +94 -19
- package/lib/cjs/components/webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps.js +3 -7
- package/lib/cjs/components/webchatcontainerstateful/common/defaultProps/defaultWebChatStatefulProps.js +2 -6
- package/lib/cjs/components/webchatcontainerstateful/common/defaultStyles/defaultAdaptiveCardStyles.js +11 -0
- package/lib/cjs/components/webchatcontainerstateful/common/mockadapter.js +12 -27
- package/lib/cjs/components/webchatcontainerstateful/common/mockchatsdk.js +6 -17
- package/lib/cjs/components/webchatcontainerstateful/common/utils/BrowserInfo.js +2 -24
- package/lib/cjs/components/webchatcontainerstateful/common/utils/FileAttachmentIconManager.js +5 -15
- package/lib/cjs/components/webchatcontainerstateful/common/utils/isMaskingFromCustomer.js +5 -8
- package/lib/cjs/components/webchatcontainerstateful/interfaces/IAdaptiveCardStyles.js +1 -0
- package/lib/cjs/components/webchatcontainerstateful/interfaces/IBotMagicCodeConfig.js +1 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/BotMagicCodeStore.js +12 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/WebChatStoreLoader.js +3 -5
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/BrowserVendor.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/DirectLineActivityType.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/DirectLineSenderRole.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/MessageType.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/NotificationLevel.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/SendStatus.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/enums/WebChatActionType.js +0 -1
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/adaptermiddlewares/formatTagsEgressMiddleware.js +0 -7
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/adaptermiddlewares/formatTagsIngressMiddleware.js +0 -5
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.js +27 -37
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware.js +10 -22
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware.js +25 -61
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/avatarMiddleware.js +7 -15
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware.js +41 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware.spec.js +82 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultReceivedMessageAnchorStyles.js +10 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultSystemMessageBoxStyles.js +10 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultTimestampFailedStyles.js +2 -3
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultTimestampRetryStyles.js +2 -3
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultUserMessageBoxStyles.js +10 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/groupActivitiesMiddleware.js +3 -9
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware.js +89 -0
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/DeliveredTimestamp.js +7 -18
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/NotDeliveredTimestamp.js +8 -42
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/SendingTimestamp.js +4 -22
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/typingIndicatorMiddleware.js +13 -30
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware.js +3 -9
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js +6 -34
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/channelDataMiddleware.js +1 -10
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/conversationEndMiddleware.js +1 -12
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware.js +17 -19
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/gifUploadMiddleware.js +1 -9
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlPlayerMiddleware.js +3 -9
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware.js +13 -34
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator.js +1 -10
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware.js +7 -11
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware.js +5 -14
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/notification/NotificationHandler.js +1 -21
- package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js +33 -0
- package/lib/cjs/contexts/ChatAdapterStore.js +0 -2
- package/lib/cjs/contexts/ChatContextStore.js +0 -2
- package/lib/cjs/contexts/ChatSDKStore.js +0 -2
- package/lib/cjs/contexts/common/ConversationState.js +3 -3
- package/lib/cjs/contexts/common/LiveChatWidgetActionType.js +30 -26
- package/lib/cjs/contexts/common/LiveChatWidgetContextInitialState.js +14 -13
- package/lib/cjs/contexts/createReducer.js +169 -109
- package/lib/cjs/controller/componentController.js +4 -33
- package/lib/cjs/hooks/useChatAdapterStore.js +0 -6
- package/lib/cjs/hooks/useChatContextStore.js +0 -6
- package/lib/cjs/hooks/useChatSDKStore.js +0 -6
- package/lib/cjs/index.js +0 -5
- package/lib/cjs/plugins/newMessageEventHandler.js +26 -46
- package/lib/esm/assets/Icons.js +2 -1
- package/lib/esm/common/Constants.js +45 -143
- package/lib/esm/common/KeyCodes.js +3 -3
- package/lib/esm/common/contextDataStore/DataStoreManager.js +3 -3
- package/lib/esm/common/storage/default/defaultCacheManager.js +18 -0
- package/lib/esm/common/storage/default/defaultClientDataStoreProvider.js +100 -0
- package/lib/esm/common/storage/default/defaultInMemoryDataStore.js +70 -0
- package/lib/esm/common/telemetry/TelemetryConstants.js +69 -22
- package/lib/esm/common/telemetry/TelemetryHelper.js +32 -46
- package/lib/esm/common/telemetry/TelemetryManager.js +16 -23
- package/lib/esm/common/telemetry/defaultConfigs/defaultAriaConfig.js +1 -1
- package/lib/esm/common/telemetry/defaultConfigs/defaultTelemetryConfiguration.js +4 -1
- package/lib/esm/common/telemetry/loggers/ariaTelemetryLogger.js +49 -23
- package/lib/esm/common/telemetry/loggers/consoleLogger.js +6 -10
- package/lib/esm/common/utils.js +73 -45
- package/lib/esm/components/callingcontainerstateful/CallingContainerStateful.js +21 -16
- package/lib/esm/components/chatbuttonstateful/ChatButtonStateful.js +23 -13
- package/lib/esm/components/chatbuttonstateful/common/styleProps/defaultOutOfOfficeChatButtonStyleProps.js +3 -0
- package/lib/esm/components/confirmationpanestateful/ConfirmationPaneStateful.js +15 -49
- package/lib/esm/components/emailtranscriptpanestateful/EmailTranscriptPaneStateful.js +9 -16
- package/lib/esm/components/emailtranscriptpanestateful/EmailTranscriptPaneStateful.spec.js +6 -6
- package/lib/esm/components/footerstateful/FooterStateful.js +14 -25
- package/lib/esm/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.js +15 -37
- package/lib/esm/components/footerstateful/downloadtranscriptstateful/DownloadTranscriptStateful.spec.js +6 -6
- package/lib/esm/components/headerstateful/HeaderStateful.js +21 -24
- package/lib/esm/components/livechatwidget/LiveChatWidget.js +2 -2
- package/lib/esm/components/livechatwidget/common/ActivityStreamHandler.js +32 -0
- package/lib/esm/components/livechatwidget/common/ActivitySubscriber/DefaultActivitySubscriber.js +13 -0
- package/lib/esm/components/livechatwidget/common/ActivitySubscriber/IActivitySubscriber.js +1 -0
- package/lib/esm/components/livechatwidget/common/ActivitySubscriber/PauseActivitySubscriber.js +27 -0
- package/lib/esm/components/livechatwidget/common/ChatAdapterShim.js +57 -0
- package/lib/esm/components/livechatwidget/common/Deferred.js +30 -0
- package/lib/esm/components/livechatwidget/common/authHelper.js +42 -0
- package/lib/esm/components/livechatwidget/common/createAdapter.js +12 -4
- package/lib/esm/components/livechatwidget/common/createFooter.js +4 -16
- package/lib/esm/components/livechatwidget/common/createInternetConnectionChangeHandler.js +10 -5
- package/lib/esm/components/livechatwidget/common/createMarkdown.js +38 -37
- package/lib/esm/components/livechatwidget/common/defaultProps/defaultScrollBarProps.js +7 -0
- package/lib/esm/components/livechatwidget/common/defaultProps/dummyDefaultProps.js +133 -49
- package/lib/esm/components/livechatwidget/common/endChat.js +124 -14
- package/lib/esm/components/livechatwidget/common/getGeneralStylesForButton.js +0 -2
- package/lib/esm/components/livechatwidget/common/initCallingSdk.js +10 -12
- package/lib/esm/components/livechatwidget/common/initConfirmationPropsComposer.js +4 -5
- package/lib/esm/components/livechatwidget/common/initWebChatComposer.js +41 -22
- package/lib/esm/components/livechatwidget/common/reconnectChatHelper.js +98 -58
- package/lib/esm/components/livechatwidget/common/registerTelemetryLoggers.js +9 -23
- package/lib/esm/components/livechatwidget/common/setPostChatContextAndLoadSurvey.js +4 -7
- package/lib/esm/components/livechatwidget/common/shareObservable.js +35 -0
- package/lib/esm/components/livechatwidget/common/startChat.js +245 -71
- package/lib/esm/components/livechatwidget/common/updateSessionDataForTelemetry.js +4 -2
- package/lib/esm/components/livechatwidget/interfaces/IScrollBarProps.js +1 -0
- package/lib/esm/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js +350 -117
- package/lib/esm/components/loadingpanestateful/LoadingPaneStateful.js +19 -7
- package/lib/esm/components/loadingpanestateful/common/errorUIStyleProps/errorUILoadingPaneStyleProps.js +50 -0
- package/lib/esm/components/ooohpanestateful/OOOHPaneStateful.js +4 -5
- package/lib/esm/components/postchatloadingpanestateful/PostChatLoadingPaneStateful.js +9 -4
- package/lib/esm/components/postchatsurveypanestateful/PostChatSurveyPaneStateful.js +32 -11
- package/lib/esm/components/postchatsurveypanestateful/common/defaultStyleProps/defaultgeneralPostChatSurveyPaneStyleProps.js +1 -1
- package/lib/esm/components/postchatsurveypanestateful/enums/CustomerVoiceEvents.js +6 -0
- package/lib/esm/components/postchatsurveypanestateful/enums/PostChatSurveyMode.js +0 -1
- package/lib/esm/components/postchatsurveypanestateful/interfaces/IPostChatSurveyPaneStatefulProps.js +1 -0
- package/lib/esm/components/prechatsurveypanestateful/PreChatSurveyPaneStateful.js +15 -29
- package/lib/esm/components/proactivechatpanestateful/ProactiveChatPaneStateful.js +21 -9
- package/lib/esm/components/reconnectchatpanestateful/ReconnectChatPaneStateful.js +6 -6
- package/lib/esm/components/webchatcontainerstateful/WebChatContainerStateful.js +94 -4
- package/lib/esm/components/webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps.js +3 -1
- package/lib/esm/components/webchatcontainerstateful/common/defaultProps/defaultWebChatStatefulProps.js +2 -2
- package/lib/esm/components/webchatcontainerstateful/common/defaultStyles/defaultAdaptiveCardStyles.js +4 -0
- package/lib/esm/components/webchatcontainerstateful/common/mockadapter.js +12 -19
- package/lib/esm/components/webchatcontainerstateful/common/mockchatsdk.js +6 -13
- package/lib/esm/components/webchatcontainerstateful/common/utils/BrowserInfo.js +2 -16
- package/lib/esm/components/webchatcontainerstateful/common/utils/FileAttachmentIconManager.js +5 -5
- package/lib/esm/components/webchatcontainerstateful/common/utils/isMaskingFromCustomer.js +5 -6
- package/lib/esm/components/webchatcontainerstateful/interfaces/IAdaptiveCardStyles.js +1 -0
- package/lib/esm/components/webchatcontainerstateful/interfaces/IBotMagicCodeConfig.js +1 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/BotMagicCodeStore.js +5 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/WebChatStoreLoader.js +3 -3
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/BrowserVendor.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/DirectLineActivityType.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/DirectLineSenderRole.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/MessageType.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/NotificationLevel.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/NotificationScenarios.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/SendStatus.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/enums/WebChatActionType.js +0 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/adaptermiddlewares/formatTagsEgressMiddleware.js +2 -5
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/adaptermiddlewares/formatTagsIngressMiddleware.js +0 -4
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware.js +27 -22
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware.js +12 -14
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware.js +25 -39
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/avatarMiddleware.js +9 -8
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware.js +34 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware.spec.js +80 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultReceivedMessageAnchorStyles.js +3 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultSystemMessageBoxStyles.js +3 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultTimestampFailedStyles.js +2 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultTimestampRetryStyles.js +2 -1
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultUserMessageBoxStyles.js +3 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/groupActivitiesMiddleware.js +3 -7
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware.js +83 -0
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/DeliveredTimestamp.js +8 -9
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/NotDeliveredTimestamp.js +9 -28
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/SendingTimestamp.js +5 -14
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/typingIndicatorMiddleware.js +15 -19
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware.js +5 -8
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js +6 -29
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/channelDataMiddleware.js +3 -7
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/conversationEndMiddleware.js +3 -8
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/dataMaskingMiddleware.js +17 -14
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/gifUploadMiddleware.js +3 -7
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlPlayerMiddleware.js +3 -7
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware.js +15 -27
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/maxMessageSizeValidator.js +3 -5
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware.js +9 -9
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware.js +7 -9
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/notification/NotificationHandler.js +1 -13
- package/lib/esm/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js +27 -0
- package/lib/esm/contexts/ChatAdapterStore.js +2 -1
- package/lib/esm/contexts/ChatContextStore.js +2 -1
- package/lib/esm/contexts/ChatSDKStore.js +2 -1
- package/lib/esm/contexts/common/ConversationState.js +3 -3
- package/lib/esm/contexts/common/LiveChatWidgetActionType.js +30 -26
- package/lib/esm/contexts/common/LiveChatWidgetContextInitialState.js +14 -9
- package/lib/esm/contexts/createReducer.js +169 -105
- package/lib/esm/controller/componentController.js +5 -4
- package/lib/esm/hooks/useChatAdapterStore.js +0 -4
- package/lib/esm/hooks/useChatContextStore.js +0 -4
- package/lib/esm/hooks/useChatSDKStore.js +0 -4
- package/lib/esm/plugins/newMessageEventHandler.js +26 -35
- package/lib/types/assets/Icons.d.ts +1 -0
- package/lib/types/common/Constants.d.ts +37 -2
- package/lib/types/common/interfaces/IContextDataStore.d.ts +2 -2
- package/lib/types/common/storage/default/defaultCacheManager.d.ts +4 -0
- package/lib/types/common/storage/default/defaultClientDataStoreProvider.d.ts +2 -0
- package/lib/types/common/storage/default/defaultInMemoryDataStore.d.ts +6 -0
- package/lib/types/common/telemetry/TelemetryConstants.d.ts +45 -7
- package/lib/types/common/telemetry/TelemetryHelper.d.ts +2 -0
- package/lib/types/common/telemetry/definitions/Contracts.d.ts +4 -4
- package/lib/types/common/telemetry/definitions/Payload.d.ts +13 -9
- package/lib/types/common/telemetry/interfaces/ITelemetryConfig.d.ts +7 -3
- package/lib/types/common/utils.d.ts +8 -1
- package/lib/types/components/confirmationpanestateful/interfaces/IConfirmationPaneStatefulParams.d.ts +4 -4
- package/lib/types/components/footerstateful/audionotificationstateful/interfaces/IAudioNotificationStatefulParams.d.ts +0 -1
- package/lib/types/components/headerstateful/interfaces/IHeaderStatefulParams.d.ts +2 -1
- package/lib/types/components/livechatwidget/common/ActivityStreamHandler.d.ts +14 -0
- package/lib/types/components/livechatwidget/common/ActivitySubscriber/DefaultActivitySubscriber.d.ts +5 -0
- package/lib/types/components/livechatwidget/common/ActivitySubscriber/IActivitySubscriber.d.ts +6 -0
- package/lib/types/components/livechatwidget/common/ActivitySubscriber/PauseActivitySubscriber.d.ts +7 -0
- package/lib/types/components/livechatwidget/common/ChatAdapterShim.d.ts +7 -0
- package/lib/types/components/livechatwidget/common/Deferred.d.ts +9 -0
- package/lib/types/components/livechatwidget/common/authHelper.d.ts +5 -0
- package/lib/types/components/livechatwidget/common/defaultProps/defaultScrollBarProps.d.ts +2 -0
- package/lib/types/components/livechatwidget/common/endChat.d.ts +4 -1
- package/lib/types/components/livechatwidget/common/reconnectChatHelper.d.ts +6 -4
- package/lib/types/components/livechatwidget/common/shareObservable.d.ts +1 -0
- package/lib/types/components/livechatwidget/common/startChat.d.ts +6 -2
- package/lib/types/components/livechatwidget/interfaces/ILiveChatWidgetComponentOverrides.d.ts +1 -0
- package/lib/types/components/livechatwidget/interfaces/ILiveChatWidgetControlProps.d.ts +2 -1
- package/lib/types/components/livechatwidget/interfaces/ILiveChatWidgetProps.d.ts +6 -3
- package/lib/types/components/livechatwidget/interfaces/IScrollBarProps.d.ts +22 -0
- package/lib/types/components/loadingpanestateful/common/errorUIStyleProps/errorUILoadingPaneStyleProps.d.ts +2 -0
- package/lib/types/components/postchatsurveypanestateful/PostChatSurveyPaneStateful.d.ts +2 -2
- package/lib/types/components/postchatsurveypanestateful/enums/CustomerVoiceEvents.d.ts +5 -0
- package/lib/types/components/postchatsurveypanestateful/interfaces/IPostChatSurveyPaneStatefulProps.d.ts +4 -0
- package/lib/types/components/reconnectchatpanestateful/interfaces/IReconnectChatPaneStatefulProps.d.ts +1 -2
- package/lib/types/components/webchatcontainerstateful/common/defaultStyles/defaultAdaptiveCardStyles.d.ts +2 -0
- package/lib/types/components/webchatcontainerstateful/common/mockchatsdk.d.ts +1 -0
- package/lib/types/components/webchatcontainerstateful/interfaces/IAdaptiveCardStyles.d.ts +4 -0
- package/lib/types/components/webchatcontainerstateful/interfaces/IBotMagicCodeConfig.d.ts +4 -0
- package/lib/types/components/webchatcontainerstateful/interfaces/IRenderingMiddlewareProps.d.ts +4 -1
- package/lib/types/components/webchatcontainerstateful/interfaces/IWebChatContainerStatefulProps.d.ts +4 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/BotMagicCodeStore.d.ts +3 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware.d.ts +1 -1
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware.d.ts +2 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/cardActionMiddleware.spec.d.ts +1 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultReceivedMessageAnchorStyles.d.ts +2 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultSystemMessageBoxStyles.d.ts +3 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/defaultStyles/defaultUserMessageBoxStyles.d.ts +3 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/messageTimestampMiddleware.d.ts +5 -0
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/SendingTimestamp.d.ts +1 -1
- package/lib/types/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.d.ts +1 -0
- package/lib/types/contexts/common/ConversationState.d.ts +3 -2
- package/lib/types/contexts/common/ILiveChatWidgetContext.d.ts +6 -3
- package/lib/types/contexts/common/LiveChatWidgetActionType.d.ts +30 -25
- package/lib/types/contexts/common/LiveChatWidgetContextInitialState.d.ts +1 -2
- package/package.json +9 -9
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* 2. Changes the font size of user messages
|
|
7
7
|
* 3. Decodes certain html characters that came through from chat services
|
|
8
8
|
******/
|
|
9
|
+
|
|
9
10
|
import { LogLevel, TelemetryEvent } from "../../../../../common/telemetry/TelemetryConstants";
|
|
10
11
|
import { Constants } from "../../../../../common/Constants";
|
|
11
12
|
import { DirectLineActivityType } from "../../enums/DirectLineActivityType";
|
|
@@ -16,15 +17,15 @@ import { TelemetryHelper } from "../../../../../common/telemetry/TelemetryHelper
|
|
|
16
17
|
import { defaultSystemMessageStyles } from "./defaultStyles/defaultSystemMessageStyles";
|
|
17
18
|
import { defaultUserMessageStyles } from "./defaultStyles/defaultUserMessageStyles";
|
|
18
19
|
import { escapeHtml } from "../../../../../common/utils";
|
|
19
|
-
const loggedSystemMessages = new Array();
|
|
20
|
+
const loggedSystemMessages = new Array();
|
|
20
21
|
|
|
22
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
21
23
|
const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
|
|
22
24
|
var _card$activity, _card$activity$channe, _card$activity$channe2, _card$activity2, _card$activity2$chann, _card$activity3, _card$activity3$chann, _card$activity3$chann2, _card$activity4, _card$activity4$chann, _card$activity5, _card$activity5$chann, _card$nextVisibleActi, _card$nextVisibleActi2, _card$activity6, _card$activity6$chann, _card$activity7, _card$nextVisibleActi3, _card$activity8;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
const systemMessageStyles = {
|
|
26
|
+
...defaultSystemMessageStyles,
|
|
25
27
|
...systemMessageStyleProps
|
|
26
28
|
};
|
|
27
|
-
|
|
28
29
|
if ((_card$activity = card.activity) !== null && _card$activity !== void 0 && (_card$activity$channe = _card$activity.channelData) !== null && _card$activity$channe !== void 0 && (_card$activity$channe2 = _card$activity$channe.tags) !== null && _card$activity$channe2 !== void 0 && _card$activity$channe2.includes(Constants.averageWaitTimeMessageTag) && loggedSystemMessages.indexOf((_card$activity2 = card.activity) === null || _card$activity2 === void 0 ? void 0 : (_card$activity2$chann = _card$activity2.channelData) === null || _card$activity2$chann === void 0 ? void 0 : _card$activity2$chann.clientmessageid) < 0) {
|
|
29
30
|
TelemetryHelper.logActionEvent(LogLevel.INFO, {
|
|
30
31
|
Event: TelemetryEvent.AverageWaitTimeMessageRecieved,
|
|
@@ -32,7 +33,6 @@ const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
|
|
|
32
33
|
});
|
|
33
34
|
loggedSystemMessages.push(card.activity.channelData.clientmessageid);
|
|
34
35
|
}
|
|
35
|
-
|
|
36
36
|
if ((_card$activity3 = card.activity) !== null && _card$activity3 !== void 0 && (_card$activity3$chann = _card$activity3.channelData) !== null && _card$activity3$chann !== void 0 && (_card$activity3$chann2 = _card$activity3$chann.tags) !== null && _card$activity3$chann2 !== void 0 && _card$activity3$chann2.includes(Constants.queuePositionMessageTag) && loggedSystemMessages.indexOf((_card$activity4 = card.activity) === null || _card$activity4 === void 0 ? void 0 : (_card$activity4$chann = _card$activity4.channelData) === null || _card$activity4$chann === void 0 ? void 0 : _card$activity4$chann.clientmessageid) < 0) {
|
|
37
37
|
TelemetryHelper.logActionEvent(LogLevel.INFO, {
|
|
38
38
|
Event: TelemetryEvent.QueuePositionMessageRecieved,
|
|
@@ -40,55 +40,61 @@ const handleSystemMessage = (next, args, card, systemMessageStyleProps) => {
|
|
|
40
40
|
});
|
|
41
41
|
loggedSystemMessages.push(card.activity.channelData.clientmessageid);
|
|
42
42
|
}
|
|
43
|
-
|
|
44
43
|
if ((_card$activity5 = card.activity) !== null && _card$activity5 !== void 0 && (_card$activity5$chann = _card$activity5.channelData) !== null && _card$activity5$chann !== void 0 && _card$activity5$chann.clientmessageid && ((_card$nextVisibleActi = card.nextVisibleActivity) === null || _card$nextVisibleActi === void 0 ? void 0 : (_card$nextVisibleActi2 = _card$nextVisibleActi.channelData) === null || _card$nextVisibleActi2 === void 0 ? void 0 : _card$nextVisibleActi2.clientmessageid) === ((_card$activity6 = card.activity) === null || _card$activity6 === void 0 ? void 0 : (_card$activity6$chann = _card$activity6.channelData) === null || _card$activity6$chann === void 0 ? void 0 : _card$activity6$chann.clientmessageid) || (_card$activity7 = card.activity) !== null && _card$activity7 !== void 0 && _card$activity7.messageid && ((_card$nextVisibleActi3 = card.nextVisibleActivity) === null || _card$nextVisibleActi3 === void 0 ? void 0 : _card$nextVisibleActi3.messageid) === ((_card$activity8 = card.activity) === null || _card$activity8 === void 0 ? void 0 : _card$activity8.messageid)) {
|
|
45
44
|
return () => false;
|
|
46
|
-
}
|
|
47
|
-
|
|
45
|
+
}
|
|
48
46
|
|
|
47
|
+
// eslint-disable-next-line react/display-name, @typescript-eslint/no-explicit-any
|
|
49
48
|
return () => /*#__PURE__*/React.createElement("div", {
|
|
50
49
|
key: card.activity.id,
|
|
51
50
|
style: systemMessageStyles,
|
|
52
51
|
"aria-hidden": "true"
|
|
53
52
|
}, card.activity.text);
|
|
54
|
-
};
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
56
|
+
const isTagIncluded = (card, tag) => {
|
|
57
|
+
return isDataTagsPresent(card) && card.activity.channelData.tags.includes(tag);
|
|
58
|
+
};
|
|
55
59
|
|
|
60
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
61
|
+
const isDataTagsPresent = card => {
|
|
62
|
+
return card && card.activity && card.activity.channelData && card.activity.channelData.tags && card.activity.channelData.tags.length > 0;
|
|
63
|
+
};
|
|
56
64
|
|
|
65
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
57
66
|
export const createActivityMiddleware = (systemMessageStyleProps, userMessageStyleProps) => () => next => function () {
|
|
58
67
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
59
68
|
args[_key] = arguments[_key];
|
|
60
69
|
}
|
|
61
|
-
|
|
62
70
|
const [card] = args;
|
|
63
|
-
|
|
64
71
|
if (card.activity) {
|
|
65
|
-
var _card$activity$from
|
|
66
|
-
|
|
72
|
+
var _card$activity$from;
|
|
67
73
|
if (((_card$activity$from = card.activity.from) === null || _card$activity$from === void 0 ? void 0 : _card$activity$from.role) === DirectLineSenderRole.Channel) {
|
|
68
74
|
var _card$activity$channe3;
|
|
69
|
-
|
|
70
75
|
if (((_card$activity$channe3 = card.activity.channelData) === null || _card$activity$channe3 === void 0 ? void 0 : _card$activity$channe3.type) === MessageTypes.Thread) {
|
|
71
76
|
TelemetryHelper.logActionEvent(LogLevel.INFO, {
|
|
72
77
|
Event: TelemetryEvent.IC3ThreadUpdateEventReceived,
|
|
73
78
|
Description: "IC3 ThreadUpdateEvent Received"
|
|
74
79
|
});
|
|
75
80
|
}
|
|
76
|
-
|
|
77
81
|
return () => false;
|
|
78
82
|
}
|
|
79
|
-
|
|
80
|
-
|
|
83
|
+
if (isTagIncluded(card, Constants.hiddenTag)) {
|
|
84
|
+
return () => false;
|
|
85
|
+
}
|
|
86
|
+
if (isTagIncluded(card, Constants.systemMessageTag)) {
|
|
81
87
|
return handleSystemMessage(next, args, card, systemMessageStyleProps);
|
|
82
88
|
} else if (card.activity.text && card.activity.type === DirectLineActivityType.Message) {
|
|
83
89
|
if (!card.activity.channelData.isHtmlEncoded && card.activity.channelId === Constants.webchatChannelId) {
|
|
84
90
|
card.activity.text = escapeHtml(card.activity.text);
|
|
85
91
|
card.activity.channelData.isHtmlEncoded = true;
|
|
86
92
|
}
|
|
87
|
-
|
|
88
|
-
|
|
93
|
+
const userMessageStyles = {
|
|
94
|
+
...defaultUserMessageStyles,
|
|
89
95
|
...userMessageStyleProps
|
|
90
|
-
};
|
|
91
|
-
|
|
96
|
+
};
|
|
97
|
+
// eslint-disable-next-line react/display-name, @typescript-eslint/no-explicit-any
|
|
92
98
|
return function () {
|
|
93
99
|
return /*#__PURE__*/React.createElement("div", {
|
|
94
100
|
className: card.activity.from.role === DirectLineSenderRole.User ? Constants.sentMessageClassName : Constants.receivedMessageClassName,
|
|
@@ -98,6 +104,5 @@ export const createActivityMiddleware = (systemMessageStyleProps, userMessageSty
|
|
|
98
104
|
};
|
|
99
105
|
}
|
|
100
106
|
}
|
|
101
|
-
|
|
102
107
|
return next(...args);
|
|
103
108
|
};
|
|
@@ -3,8 +3,9 @@ import { DeliveredTimestamp } from "./timestamps/DeliveredTimestamp";
|
|
|
3
3
|
import { NotDeliveredTimestamp } from "./timestamps/NotDeliveredTimestamp";
|
|
4
4
|
import React from "react";
|
|
5
5
|
import { SendStatus } from "../../enums/SendStatus";
|
|
6
|
-
import { SendingTimestamp } from "./timestamps/SendingTimestamp";
|
|
6
|
+
import { SendingTimestamp } from "./timestamps/SendingTimestamp";
|
|
7
7
|
|
|
8
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, react/display-name, @typescript-eslint/no-unused-vars
|
|
8
9
|
export const activityStatusMiddleware = () => next => args => {
|
|
9
10
|
const {
|
|
10
11
|
activity: {
|
|
@@ -21,11 +22,10 @@ export const activityStatusMiddleware = () => next => args => {
|
|
|
21
22
|
sameTimestampGroup
|
|
22
23
|
} = args;
|
|
23
24
|
const current_tags = tags,
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
current_name = name,
|
|
26
|
+
current_role = role,
|
|
27
|
+
current_timestamp = timestamp;
|
|
27
28
|
let sameTimestampGroupTemp = sameTimestampGroup;
|
|
28
|
-
|
|
29
29
|
if (args[WebChatMiddlewareConstants.nextVisibleActivity]) {
|
|
30
30
|
const {
|
|
31
31
|
nextVisibleActivity: {
|
|
@@ -34,18 +34,16 @@ export const activityStatusMiddleware = () => next => args => {
|
|
|
34
34
|
},
|
|
35
35
|
timestamp
|
|
36
36
|
}
|
|
37
|
-
} = args;
|
|
38
|
-
|
|
37
|
+
} = args;
|
|
38
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
39
39
|
const next_name = name,
|
|
40
|
-
|
|
40
|
+
next_timestamp = timestamp;
|
|
41
41
|
const timestampCurrentInMillisecond = Date.parse(current_timestamp);
|
|
42
42
|
const timestampNextInMillisecond = Date.parse(next_timestamp);
|
|
43
|
-
|
|
44
43
|
if (current_name !== next_name || timestampNextInMillisecond - timestampCurrentInMillisecond > WebChatMiddlewareConstants.timeBetweenTimestampGroups) {
|
|
45
44
|
sameTimestampGroupTemp = false;
|
|
46
45
|
}
|
|
47
46
|
}
|
|
48
|
-
|
|
49
47
|
if (current_tags && current_tags.includes(Constants.systemMessageTag) || sameTimestampGroupTemp && sendState === SendStatus.Sent) {
|
|
50
48
|
return;
|
|
51
49
|
} else {
|
|
@@ -53,14 +51,14 @@ export const activityStatusMiddleware = () => next => args => {
|
|
|
53
51
|
style: {
|
|
54
52
|
padding: "2px"
|
|
55
53
|
}
|
|
56
|
-
}, sendState === SendStatus.Sending && /*#__PURE__*/React.createElement(SendingTimestamp, {
|
|
57
|
-
args: args
|
|
58
|
-
}), sendState === SendStatus.SendFailed && /*#__PURE__*/React.createElement(NotDeliveredTimestamp, {
|
|
54
|
+
}, sendState === SendStatus.Sending && /*#__PURE__*/React.createElement(SendingTimestamp, null), sendState === SendStatus.SendFailed && /*#__PURE__*/React.createElement(NotDeliveredTimestamp, {
|
|
59
55
|
args: args
|
|
60
56
|
}), sendState === SendStatus.Sent && /*#__PURE__*/React.createElement(DeliveredTimestamp, {
|
|
61
57
|
args: args,
|
|
62
58
|
role: current_role,
|
|
63
59
|
name: current_name
|
|
64
|
-
}))
|
|
60
|
+
}))
|
|
61
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
62
|
+
;
|
|
65
63
|
}
|
|
66
64
|
};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
-
|
|
3
2
|
/******
|
|
4
3
|
* AttachmentMiddleware
|
|
5
4
|
*
|
|
6
5
|
* Handles attachment downloading.
|
|
7
6
|
******/
|
|
7
|
+
|
|
8
8
|
import { Constants, MimeTypes, WebChatMiddlewareConstants } from "../../../../../common/Constants";
|
|
9
9
|
import React from "react";
|
|
10
10
|
import { getFileAttachmentIconData, isInlineMediaSupported } from "../../../common/utils/FileAttachmentIconManager";
|
|
@@ -21,14 +21,12 @@ import { defaultAttachmentProps } from "../../../common/defaultProps/defaultAtta
|
|
|
21
21
|
import { defaultAttachmentSizeStyles } from "./defaultStyles/defaultAttachmentSizeStyles";
|
|
22
22
|
import { defaultAttachmentStyles } from "./defaultStyles/defaultAtttachmentStyles";
|
|
23
23
|
import { useChatContextStore } from "../../../../..";
|
|
24
|
-
|
|
25
24
|
const AttachmentContent = props => {
|
|
26
25
|
return /*#__PURE__*/React.createElement("div", {
|
|
27
26
|
id: props.id,
|
|
28
27
|
style: props.style
|
|
29
28
|
}, props.children);
|
|
30
29
|
};
|
|
31
|
-
|
|
32
30
|
const AttachmentIcon = props => {
|
|
33
31
|
return /*#__PURE__*/React.createElement("div", {
|
|
34
32
|
id: props.id,
|
|
@@ -37,10 +35,8 @@ const AttachmentIcon = props => {
|
|
|
37
35
|
src: props.src ?? getFileAttachmentIconData("txt")
|
|
38
36
|
}));
|
|
39
37
|
};
|
|
40
|
-
|
|
41
38
|
const Attachment = props => {
|
|
42
39
|
var _state$domainStates$r, _state$domainStates$r2, _state$domainStates$r3, _state$domainStates$r4, _state$domainStates$r5, _state$domainStates$r6, _state$domainStates$r7, _state$domainStates$r8, _state$domainStates$r9;
|
|
43
|
-
|
|
44
40
|
const {
|
|
45
41
|
iconData,
|
|
46
42
|
imageCard,
|
|
@@ -49,34 +45,41 @@ const Attachment = props => {
|
|
|
49
45
|
} = props;
|
|
50
46
|
const [state] = useChatContextStore();
|
|
51
47
|
const attachmentId = ((_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : (_state$domainStates$r2 = _state$domainStates$r.attachmentProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.webChatAttachmentId) ?? defaultAttachmentProps.webChatAttachmentId;
|
|
52
|
-
const attachmentDividerStyles = {
|
|
48
|
+
const attachmentDividerStyles = {
|
|
49
|
+
...defaultAttachmentDividerStyles,
|
|
53
50
|
...((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 ? void 0 : _state$domainStates$r3.attachmentDividerStyles)
|
|
54
51
|
};
|
|
55
|
-
const attachmentIconStyles = {
|
|
52
|
+
const attachmentIconStyles = {
|
|
53
|
+
...defaultAttachmentIconStyles,
|
|
56
54
|
...((_state$domainStates$r4 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r4 === void 0 ? void 0 : _state$domainStates$r4.attachmentIconStyles)
|
|
57
55
|
};
|
|
58
|
-
const attachmentStyles = {
|
|
56
|
+
const attachmentStyles = {
|
|
57
|
+
...defaultAttachmentStyles,
|
|
59
58
|
...((_state$domainStates$r5 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r5 === void 0 ? void 0 : _state$domainStates$r5.attachmentStyles)
|
|
60
59
|
};
|
|
61
|
-
const attachmentSizeStylesString = Object.entries({
|
|
60
|
+
const attachmentSizeStylesString = Object.entries({
|
|
61
|
+
...defaultAttachmentSizeStyles,
|
|
62
62
|
...((_state$domainStates$r6 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r6 === void 0 ? void 0 : _state$domainStates$r6.attachmentSizeStyles)
|
|
63
63
|
}).map(_ref => {
|
|
64
64
|
let [k, v] = _ref;
|
|
65
65
|
return `${k.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)}:${v}`;
|
|
66
66
|
}).join(";");
|
|
67
|
-
const attachmentContentStylesString = Object.entries({
|
|
67
|
+
const attachmentContentStylesString = Object.entries({
|
|
68
|
+
...defaultAttachmentContentStyles,
|
|
68
69
|
...((_state$domainStates$r7 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r7 === void 0 ? void 0 : _state$domainStates$r7.attachmentContentStyles)
|
|
69
70
|
}).map(_ref2 => {
|
|
70
71
|
let [k, v] = _ref2;
|
|
71
72
|
return `${k.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)}:${v}`;
|
|
72
73
|
}).join(";");
|
|
73
|
-
const attachmentFileNameStylesString = Object.entries({
|
|
74
|
+
const attachmentFileNameStylesString = Object.entries({
|
|
75
|
+
...defaultAttachmentFileNameStyles,
|
|
74
76
|
...((_state$domainStates$r8 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r8 === void 0 ? void 0 : _state$domainStates$r8.attachmentFileNameStyles)
|
|
75
77
|
}).map(_ref3 => {
|
|
76
78
|
let [k, v] = _ref3;
|
|
77
79
|
return `${k.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)}:${v}`;
|
|
78
80
|
}).join(";");
|
|
79
|
-
const attachmentDownloadIconStylesString = Object.entries({
|
|
81
|
+
const attachmentDownloadIconStylesString = Object.entries({
|
|
82
|
+
...defaultAttachmentDownloadIconStyles,
|
|
80
83
|
...((_state$domainStates$r9 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r9 === void 0 ? void 0 : _state$domainStates$r9.attachmentDownloadIconStyles)
|
|
81
84
|
}).map(_ref4 => {
|
|
82
85
|
let [k, v] = _ref4;
|
|
@@ -102,13 +105,12 @@ const Attachment = props => {
|
|
|
102
105
|
style: attachmentIconStyles
|
|
103
106
|
}), textCard && renderer(textCard))));
|
|
104
107
|
};
|
|
108
|
+
|
|
105
109
|
/**
|
|
106
110
|
* Patch card with different attachment data.
|
|
107
111
|
* @param card
|
|
108
112
|
* @param newAttachment
|
|
109
113
|
*/
|
|
110
|
-
|
|
111
|
-
|
|
112
114
|
const patchAttachment = (card, newAttachment) => {
|
|
113
115
|
const {
|
|
114
116
|
activity,
|
|
@@ -125,7 +127,6 @@ const patchAttachment = (card, newAttachment) => {
|
|
|
125
127
|
attachment: patchedAttachment
|
|
126
128
|
};
|
|
127
129
|
};
|
|
128
|
-
|
|
129
130
|
const genPreviewCardWithAttachment = (card, iconData, next) => {
|
|
130
131
|
const patchedTextCard = patchAttachment(card, {
|
|
131
132
|
contentType: MimeTypes.UnknownFileType,
|
|
@@ -138,35 +139,30 @@ const genPreviewCardWithAttachment = (card, iconData, next) => {
|
|
|
138
139
|
renderer: next
|
|
139
140
|
});
|
|
140
141
|
};
|
|
141
|
-
|
|
142
142
|
const createAttachmentMiddleware = enableInlinePlaying => {
|
|
143
143
|
// eslint-disable-next-line react/display-name
|
|
144
144
|
const attachmentMiddleware = () => next => function () {
|
|
145
145
|
var _state$domainStates$r10, _state$domainStates$r11, _state$domainStates$r12, _card$activity$channe;
|
|
146
|
-
|
|
147
146
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
148
147
|
args[_key] = arguments[_key];
|
|
149
148
|
}
|
|
150
|
-
|
|
151
149
|
const [card] = args;
|
|
152
|
-
|
|
153
150
|
if (!(card !== null && card !== void 0 && card.activity)) {
|
|
154
151
|
return next(...args);
|
|
155
152
|
}
|
|
156
|
-
|
|
157
153
|
const {
|
|
158
154
|
activity: {
|
|
159
155
|
attachments
|
|
160
156
|
},
|
|
161
157
|
attachment
|
|
162
|
-
} = card;
|
|
163
|
-
|
|
158
|
+
} = card;
|
|
159
|
+
// No attachment
|
|
164
160
|
if (!attachments || !attachments.length || !attachment) {
|
|
165
161
|
return next(...args);
|
|
166
|
-
}
|
|
167
|
-
// eslint-disable-next-line prefer-const
|
|
168
|
-
|
|
162
|
+
}
|
|
169
163
|
|
|
164
|
+
// Check for Adaptive cards
|
|
165
|
+
// eslint-disable-next-line prefer-const
|
|
170
166
|
let {
|
|
171
167
|
content,
|
|
172
168
|
contentType
|
|
@@ -179,7 +175,6 @@ const createAttachmentMiddleware = enableInlinePlaying => {
|
|
|
179
175
|
} = content || {
|
|
180
176
|
type: ""
|
|
181
177
|
};
|
|
182
|
-
|
|
183
178
|
if (!type && content && Constants.supportedAdaptiveCardContentTypes.indexOf(contentType) >= 0) {
|
|
184
179
|
try {
|
|
185
180
|
content = JSON.parse(content);
|
|
@@ -196,41 +191,35 @@ const createAttachmentMiddleware = enableInlinePlaying => {
|
|
|
196
191
|
});
|
|
197
192
|
}
|
|
198
193
|
}
|
|
199
|
-
|
|
200
194
|
const [state] = useChatContextStore();
|
|
201
195
|
const attachmentId = ((_state$domainStates$r10 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r10 === void 0 ? void 0 : (_state$domainStates$r11 = _state$domainStates$r10.attachmentProps) === null || _state$domainStates$r11 === void 0 ? void 0 : _state$domainStates$r11.adaptiveCardAttachmentId) ?? defaultAttachmentProps.adaptiveCardAttachmentId;
|
|
202
|
-
const atttachmentAdaptiveCardStyles = {
|
|
196
|
+
const atttachmentAdaptiveCardStyles = {
|
|
197
|
+
...defaultAttachmentAdaptiveCardStyles,
|
|
203
198
|
...((_state$domainStates$r12 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r12 === void 0 ? void 0 : _state$domainStates$r12.attachmentAdaptiveCardStyles)
|
|
204
199
|
};
|
|
205
|
-
|
|
206
200
|
if (type === WebChatMiddlewareConstants.adaptiveCard || Constants.supportedAdaptiveCardContentTypes.indexOf(contentType) >= 0) {
|
|
207
201
|
return /*#__PURE__*/React.createElement("div", {
|
|
208
202
|
id: attachmentId,
|
|
209
203
|
style: atttachmentAdaptiveCardStyles
|
|
210
204
|
}, next(...args));
|
|
211
205
|
}
|
|
212
|
-
|
|
213
206
|
if ((_card$activity$channe = card.activity.channelData) !== null && _card$activity$channe !== void 0 && _card$activity$channe.middlewareData) {
|
|
214
207
|
attachment.contentUrl = card.activity.channelData.middlewareData[attachment.name];
|
|
215
208
|
} else if (attachment !== null && attachment !== void 0 && attachment.tempContentUrl) {
|
|
216
209
|
attachment.contentUrl = attachment.tempContentUrl;
|
|
217
210
|
}
|
|
218
|
-
|
|
219
211
|
const fileExtension = attachment.name.substring(attachment.name.lastIndexOf(".") + 1, attachment.name.length) || attachment.name;
|
|
220
212
|
const imageExtension = Constants.imageRegex.test(attachment.name);
|
|
221
213
|
const audioExtension = Constants.audioMediaRegex.test(attachment.name);
|
|
222
214
|
const videoExtension = Constants.videoMediaRegex.test(attachment.name);
|
|
223
215
|
const iconData = getFileAttachmentIconData(fileExtension);
|
|
224
|
-
|
|
225
216
|
if (imageExtension) {
|
|
226
217
|
return genPreviewCardWithAttachment(card, iconData, next);
|
|
227
218
|
}
|
|
228
|
-
|
|
229
219
|
if (audioExtension || videoExtension) {
|
|
230
220
|
if (enableInlinePlaying && card.activity.actionType && card.activity.actionType === WebChatActionType.DIRECT_LINE_INCOMING_ACTIVITY && isInlineMediaSupported(attachment.name)) {
|
|
231
221
|
return genPreviewCardWithAttachment(card, iconData, next);
|
|
232
222
|
}
|
|
233
|
-
|
|
234
223
|
return /*#__PURE__*/React.createElement(Attachment, {
|
|
235
224
|
iconData: iconData,
|
|
236
225
|
textCard: patchAttachment(card, {
|
|
@@ -240,8 +229,8 @@ const createAttachmentMiddleware = enableInlinePlaying => {
|
|
|
240
229
|
renderer: next
|
|
241
230
|
});
|
|
242
231
|
}
|
|
243
|
-
|
|
244
|
-
if (fileExtension === "txt") {
|
|
232
|
+
const isUnknownImageObject = contentType.toLowerCase().includes("image") && !imageExtension;
|
|
233
|
+
if (fileExtension === "txt" || isUnknownImageObject) {
|
|
245
234
|
return /*#__PURE__*/React.createElement(Attachment, {
|
|
246
235
|
iconData: iconData,
|
|
247
236
|
textCard: patchAttachment(card, {
|
|
@@ -251,15 +240,12 @@ const createAttachmentMiddleware = enableInlinePlaying => {
|
|
|
251
240
|
renderer: next
|
|
252
241
|
});
|
|
253
242
|
}
|
|
254
|
-
|
|
255
243
|
return /*#__PURE__*/React.createElement(Attachment, {
|
|
256
244
|
iconData: iconData,
|
|
257
245
|
textCard: card,
|
|
258
246
|
renderer: next
|
|
259
247
|
});
|
|
260
248
|
};
|
|
261
|
-
|
|
262
249
|
return attachmentMiddleware;
|
|
263
250
|
};
|
|
264
|
-
|
|
265
251
|
export default createAttachmentMiddleware;
|
|
@@ -4,17 +4,18 @@
|
|
|
4
4
|
* This middleware handles the avatar icon for each non-system message. It does the following processing:
|
|
5
5
|
* 1. Renders the first two letters of the sender as the profile pic
|
|
6
6
|
******/
|
|
7
|
+
|
|
7
8
|
import React from "react";
|
|
8
9
|
import { Constants } from "../../../../../common/Constants";
|
|
9
10
|
import { defaultAvatarStyles } from "./defaultStyles/defaultAvatarStyles";
|
|
10
11
|
import { defaultAvatarTextStyles } from "./defaultStyles/defaultAvatarTextStyles";
|
|
11
|
-
import { getIconText } from "../../../../../common/utils";
|
|
12
|
+
import { getIconText } from "../../../../../common/utils";
|
|
12
13
|
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
|
|
13
15
|
export const createAvatarMiddleware = (avatarStyleProps, avatarTextStyleProps) => () => next => function () {
|
|
14
16
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
15
17
|
args[_key] = arguments[_key];
|
|
16
18
|
}
|
|
17
|
-
|
|
18
19
|
const [params] = args;
|
|
19
20
|
const {
|
|
20
21
|
activity: {
|
|
@@ -27,18 +28,18 @@ export const createAvatarMiddleware = (avatarStyleProps, avatarTextStyleProps) =
|
|
|
27
28
|
},
|
|
28
29
|
fromUser
|
|
29
30
|
} = params;
|
|
30
|
-
|
|
31
31
|
if (fromUser !== false || tags && tags.includes(Constants.systemMessageTag)) {
|
|
32
32
|
return false;
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
const avatarStyles = {
|
|
35
|
+
...defaultAvatarStyles,
|
|
36
36
|
...avatarStyleProps
|
|
37
37
|
};
|
|
38
|
-
const avatarTextStyles = {
|
|
38
|
+
const avatarTextStyles = {
|
|
39
|
+
...defaultAvatarTextStyles,
|
|
39
40
|
...avatarTextStyleProps
|
|
40
|
-
};
|
|
41
|
-
|
|
41
|
+
};
|
|
42
|
+
// eslint-disable-next-line react/display-name
|
|
42
43
|
return () => /*#__PURE__*/React.createElement("div", {
|
|
43
44
|
style: avatarStyles
|
|
44
45
|
}, /*#__PURE__*/React.createElement("p", {
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { BotMagicCodeStore } from "../../BotMagicCodeStore";
|
|
2
|
+
var CardActionType;
|
|
3
|
+
(function (CardActionType) {
|
|
4
|
+
CardActionType["OpenUrl"] = "openUrl";
|
|
5
|
+
CardActionType["SignIn"] = "signin";
|
|
6
|
+
})(CardActionType || (CardActionType = {}));
|
|
7
|
+
const validCardActionTypes = [CardActionType.OpenUrl, CardActionType.SignIn];
|
|
8
|
+
const botOauthUrlRegex = /[\S]+.botframework.com\/api\/oauth\/signin\?signin=([\S]+)/;
|
|
9
|
+
export const createCardActionMiddleware = botMagicCodeConfig => {
|
|
10
|
+
const cardActionMiddleware = () => next => function () {
|
|
11
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
12
|
+
args[_key] = arguments[_key];
|
|
13
|
+
}
|
|
14
|
+
// eslint-disable-line @typescript-eslint/no-explicit-any
|
|
15
|
+
const [card] = args;
|
|
16
|
+
if (card.cardAction && validCardActionTypes.indexOf(card.cardAction.type) >= 0 && card.cardAction.value) {
|
|
17
|
+
// Override signin url only if fwdUrl is valid & feature is enabled
|
|
18
|
+
if ((botMagicCodeConfig === null || botMagicCodeConfig === void 0 ? void 0 : botMagicCodeConfig.disabled) === true && botMagicCodeConfig !== null && botMagicCodeConfig !== void 0 && botMagicCodeConfig.fwdUrl) {
|
|
19
|
+
const baseUrl = window.location.origin;
|
|
20
|
+
const result = botOauthUrlRegex.exec(card.cardAction.value);
|
|
21
|
+
if (result) {
|
|
22
|
+
BotMagicCodeStore.botOAuthSignInId = `${result[1]}`;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
// fwdUrl must be on the same domain as the chat widget
|
|
26
|
+
if (botMagicCodeConfig !== null && botMagicCodeConfig !== void 0 && botMagicCodeConfig.fwdUrl.startsWith(baseUrl)) {
|
|
27
|
+
card.cardAction.value += `&fwdUrl=${botMagicCodeConfig.fwdUrl}`;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return next(...args);
|
|
32
|
+
};
|
|
33
|
+
return cardActionMiddleware;
|
|
34
|
+
};
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import "@testing-library/jest-dom/extend-expect";
|
|
2
|
+
import { createCardActionMiddleware } from "./cardActionMiddleware";
|
|
3
|
+
describe("cardActionMiddleware test", () => {
|
|
4
|
+
it("createCardActionMiddleware() with undefined botMagicCodeConfig should not change the sign in card url", () => {
|
|
5
|
+
const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
6
|
+
const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
|
|
7
|
+
const args = {
|
|
8
|
+
cardAction: {
|
|
9
|
+
type: "signin",
|
|
10
|
+
value: signInUrl
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
const results = createCardActionMiddleware(undefined)()(next)(args);
|
|
14
|
+
expect(signInUrl).toEqual(results.cardAction.value);
|
|
15
|
+
});
|
|
16
|
+
it("createCardActionMiddleware() with botMagicCode enabled should not change the sign in card url", () => {
|
|
17
|
+
const botMagicCodeConfig = {
|
|
18
|
+
disabled: false
|
|
19
|
+
};
|
|
20
|
+
const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
21
|
+
const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
|
|
22
|
+
const args = {
|
|
23
|
+
cardAction: {
|
|
24
|
+
type: "signin",
|
|
25
|
+
value: signInUrl
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
|
|
29
|
+
expect(args.cardAction.value).toEqual(results.cardAction.value);
|
|
30
|
+
});
|
|
31
|
+
it("createCardActionMiddleware() with botMagicCode disabled & no fwdUrl should not change the sign in card url", () => {
|
|
32
|
+
const botMagicCodeConfig = {
|
|
33
|
+
disabled: true
|
|
34
|
+
};
|
|
35
|
+
const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
36
|
+
const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
|
|
37
|
+
const args = {
|
|
38
|
+
cardAction: {
|
|
39
|
+
type: "signin",
|
|
40
|
+
value: signInUrl
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
|
|
44
|
+
expect(args.cardAction.value).toEqual(results.cardAction.value);
|
|
45
|
+
});
|
|
46
|
+
it("createCardActionMiddleware() with botMagicCode disabled & fwdUrl should append the fwdUrl in the sign in card url", () => {
|
|
47
|
+
const botMagicCodeConfig = {
|
|
48
|
+
disabled: true,
|
|
49
|
+
fwdUrl: "http://localhost/forwarder.html"
|
|
50
|
+
};
|
|
51
|
+
const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
52
|
+
const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
|
|
53
|
+
const args = {
|
|
54
|
+
cardAction: {
|
|
55
|
+
type: "signin",
|
|
56
|
+
value: signInUrl
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
|
|
60
|
+
expect(signInUrl === results.cardAction.value).toBe(false);
|
|
61
|
+
expect(results.cardAction.value === `${signInUrl}&fwdUrl=${botMagicCodeConfig.fwdUrl}`).toBe(true);
|
|
62
|
+
});
|
|
63
|
+
it("createCardActionMiddleware() should not append fwdUrl if fwdUrl & sign in card url are not in the same domain", () => {
|
|
64
|
+
const botMagicCodeConfig = {
|
|
65
|
+
disabled: true,
|
|
66
|
+
fwdUrl: "https://localhost/forwarder.html"
|
|
67
|
+
};
|
|
68
|
+
const next = args => args; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
69
|
+
const signInUrl = "https://token.botframework.com/api/oauth/signin?signin=[signin]";
|
|
70
|
+
const args = {
|
|
71
|
+
cardAction: {
|
|
72
|
+
type: "signin",
|
|
73
|
+
value: signInUrl
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
const results = createCardActionMiddleware(botMagicCodeConfig)()(next)(args);
|
|
77
|
+
expect(signInUrl === results.cardAction.value).toBe(true);
|
|
78
|
+
expect(results.cardAction.value === `${signInUrl}&fwdUrl=${botMagicCodeConfig.fwdUrl}`).toBe(false);
|
|
79
|
+
});
|
|
80
|
+
});
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { defaultTimestampContentStyles } from "./defaultTimestampContentStyles";
|
|
2
|
-
export const defaultTimestampFailedStyles = {
|
|
2
|
+
export const defaultTimestampFailedStyles = {
|
|
3
|
+
...defaultTimestampContentStyles,
|
|
3
4
|
color: "#A80000"
|
|
4
5
|
};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { defaultTimestampContentStyles } from "./defaultTimestampContentStyles";
|
|
2
|
-
export const defaultTimestampRetryStyles = {
|
|
2
|
+
export const defaultTimestampRetryStyles = {
|
|
3
|
+
...defaultTimestampContentStyles,
|
|
3
4
|
color: "#0063B1",
|
|
4
5
|
cursor: "pointer"
|
|
5
6
|
};
|
|
@@ -4,13 +4,12 @@
|
|
|
4
4
|
* This middleware controls which messages are grouped together regarding to timestamps. It does the following processing:
|
|
5
5
|
* 1. Distinguishes different messages by sender name and whether it is a system message
|
|
6
6
|
******/
|
|
7
|
-
import { Constants } from "../../../../../common/Constants";
|
|
8
7
|
|
|
8
|
+
import { Constants } from "../../../../../common/Constants";
|
|
9
9
|
function bin(items, grouping) {
|
|
10
10
|
let lastBin;
|
|
11
11
|
const bins = [];
|
|
12
12
|
let lastItem;
|
|
13
|
-
|
|
14
13
|
if (items.length > 0) {
|
|
15
14
|
items.forEach(item => {
|
|
16
15
|
if (lastItem && grouping(lastItem, item)) {
|
|
@@ -19,20 +18,17 @@ function bin(items, grouping) {
|
|
|
19
18
|
lastBin = [item];
|
|
20
19
|
bins.push(lastBin);
|
|
21
20
|
}
|
|
22
|
-
|
|
23
21
|
lastItem = item;
|
|
24
22
|
});
|
|
25
23
|
}
|
|
26
|
-
|
|
27
24
|
return bins;
|
|
28
|
-
}
|
|
29
|
-
|
|
25
|
+
}
|
|
30
26
|
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
|
|
31
28
|
export const groupActivitiesMiddleware = () => next => args => {
|
|
32
29
|
const {
|
|
33
30
|
activities
|
|
34
31
|
} = args;
|
|
35
|
-
|
|
36
32
|
if (activities != null && activities.length > 0) {
|
|
37
33
|
const {
|
|
38
34
|
status
|