@atlaskit/user-picker 8.6.4 → 8.7.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/user-picker
 
+## 8.7.2
+
+### Patch Changes
+
+- [`4d4d565e8ad`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4d4d565e8ad) - Skip sending UFO success if already failed
+
+## 8.7.1
+
+### Patch Changes
+
+- [`dace9a85101`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dace9a85101) - Add new attribute to analytics events
+
+## 8.7.0
+
+### Minor Changes
+
+- [`90f5bb4745c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/90f5bb4745c) - [ux] Sources tooltip: support 'Other Atlassian products', change heading
+
 ## 8.6.4
 
 ### Patch Changes

package/dist/cjs/analytics.js

@@ -64,7 +64,8 @@ var optionData2Analytics = function optionData2Analytics(option) {
   if ((0, _utils.isExternalUser)(option)) {
     return {
       type: 'external_user',
-      sources: option.sources
+      sources: option.sources,
+      externalUserType: option.externalUserType
     };
   } else {
     // id's of email types are emails which is PII

package/dist/cjs/components/ExternalUserOption/main.js

@@ -31,9 +31,7 @@ var _reactIntlNext = require("react-intl-next");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _confluenceIcon = require("@atlaskit/logo/confluence-icon");
-
-var _jiraIcon = require("@atlaskit/logo/jira-icon");
+var _logo = require("@atlaskit/logo");
 
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 
@@ -102,16 +100,22 @@ var SourcesInfoMap = new Map([['slack', {
   label: _i18n.messages.gitHubProvider
 }], ['jira', {
   key: 'jira',
-  icon: /*#__PURE__*/_react.default.createElement(_jiraIcon.JiraIcon, {
+  icon: /*#__PURE__*/_react.default.createElement(_logo.JiraIcon, {
     size: 'xsmall'
   }),
   label: _i18n.messages.jiraSource
 }], ['confluence', {
   key: 'confluence',
-  icon: /*#__PURE__*/_react.default.createElement(_confluenceIcon.ConfluenceIcon, {
+  icon: /*#__PURE__*/_react.default.createElement(_logo.ConfluenceIcon, {
     size: 'xsmall'
   }),
   label: _i18n.messages.confluenceSource
+}], ['other-atlassian', {
+  key: 'other-atlassian',
+  icon: /*#__PURE__*/_react.default.createElement(_logo.AtlassianIcon, {
+    size: 'xsmall'
+  }),
+  label: _i18n.messages.otherAtlassianSource
 }]]);
 
 var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {

package/dist/cjs/components/UserPicker.js

@@ -27,6 +27,8 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 
 var _select = _interopRequireWildcard(require("@atlaskit/select"));
 
+var _ufo = require("@atlaskit/ufo");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _BaseUserPicker = require("./BaseUserPicker");
@@ -80,9 +82,12 @@ var UserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Component) {
   (0, _createClass2.default)(UserPickerWithoutAnalytics, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var experienceForId = _ufoExperiences.userPickerRenderedUfoExperience.getInstance(this.ufoId);
+      var experienceForId = _ufoExperiences.userPickerRenderedUfoExperience.getInstance(this.ufoId); // Send UFO success if the experience is still in progress i.e. hasn't failed
+
 
-      experienceForId.success();
+      if ([_ufo.UFOExperienceState.IN_PROGRESS.id, _ufo.UFOExperienceState.STARTED.id].includes(experienceForId.state.id)) {
+        experienceForId.success();
+      }
     }
   }, {
     key: "render",

package/dist/cjs/components/i18n.js

@@ -70,7 +70,7 @@ var messages = (0, _reactIntlNext.defineMessages)({
   },
   externalUserSourcesHeading: {
     id: 'fabric.elements.user-picker.external.sourced.from',
-    defaultMessage: 'Found in:',
+    defaultMessage: 'Also found in:',
     description: 'From where the external user is coming'
   },
   externalUserSourcesError: {
@@ -108,6 +108,11 @@ var messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Confluence',
     description: 'This external user is sourced from Confluence'
   },
+  otherAtlassianSource: {
+    id: 'fabric.elements.user-picker.source.other-atlassian',
+    defaultMessage: 'Other Atlassian products',
+    description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
+  },
   memberLozengeText: {
     id: 'fabric.elements.user-picker.member.lozenge.text',
     defaultMessage: 'MEMBER',

package/dist/cjs/index.js

@@ -63,6 +63,12 @@ Object.defineProperty(exports, "isEmail", {
     return _utils.isEmail;
   }
 });
+Object.defineProperty(exports, "isExternalUser", {
+  enumerable: true,
+  get: function get() {
+    return _utils.isExternalUser;
+  }
+});
 Object.defineProperty(exports, "isTeam", {
   enumerable: true,
   get: function get() {

package/dist/cjs/util/ufoExperiences.js

@@ -47,7 +47,11 @@ var UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
   (0, _createClass2.default)(UfoErrorBoundary, [{
     key: "componentDidCatch",
     value: function componentDidCatch() {
-      userPickerRenderedUfoExperience.getInstance(this.props.id).failure();
+      var instance = userPickerRenderedUfoExperience.getInstance(this.props.id);
+
+      if (instance.state.id !== _ufo.UFOExperienceState.FAILED.id) {
+        instance.failure();
+      }
     }
   }, {
     key: "render",

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.6.4",
+	"version": "8.7.2",
 	"sideEffects": false
 }

package/dist/es2019/analytics.js

@@ -39,7 +39,8 @@ const optionData2Analytics = option => {
   if (isExternalUser(option)) {
     return {
       type: 'external_user',
-      sources: option.sources
+      sources: option.sources,
+      externalUserType: option.externalUserType
     };
   } else {
     // id's of email types are emails which is PII

package/dist/es2019/components/ExternalUserOption/main.js

@@ -2,8 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import styled from 'styled-components';
-import { ConfluenceIcon } from '@atlaskit/logo/confluence-icon';
-import { JiraIcon } from '@atlaskit/logo/jira-icon';
+import { ConfluenceIcon, JiraIcon, AtlassianIcon } from '@atlaskit/logo';
 import Spinner from '@atlaskit/spinner';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
 import { token } from '@atlaskit/tokens';
@@ -66,6 +65,12 @@ const SourcesInfoMap = new Map([['slack', {
     size: 'xsmall'
   }),
   label: messages.confluenceSource
+}], ['other-atlassian', {
+  key: 'other-atlassian',
+  icon: /*#__PURE__*/React.createElement(AtlassianIcon, {
+    size: 'xsmall'
+  }),
+  label: messages.otherAtlassianSource
 }]]);
 export class ExternalUserOption extends React.PureComponent {
   constructor(...args) {

package/dist/es2019/components/UserPicker.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import Select, { CreatableSelect } from '@atlaskit/select';
+import { UFOExperienceState } from '@atlaskit/ufo';
 import React from 'react';
 import { BaseUserPickerWithoutAnalytics } from './BaseUserPicker';
 import { getStyles } from './styles';
@@ -21,8 +22,11 @@ export class UserPickerWithoutAnalytics extends React.Component {
   }
 
   componentDidMount() {
-    const experienceForId = experience.getInstance(this.ufoId);
-    experienceForId.success();
+    const experienceForId = experience.getInstance(this.ufoId); // Send UFO success if the experience is still in progress i.e. hasn't failed
+
+    if ([UFOExperienceState.IN_PROGRESS.id, UFOExperienceState.STARTED.id].includes(experienceForId.state.id)) {
+      experienceForId.success();
+    }
   }
 
   render() {

package/dist/es2019/components/i18n.js

@@ -62,7 +62,7 @@ export const messages = defineMessages({
   },
   externalUserSourcesHeading: {
     id: 'fabric.elements.user-picker.external.sourced.from',
-    defaultMessage: 'Found in:',
+    defaultMessage: 'Also found in:',
     description: 'From where the external user is coming'
   },
   externalUserSourcesError: {
@@ -100,6 +100,11 @@ export const messages = defineMessages({
     defaultMessage: 'Confluence',
     description: 'This external user is sourced from Confluence'
   },
+  otherAtlassianSource: {
+    id: 'fabric.elements.user-picker.source.other-atlassian',
+    defaultMessage: 'Other Atlassian products',
+    description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
+  },
   memberLozengeText: {
     id: 'fabric.elements.user-picker.member.lozenge.text',
     defaultMessage: 'MEMBER',

package/dist/es2019/index.js

@@ -2,6 +2,6 @@ export { isValidEmail } from './components/emailValidation';
 export { UserPicker as default } from './components/UserPicker';
 export { getUserRecommendations, hydrateDefaultValues, SmartUserPicker, setSmartUserPickerEnv } from './components/smart-user-picker/index';
 export { PopupUserPicker } from './components/PopupUserPicker';
-export { isEmail, isTeam, isUser } from './components/utils';
+export { isEmail, isExternalUser, isTeam, isUser } from './components/utils';
 export { // Constants
 EmailType, GroupType, TeamType, UserType } from './types';

package/dist/es2019/util/ufoExperiences.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ExperiencePerformanceTypes, ExperienceTypes, ConcurrentExperience } from '@atlaskit/ufo';
+import { ExperiencePerformanceTypes, ExperienceTypes, ConcurrentExperience, UFOExperienceState } from '@atlaskit/ufo';
 export const userPickerRenderedUfoExperience = new ConcurrentExperience('user-picker-rendered', {
   platform: {
     component: 'user-picker'
@@ -9,7 +9,11 @@ export const userPickerRenderedUfoExperience = new ConcurrentExperience('user-pi
 });
 export class UfoErrorBoundary extends React.Component {
   componentDidCatch() {
-    userPickerRenderedUfoExperience.getInstance(this.props.id).failure();
+    const instance = userPickerRenderedUfoExperience.getInstance(this.props.id);
+
+    if (instance.state.id !== UFOExperienceState.FAILED.id) {
+      instance.failure();
+    }
   }
 
   render() {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.6.4",
+	"version": "8.7.2",
 	"sideEffects": false
 }

package/dist/esm/analytics.js

@@ -47,7 +47,8 @@ var optionData2Analytics = function optionData2Analytics(option) {
   if (isExternalUser(option)) {
     return {
       type: 'external_user',
-      sources: option.sources
+      sources: option.sources,
+      externalUserType: option.externalUserType
     };
   } else {
     // id's of email types are emails which is PII

package/dist/esm/components/ExternalUserOption/main.js

@@ -17,8 +17,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import styled from 'styled-components';
-import { ConfluenceIcon } from '@atlaskit/logo/confluence-icon';
-import { JiraIcon } from '@atlaskit/logo/jira-icon';
+import { ConfluenceIcon, JiraIcon, AtlassianIcon } from '@atlaskit/logo';
 import Spinner from '@atlaskit/spinner';
 import { B400, N200, N800 } from '@atlaskit/theme/colors';
 import { token } from '@atlaskit/tokens';
@@ -65,6 +64,12 @@ var SourcesInfoMap = new Map([['slack', {
     size: 'xsmall'
   }),
   label: messages.confluenceSource
+}], ['other-atlassian', {
+  key: 'other-atlassian',
+  icon: /*#__PURE__*/React.createElement(AtlassianIcon, {
+    size: 'xsmall'
+  }),
+  label: messages.otherAtlassianSource
 }]]);
 export var ExternalUserOption = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(ExternalUserOption, _React$PureComponent);

package/dist/esm/components/UserPicker.js

@@ -16,6 +16,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import Select, { CreatableSelect } from '@atlaskit/select';
+import { UFOExperienceState } from '@atlaskit/ufo';
 import React from 'react';
 import { BaseUserPickerWithoutAnalytics } from './BaseUserPicker';
 import { getStyles } from './styles';
@@ -46,8 +47,11 @@ export var UserPickerWithoutAnalytics = /*#__PURE__*/function (_React$Component)
   _createClass(UserPickerWithoutAnalytics, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var experienceForId = experience.getInstance(this.ufoId);
-      experienceForId.success();
+      var experienceForId = experience.getInstance(this.ufoId); // Send UFO success if the experience is still in progress i.e. hasn't failed
+
+      if ([UFOExperienceState.IN_PROGRESS.id, UFOExperienceState.STARTED.id].includes(experienceForId.state.id)) {
+        experienceForId.success();
+      }
     }
   }, {
     key: "render",

package/dist/esm/components/i18n.js

@@ -62,7 +62,7 @@ export var messages = defineMessages({
   },
   externalUserSourcesHeading: {
     id: 'fabric.elements.user-picker.external.sourced.from',
-    defaultMessage: 'Found in:',
+    defaultMessage: 'Also found in:',
     description: 'From where the external user is coming'
   },
   externalUserSourcesError: {
@@ -100,6 +100,11 @@ export var messages = defineMessages({
     defaultMessage: 'Confluence',
     description: 'This external user is sourced from Confluence'
   },
+  otherAtlassianSource: {
+    id: 'fabric.elements.user-picker.source.other-atlassian',
+    defaultMessage: 'Other Atlassian products',
+    description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
+  },
   memberLozengeText: {
     id: 'fabric.elements.user-picker.member.lozenge.text',
     defaultMessage: 'MEMBER',

package/dist/esm/index.js

@@ -2,6 +2,6 @@ export { isValidEmail } from './components/emailValidation';
 export { UserPicker as default } from './components/UserPicker';
 export { getUserRecommendations, hydrateDefaultValues, SmartUserPicker, setSmartUserPickerEnv } from './components/smart-user-picker/index';
 export { PopupUserPicker } from './components/PopupUserPicker';
-export { isEmail, isTeam, isUser } from './components/utils';
+export { isEmail, isExternalUser, isTeam, isUser } from './components/utils';
 export { // Constants
 EmailType, GroupType, TeamType, UserType } from './types';

package/dist/esm/util/ufoExperiences.js

@@ -9,7 +9,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import React from 'react';
-import { ExperiencePerformanceTypes, ExperienceTypes, ConcurrentExperience } from '@atlaskit/ufo';
+import { ExperiencePerformanceTypes, ExperienceTypes, ConcurrentExperience, UFOExperienceState } from '@atlaskit/ufo';
 export var userPickerRenderedUfoExperience = new ConcurrentExperience('user-picker-rendered', {
   platform: {
     component: 'user-picker'
@@ -31,7 +31,11 @@ export var UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
   _createClass(UfoErrorBoundary, [{
     key: "componentDidCatch",
     value: function componentDidCatch() {
-      userPickerRenderedUfoExperience.getInstance(this.props.id).failure();
+      var instance = userPickerRenderedUfoExperience.getInstance(this.props.id);
+
+      if (instance.state.id !== UFOExperienceState.FAILED.id) {
+        instance.failure();
+      }
     }
   }, {
     key: "render",

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/user-picker",
-	"version": "8.6.4",
+	"version": "8.7.2",
 	"sideEffects": false
 }

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

@@ -99,6 +99,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    otherAtlassianSource: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     memberLozengeText: {
         id: string;
         defaultMessage: string;

package/dist/types/index.d.ts

@@ -4,6 +4,6 @@ export { UserPicker as default } from './components/UserPicker';
 export { getUserRecommendations, hydrateDefaultValues, SmartUserPicker, setSmartUserPickerEnv, } from './components/smart-user-picker/index';
 export type { RecommendationRequest, SmartUserPickerProps, SupportedProduct, } from './components/smart-user-picker/index';
 export { PopupUserPicker } from './components/PopupUserPicker';
-export { isEmail, isTeam, isUser } from './components/utils';
+export { isEmail, isExternalUser, isTeam, isUser } from './components/utils';
 export { EmailType, GroupType, TeamType, UserType, } from './types';
 export type { ActionTypes, Appearance, AtlasKitSelectChange, AtlaskitSelectValue, DefaultValue, InputActionTypes, LozengeProps, OnChange, OnInputChange, OnOption, OnPicker, Option, OptionData, OptionIdentifier, PopupUserPickerProps, Promisable, Target, UserPickerProps, UserPickerState, Value, Email, Group, GroupHighlight, HighlightRange, LoadOptions, Team, TeamHighlight, User, UserHighlight, ExternalUser, UserSource, } from './types';

package/dist/types/types.d.ts

@@ -202,8 +202,9 @@ export interface OptionData {
     lozenge?: string | LozengeProps;
 }
 export declare const UserType = "user";
-export declare type UserSource = 'google' | 'slack' | 'microsoft' | 'github' | 'jira' | 'confluence';
+export declare type UserSource = 'google' | 'slack' | 'microsoft' | 'github' | 'jira' | 'confluence' | 'other-atlassian';
 export interface ExternalUser extends User {
+    externalUserType?: 'crossSite' | 'thirdParty';
     requiresSourceHydration?: boolean;
     sources: UserSource[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/user-picker",
-  "version": "8.6.4",
+  "version": "8.7.2",
   "description": "Fabric component for display a dropdown to select a user from",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"