@atlaskit/reactions 36.4.0 → 36.5.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/reactions
 
+## 36.5.0
+
+### Minor Changes
+
+- [`6680b6edfb038`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6680b6edfb038) -
+  Format agent reactions with the agent name and the person's display name in the tooltip and
+  reaction dialog.
+
+## 36.4.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 36.4.0
 
 ### Minor Changes

package/dist/cjs/analytics/index.js

@@ -11,7 +11,7 @@ var _createAndFireEvents = _interopRequireDefault(require("@atlaskit/analytics-n
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 var packageName = "@atlaskit/reactions";
-var packageVersion = "36.3.36";
+var packageVersion = "36.4.1";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/cjs/components/ReactionTooltip.js

@@ -58,7 +58,12 @@ var ReactionTooltip = exports.ReactionTooltip = function ReactionTooltip(_ref) {
   }, emojiName) : null, users.slice(0, maxReactions).map(function (user) {
     return /*#__PURE__*/_react.default.createElement("li", {
       key: user.id
-    }, user.displayName);
+    }, user.agent ? /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, _i18n.messages.agentWithPerson, {
+      values: {
+        agentName: user.agent.name,
+        personName: user.displayName
+      }
+    })) : user.displayName);
   }), /*#__PURE__*/_react.default.createElement("li", {
     className: (0, _runtime.ax)(["_syaz15cr"])
   }, users.length > maxReactions && (allowUserDialog && handleOpenReactionsDialog ? /*#__PURE__*/_react.default.createElement("button", {

package/dist/cjs/components/ReactionView.js

@@ -11,10 +11,13 @@ require("./ReactionView.compiled.css");
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _reactIntl = require("react-intl");
 var _Avatar = _interopRequireDefault(require("@atlaskit/avatar/Avatar"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner/spinner"));
 var _tabPanel = _interopRequireDefault(require("@atlaskit/tabs/tab-panel"));
+var _i18n = require("../shared/i18n");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var userListStyle = null;
 var userStyle = null;
@@ -30,8 +33,9 @@ var ReactionView = exports.ReactionView = function ReactionView(_ref) {
   var alphabeticalNames = (0, _react.useMemo)(function () {
     var _reactionObj$users;
     var reactionObj = reaction;
-    return ((_reactionObj$users = reactionObj.users) === null || _reactionObj$users === void 0 ? void 0 : _reactionObj$users.sort(function (a, b) {
-      return a.displayName.localeCompare(b.displayName);
+    return ((_reactionObj$users = reactionObj.users) === null || _reactionObj$users === void 0 ? void 0 : _reactionObj$users.slice().sort(function (a, b) {
+      var _a$agent$name, _a$agent, _b$agent$name, _b$agent;
+      return ((_a$agent$name = (_a$agent = a.agent) === null || _a$agent === void 0 ? void 0 : _a$agent.name) !== null && _a$agent$name !== void 0 ? _a$agent$name : a.displayName).localeCompare((_b$agent$name = (_b$agent = b.agent) === null || _b$agent === void 0 ? void 0 : _b$agent.name) !== null && _b$agent$name !== void 0 ? _b$agent$name : b.displayName);
     })) || [];
   }, [reaction]);
   return /*#__PURE__*/React.createElement(_tabPanel.default, null, /*#__PURE__*/React.createElement(_compiled.Flex, {
@@ -67,6 +71,11 @@ var ReactionView = exports.ReactionView = function ReactionView(_ref) {
       testId: "profile"
     }), /*#__PURE__*/React.createElement(_compiled.Flex, {
       xcss: styles.userDescriptionStyle
-    }, /*#__PURE__*/React.createElement("div", null, user.displayName)));
+    }, /*#__PURE__*/React.createElement("div", null, user.agent ? /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, _i18n.messages.agentWithPerson, {
+      values: {
+        agentName: user.agent.name,
+        personName: user.displayName
+      }
+    })) : user.displayName)));
   }))));
 };

package/dist/cjs/shared/i18n.js

