Minor changes to botAgent and revert misc eslint changes

microsoft · Jun 21, 2019 · f17466c · f17466c
1 parent fea74c7
commit f17466c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  `*`: Added [`eslint`](https://npmjs.com/package/eslint/) to static code analysis, by [@compulim](https://github.com/compulim), in PR [#1970](https://github.com/microsoft/BotFramework-WebChat/pull/1970)
 -  Added pt-PT language, by [@bodyzatva](https://github.com/bodyzatva) in PR [#2005](https://github.com/microsoft/BotFramework-WebChat/pull/2005) and PR [#2020](https://github.com/Microsoft/BotFramework-WebChat/pull/2020)
 - Added documentation for using Web Chat dev build, by [@corinagum](https://github.com/corinagum), in PR [#2074](https://github.com/Microsoft/BotFramework-WebChat/pull/2074)
+-  Added the Web Chat version to DirectLine's botAgent option, by [@tdurnford](https://github.com/tdurnford), in PR [#2101](https://github.com/Microsoft/BotFramework-WebChat/pull/2101)
 
 ### Changed
 

diff --git a/packages/bundle/src/FullReactWebChat.js b/packages/bundle/src/FullReactWebChat.js
@@ -66,15 +66,13 @@ class FullReactWebChat extends React.Component {
 FullReactWebChat.defaultProps = {
   adaptiveCardHostConfig: undefined,
   attachmentMiddleware: undefined,
-  renderMarkdown: undefined,
   styleOptions: undefined,
   styleSet: undefined
 };
 
 FullReactWebChat.propTypes = {
   adaptiveCardHostConfig: PropTypes.any,
   attachmentMiddleware: PropTypes.func,
-  renderMarkdown: PropTypes.func,
   styleOptions: PropTypes.any,
   styleSet: PropTypes.any
 };

diff --git a/packages/bundle/src/createDirectLine.js b/packages/bundle/src/createDirectLine.js
@@ -13,6 +13,7 @@ export default function createDirectLine({
   webSocket
 }) {
   return new DirectLine({
+    botAgent,
     conversationId,
     domain,
     fetch,
@@ -22,7 +23,6 @@ export default function createDirectLine({
     token,
     watermark,
     webSocket,
-    botAgent,
     createFormData: attachments => {
       const formData = new FormData();
 

diff --git a/packages/bundle/src/index-es5.ts b/packages/bundle/src/index-es5.ts
@@ -16,11 +16,11 @@ import 'core-js/modules/es6.symbol';
 import 'core-js/modules/es7.array.includes';
 import 'url-search-params-polyfill';
 import 'whatwg-fetch';
+import { version } from './index-minimal';
 import addVersion from './addVersion';
 import defaultCreateDirectLine from './createDirectLine';
-import { version } from './index-minimal';
 
-const createDirectLine = options => defaultCreateDirectLine({ botAgent: `webchat-es5/${version}`, ...options });
+const createDirectLine = options => defaultCreateDirectLine({ botAgent: `webchat/${version} (ES5)`, ...options });
 
 window['WebChat'] = {
   ...window['WebChat'],

diff --git a/packages/bundle/src/index-minimal.ts b/packages/bundle/src/index-minimal.ts
@@ -16,7 +16,7 @@ import createBrowserWebSpeechPonyfillFactory from './createBrowserWebSpeechPonyf
 import defaultCreateDirectLine from './createDirectLine';
 
 const renderWebChat = coreRenderWebChat.bind(null, ReactWebChat);
-const createDirectLine = options => defaultCreateDirectLine({ botAgent: `webchat-minimal/${version}`, ...options });
+const createDirectLine = options => defaultCreateDirectLine({ botAgent: `webchat/${version} (Minimal)`, ...options });
 
 export default ReactWebChat;
 

diff --git a/packages/bundle/src/index.ts b/packages/bundle/src/index.ts
@@ -3,8 +3,8 @@
 
 export * from './index-minimal';
 
-import addVersion from './addVersion';
 import { version } from './index-minimal';
+import addVersion from './addVersion';
 import coreRenderWebChat from './renderWebChat';
 import createCognitiveServicesBingSpeechPonyfillFactory from './createCognitiveServicesBingSpeechPonyfillFactory';
 import createCognitiveServicesSpeechServicesPonyfillFactory from './createCognitiveServicesSpeechServicesPonyfillFactory';
@@ -15,7 +15,7 @@ import renderMarkdown from './renderMarkdown';
 
 const renderWebChat = coreRenderWebChat.bind(null, ReactWebChat);
 
-const createDirectLine = options => defaultCreateDirectLine({ botAgent: `webchat/${version}`, ...options });
+const createDirectLine = options => defaultCreateDirectLine({ botAgent: `webchat/${version} (Full)`, ...options });
 
 export default ReactWebChat;
 

diff --git a/packages/component/src/Localization/tr-TR.js b/packages/component/src/Localization/tr-TR.js
@@ -1,5 +1,3 @@
-/* eslint no-magic-numbers: ["error", { "ignore": [1, 5, 24, 48, 60000, 3600000] }] */
-
 function xMinutesAgo(dateStr) {
   const date = new Date(dateStr);
   const dateTime = date.getTime();