@@ -6,6 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.messages = void 0;
 var _reactIntl = require("react-intl");
 var messages = exports.messages = (0, _reactIntl.defineMessages)({
+  agentWithPerson: {
+    id: 'fabric.reactions.agent.with.person',
+    defaultMessage: '{agentName} with {personName}',
+    description: 'Name of an agent that reacted on behalf of a person.'
+  },
   addReaction: {
     id: 'fabric.reactions.add',
     defaultMessage: 'Add reaction',

package/dist/es2019/analytics/index.js

@@ -2,7 +2,7 @@ import { UI_EVENT_TYPE, OPERATIONAL_EVENT_TYPE } from '@atlaskit/analytics-gas-t
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import createAndFireEvent from '@atlaskit/analytics-next/createAndFireEvents';
 const packageName = "@atlaskit/reactions";
-const packageVersion = "36.3.36";
+const packageVersion = "36.4.1";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/es2019/components/ReactionTooltip.js

@@ -47,11 +47,14 @@ export const ReactionTooltip = ({
     className: ax(["_1reo15vq _18m915vq _p12f1w81 _1bto1l2s _o5721q9c _otyr14y2 _d1n8glyw _102oidpf _1kvxidpf _1ysjidpf _17d4idpf _1hziidpf _3n4midpf _ltofidpf _k7zyidpf _1ywo1e5h _1pru15vq _u0h115vq _5qec1l2s _1eg614y2", wideTooltip && "_p12fnklw"])
   }, /*#__PURE__*/React.createElement("ul", null, emojiName ? /*#__PURE__*/React.createElement("li", {
     className: ax(["_1p1d1dk0 _syaz15cr _k48p1pd9"])
-  }, emojiName) : null, users.slice(0, maxReactions).map(user => {
-    return /*#__PURE__*/React.createElement("li", {
-      key: user.id
-    }, user.displayName);
-  }), /*#__PURE__*/React.createElement("li", {
+  }, emojiName) : null, users.slice(0, maxReactions).map(user => /*#__PURE__*/React.createElement("li", {
+    key: user.id
+  }, user.agent ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.agentWithPerson, {
+    values: {
+      agentName: user.agent.name,
+      personName: user.displayName
+    }
+  })) : user.displayName)), /*#__PURE__*/React.createElement("li", {
     className: ax(["_syaz15cr"])
   }, users.length > maxReactions && (allowUserDialog && handleOpenReactionsDialog ? /*#__PURE__*/React.createElement("button", {
     type: "button",

package/dist/es2019/components/ReactionView.js

@@ -1,12 +1,15 @@
 /* ReactionView.tsx generated by @compiled/babel-plugin v3.0.2 */
+import _extends from "@babel/runtime/helpers/extends";
 import "./ReactionView.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useMemo } from 'react';
+import { FormattedMessage } from 'react-intl';
 import Avatar from '@atlaskit/avatar/Avatar';
 import { Box, Flex } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner/spinner';
 import TabPanel from '@atlaskit/tabs/tab-panel';
+import { messages } from '../shared/i18n';
 const userListStyle = null;
 const userStyle = null;
 const styles = {
@@ -22,7 +25,10 @@ export const ReactionView = ({
   const alphabeticalNames = useMemo(() => {
     var _reactionObj$users;
     const reactionObj = reaction;
-    return ((_reactionObj$users = reactionObj.users) === null || _reactionObj$users === void 0 ? void 0 : _reactionObj$users.sort((a, b) => a.displayName.localeCompare(b.displayName))) || [];
+    return ((_reactionObj$users = reactionObj.users) === null || _reactionObj$users === void 0 ? void 0 : _reactionObj$users.slice().sort((a, b) => {
+      var _a$agent$name, _a$agent, _b$agent$name, _b$agent;
+      return ((_a$agent$name = (_a$agent = a.agent) === null || _a$agent === void 0 ? void 0 : _a$agent.name) !== null && _a$agent$name !== void 0 ? _a$agent$name : a.displayName).localeCompare((_b$agent$name = (_b$agent = b.agent) === null || _b$agent === void 0 ? void 0 : _b$agent.name) !== null && _b$agent$name !== void 0 ? _b$agent$name : b.displayName);
+    })) || [];
   }, [reaction]);
   return /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(Flex, {
     direction: "column",
@@ -57,6 +63,11 @@ export const ReactionView = ({
       testId: "profile"
     }), /*#__PURE__*/React.createElement(Flex, {
       xcss: styles.userDescriptionStyle
-    }, /*#__PURE__*/React.createElement("div", null, user.displayName)));
+    }, /*#__PURE__*/React.createElement("div", null, user.agent ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.agentWithPerson, {
+      values: {
+        agentName: user.agent.name,
+        personName: user.displayName
+      }
+    })) : user.displayName)));
   }))));
 };

package/dist/es2019/shared/i18n.js

@@ -1,5 +1,10 @@
 import { defineMessages } from 'react-intl';
 export const messages = defineMessages({
+  agentWithPerson: {
+    id: 'fabric.reactions.agent.with.person',
+    defaultMessage: '{agentName} with {personName}',
+    description: 'Name of an agent that reacted on behalf of a person.'
+  },
   addReaction: {
     id: 'fabric.reactions.add',
     defaultMessage: 'Add reaction',

package/dist/esm/analytics/index.js

@@ -5,7 +5,7 @@ import { UI_EVENT_TYPE, OPERATIONAL_EVENT_TYPE } from '@atlaskit/analytics-gas-t
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import createAndFireEvent from '@atlaskit/analytics-next/createAndFireEvents';
 var packageName = "@atlaskit/reactions";
-var packageVersion = "36.3.36";
+var packageVersion = "36.4.1";
 /**
  * TODO: move to utility package?
  * A random sampling function

package/dist/esm/components/ReactionTooltip.js

@@ -51,7 +51,12 @@ export var ReactionTooltip = function ReactionTooltip(_ref) {
   }, emojiName) : null, users.slice(0, maxReactions).map(function (user) {
     return /*#__PURE__*/React.createElement("li", {
       key: user.id
-    }, user.displayName);
+    }, user.agent ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.agentWithPerson, {
+      values: {
+        agentName: user.agent.name,
+        personName: user.displayName
+      }
+    })) : user.displayName);
   }), /*#__PURE__*/React.createElement("li", {
     className: ax(["_syaz15cr"])
   }, users.length > maxReactions && (allowUserDialog && handleOpenReactionsDialog ? /*#__PURE__*/React.createElement("button", {

package/dist/esm/components/ReactionView.js

@@ -1,12 +1,15 @@
 /* ReactionView.tsx generated by @compiled/babel-plugin v3.0.2 */
+import _extends from "@babel/runtime/helpers/extends";
 import "./ReactionView.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useMemo } from 'react';
+import { FormattedMessage } from 'react-intl';
 import Avatar from '@atlaskit/avatar/Avatar';
 import { Box, Flex } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner/spinner';
 import TabPanel from '@atlaskit/tabs/tab-panel';
+import { messages } from '../shared/i18n';
 var userListStyle = null;
 var userStyle = null;
 var styles = {
@@ -21,8 +24,9 @@ export var ReactionView = function ReactionView(_ref) {
   var alphabeticalNames = useMemo(function () {
     var _reactionObj$users;
     var reactionObj = reaction;
-    return ((_reactionObj$users = reactionObj.users) === null || _reactionObj$users === void 0 ? void 0 : _reactionObj$users.sort(function (a, b) {
-      return a.displayName.localeCompare(b.displayName);
+    return ((_reactionObj$users = reactionObj.users) === null || _reactionObj$users === void 0 ? void 0 : _reactionObj$users.slice().sort(function (a, b) {
+      var _a$agent$name, _a$agent, _b$agent$name, _b$agent;
+      return ((_a$agent$name = (_a$agent = a.agent) === null || _a$agent === void 0 ? void 0 : _a$agent.name) !== null && _a$agent$name !== void 0 ? _a$agent$name : a.displayName).localeCompare((_b$agent$name = (_b$agent = b.agent) === null || _b$agent === void 0 ? void 0 : _b$agent.name) !== null && _b$agent$name !== void 0 ? _b$agent$name : b.displayName);
     })) || [];
   }, [reaction]);
   return /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(Flex, {
@@ -58,6 +62,11 @@ export var ReactionView = function ReactionView(_ref) {
       testId: "profile"
     }), /*#__PURE__*/React.createElement(Flex, {
       xcss: styles.userDescriptionStyle
-    }, /*#__PURE__*/React.createElement("div", null, user.displayName)));
+    }, /*#__PURE__*/React.createElement("div", null, user.agent ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.agentWithPerson, {
+      values: {
+        agentName: user.agent.name,
+        personName: user.displayName
+      }
+    })) : user.displayName)));
   }))));
 };

package/dist/esm/shared/i18n.js

@@ -1,5 +1,10 @@
 import { defineMessages } from 'react-intl';
 export var messages = defineMessages({
+  agentWithPerson: {
+    id: 'fabric.reactions.agent.with.person',
+    defaultMessage: '{agentName} with {personName}',
+    description: 'Name of an agent that reacted on behalf of a person.'
+  },
   addReaction: {
     id: 'fabric.reactions.add',
     defaultMessage: 'Add reaction',

package/dist/types/shared/i18n.d.ts

@@ -14,6 +14,11 @@ export declare const messages: {
         description: string;
         id: string;
     };
+    agentWithPerson: {
+        defaultMessage: string;
+        description: string;
+        id: string;
+    };
     closeReactionsDialog: {
         defaultMessage: string;
         description: string;

package/dist/types/types/User.d.ts

@@ -1,5 +1,11 @@
 export interface User {
     accountId?: string;
+    /**
+     * Agent that reacted with the user
+     */
+    agent?: {
+        name: string;
+    };
     /**
      * name of user clicked on the reaction
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/reactions",
-	"version": "36.4.0",
+	"version": "36.5.0",
 	"description": "Reactions component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
 		"@atlaskit/icon": "^38.0.0",
 		"@atlaskit/link": "^5.1.0",
 		"@atlaskit/modal-dialog": "^17.0.0",
-		"@atlaskit/motion": "^9.2.0",
+		"@atlaskit/motion": "^9.3.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/popper": "^9.4.0",
@@ -58,8 +58,8 @@
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/tabs": "^21.3.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^220.0.0",
-		"@atlaskit/tokens": "^20.1.0",
+		"@atlaskit/tmp-editor-statsig": "^221.0.0",
+		"@atlaskit/tokens": "^20.2.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/ufo": "^2.0.0",
 		"@atlaskit/util-service-support": "^7.4.0",